[incubator-skywalking] branch top-sql updated: Fix wrong db default threshold

[wu...@apache.org]

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

wusheng pushed a commit to branch top-sql
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/top-sql by this push:
     new 9ef1cd9  Fix wrong db default threshold
9ef1cd9 is described below

commit 9ef1cd9561869c7070b5b467ed05dce1b01302ed
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Feb 12 10:30:18 2019 +0800

    Fix wrong db default threshold
---
 .../oap/server/receiver/trace/provider/DBLatencyThresholds.java         | 2 +-
 .../apache/skywalking/oap/server/receiver/trace/mock/ServiceBMock.java  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/DBLatencyThresholds.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/DBLatencyThresholds.java
index 55aab89..b66c890 100644
--- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/DBLatencyThresholds.java
+++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/DBLatencyThresholds.java
@@ -35,7 +35,7 @@ public class DBLatencyThresholds {
                 thresholds.put(typeValue[0].toLowerCase(), Integer.parseInt(typeValue[1]));
             }
         }
-        if (thresholds.containsKey("default")) {
+        if (!thresholds.containsKey("default")) {
             thresholds.put("default", 10000);
         }
     }
diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceBMock.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceBMock.java
index f9bcfbe..9496815 100644
--- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceBMock.java
+++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceBMock.java
@@ -117,6 +117,7 @@ class ServiceBMock {
         span.setComponentId(ComponentsDefine.MONGO_DRIVER.getId());
         span.setIsError(true);
         span.addTags(KeyWithStringValue.newBuilder().setKey("db.statement").setValue("select * from database where complex = 1;").build());
+        span.addTags(KeyWithStringValue.newBuilder().setKey("db.type").setValue("mongodb").build());
 
         if (isPrepare) {
             span.setOperationName("mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]");