Polish JDBC plugins to make DBType accurate

.github/workflows/plugins-test.3.yaml

@@ -121,7 +121,7 @@ jobs:
         run: |
           mkdir -p skywalking-agent/plugins
           curl -O https://skyapm.github.io/ci-assist/jars/ojdbc14-10.2.0.4.0.jar
-          curl -L -o ./skywalking-agent/plugins/apm-oracle-10.x-plugin-2.0.0.jar https://github.com/SkyAPM/java-plugin-extensions/releases/download/2.3.0/apm-oracle-10.x-plugin-2.3.0.jar
+          curl -L -o ./skywalking-agent/plugins/apm-oracle-10.x-plugin-2.3.1.jar https://github.com/SkyAPM/java-plugin-extensions/releases/download/2.3.1/apm-oracle-10.x-plugin-2.3.1.jar
           ./mvnw -q --batch-mode install:install-file -Dfile=ojdbc14-10.2.0.4.0.jar -DgroupId=com.oracle -DartifactId=ojdbc14 -Dversion=10.2.0.4.0 -Dpackaging=jar
       - name: Run Plugin Test
         uses: ./.github/actions/run

CHANGES.md

@@ -12,6 +12,7 @@ Release Notes.
 * Bump up byte-buddy to 1.12.19
 * Upgrade agent test tools
 * [Breaking Change] Compatible with 3.x and 4.x RabbitMQ Client, rename `rabbitmq-5.x-plugin` to `rabbitmq-plugin`
+* Polish JDBC plugins to make DBType accurate
 
 #### Documentation
 

apm-sniffer/apm-sdk-plugin/clickhouse-0.3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/clickhouse/ClickHouseStatementTracingWrapper.java

@@ -35,7 +35,7 @@ public static <T> T of(ConnectionInfo connectionInfo, String methodName, String
         final AbstractSpan span = ContextManager.createExitSpan(
                 connectionInfo.getDBType() + "/JDBC/Statement/" + methodName, connectionInfo.getDatabasePeer());
         try {
-            Tags.DB_TYPE.set(span, "sql");
+            Tags.DB_TYPE.set(span, connectionInfo.getDBType());
             Tags.DB_INSTANCE.set(span, connectionInfo.getDatabaseName());
             Tags.DB_STATEMENT.set(span, sql);
             span.setComponent(connectionInfo.getComponent());

apm-sniffer/apm-sdk-plugin/clickhouse-0.3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/clickhouse/ClickHouseStatementMethodInterceptorTest.java

@@ -121,7 +121,7 @@ private void assertSpan(final AbstractTracingSpan span) throws JsonProcessingExc
         SpanAssert.assertComponent(span, ComponentsDefine.CLICKHOUSE_JDBC_DRIVER);
         SpanAssert.assertLayer(span, SpanLayer.DB);
         SpanAssert.assertTagSize(span, 3);
-        SpanAssert.assertTag(span, 0, "sql");
+        SpanAssert.assertTag(span, 0, "ClickHouse");
         SpanAssert.assertTag(span, 1, "default");
         SpanAssert.assertTag(span, 2, SQL);
     }

apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/PreparedStatementExecuteMethodsInterceptor.java

@@ -45,7 +45,7 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[]
         }
         AbstractSpan span = ContextManager.createExitSpan(buildOperationName(connectInfo, method.getName(), cacheObject
             .getStatementName()), connectInfo.getDatabasePeer());
-        Tags.DB_TYPE.set(span, "sql");
+        Tags.DB_TYPE.set(span, connectInfo.getDBType());
         Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
         Tags.DB_STATEMENT.set(span, SqlBodyUtil.limitSqlBodySize(cacheObject.getSql()));
         span.setComponent(connectInfo.getComponent());

apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/StatementExecuteMethodsInterceptor.java

@@ -40,7 +40,7 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[]
         if (connectInfo != null) {
             AbstractSpan span = ContextManager.createExitSpan(buildOperationName(connectInfo, method.getName(), cacheObject
                     .getStatementName()), connectInfo.getDatabasePeer());
-            Tags.DB_TYPE.set(span, "sql");
+            Tags.DB_TYPE.set(span, connectInfo.getDBType());
             Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
             String sql = allArguments.length > 0 ? (String) allArguments[0] : "";
             sql = SqlBodyUtil.limitSqlBodySize(sql);

apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/PreparedStatementExecuteMethodsInterceptorTest.java

@@ -115,7 +115,7 @@ public void testExecutePreparedStatement() throws Throwable {
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
         assertThat(span.getOperationName(), is("Impala/JDBC/PreparedStatement/"));
-        SpanAssert.assertTag(span, 0, "sql");
+        SpanAssert.assertTag(span, 0, "Impala");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, SQL);
         SpanAssert.assertTag(span, 3, "[abcd,efgh]");
@@ -145,7 +145,7 @@ public void testExecutePreparedStatementWithLimitSqlBody() throws Throwable {
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
         assertThat(span.getOperationName(), is("Impala/JDBC/PreparedStatement/"));
-        SpanAssert.assertTag(span, 0, "sql");
+        SpanAssert.assertTag(span, 0, "Impala");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, "Select * f...");
         SpanAssert.assertTag(span, 3, "[abcd,efgh]");

apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/StatementExecuteMethodsInterceptorTest.java

@@ -98,7 +98,7 @@ public void testExecuteStatement() {
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
         assertThat(span.getOperationName(), is("Impala/JDBC/CallableStatement/"));
-        SpanAssert.assertTag(span, 0, "sql");
+        SpanAssert.assertTag(span, 0, "Impala");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, SQL);
     }
@@ -115,7 +115,7 @@ public void testExecuteStatementWithLimitSqlBody() {
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
         assertThat(span.getOperationName(), is("Impala/JDBC/CallableStatement/"));
-        SpanAssert.assertTag(span, 0, "sql");
+        SpanAssert.assertTag(span, 0, "Impala");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, "Select * f...");
     }

apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/ConnectionServiceMethodInterceptor.java

@@ -41,7 +41,7 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[]
         if (connectInfo != null) {
             AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBC/Connection/" + method.getName(), connectInfo
                 .getDatabasePeer());
-            Tags.DB_TYPE.set(span, "sql");
+            Tags.DB_TYPE.set(span, connectInfo.getDBType());
             Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
             Tags.DB_STATEMENT.set(span, "");
             span.setComponent(connectInfo.getComponent());

apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/CallableStatementTracing.java

@@ -35,7 +35,7 @@ public static <R> R execute(java.sql.CallableStatement realStatement, Connection
         AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBC/CallableStatement/" + method, connectInfo
             .getDatabasePeer());
         try {
-            Tags.DB_TYPE.set(span, "sql");
+            Tags.DB_TYPE.set(span, connectInfo.getDBType());
             SpanLayer.asDB(span);
             Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
             Tags.DB_STATEMENT.set(span, sql);

apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/PreparedStatementTracing.java

@@ -35,7 +35,7 @@ public static <R> R execute(java.sql.PreparedStatement realStatement, Connection
         final AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBC/PreparedStatement/" + method, connectInfo
             .getDatabasePeer());
         try {
-            Tags.DB_TYPE.set(span, "sql");
+            Tags.DB_TYPE.set(span, connectInfo.getDBType());
             Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
             Tags.DB_STATEMENT.set(span, sql);
             span.setComponent(connectInfo.getComponent());

apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/StatementTracing.java

@@ -34,7 +34,7 @@ public static <R> R execute(java.sql.Statement realStatement, ConnectionInfo con
         try {
             AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBC/Statement/" + method, connectInfo
                 .getDatabasePeer());
-            Tags.DB_TYPE.set(span, "sql");
+            Tags.DB_TYPE.set(span, connectInfo.getDBType());
             Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
             Tags.DB_STATEMENT.set(span, sql);
             span.setComponent(connectInfo.getComponent());

apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/AbstractStatementTest.java

@@ -53,7 +53,7 @@ protected void assertDBSpan(AbstractTracingSpan span, String exceptOperationName
         assertThat(span.getOperationName(), is(exceptOperationName));
         assertThat(SpanHelper.getComponentId(span), is(33));
         List<TagValuePair> tags = SpanHelper.getTags(span);
-        assertThat(tags.get(0).getValue(), is("sql"));
+        assertThat(tags.get(0).getValue(), is("Mysql"));
         assertThat(tags.get(1).getValue(), is("test"));
         assertThat(SpanHelper.getLayer(span), CoreMatchers.is(SpanLayer.DB));
     }

apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/ConnectionTracing.java

@@ -32,7 +32,7 @@ public static <R> R execute(java.sql.Connection realConnection, ConnectionInfo c
         AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBC/Connection/" + method, connectInfo
             .getDatabasePeer());
         try {
-            Tags.DB_TYPE.set(span, "sql");
+            Tags.DB_TYPE.set(span, connectInfo.getDBType());
             Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
             Tags.DB_STATEMENT.set(span, sql);
             span.setComponent(connectInfo.getComponent());

apm-sniffer/apm-sdk-plugin/kylin-jdbc-2.6.x-3.x-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/kylin/PreparedStatementExecuteMethodsInterceptor.java

@@ -45,7 +45,7 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[]
         }
         AbstractSpan span = ContextManager.createExitSpan(buildOperationName(connectInfo, method.getName(), cacheObject
             .getStatementName()), connectInfo.getDatabasePeer());
-        Tags.DB_TYPE.set(span, "sql");
+        Tags.DB_TYPE.set(span, connectInfo.getDBType());
         Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
         Tags.DB_STATEMENT.set(span, SqlBodyUtil.limitSqlBodySize(cacheObject.getSql()));
         span.setComponent(connectInfo.getComponent());

apm-sniffer/apm-sdk-plugin/kylin-jdbc-2.6.x-3.x-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/kylin/StatementExecuteMethodsInterceptor.java

@@ -39,7 +39,7 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[]
         if (connectInfo != null) {
             AbstractSpan span = ContextManager.createExitSpan(buildOperationName(connectInfo, method.getName(), cacheObject
                     .getStatementName()), connectInfo.getDatabasePeer());
-            Tags.DB_TYPE.set(span, "sql");
+            Tags.DB_TYPE.set(span, connectInfo.getDBType());
             Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
             String sql = allArguments.length > 0 ? (String) allArguments[0] : "";
             sql = SqlBodyUtil.limitSqlBodySize(sql);

apm-sniffer/apm-sdk-plugin/kylin-jdbc-2.6.x-3.x-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/kylin/PreparedStatementExecuteMethodsInterceptorTest.java

@@ -114,7 +114,7 @@ public void testExecutePreparedStatement() throws Throwable {
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
         assertThat(span.getOperationName(), is("kylin/JDBC/PreparedStatement/"));
-        SpanAssert.assertTag(span, 0, "sql");
+        SpanAssert.assertTag(span, 0, "kylin");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, SQL);
         SpanAssert.assertTag(span, 3, "[abcd,efgh]");
@@ -144,7 +144,7 @@ public void testExecutePreparedStatementWithLimitSqlBody() throws Throwable {
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
         assertThat(span.getOperationName(), is("kylin/JDBC/PreparedStatement/"));
-        SpanAssert.assertTag(span, 0, "sql");
+        SpanAssert.assertTag(span, 0, "kylin");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, "Select * f...");
         SpanAssert.assertTag(span, 3, "[abcd,efgh]");

apm-sniffer/apm-sdk-plugin/kylin-jdbc-2.6.x-3.x-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/kylin/StatementExecuteMethodsInterceptorTest.java

@@ -97,7 +97,7 @@ public void testExecuteStatement() {
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
         assertThat(span.getOperationName(), is("kylin/JDBC/CallableStatement/"));
-        SpanAssert.assertTag(span, 0, "sql");
+        SpanAssert.assertTag(span, 0, "kylin");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, SQL);
     }
@@ -114,7 +114,7 @@ public void testExecuteStatementWithLimitSqlBody() {
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
         assertThat(span.getOperationName(), is("kylin/JDBC/CallableStatement/"));
-        SpanAssert.assertTag(span, 0, "sql");
+        SpanAssert.assertTag(span, 0, "kylin");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, "Select * f...");
     }

apm-sniffer/apm-sdk-plugin/mariadb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mariadb/v2/PreparedStatementExecuteMethodsInterceptor.java

@@ -45,7 +45,7 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[]
         }
         AbstractSpan span = ContextManager.createExitSpan(buildOperationName(connectInfo, method.getName(), cacheObject
             .getStatementName()), connectInfo.getDatabasePeer());
-        Tags.DB_TYPE.set(span, "sql");
+        Tags.DB_TYPE.set(span, connectInfo.getDBType());
         Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
         Tags.DB_STATEMENT.set(span, SqlBodyUtil.limitSqlBodySize(cacheObject.getSql()));
         span.setComponent(connectInfo.getComponent());

apm-sniffer/apm-sdk-plugin/mariadb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mariadb/v2/StatementExecuteMethodsInterceptor.java

@@ -40,7 +40,7 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[]
         if (connectInfo != null) {
             AbstractSpan span = ContextManager.createExitSpan(buildOperationName(connectInfo, method.getName(), cacheObject
                     .getStatementName()), connectInfo.getDatabasePeer());
-            Tags.DB_TYPE.set(span, "sql");
+            Tags.DB_TYPE.set(span, connectInfo.getDBType());
             Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
             String sql = allArguments.length > 0 ? (String) allArguments[0] : "";
             sql = SqlBodyUtil.limitSqlBodySize(sql);

apm-sniffer/apm-sdk-plugin/mariadb-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mariadb/v2/PreparedStatementExecuteMethodsInterceptorTest.java

@@ -114,7 +114,7 @@ public void testExecutePreparedStatement() throws Throwable {
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
         assertThat(span.getOperationName(), is("Mariadb/JDBC/PreparedStatement/"));
-        SpanAssert.assertTag(span, 0, "sql");
+        SpanAssert.assertTag(span, 0, "Mariadb");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, SQL);
         SpanAssert.assertTag(span, 3, "[abcd,efgh]");
@@ -144,7 +144,7 @@ public void testExecutePreparedStatementWithLimitSqlBody() throws Throwable {
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
         assertThat(span.getOperationName(), is("Mariadb/JDBC/PreparedStatement/"));
-        SpanAssert.assertTag(span, 0, "sql");
+        SpanAssert.assertTag(span, 0, "Mariadb");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, "Select * f...");
         SpanAssert.assertTag(span, 3, "[abcd,efgh]");

apm-sniffer/apm-sdk-plugin/mariadb-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mariadb/v2/StatementExecuteMethodsInterceptorTest.java

@@ -98,7 +98,7 @@ public void testExecuteStatement() {
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
         assertThat(span.getOperationName(), is("Mariadb/JDBC/CallableStatement/"));
-        SpanAssert.assertTag(span, 0, "sql");
+        SpanAssert.assertTag(span, 0, "Mariadb");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, SQL);
     }
@@ -115,7 +115,7 @@ public void testExecuteStatementWithLimitSqlBody() {
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
         assertThat(span.getOperationName(), is("Mariadb/JDBC/CallableStatement/"));
-        SpanAssert.assertTag(span, 0, "sql");
+        SpanAssert.assertTag(span, 0, "Mariadb");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, "Select * f...");
     }

apm-sniffer/apm-sdk-plugin/mssql-commons/src/main/java/org/apache/skywalking/apm/plugin/mssql/commons/PreparedStatementExecuteMethodsInterceptor.java

@@ -46,7 +46,7 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[]
             AbstractSpan span = ContextManager.createExitSpan(
                 buildOperationName(connectInfo, method.getName(), cacheObject
                     .getStatementName()), connectInfo.getDatabasePeer());
-            Tags.DB_TYPE.set(span, "sql");
+            Tags.DB_TYPE.set(span, connectInfo.getDBType());
             Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
             Tags.DB_STATEMENT.set(span, SqlBodyUtil.limitSqlBodySize(cacheObject.getSql()));
             span.setComponent(connectInfo.getComponent());
@@ -83,11 +83,11 @@ public final void handleMethodException(EnhancedInstance objInst, Method method,
     private String buildOperationName(ConnectionInfo connectionInfo, String methodName, String statementName) {
         return connectionInfo.getDBType() + "/JDBC/" + statementName + "/" + methodName;
     }
-    
+
     private String getParameterString(Object[] parameters, int maxIndex) {
         return new PreparedStatementParameterBuilder()
-                .setParameters(parameters)
-                .setMaxIndex(maxIndex)
-                .build();
+            .setParameters(parameters)
+            .setMaxIndex(maxIndex)
+            .build();
     }
 }

apm-sniffer/apm-sdk-plugin/mssql-commons/src/main/java/org/apache/skywalking/apm/plugin/mssql/commons/StatementExecuteMethodsInterceptor.java

@@ -41,7 +41,7 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[]
             AbstractSpan span = ContextManager.createExitSpan(
                 buildOperationName(connectInfo, method.getName(), cacheObject
                     .getStatementName()), connectInfo.getDatabasePeer());
-            Tags.DB_TYPE.set(span, "sql");
+            Tags.DB_TYPE.set(span, connectInfo.getDBType());
             Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
 
             String sql = "";

apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/PreparedStatementExecuteMethodsInterceptor.java

@@ -51,7 +51,7 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[]
             AbstractSpan span = ContextManager.createExitSpan(
                 buildOperationName(connectInfo, method.getName(), cacheObject
                     .getStatementName()), connectInfo.getDatabasePeer());
-            Tags.DB_TYPE.set(span, "sql");
+            Tags.DB_TYPE.set(span, connectInfo.getDBType());
             Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
             Tags.DB_STATEMENT.set(span, SqlBodyUtil.limitSqlBodySize(cacheObject.getSql()));
             span.setComponent(connectInfo.getComponent());

apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/StatementExecuteMethodsInterceptor.java

@@ -48,7 +48,7 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[]
 
             AbstractSpan span = ContextManager.createExitSpan(buildOperationName(connectInfo, method.getName(), cacheObject
                 .getStatementName()), connectInfo.getDatabasePeer());
-            Tags.DB_TYPE.set(span, "sql");
+            Tags.DB_TYPE.set(span, connectInfo.getDBType());
             Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
 
             /**

apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/StatementExecuteMethodsInterceptorTest.java

@@ -98,7 +98,7 @@ public void testCreateDatabaseSpan() throws Throwable {
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
         assertThat(span.getOperationName(), is("H2/JDBC/CallableStatement/"));
-        SpanAssert.assertTag(span, 0, "sql");
+        SpanAssert.assertTag(span, 0, "H2");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, SQL);
     }
@@ -116,7 +116,7 @@ public void testCreateDatabaseSpanWithLimitSqlBody() throws Throwable {
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
         assertThat(span.getOperationName(), is("H2/JDBC/CallableStatement/"));
-        SpanAssert.assertTag(span, 0, "sql");
+        SpanAssert.assertTag(span, 0, "H2");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, "SELECT * F...");
     }

apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/PreparedStatementExecuteMethodsInterceptor.java

@@ -47,7 +47,7 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[]
         AbstractSpan span = ContextManager.createExitSpan(
             buildOperationName(connectInfo, method.getName(), cacheObject.getStatementName()), connectInfo
                 .getDatabasePeer());
-        Tags.DB_TYPE.set(span, "sql");
+        Tags.DB_TYPE.set(span, connectInfo.getDBType());
         Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
         Tags.DB_STATEMENT.set(span, SqlBodyUtil.limitSqlBodySize(cacheObject.getSql()));
         span.setComponent(connectInfo.getComponent());