[skywalking] 01/01: set no statement.

[tanjian]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch no_statement
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 2392849d0bf3cfb70b4ed522c934f6791ced2664
Author: Jared.Tan <jian....@daocloud.io>
AuthorDate: Mon Nov 18 15:22:04 2019 +0800

    set no statement.
---
 .../listener/endpoint/MultiScopesSpanListener.java | 34 +++++++++++++---------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git 
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java
 
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java
index 5fd0af1..61be410 100755
--- 
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java
+++ 
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java
@@ -18,13 +18,25 @@
 
 package 
org.apache.skywalking.oap.server.receiver.trace.provider.parser.listener.endpoint;
 
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
 import org.apache.skywalking.apm.network.common.KeyStringValuePair;
-import org.apache.skywalking.apm.network.language.agent.*;
+import org.apache.skywalking.apm.network.language.agent.SpanLayer;
+import org.apache.skywalking.apm.network.language.agent.UniqueId;
 import org.apache.skywalking.apm.util.StringUtil;
-import org.apache.skywalking.oap.server.core.*;
+import org.apache.skywalking.oap.server.core.Const;
+import org.apache.skywalking.oap.server.core.CoreModule;
 import org.apache.skywalking.oap.server.core.analysis.TimeBucket;
-import org.apache.skywalking.oap.server.core.cache.*;
-import org.apache.skywalking.oap.server.core.source.*;
+import org.apache.skywalking.oap.server.core.cache.EndpointInventoryCache;
+import 
org.apache.skywalking.oap.server.core.cache.NetworkAddressInventoryCache;
+import 
org.apache.skywalking.oap.server.core.cache.ServiceInstanceInventoryCache;
+import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache;
+import org.apache.skywalking.oap.server.core.source.DatabaseSlowStatement;
+import org.apache.skywalking.oap.server.core.source.DetectPoint;
+import org.apache.skywalking.oap.server.core.source.EndpointRelation;
+import org.apache.skywalking.oap.server.core.source.RequestType;
+import org.apache.skywalking.oap.server.core.source.SourceReceiver;
 import org.apache.skywalking.oap.server.library.module.ModuleManager;
 import 
org.apache.skywalking.oap.server.receiver.trace.provider.DBLatencyThresholdsAndWatcher;
 import 
org.apache.skywalking.oap.server.receiver.trace.provider.TraceServiceModuleConfig;
@@ -40,10 +52,6 @@ import 
org.apache.skywalking.oap.server.receiver.trace.provider.parser.listener.
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
 import static java.util.Objects.nonNull;
 
 /**
@@ -179,13 +187,13 @@ public class MultiScopesSpanListener implements 
EntrySpanListener, ExitSpanListe
             for (KeyStringValuePair tag : spanDecorator.getAllTags()) {
                 if (SpanTags.DB_STATEMENT.equals(tag.getKey())) {
                     String sqlStatement = tag.getValue();
-                    if (!StringUtil.isEmpty(sqlStatement) && 
sqlStatement.length() > config.getMaxSlowSQLLength()) {
-                        
statement.setStatement(sqlStatement.substring(0,config.getMaxSlowSQLLength()));
-                    }
-                    else {
+                    if (StringUtil.isEmpty(sqlStatement)) {
+                        statement.setStatement("No statement.");
+                    } else if (sqlStatement.length() > 
config.getMaxSlowSQLLength()) {
+                        statement.setStatement(sqlStatement.substring(0, 
config.getMaxSlowSQLLength()));
+                    } else {
                         statement.setStatement(sqlStatement);
                     }
-
                 } else if (SpanTags.DB_TYPE.equals(tag.getKey())) {
                     String dbType = tag.getValue();
                     DBLatencyThresholdsAndWatcher thresholds = 
config.getDbLatencyThresholdsAndWatcher();