Rename`JDBI` to `JDBC` (#381)

.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.0.0/apm-oracle-10.x-plugin-2.0.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
           ./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

@@ -7,6 +7,7 @@ Release Notes.
 
 * Polish test framework to support `arm64/v8` platforms
 * Fix wrong config name `plugin.toolkit.use_qualified_name_as_operation_name`, and system variable name `SW_PLUGIN_TOOLKIT_USE_QUALIFIED_NAME_AS_OPERATION_NAME:false`. They were **toolit**.
+* Rename `JDBI` to `JDBC`
 
 #### Documentation
 

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

@@ -33,7 +33,7 @@ public class ClickHouseStatementTracingWrapper {
     public static <T> T of(ConnectionInfo connectionInfo, String methodName, String sql,
             SupplierWithException<T> supplier) throws SQLException {
         final AbstractSpan span = ContextManager.createExitSpan(
-                connectionInfo.getDBType() + "/JDBI/Statement/" + methodName, connectionInfo.getDatabasePeer());
+                connectionInfo.getDBType() + "/JDBC/Statement/" + methodName, connectionInfo.getDatabasePeer());
         try {
             Tags.DB_TYPE.set(span, "sql");
             Tags.DB_INSTANCE.set(span, connectionInfo.getDatabaseName());

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

@@ -81,7 +81,7 @@ public class PreparedStatementExecuteMethodsInterceptor implements InstanceMetho
     }
 
     private String buildOperationName(ConnectionInfo connectionInfo, String methodName, String statementName) {
-        return connectionInfo.getDBType() + "/JDBI/" + statementName + "/" + methodName;
+        return connectionInfo.getDBType() + "/JDBC/" + statementName + "/" + methodName;
     }
 
     private String getParameterString(Object[] parameters, int maxIndex) {

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

@@ -70,6 +70,6 @@ public class StatementExecuteMethodsInterceptor implements InstanceMethodsAround
     }
 
     private String buildOperationName(ConnectionInfo connectionInfo, String methodName, String statementName) {
-        return connectionInfo.getDBType() + "/JDBI/" + statementName + "/" + methodName;
+        return connectionInfo.getDBType() + "/JDBC/" + statementName + "/" + methodName;
     }
 }

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

@@ -114,7 +114,7 @@ public class PreparedStatementExecuteMethodsInterceptorTest {
         assertThat(SegmentHelper.getSpans(segment).size(), is(1));
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
-        assertThat(span.getOperationName(), is("Impala/JDBI/PreparedStatement/"));
+        assertThat(span.getOperationName(), is("Impala/JDBC/PreparedStatement/"));
         SpanAssert.assertTag(span, 0, "sql");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, SQL);
@@ -144,7 +144,7 @@ public class PreparedStatementExecuteMethodsInterceptorTest {
         assertThat(SegmentHelper.getSpans(segment).size(), is(1));
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
-        assertThat(span.getOperationName(), is("Impala/JDBI/PreparedStatement/"));
+        assertThat(span.getOperationName(), is("Impala/JDBC/PreparedStatement/"));
         SpanAssert.assertTag(span, 0, "sql");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, "Select * f...");

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

@@ -97,7 +97,7 @@ public class StatementExecuteMethodsInterceptorTest {
         assertThat(SegmentHelper.getSpans(segment).size(), is(1));
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
-        assertThat(span.getOperationName(), is("Impala/JDBI/CallableStatement/"));
+        assertThat(span.getOperationName(), is("Impala/JDBC/CallableStatement/"));
         SpanAssert.assertTag(span, 0, "sql");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, SQL);
@@ -114,7 +114,7 @@ public class StatementExecuteMethodsInterceptorTest {
         assertThat(SegmentHelper.getSpans(segment).size(), is(1));
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
-        assertThat(span.getOperationName(), is("Impala/JDBI/CallableStatement/"));
+        assertThat(span.getOperationName(), is("Impala/JDBC/CallableStatement/"));
         SpanAssert.assertTag(span, 0, "sql");
         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

@@ -39,7 +39,7 @@ public class ConnectionServiceMethodInterceptor implements InstanceMethodsAround
         Class<?>[] argumentsTypes, MethodInterceptResult result) throws Throwable {
         ConnectionInfo connectInfo = (ConnectionInfo) objInst.getSkyWalkingDynamicField();
         if (connectInfo != null) {
-            AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/Connection/" + method.getName(), connectInfo
+            AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBC/Connection/" + method.getName(), connectInfo
                 .getDatabasePeer());
             Tags.DB_TYPE.set(span, "sql");
             Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());

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

@@ -32,7 +32,7 @@ public class CallableStatementTracing {
 
     public static <R> R execute(java.sql.CallableStatement realStatement, ConnectionInfo connectInfo, String method,
         String sql, Executable<R> exec) throws SQLException {
-        AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/CallableStatement/" + method, connectInfo
+        AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBC/CallableStatement/" + method, connectInfo
             .getDatabasePeer());
         try {
             Tags.DB_TYPE.set(span, "sql");

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

@@ -32,7 +32,7 @@ public class PreparedStatementTracing {
 
     public static <R> R execute(java.sql.PreparedStatement realStatement, ConnectionInfo connectInfo, String method,
         String sql, Executable<R> exec) throws SQLException {
-        final AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/PreparedStatement/" + method, connectInfo
+        final AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBC/PreparedStatement/" + method, connectInfo
             .getDatabasePeer());
         try {
             Tags.DB_TYPE.set(span, "sql");

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

@@ -32,7 +32,7 @@ public class StatementTracing {
     public static <R> R execute(java.sql.Statement realStatement, ConnectionInfo connectInfo, String method, String sql,
         Executable<R> exec) throws SQLException {
         try {
-            AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/Statement/" + method, connectInfo
+            AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBC/Statement/" + method, connectInfo
                 .getDatabasePeer());
             Tags.DB_TYPE.set(span, "sql");
             Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());

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

@@ -29,7 +29,7 @@ public class ConnectionTracing {
 
     public static <R> R execute(java.sql.Connection realConnection, ConnectionInfo connectInfo, String method,
         String sql, Executable<R> exec) throws SQLException {
-        AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/Connection/" + method, connectInfo
+        AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBC/Connection/" + method, connectInfo
             .getDatabasePeer());
         try {
             Tags.DB_TYPE.set(span, "sql");

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

@@ -481,7 +481,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/CallableStatement/executeQuery", "SELECT * FROM test");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/CallableStatement/executeQuery", "SELECT * FROM test");
     }
 
     @Test
@@ -498,7 +498,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/CallableStatement/executeQuery", "SELECT * FROM test");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/CallableStatement/executeQuery", "SELECT * FROM test");
     }
 
     @Test
@@ -513,7 +513,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/CallableStatement/execute", "INSERT INTO test VALUES(1)");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/CallableStatement/execute", "INSERT INTO test VALUES(1)");
     }
 
     @Test
@@ -530,7 +530,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/CallableStatement/execute", "INSERT INTO test VALUES(1)");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/CallableStatement/execute", "INSERT INTO test VALUES(1)");
     }
 
     @Test
@@ -547,7 +547,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/CallableStatement/execute", "INSERT INTO test VALUES(1)");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/CallableStatement/execute", "INSERT INTO test VALUES(1)");
     }
 
     @Test
@@ -564,7 +564,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/CallableStatement/execute", "UPDATE test SET  a = 1");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/CallableStatement/execute", "UPDATE test SET  a = 1");
     }
 
     @Test
@@ -581,7 +581,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/CallableStatement/executeUpdate", "UPDATE test SET  a = ?");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/CallableStatement/executeUpdate", "UPDATE test SET  a = ?");
     }
 
     @Test
@@ -598,7 +598,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/CallableStatement/executeUpdate", "UPDATE test SET  a = 1");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/CallableStatement/executeUpdate", "UPDATE test SET  a = 1");
     }
 
     @Test
@@ -614,7 +614,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/CallableStatement/executeUpdate", "UPDATE test SET  a = 1");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/CallableStatement/executeUpdate", "UPDATE test SET  a = 1");
     }
 
     @Test
@@ -630,7 +630,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/CallableStatement/executeUpdate", "UPDATE test SET  a = 1");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/CallableStatement/executeUpdate", "UPDATE test SET  a = 1");
     }
 
     @Test
@@ -646,7 +646,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/CallableStatement/executeUpdate", "UPDATE test SET  a = 1");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/CallableStatement/executeUpdate", "UPDATE test SET  a = 1");
     }
 
     @Test
@@ -666,7 +666,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/CallableStatement/executeBatch", "");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/CallableStatement/executeBatch", "");
     }
 
     @Test
@@ -710,7 +710,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
             TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
             List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
             assertThat(spans.size(), is(1));
-            assertDBSpan(spans.get(0), "Mysql/JDBI/CallableStatement/executeQuery", "SELECT * FROM test WHERE a = ? OR b = ? OR c=? OR d = ? OR e=?");
+            assertDBSpan(spans.get(0), "Mysql/JDBC/CallableStatement/executeQuery", "SELECT * FROM test WHERE a = ? OR b = ? OR c=? OR d = ? OR e=?");
             List<LogDataEntity> logs = SpanHelper.getLogs(spans.get(0));
             Assert.assertThat(logs.size(), is(1));
             assertDBSpanLog(logs.get(0));

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

@@ -91,7 +91,7 @@ public class SWConnectionTest extends AbstractStatementTest {
 
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Connection/commit");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Connection/commit");
     }
 
     @Test
@@ -104,7 +104,7 @@ public class SWConnectionTest extends AbstractStatementTest {
 
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Connection/commit");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Connection/commit");
     }
 
     @Test(expected = SQLException.class)
@@ -119,7 +119,7 @@ public class SWConnectionTest extends AbstractStatementTest {
 
             List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
             assertThat(spans.size(), is(1));
-            assertDBSpan(spans.get(0), "Mysql/JDBI/Connection/commit");
+            assertDBSpan(spans.get(0), "Mysql/JDBC/Connection/commit");
             assertThat(SpanHelper.getLogs(spans.get(0)).size(), is(1));
             assertDBSpanLog(SpanHelper.getLogs(spans.get(0)).get(0));
         }
@@ -135,7 +135,7 @@ public class SWConnectionTest extends AbstractStatementTest {
 
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Connection/rollback");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Connection/rollback");
     }
 
     @Test
@@ -148,7 +148,7 @@ public class SWConnectionTest extends AbstractStatementTest {
 
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Connection/rollback");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Connection/rollback");
     }
 
     @Test(expected = SQLException.class)
@@ -162,7 +162,7 @@ public class SWConnectionTest extends AbstractStatementTest {
 
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Connection/rollback");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Connection/rollback");
     }
 
     @Test
@@ -174,7 +174,7 @@ public class SWConnectionTest extends AbstractStatementTest {
 
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Connection/rollback to savepoint");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Connection/rollback to savepoint");
 
     }
 
@@ -187,7 +187,7 @@ public class SWConnectionTest extends AbstractStatementTest {
 
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Connection/rollback to savepoint");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Connection/rollback to savepoint");
 
     }
 
@@ -202,7 +202,7 @@ public class SWConnectionTest extends AbstractStatementTest {
 
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Connection/rollback to savepoint");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Connection/rollback to savepoint");
         assertDBSpanLog(SpanHelper.getLogs(spans.get(0)).get(0));
 
     }
@@ -217,7 +217,7 @@ public class SWConnectionTest extends AbstractStatementTest {
 
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Connection/close");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Connection/close");
 
     }
 
@@ -230,7 +230,7 @@ public class SWConnectionTest extends AbstractStatementTest {
 
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Connection/close");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Connection/close");
 
     }
 
@@ -245,7 +245,7 @@ public class SWConnectionTest extends AbstractStatementTest {
 
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Connection/close");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Connection/close");
         assertDBSpanLog(SpanHelper.getLogs(spans.get(0)).get(0));
     }
 
@@ -259,7 +259,7 @@ public class SWConnectionTest extends AbstractStatementTest {
 
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Connection/releaseSavepoint savepoint");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Connection/releaseSavepoint savepoint");
 
     }
 
@@ -272,7 +272,7 @@ public class SWConnectionTest extends AbstractStatementTest {
 
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Connection/releaseSavepoint savepoint");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Connection/releaseSavepoint savepoint");
     }
 
     @Test(expected = SQLException.class)
@@ -286,7 +286,7 @@ public class SWConnectionTest extends AbstractStatementTest {
 
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Connection/releaseSavepoint savepoint");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Connection/releaseSavepoint savepoint");
         assertDBSpanLog(SpanHelper.getLogs(spans.get(0)).get(0));
     }
 

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

@@ -140,7 +140,7 @@ public class SWStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Statement/execute", "SELECT * FROM test");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Statement/execute", "SELECT * FROM test");
     }
 
     @Test
@@ -151,7 +151,7 @@ public class SWStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Statement/execute", "SELECT * FROM test");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Statement/execute", "SELECT * FROM test");
 
     }
 
@@ -163,7 +163,7 @@ public class SWStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Statement/executeQuery", "SELECT * FROM test");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Statement/executeQuery", "SELECT * FROM test");
 
     }
 
@@ -175,7 +175,7 @@ public class SWStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Statement/executeUpdate", "UPDATE test SET a = 1");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Statement/executeUpdate", "UPDATE test SET a = 1");
 
     }
 
@@ -189,7 +189,7 @@ public class SWStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Statement/executeUpdate", "UPDATE test SET a = 1");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Statement/executeUpdate", "UPDATE test SET a = 1");
 
     }
 
@@ -201,7 +201,7 @@ public class SWStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Statement/executeUpdate", "UPDATE test SET a = 1");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Statement/executeUpdate", "UPDATE test SET a = 1");
 
     }
 
@@ -213,7 +213,7 @@ public class SWStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Statement/executeUpdate", "UPDATE test SET a = 1");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Statement/executeUpdate", "UPDATE test SET a = 1");
 
     }
 
@@ -225,7 +225,7 @@ public class SWStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Statement/execute", "UPDATE test SET a = 1");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Statement/execute", "UPDATE test SET a = 1");
 
     }
 
@@ -237,7 +237,7 @@ public class SWStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Statement/execute", "UPDATE test SET a = 1");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Statement/execute", "UPDATE test SET a = 1");
     }
 
     @Test
@@ -254,7 +254,7 @@ public class SWStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/Statement/executeBatch", "");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/Statement/executeBatch", "");
 
     }
 
@@ -269,7 +269,7 @@ public class SWStatementTest extends AbstractStatementTest {
             TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
             List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
             assertThat(spans.size(), is(1));
-            assertDBSpan(spans.get(0), "Mysql/JDBI/Statement/execute", "UPDATE test SET a = 1 WHERE b = 2");
+            assertDBSpan(spans.get(0), "Mysql/JDBC/Statement/execute", "UPDATE test SET a = 1 WHERE b = 2");
             assertThat(SpanHelper.getLogs(spans.get(0)).size(), is(1));
             assertDBSpanLog(SpanHelper.getLogs(spans.get(0)).get(0));
 

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

@@ -311,7 +311,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/PreparedStatement/executeQuery", "SELECT * FROM test");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/PreparedStatement/executeQuery", "SELECT * FROM test");
     }
 
     @Test
@@ -326,7 +326,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/PreparedStatement/execute", "SELECT * FROM test");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/PreparedStatement/execute", "SELECT * FROM test");
     }
 
     @Test
@@ -342,7 +342,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/PreparedStatement/executeQuery", "SELECT * FROM test");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/PreparedStatement/executeQuery", "SELECT * FROM test");
 
     }
 
@@ -357,7 +357,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/PreparedStatement/execute", "INSERT INTO test VALUES(1)");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/PreparedStatement/execute", "INSERT INTO test VALUES(1)");
 
     }
 
@@ -374,7 +374,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/PreparedStatement/execute", "INSERT INTO test VALUES(1)");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/PreparedStatement/execute", "INSERT INTO test VALUES(1)");
 
     }
 
@@ -391,7 +391,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/PreparedStatement/execute", "INSERT INTO test VALUES(1)");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/PreparedStatement/execute", "INSERT INTO test VALUES(1)");
 
     }
 
@@ -408,7 +408,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/PreparedStatement/execute", "UPDATE test SET  a = 1");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/PreparedStatement/execute", "UPDATE test SET  a = 1");
 
     }
 
@@ -425,7 +425,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/PreparedStatement/executeUpdate", "UPDATE test SET  a = ?");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/PreparedStatement/executeUpdate", "UPDATE test SET  a = ?");
 
     }
 
@@ -442,7 +442,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/PreparedStatement/executeUpdate", "UPDATE test SET  a = 1");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/PreparedStatement/executeUpdate", "UPDATE test SET  a = 1");
 
     }
 
@@ -458,7 +458,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/PreparedStatement/executeUpdate", "UPDATE test SET  a = 1");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/PreparedStatement/executeUpdate", "UPDATE test SET  a = 1");
     }
 
     @Test
@@ -473,7 +473,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/PreparedStatement/executeUpdate", "UPDATE test SET  a = 1");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/PreparedStatement/executeUpdate", "UPDATE test SET  a = 1");
 
     }
 
@@ -489,7 +489,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/PreparedStatement/executeUpdate", "UPDATE test SET  a = 1");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/PreparedStatement/executeUpdate", "UPDATE test SET  a = 1");
     }
 
     @Test
@@ -508,7 +508,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
         TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
         List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
         assertThat(spans.size(), is(1));
-        assertDBSpan(spans.get(0), "Mysql/JDBI/PreparedStatement/executeBatch", "");
+        assertDBSpan(spans.get(0), "Mysql/JDBC/PreparedStatement/executeBatch", "");
 
     }
 
@@ -556,7 +556,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
             TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
             List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
             assertThat(spans.size(), is(1));
-            assertDBSpan(spans.get(0), "Mysql/JDBI/PreparedStatement/executeQuery", "SELECT * FROM test WHERE a = ? or b = ? or c=? or d = ? or e=?");
+            assertDBSpan(spans.get(0), "Mysql/JDBC/PreparedStatement/executeQuery", "SELECT * FROM test WHERE a = ? or b = ? or c=? or d = ? or e=?");
 
             List<LogDataEntity> logData = SpanHelper.getLogs(spans.get(0));
             Assert.assertThat(logData.size(), is(1));

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

@@ -81,7 +81,7 @@ public class PreparedStatementExecuteMethodsInterceptor implements InstanceMetho
     }
 
     private String buildOperationName(ConnectionInfo connectionInfo, String methodName, String statementName) {
-        return connectionInfo.getDBType() + "/JDBI/" + statementName + "/" + methodName;
+        return connectionInfo.getDBType() + "/JDBC/" + statementName + "/" + methodName;
     }
 
     private String getParameterString(Object[] parameters, int maxIndex) {

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

@@ -69,6 +69,6 @@ public class StatementExecuteMethodsInterceptor implements InstanceMethodsAround
     }
 
     private String buildOperationName(ConnectionInfo connectionInfo, String methodName, String statementName) {
-        return connectionInfo.getDBType() + "/JDBI/" + statementName + "/" + methodName;
+        return connectionInfo.getDBType() + "/JDBC/" + statementName + "/" + methodName;
     }
 }

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

@@ -113,7 +113,7 @@ public class PreparedStatementExecuteMethodsInterceptorTest {
         assertThat(SegmentHelper.getSpans(segment).size(), is(1));
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
-        assertThat(span.getOperationName(), is("kylin/JDBI/PreparedStatement/"));
+        assertThat(span.getOperationName(), is("kylin/JDBC/PreparedStatement/"));
         SpanAssert.assertTag(span, 0, "sql");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, SQL);
@@ -143,7 +143,7 @@ public class PreparedStatementExecuteMethodsInterceptorTest {
         assertThat(SegmentHelper.getSpans(segment).size(), is(1));
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
-        assertThat(span.getOperationName(), is("kylin/JDBI/PreparedStatement/"));
+        assertThat(span.getOperationName(), is("kylin/JDBC/PreparedStatement/"));
         SpanAssert.assertTag(span, 0, "sql");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, "Select * f...");

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

@@ -96,7 +96,7 @@ public class StatementExecuteMethodsInterceptorTest {
         assertThat(SegmentHelper.getSpans(segment).size(), is(1));
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
-        assertThat(span.getOperationName(), is("kylin/JDBI/CallableStatement/"));
+        assertThat(span.getOperationName(), is("kylin/JDBC/CallableStatement/"));
         SpanAssert.assertTag(span, 0, "sql");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, SQL);
@@ -113,7 +113,7 @@ public class StatementExecuteMethodsInterceptorTest {
         assertThat(SegmentHelper.getSpans(segment).size(), is(1));
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
-        assertThat(span.getOperationName(), is("kylin/JDBI/CallableStatement/"));
+        assertThat(span.getOperationName(), is("kylin/JDBC/CallableStatement/"));
         SpanAssert.assertTag(span, 0, "sql");
         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

@@ -81,7 +81,7 @@ public class PreparedStatementExecuteMethodsInterceptor implements InstanceMetho
     }
 
     private String buildOperationName(ConnectionInfo connectionInfo, String methodName, String statementName) {
-        return connectionInfo.getDBType() + "/JDBI/" + statementName + "/" + methodName;
+        return connectionInfo.getDBType() + "/JDBC/" + statementName + "/" + methodName;
     }
 
     private String getParameterString(Object[] parameters, int maxIndex) {

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

@@ -70,6 +70,6 @@ public class StatementExecuteMethodsInterceptor implements InstanceMethodsAround
     }
 
     private String buildOperationName(ConnectionInfo connectionInfo, String methodName, String statementName) {
-        return connectionInfo.getDBType() + "/JDBI/" + statementName + "/" + methodName;
+        return connectionInfo.getDBType() + "/JDBC/" + statementName + "/" + methodName;
     }
 }

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

@@ -113,7 +113,7 @@ public class PreparedStatementExecuteMethodsInterceptorTest {
         assertThat(SegmentHelper.getSpans(segment).size(), is(1));
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
-        assertThat(span.getOperationName(), is("Mariadb/JDBI/PreparedStatement/"));
+        assertThat(span.getOperationName(), is("Mariadb/JDBC/PreparedStatement/"));
         SpanAssert.assertTag(span, 0, "sql");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, SQL);
@@ -143,7 +143,7 @@ public class PreparedStatementExecuteMethodsInterceptorTest {
         assertThat(SegmentHelper.getSpans(segment).size(), is(1));
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
-        assertThat(span.getOperationName(), is("Mariadb/JDBI/PreparedStatement/"));
+        assertThat(span.getOperationName(), is("Mariadb/JDBC/PreparedStatement/"));
         SpanAssert.assertTag(span, 0, "sql");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, "Select * f...");

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

@@ -97,7 +97,7 @@ public class StatementExecuteMethodsInterceptorTest {
         assertThat(SegmentHelper.getSpans(segment).size(), is(1));
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
-        assertThat(span.getOperationName(), is("Mariadb/JDBI/CallableStatement/"));
+        assertThat(span.getOperationName(), is("Mariadb/JDBC/CallableStatement/"));
         SpanAssert.assertTag(span, 0, "sql");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, SQL);
@@ -114,7 +114,7 @@ public class StatementExecuteMethodsInterceptorTest {
         assertThat(SegmentHelper.getSpans(segment).size(), is(1));
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
-        assertThat(span.getOperationName(), is("Mariadb/JDBI/CallableStatement/"));
+        assertThat(span.getOperationName(), is("Mariadb/JDBC/CallableStatement/"));
         SpanAssert.assertTag(span, 0, "sql");
         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

@@ -81,7 +81,7 @@ public class PreparedStatementExecuteMethodsInterceptor implements InstanceMetho
     }
 
     private String buildOperationName(ConnectionInfo connectionInfo, String methodName, String statementName) {
-        return connectionInfo.getDBType() + "/JDBI/" + statementName + "/" + methodName;
+        return connectionInfo.getDBType() + "/JDBC/" + statementName + "/" + methodName;
     }
     
     private String getParameterString(Object[] parameters, int maxIndex) {

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

@@ -76,6 +76,6 @@ public class StatementExecuteMethodsInterceptor implements InstanceMethodsAround
     }
 
     private String buildOperationName(ConnectionInfo connectionInfo, String methodName, String statementName) {
-        return connectionInfo.getDBType() + "/JDBI/" + statementName + "/" + methodName;
+        return connectionInfo.getDBType() + "/JDBC/" + statementName + "/" + methodName;
     }
 }

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

@@ -89,7 +89,7 @@ public class PreparedStatementExecuteMethodsInterceptor implements InstanceMetho
     }
 
     private String buildOperationName(ConnectionInfo connectionInfo, String methodName, String statementName) {
-        return connectionInfo.getDBType() + "/JDBI/" + statementName + "/" + methodName;
+        return connectionInfo.getDBType() + "/JDBC/" + statementName + "/" + methodName;
     }
 
     private String getParameterString(Object[] parameters, int maxIndex) {

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

@@ -87,6 +87,6 @@ public class StatementExecuteMethodsInterceptor implements InstanceMethodsAround
     }
 
     private String buildOperationName(ConnectionInfo connectionInfo, String methodName, String statementName) {
-        return connectionInfo.getDBType() + "/JDBI/" + statementName + "/" + methodName;
+        return connectionInfo.getDBType() + "/JDBC/" + statementName + "/" + methodName;
     }
 }

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

@@ -97,7 +97,7 @@ public class StatementExecuteMethodsInterceptorTest {
         assertThat(SegmentHelper.getSpans(segment).size(), is(1));
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
-        assertThat(span.getOperationName(), is("H2/JDBI/CallableStatement/"));
+        assertThat(span.getOperationName(), is("H2/JDBC/CallableStatement/"));
         SpanAssert.assertTag(span, 0, "sql");
         SpanAssert.assertTag(span, 1, "test");
         SpanAssert.assertTag(span, 2, SQL);
@@ -115,7 +115,7 @@ public class StatementExecuteMethodsInterceptorTest {
         assertThat(SegmentHelper.getSpans(segment).size(), is(1));
         AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
         SpanAssert.assertLayer(span, SpanLayer.DB);
-        assertThat(span.getOperationName(), is("H2/JDBI/CallableStatement/"));
+        assertThat(span.getOperationName(), is("H2/JDBC/CallableStatement/"));
         SpanAssert.assertTag(span, 0, "sql");
         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

@@ -84,7 +84,7 @@ public class PreparedStatementExecuteMethodsInterceptor implements InstanceMetho
     }
 
     private String buildOperationName(ConnectionInfo connectionInfo, String methodName, String statementName) {
-        return connectionInfo.getDBType() + "/JDBI/" + statementName + "/" + methodName;
+        return connectionInfo.getDBType() + "/JDBC/" + statementName + "/" + methodName;
     }
 
     private String getParameterString(Object[] parameters, int maxIndex) {

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

@@ -71,6 +71,6 @@ public class StatementExecuteMethodsInterceptor implements InstanceMethodsAround
     }
 
     private String buildOperationName(ConnectionInfo connectionInfo, String methodName, String statementName) {
-        return connectionInfo.getDBType() + "/JDBI/" + statementName + "/" + methodName;
+        return connectionInfo.getDBType() + "/JDBC/" + statementName + "/" + methodName;
     }
 }

test/plugin/scenarios/clickhouse-0.3.x-scenario/config/expectedData.yaml

@@ -37,7 +37,7 @@ segmentItems:
               - {key: http.status_code, value: '200'}
       - segmentId: not null
         spans:
-          - operationName: ClickHouse/JDBI/Statement/executeQuery
+          - operationName: ClickHouse/JDBC/Statement/executeQuery
             operationId: 0
             parentSpanId: 0
             spanId: 1
@@ -54,7 +54,7 @@ segmentItems:
               - {key: db.instance, value: system}
               - {key: db.statement, value: 'select timezone(), version()'}
               - {key: http.status_code, value: '200'}
-          - operationName: ClickHouse/JDBI/Statement/executeQuery
+          - operationName: ClickHouse/JDBC/Statement/executeQuery
             operationId: 0
             parentSpanId: 0
             spanId: 2
@@ -71,7 +71,7 @@ segmentItems:
               - {key: db.instance, value: system}
               - {key: db.statement, value: SELECT * FROM clusters}
               - {key: http.status_code, value: '200'}
-          - operationName: ClickHouse/JDBI/Statement/execute
+          - operationName: ClickHouse/JDBC/Statement/execute
             operationId: 0
             parentSpanId: 0
             spanId: 3
@@ -88,7 +88,7 @@ segmentItems:
               - {key: db.instance, value: system}
               - {key: db.statement, value: SELECT 1}
               - {key: http.status_code, value: '200'}
-          - operationName: ClickHouse/JDBI/Connection/close
+          - operationName: ClickHouse/JDBC/Connection/close
             operationId: 0
             parentSpanId: 0
             spanId: 4
@@ -104,7 +104,7 @@ segmentItems:
               - {key: db.type, value: sql}
               - {key: db.instance, value: system}
               - {key: db.statement, value: ''}
-          - operationName: ClickHouse/JDBI/Statement/executeQuery
+          - operationName: ClickHouse/JDBC/Statement/executeQuery
             operationId: 0
             parentSpanId: 0
             spanId: 5
@@ -121,7 +121,7 @@ segmentItems:
               - {key: db.instance, value: system}
               - {key: db.statement, value: 'select timezone(), version()'}
               - {key: http.status_code, value: '200'}
-          - operationName: ClickHouse/JDBI/PreparedStatement/executeQuery
+          - operationName: ClickHouse/JDBC/PreparedStatement/executeQuery
             operationId: 0
             parentSpanId: 0
             spanId: 6
@@ -138,7 +138,7 @@ segmentItems:
               - {key: db.instance, value: system}
               - {key: db.statement, value: SELECT * FROM clusters}
               - {key: http.status_code, value: '200'}
-          - operationName: ClickHouse/JDBI/Statement/execute
+          - operationName: ClickHouse/JDBC/Statement/execute
             operationId: 0
             parentSpanId: 0
             spanId: 7
@@ -155,7 +155,7 @@ segmentItems:
               - {key: db.instance, value: system}
               - {key: db.statement, value: SELECT 1}
               - {key: http.status_code, value: '200'}
-          - operationName: ClickHouse/JDBI/Connection/close
+          - operationName: ClickHouse/JDBC/Connection/close
             operationId: 0
             parentSpanId: 0
             spanId: 8

test/plugin/scenarios/dbcp-2.x-scenario/config/expectedData.yaml

@@ -19,7 +19,7 @@ segmentItems:
   segments:
   - segmentId: not null
     spans:
-    - operationName: Mysql/JDBI/Connection/close
+    - operationName: Mysql/JDBC/Connection/close
       parentSpanId: 1
       spanId: 2
       componentId: 33
@@ -41,7 +41,7 @@ segmentItems:
       spanType: Local
       peer: ''
       skipAnalysis: false
-    - operationName: Mysql/JDBI/Statement/execute
+    - operationName: Mysql/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 3
       startTime: gt 0
@@ -77,7 +77,7 @@ segmentItems:
       spanType: Local
       peer: ''
       skipAnalysis: false
-    - operationName: Mysql/JDBI/Statement/execute
+    - operationName: Mysql/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 6
       startTime: gt 0
@@ -112,7 +112,7 @@ segmentItems:
       spanType: Local
       peer: ''
       skipAnalysis: false
-    - operationName: Mysql/JDBI/Statement/execute
+    - operationName: Mysql/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 9
       startTime: gt 0
@@ -147,7 +147,7 @@ segmentItems:
       spanType: Local
       peer: ''
       skipAnalysis: false
-    - operationName: Mysql/JDBI/Statement/execute
+    - operationName: Mysql/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 12
       startTime: gt 0
@@ -182,7 +182,7 @@ segmentItems:
       spanType: Local
       peer: ''
       skipAnalysis: false
-    - operationName: Mysql/JDBI/Statement/execute
+    - operationName: Mysql/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 15
       startTime: gt 0

test/plugin/scenarios/druid-1.x-scenario/config/expectedData.yaml

@@ -29,7 +29,7 @@ segmentItems:
       isError: false
       spanType: Local
       peer: ''
-    - operationName: Mysql/JDBI/Statement/execute
+    - operationName: Mysql/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 2
       spanLayer: Database
@@ -64,7 +64,7 @@ segmentItems:
       isError: false
       spanType: Local
       peer: ''
-    - operationName: Mysql/JDBI/Statement/execute
+    - operationName: Mysql/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 5
       spanLayer: Database
@@ -98,7 +98,7 @@ segmentItems:
       isError: false
       spanType: Local
       peer: ''
-    - operationName: Mysql/JDBI/Statement/execute
+    - operationName: Mysql/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 8
       spanLayer: Database
@@ -132,7 +132,7 @@ segmentItems:
       isError: false
       spanType: Local
       peer: ''
-    - operationName: Mysql/JDBI/Statement/execute
+    - operationName: Mysql/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 11
       spanLayer: Database
@@ -166,7 +166,7 @@ segmentItems:
       isError: false
       spanType: Local
       peer: ''
-    - operationName: Mysql/JDBI/Statement/execute
+    - operationName: Mysql/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 14
       spanLayer: Database

test/plugin/scenarios/h2-scenario/config/expectedData.yaml

@@ -19,7 +19,7 @@ segmentItems:
   segments:
   - segmentId: not null
     spans:
-    - operationName: H2/JDBI/PreparedStatement/execute
+    - operationName: H2/JDBC/PreparedStatement/execute
       parentSpanId: 0
       spanId: 1
       spanLayer: Database
@@ -36,7 +36,7 @@ segmentItems:
         value: "CREATE TABLE test_007(\nid VARCHAR(1) PRIMARY KEY, \nvalue VARCHAR(1)\
           \ NOT NULL)"
       skipAnalysis: 'false'
-    - operationName: H2/JDBI/CallableStatement/execute
+    - operationName: H2/JDBC/CallableStatement/execute
       parentSpanId: 0
       spanId: 2
       spanLayer: Database
@@ -51,7 +51,7 @@ segmentItems:
       - {key: db.instance, value: test}
       - {key: db.statement, value: 'INSERT INTO test_007(id, value) VALUES(?,?)'}
       skipAnalysis: 'false'
-    - operationName: H2/JDBI/Statement/execute
+    - operationName: H2/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 3
       spanLayer: Database
@@ -66,7 +66,7 @@ segmentItems:
       - {key: db.instance, value: test}
       - {key: db.statement, value: DROP table test_007}
       skipAnalysis: 'false'
-    - operationName: H2/JDBI/Connection/close
+    - operationName: H2/JDBC/Connection/close
       parentSpanId: 0
       spanId: 4
       spanLayer: Database

test/plugin/scenarios/hikaricp-scenario/config/expectedData.yaml

@@ -29,7 +29,7 @@ segmentItems:
       isError: false
       spanType: Local
       peer: ''
-    - operationName: Mysql/JDBI/Statement/execute
+    - operationName: Mysql/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 2
       spanLayer: Database
@@ -64,7 +64,7 @@ segmentItems:
       isError: false
       spanType: Local
       peer: ''
-    - operationName: Mysql/JDBI/Statement/execute
+    - operationName: Mysql/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 5
       spanLayer: Database
@@ -98,7 +98,7 @@ segmentItems:
       isError: false
       spanType: Local
       peer: ''
-    - operationName: Mysql/JDBI/Statement/execute
+    - operationName: Mysql/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 8
       spanLayer: Database
@@ -132,7 +132,7 @@ segmentItems:
       isError: false
       spanType: Local
       peer: ''
-    - operationName: Mysql/JDBI/Statement/execute
+    - operationName: Mysql/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 11
       spanLayer: Database
@@ -166,7 +166,7 @@ segmentItems:
       isError: false
       spanType: Local
       peer: ''
-    - operationName: Mysql/JDBI/Statement/execute
+    - operationName: Mysql/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 14
       spanLayer: Database

test/plugin/scenarios/impala-jdbc-2.6.x-scenario/config/expectedData.yaml

@@ -19,7 +19,7 @@ segmentItems:
     segments:
     - segmentId: not null
       spans:
-      - operationName: Impala/JDBI/Statement/execute
+      - operationName: Impala/JDBC/Statement/execute
         parentSpanId: 0
         spanId: 1
         spanLayer: Database
@@ -35,7 +35,7 @@ segmentItems:
           - { key: db.instance, value: '' }
           - key: db.statement
             value: "CREATE TABLE IF NOT EXISTS default.impala_test (test_id BIGINT, test_name STRING);"
-      - operationName: Impala/JDBI/Statement/execute
+      - operationName: Impala/JDBC/Statement/execute
         parentSpanId: 0
         spanId: 2
         spanLayer: Database
@@ -51,7 +51,7 @@ segmentItems:
         - { key: db.instance, value: '' }
         - key: db.statement
           value: "INSERT INTO impala_test VALUES (123, 'test');"
-      - operationName: Impala/JDBI/PreparedStatement/executeQuery
+      - operationName: Impala/JDBC/PreparedStatement/executeQuery
         parentSpanId: 0
         spanId: 3
         spanLayer: Database
@@ -67,7 +67,7 @@ segmentItems:
           - { key: db.instance, value: '' }
           - key: db.statement
             value: "SELECT COUNT(*) FROM impala_test;"
-      - operationName: Impala/JDBI/PreparedStatement/executeQuery
+      - operationName: Impala/JDBC/PreparedStatement/executeQuery
         parentSpanId: 0
         spanId: 4
         spanLayer: Database
@@ -84,7 +84,7 @@ segmentItems:
           - key: db.statement
             value: 'SELECT COUNT(*) FROM impala_test WHERE test_id = ?;'
           - { key: db.sql.parameters, value: '[123]'}
-      - operationName: Impala/JDBI/Connection/close
+      - operationName: Impala/JDBC/Connection/close
         parentSpanId: 0
         spanId: 5
         spanLayer: Database

test/plugin/scenarios/kotlin-coroutine-scenario/config/expectedData.yaml

@@ -19,7 +19,7 @@ segmentItems:
   segments:
   - segmentId: not null
     spans:
-    - operationName: H2/JDBI/PreparedStatement/executeQuery
+    - operationName: H2/JDBC/PreparedStatement/executeQuery
       parentSpanId: 0
       spanId: 1
       spanLayer: Database
@@ -34,7 +34,7 @@ segmentItems:
       - {key: db.instance, value: demo}
       - {key: db.statement, value: 'SELECT * FROM PERSON WHERE ID = ?'}
       skipAnalysis: 'false'
-    - operationName: H2/JDBI/Connection/commit
+    - operationName: H2/JDBC/Connection/commit
       parentSpanId: 0
       spanId: 2
       spanLayer: Database
@@ -65,7 +65,7 @@ segmentItems:
       skipAnalysis: 'false'
   - segmentId: not null
     spans:
-    - operationName: H2/JDBI/PreparedStatement/executeQuery
+    - operationName: H2/JDBC/PreparedStatement/executeQuery
       parentSpanId: 0
       spanId: 1
       spanLayer: Database
@@ -80,7 +80,7 @@ segmentItems:
       - {key: db.instance, value: demo}
       - {key: db.statement, value: 'SELECT * FROM PERSON WHERE ID = ?'}
       skipAnalysis: 'false'
-    - operationName: H2/JDBI/Connection/commit
+    - operationName: H2/JDBC/Connection/commit
       parentSpanId: 0
       spanId: 2
       spanLayer: Database

test/plugin/scenarios/kylin-jdbc-2.6.x-3.x-4.x-scenario/config/expectedData.yaml

@@ -19,7 +19,7 @@ segmentItems:
   segments:
   - segmentId: not null
     spans:
-    - operationName: kylin/JDBI/Statement/execute
+    - operationName: kylin/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 1
       spanLayer: Database
@@ -35,7 +35,7 @@ segmentItems:
       - {key: db.instance, value: learn_kylin}
       - key: db.statement
         value: "select * from KYLIN_ACCOUNT LIMIT 1"
-    - operationName: kylin/JDBI/PreparedStatement/executeQuery
+    - operationName: kylin/JDBC/PreparedStatement/executeQuery
       parentSpanId: 0
       spanId: 2
       spanLayer: Database
@@ -50,7 +50,7 @@ segmentItems:
       - {key: db.type, value: sql}
       - {key: db.instance, value: learn_kylin}
       - {key: db.statement, value: "select * from KYLIN_ACCOUNT"}
-    - operationName: kylin/JDBI/Connection/close
+    - operationName: kylin/JDBC/Connection/close
       parentSpanId: 0
       spanId: 3
       spanLayer: Database

test/plugin/scenarios/mariadb-scenario/config/expectedData.yaml

@@ -19,7 +19,7 @@ segmentItems:
   segments:
   - segmentId: not null
     spans:
-    - operationName: Mariadb/JDBI/Statement/execute
+    - operationName: Mariadb/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 1
       spanLayer: Database
@@ -36,7 +36,7 @@ segmentItems:
       - key: db.statement
         value: "CREATE TABLE test_table(\nid VARCHAR(1) PRIMARY KEY, \nvalue VARCHAR(10)\
           \ NOT NULL)"
-    - operationName: Mariadb/JDBI/PreparedStatement/execute
+    - operationName: Mariadb/JDBC/PreparedStatement/execute
       parentSpanId: 0
       spanId: 2
       spanLayer: Database
@@ -51,7 +51,7 @@ segmentItems:
       - {key: db.type, value: sql}
       - {key: db.instance, value: test}
       - {key: db.statement, value: "INSERT INTO test_table(id, value) VALUES(?,?)"}
-    - operationName: Mariadb/JDBI/PreparedStatement/execute
+    - operationName: Mariadb/JDBC/PreparedStatement/execute
       parentSpanId: 0
       spanId: 3
       spanLayer: Database
@@ -66,7 +66,7 @@ segmentItems:
       - {key: db.type, value: sql}
       - {key: db.instance, value: test}
       - {key: db.statement, value: "SELECT id, value FROM test_table WHERE id = ?"}
-    - operationName: Mariadb/JDBI/Statement/execute
+    - operationName: Mariadb/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 4
       spanLayer: Database
@@ -81,7 +81,7 @@ segmentItems:
       - {key: db.type, value: sql}
       - {key: db.instance, value: test}
       - {key: db.statement, value: "DROP table test_table"}
-    - operationName: Mariadb/JDBI/Connection/close
+    - operationName: Mariadb/JDBC/Connection/close
       parentSpanId: 0
       spanId: 5
       spanLayer: Database

test/plugin/scenarios/mssql-jdbc-scenario/config/expectedData.yaml

@@ -19,7 +19,7 @@ segmentItems:
     segments:
       - segmentId: not null
         spans:
-          - operationName: Mssql/JDBI/PreparedStatement/execute
+          - operationName: Mssql/JDBC/PreparedStatement/execute
             parentSpanId: 0
             spanId: 1
             tags:
@@ -37,7 +37,7 @@ segmentItems:
             componentId: 104
             peer: mssql-server:1433
             skipAnalysis: 'false'
-          - operationName: Mssql/JDBI/PreparedStatement/execute
+          - operationName: Mssql/JDBC/PreparedStatement/execute
             parentSpanId: 0
             spanId: 2
             tags:
@@ -54,7 +54,7 @@ segmentItems:
             componentId: 104
             peer: mssql-server:1433
             skipAnalysis: 'false'
-          - operationName: Mssql/JDBI/PreparedStatement/execute
+          - operationName: Mssql/JDBC/PreparedStatement/execute
             parentSpanId: 0
             spanId: 3
             tags:
@@ -71,7 +71,7 @@ segmentItems:
             componentId: 104
             peer: mssql-server:1433
             skipAnalysis: 'false'
-          - operationName: Mssql/JDBI/Statement/execute
+          - operationName: Mssql/JDBC/Statement/execute
             parentSpanId: 0
             spanId: 4
             tags:
@@ -87,7 +87,7 @@ segmentItems:
             componentId: 104
             peer: mssql-server:1433
             skipAnalysis: 'false'
-          - operationName: Mssql/JDBI/Connection/close
+          - operationName: Mssql/JDBC/Connection/close
             parentSpanId: 0
             spanId: 5
             tags:

test/plugin/scenarios/mssql-jtds-scenario/config/expectedData.yaml

@@ -19,7 +19,7 @@ segmentItems:
     segments:
       - segmentId: not null
         spans:
-          - operationName: Mssql/JDBI/PreparedStatement/execute
+          - operationName: Mssql/JDBC/PreparedStatement/execute
             parentSpanId: 0
             spanId: 1
             tags:
@@ -37,7 +37,7 @@ segmentItems:
             componentId: 104
             peer: mssql-server:1433
             skipAnalysis: 'false'
-          - operationName: Mssql/JDBI/PreparedStatement/execute
+          - operationName: Mssql/JDBC/PreparedStatement/execute
             parentSpanId: 0
             spanId: 2
             tags:
@@ -53,7 +53,7 @@ segmentItems:
             componentId: 104
             peer: mssql-server:1433
             skipAnalysis: 'false'
-          - operationName: Mssql/JDBI/Statement/execute
+          - operationName: Mssql/JDBC/Statement/execute
             parentSpanId: 0
             spanId: 3
             tags:
@@ -69,7 +69,7 @@ segmentItems:
             componentId: 104
             peer: mssql-server:1433
             skipAnalysis: 'false'
-          - operationName: Mssql/JDBI/Connection/close
+          - operationName: Mssql/JDBC/Connection/close
             parentSpanId: 0
             spanId: 4
             tags:

test/plugin/scenarios/mybatis-3.x-scenario/config/expectedData.yaml

@@ -19,7 +19,7 @@ segmentItems:
   segments:
     - segmentId: not null
       spans:
-      - operationName: Mysql/JDBI/PreparedStatement/execute
+      - operationName: Mysql/JDBC/PreparedStatement/execute
         parentSpanId: 1
         spanId: 2
         spanLayer: Database
@@ -47,7 +47,7 @@ segmentItems:
         skipAnalysis: 'false'
         tags:
         - {key: mybatis.mapper, value: test.apache.skywalking.apm.testcase.mybatis.mapper.DemoMapper.insert}
-      - operationName: Mysql/JDBI/Connection/close
+      - operationName: Mysql/JDBC/Connection/close
         parentSpanId: 0
         spanId: 3
         spanLayer: Database
@@ -62,7 +62,7 @@ segmentItems:
           - {key: db.type, value: sql}
           - {key: db.instance, value: ''}
           - {key: db.statement, value: ''}
-      - operationName: Mysql/JDBI/PreparedStatement/execute
+      - operationName: Mysql/JDBC/PreparedStatement/execute
         parentSpanId: 4
         spanId: 5
         spanLayer: Database
@@ -90,7 +90,7 @@ segmentItems:
         skipAnalysis: 'false'
         tags:
         - {key: mybatis.mapper, value: test.apache.skywalking.apm.testcase.mybatis.mapper.DemoMapper.insert}
-      - operationName: Mysql/JDBI/Connection/close
+      - operationName: Mysql/JDBC/Connection/close
         parentSpanId: 0
         spanId: 6
         spanLayer: Database

test/plugin/scenarios/mysql-scenario/config/expectedData.yaml

@@ -19,7 +19,7 @@ segmentItems:
   segments:
   - segmentId: not null
     spans:
-    - operationName: Mysql/JDBI/PreparedStatement/execute
+    - operationName: Mysql/JDBC/PreparedStatement/execute
       parentSpanId: 0
       spanId: 1
       tags:
@@ -37,7 +37,7 @@ segmentItems:
       componentId: 33
       peer: mysql-server:3306
       skipAnalysis: 'false'
-    - operationName: Mysql/JDBI/PreparedStatement/execute
+    - operationName: Mysql/JDBC/PreparedStatement/execute
       parentSpanId: 0
       spanId: 2
       tags:
@@ -53,7 +53,7 @@ segmentItems:
       componentId: 33
       peer: mysql-server:3306
       skipAnalysis: 'false'
-    - operationName: Mysql/JDBI/Statement/execute
+    - operationName: Mysql/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 3
       tags:
@@ -69,7 +69,7 @@ segmentItems:
       componentId: 33
       peer: mysql-server:3306
       skipAnalysis: 'false'
-    - operationName: Mysql/JDBI/Statement/execute
+    - operationName: Mysql/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 4
       tags:
@@ -85,7 +85,7 @@ segmentItems:
       componentId: 33
       peer: mysql-server:3306
       skipAnalysis: 'false'
-    - operationName: Mysql/JDBI/Statement/executeQuery
+    - operationName: Mysql/JDBC/Statement/executeQuery
       parentSpanId: 0
       spanId: 5
       spanLayer: Database
@@ -100,7 +100,7 @@ segmentItems:
         - {key: db.type, value: sql}
         - {key: db.instance, value: test}
         - {key: db.statement, value: SHOW CREATE PROCEDURE `test`.`testProcedure`}
-    - operationName: Mysql/JDBI/CallableStatement/execute
+    - operationName: Mysql/JDBC/CallableStatement/execute
       parentSpanId: 0
       spanId: 6
       tags:
@@ -116,7 +116,7 @@ segmentItems:
       componentId: 33
       peer: mysql-server:3306
       skipAnalysis: 'false'
-    - operationName: Mysql/JDBI/Statement/execute
+    - operationName: Mysql/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 7
       tags:
@@ -132,7 +132,7 @@ segmentItems:
       componentId: 33
       peer: mysql-server:3306
       skipAnalysis: 'false'
-    - operationName: Mysql/JDBI/Connection/close
+    - operationName: Mysql/JDBC/Connection/close
       parentSpanId: 0
       spanId: 8
       tags:

test/plugin/scenarios/oracle-scenario/config/expectedData.yaml

@@ -19,7 +19,7 @@ segmentItems:
   segments:
   - segmentId: not null
     spans:
-    - operationName: Oracle/JDBI/Statement/execute
+    - operationName: Oracle/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 1
       spanLayer: Database
@@ -36,7 +36,7 @@ segmentItems:
         value: "CREATE TABLE test_007(\nid VARCHAR(1) PRIMARY KEY, \nvalue VARCHAR(1)\
           \ NOT NULL)"
       skipAnalysis: 'false'
-    - operationName: Oracle/JDBI/PreparedStatement/execute
+    - operationName: Oracle/JDBC/PreparedStatement/execute
       parentSpanId: 0
       spanId: 2
       spanLayer: Database
@@ -51,7 +51,7 @@ segmentItems:
       - {key: db.instance, value: xe}
       - {key: db.statement, value: 'INSERT INTO test_007(id, value) VALUES(?,?)'}
       skipAnalysis: 'false'
-    - operationName: Oracle/JDBI/PreparedStatement/executeQuery
+    - operationName: Oracle/JDBC/PreparedStatement/executeQuery
       parentSpanId: 0
       spanId: 3
       spanLayer: Database
@@ -66,7 +66,7 @@ segmentItems:
       - {key: db.instance, value: xe}
       - {key: db.statement, value: 'SELECT id, value FROM test_007 WHERE id=?'}
       skipAnalysis: 'false'
-    - operationName: Oracle/JDBI/Statement/execute
+    - operationName: Oracle/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 4
       spanLayer: Database
@@ -81,7 +81,7 @@ segmentItems:
       - {key: db.instance, value: xe}
       - {key: db.statement, value: DROP table test_007}
       skipAnalysis: 'false'
-    - operationName: Oracle/JDBI/Connection/close
+    - operationName: Oracle/JDBC/Connection/close
       parentSpanId: 0
       spanId: 5
       spanLayer: Database

test/plugin/scenarios/postgresql-above9.4.1207-scenario/config/expectedData.yaml

@@ -19,7 +19,7 @@ segmentItems:
   segments:
   - segmentId: not null
     spans:
-    - operationName: PostgreSQL/JDBI/PreparedStatement/executeWithFlags
+    - operationName: PostgreSQL/JDBC/PreparedStatement/executeWithFlags
       parentSpanId: 0
       spanId: 1
       tags:
@@ -36,7 +36,7 @@ segmentItems:
       componentId: 37
       peer: postgresql-server:5432
       skipAnalysis: 'false'
-    - operationName: PostgreSQL/JDBI/CallableStatement/executeWithFlags
+    - operationName: PostgreSQL/JDBC/CallableStatement/executeWithFlags
       parentSpanId: 0
       spanId: 2
       tags:
@@ -52,7 +52,7 @@ segmentItems:
       componentId: 37
       peer: postgresql-server:5432
       skipAnalysis: 'false'
-    - operationName: PostgreSQL/JDBI/Statement/execute
+    - operationName: PostgreSQL/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 3
       tags:
@@ -67,7 +67,7 @@ segmentItems:
       componentId: 37
       peer: postgresql-server:5432
       skipAnalysis: 'false'
-    - operationName: PostgreSQL/JDBI/Connection/close
+    - operationName: PostgreSQL/JDBC/Connection/close
       parentSpanId: 0
       spanId: 4
       tags:

test/plugin/scenarios/postgresql-scenario/config/expectedData.yaml

@@ -19,7 +19,7 @@ segmentItems:
   segments:
   - segmentId: not null
     spans:
-    - operationName: PostgreSQL/JDBI/PreparedStatement/execute
+    - operationName: PostgreSQL/JDBC/PreparedStatement/execute
       parentSpanId: 0
       spanId: 1
       tags:
@@ -36,7 +36,7 @@ segmentItems:
       componentId: 37
       peer: postgresql-server:5432
       skipAnalysis: 'false'
-    - operationName: PostgreSQL/JDBI/CallableStatement/execute
+    - operationName: PostgreSQL/JDBC/CallableStatement/execute
       parentSpanId: 0
       spanId: 2
       tags:
@@ -51,7 +51,7 @@ segmentItems:
       componentId: 37
       peer: postgresql-server:5432
       skipAnalysis: 'false'
-    - operationName: PostgreSQL/JDBI/Statement/execute
+    - operationName: PostgreSQL/JDBC/Statement/execute
       parentSpanId: 0
       spanId: 3
       tags:
@@ -66,7 +66,7 @@ segmentItems:
       componentId: 37
       peer: postgresql-server:5432
       skipAnalysis: 'false'
-    - operationName: PostgreSQL/JDBI/Connection/close
+    - operationName: PostgreSQL/JDBC/Connection/close
       parentSpanId: 0
       spanId: 4
       tags:

test/plugin/scenarios/shardingsphere-3.x-scenario/config/expectedData.yaml

@@ -19,7 +19,7 @@ segmentItems:
   segments:
   - segmentId: not null
     spans:
-    - operationName: H2/JDBI/PreparedStatement/executeQuery
+    - operationName: H2/JDBC/PreparedStatement/executeQuery
       parentSpanId: 0
       spanId: 1
       spanLayer: Database
@@ -51,7 +51,7 @@ segmentItems:
       skipAnalysis: 'false'
   - segmentId: not null
     spans:
-    - operationName: H2/JDBI/PreparedStatement/executeQuery
+    - operationName: H2/JDBC/PreparedStatement/executeQuery
       parentSpanId: 0
       spanId: 1
       spanLayer: Database
@@ -83,7 +83,7 @@ segmentItems:
       skipAnalysis: 'false'
   - segmentId: not null
     spans:
-    - operationName: H2/JDBI/PreparedStatement/executeQuery
+    - operationName: H2/JDBC/PreparedStatement/executeQuery
       parentSpanId: 0
       spanId: 1
       spanLayer: Database
@@ -128,7 +128,7 @@ segmentItems:
       tags:
       - {key: db.statement, value: SELECT * FROM t_order}
       skipAnalysis: 'false'
-    - operationName: H2/JDBI/PreparedStatement/executeQuery
+    - operationName: H2/JDBC/PreparedStatement/executeQuery
       parentSpanId: 3
       spanId: 4
       spanLayer: Database

test/plugin/scenarios/shardingsphere-4.0.x-scenario/config/expectedData.yaml

@@ -19,7 +19,7 @@ segmentItems:
   segments:
   - segmentId: not null
     spans:
-    - operationName: H2/JDBI/PreparedStatement/executeQuery
+    - operationName: H2/JDBC/PreparedStatement/executeQuery
       parentSpanId: 0
       spanId: 1
       spanLayer: Database
@@ -51,7 +51,7 @@ segmentItems:
       skipAnalysis: 'false'
   - segmentId: not null
     spans:
-    - operationName: H2/JDBI/PreparedStatement/executeQuery
+    - operationName: H2/JDBC/PreparedStatement/executeQuery
       parentSpanId: 0
       spanId: 1
       spanLayer: Database
@@ -83,7 +83,7 @@ segmentItems:
       skipAnalysis: 'false'
   - segmentId: not null
     spans:
-    - operationName: H2/JDBI/PreparedStatement/executeQuery
+    - operationName: H2/JDBC/PreparedStatement/executeQuery
       parentSpanId: 0
       spanId: 1
       spanLayer: Database
@@ -128,7 +128,7 @@ segmentItems:
       tags:
       - {key: db.statement, value: SELECT * FROM t_order}
       skipAnalysis: 'false'
-    - operationName: H2/JDBI/PreparedStatement/executeQuery
+    - operationName: H2/JDBC/PreparedStatement/executeQuery
       parentSpanId: 3
       spanId: 4
       spanLayer: Database

test/plugin/scenarios/shardingsphere-4.x-scenario/config/expectedData.yaml

@@ -19,7 +19,7 @@ segmentItems:
   segments:
   - segmentId: not null
     spans:
-    - operationName: H2/JDBI/PreparedStatement/executeQuery
+    - operationName: H2/JDBC/PreparedStatement/executeQuery
       parentSpanId: 0
       spanId: 1
       spanLayer: Database
@@ -51,7 +51,7 @@ segmentItems:
       skipAnalysis: 'false'
   - segmentId: not null
     spans:
-    - operationName: H2/JDBI/PreparedStatement/executeQuery
+    - operationName: H2/JDBC/PreparedStatement/executeQuery
       parentSpanId: 0
       spanId: 1
       spanLayer: Database
@@ -83,7 +83,7 @@ segmentItems:
       skipAnalysis: 'false'
   - segmentId: not null
     spans:
-    - operationName: H2/JDBI/PreparedStatement/executeQuery
+    - operationName: H2/JDBC/PreparedStatement/executeQuery
       parentSpanId: 0
       spanId: 1
       spanLayer: Database
@@ -128,7 +128,7 @@ segmentItems:
       tags:
       - {key: db.statement, value: SELECT * FROM t_order}
       skipAnalysis: 'false'
-    - operationName: H2/JDBI/PreparedStatement/executeQuery
+    - operationName: H2/JDBC/PreparedStatement/executeQuery
       parentSpanId: 3
       spanId: 4
       spanLayer: Database

test/plugin/scenarios/shardingsphere-5.0.0-scenario/config/expectedData.yaml

@@ -19,7 +19,7 @@ segmentItems:
     segments:
       - segmentId: not null
         spans:
-          - operationName: H2/JDBI/PreparedStatement/executeQuery
+          - operationName: H2/JDBC/PreparedStatement/executeQuery
             operationId: 0
             parentSpanId: -1
             spanId: 0
@@ -37,7 +37,7 @@ segmentItems:
               - { key: db.statement, value: not null}
       - segmentId: not null
         spans:
-          - operationName: H2/JDBI/Statement/executeUpdate
+          - operationName: H2/JDBC/Statement/executeUpdate
             operationId: 0
             parentSpanId: 0
             spanId: 1
@@ -72,7 +72,7 @@ segmentItems:
                   traceId: not null }
       - segmentId: not null
         spans:
-          - operationName: H2/JDBI/Connection/close
+          - operationName: H2/JDBC/Connection/close
             operationId: 0
             parentSpanId: -1
             spanId: 0
@@ -90,7 +90,7 @@ segmentItems:
               - { key: db.statement, value: '' }
       - segmentId: not null
         spans:
-          - operationName: H2/JDBI/PreparedStatement/executeQuery
+          - operationName: H2/JDBC/PreparedStatement/executeQuery
             operationId: 0
             parentSpanId: 0
             spanId: 1
@@ -160,7 +160,7 @@ segmentItems:
             spanType: Local
             peer: ''
             skipAnalysis: false
-          - operationName: H2/JDBI/PreparedStatement/executeQuery
+          - operationName: H2/JDBC/PreparedStatement/executeQuery
             parentSpanId: 5
             spanId: 6
             spanLayer: Database

test/plugin/scenarios/spring-tx-scenario/config/expectedData.yaml

@@ -34,7 +34,7 @@ segmentItems:
       - {key: propagationBehavior, value: '0'}
       - {key: timeout, value: '-1'}
       skipAnalysis: 'false'
-    - operationName: Mysql/JDBI/PreparedStatement/executeUpdate
+    - operationName: Mysql/JDBC/PreparedStatement/executeUpdate
       parentSpanId: 0
       spanId: 2
       spanLayer: Database
@@ -49,7 +49,7 @@ segmentItems:
       - {key: db.instance, value: ''}
       - {key: db.statement, value: 'insert into `test`.`table_demo`(name) values(?)'}
       skipAnalysis: 'false'
-    - operationName: Mysql/JDBI/PreparedStatement/executeUpdate
+    - operationName: Mysql/JDBC/PreparedStatement/executeUpdate
       parentSpanId: 0
       spanId: 3
       spanLayer: Database
@@ -64,7 +64,7 @@ segmentItems:
       - {key: db.instance, value: ''}
       - {key: db.statement, value: 'insert into `test`.`table_demo`(name) values(?)'}
       skipAnalysis: 'false'
-    - operationName: Mysql/JDBI/Connection/commit
+    - operationName: Mysql/JDBC/Connection/commit
       parentSpanId: 4
       spanId: 5
       spanLayer: Database
@@ -79,7 +79,7 @@ segmentItems:
       - {key: db.instance, value: ''}
       - {key: db.statement, value: ''}
       skipAnalysis: 'false'
-    - operationName: Mysql/JDBI/Statement/executeQuery
+    - operationName: Mysql/JDBC/Statement/executeQuery
       parentSpanId: 4
       spanId: 6
       spanLayer: Database
@@ -94,7 +94,7 @@ segmentItems:
       - {key: db.instance, value: ''}
       - {key: db.statement, value: select @@session.tx_read_only}
       skipAnalysis: 'false'
-    - operationName: Mysql/JDBI/Connection/close
+    - operationName: Mysql/JDBC/Connection/close
       parentSpanId: 4
       spanId: 7
       spanLayer: Database

test/plugin/scenarios/springmvc-reactive-devtools-scenario/config/expectedData.yaml

@@ -20,7 +20,7 @@ segmentItems:
   segments:
   - segmentId: not null
     spans:
-    - operationName: H2/JDBI/PreparedStatement/executeQuery
+    - operationName: H2/JDBC/PreparedStatement/executeQuery
       parentSpanId: 0
       spanId: 1
       spanLayer: Database

test/plugin/scenarios/springmvc-reactive-scenario/config/expectedData.yaml

@@ -20,7 +20,7 @@ segmentItems:
   segments:
   - segmentId: not null
     spans:
-    - operationName: H2/JDBI/PreparedStatement/executeQuery
+    - operationName: H2/JDBC/PreparedStatement/executeQuery
       parentSpanId: 0
       spanId: 1
       spanLayer: Database