Skip to content

Commit bcbbc2b

Browse files
nisiyongnisiyong
authored
RenameJDBI to JDBC (#381)
1 parent 9559fad commit bcbbc2b

54 files changed

Lines changed: 190 additions & 189 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
run: |
122122
mkdir -p skywalking-agent/plugins
123123
curl -O https://skyapm.github.io/ci-assist/jars/ojdbc14-10.2.0.4.0.jar
124-
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
124+
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
125125
./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
126126
- name: Run Plugin Test
127127
uses: ./.github/actions/run

‎CHANGES.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Release Notes.
77

88
* Polish test framework to support `arm64/v8` platforms
99
* 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**.
10+
* Rename `JDBI` to `JDBC`
1011

1112
#### Documentation
1213

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class ClickHouseStatementTracingWrapper {
3333
public static <T> T of(ConnectionInfo connectionInfo, String methodName, String sql,
3434
SupplierWithException<T> supplier) throws SQLException {
3535
final AbstractSpan span = ContextManager.createExitSpan(
36-
connectionInfo.getDBType() + "/JDBI/Statement/" + methodName, connectionInfo.getDatabasePeer());
36+
connectionInfo.getDBType() + "/JDBC/Statement/" + methodName, connectionInfo.getDatabasePeer());
3737
try {
3838
Tags.DB_TYPE.set(span, "sql");
3939
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public final void handleMethodException(EnhancedInstance objInst, Method method,
8181
}
8282

8383
private String buildOperationName(ConnectionInfo connectionInfo, String methodName, String statementName) {
84-
return connectionInfo.getDBType() + "/JDBI/" + statementName + "/" + methodName;
84+
return connectionInfo.getDBType() + "/JDBC/" + statementName + "/" + methodName;
8585
}
8686

8787
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,6 @@ public final void handleMethodException(EnhancedInstance objInst, Method method,
7070
}
7171

7272
private String buildOperationName(ConnectionInfo connectionInfo, String methodName, String statementName) {
73-
return connectionInfo.getDBType() + "/JDBI/" + statementName + "/" + methodName;
73+
return connectionInfo.getDBType() + "/JDBC/" + statementName + "/" + methodName;
7474
}
7575
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public void testExecutePreparedStatement() throws Throwable {
114114
assertThat(SegmentHelper.getSpans(segment).size(), is(1));
115115
AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
116116
SpanAssert.assertLayer(span, SpanLayer.DB);
117-
assertThat(span.getOperationName(), is("Impala/JDBI/PreparedStatement/"));
117+
assertThat(span.getOperationName(), is("Impala/JDBC/PreparedStatement/"));
118118
SpanAssert.assertTag(span, 0, "sql");
119119
SpanAssert.assertTag(span, 1, "test");
120120
SpanAssert.assertTag(span, 2, SQL);
@@ -144,7 +144,7 @@ public void testExecutePreparedStatementWithLimitSqlBody() throws Throwable {
144144
assertThat(SegmentHelper.getSpans(segment).size(), is(1));
145145
AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
146146
SpanAssert.assertLayer(span, SpanLayer.DB);
147-
assertThat(span.getOperationName(), is("Impala/JDBI/PreparedStatement/"));
147+
assertThat(span.getOperationName(), is("Impala/JDBC/PreparedStatement/"));
148148
SpanAssert.assertTag(span, 0, "sql");
149149
SpanAssert.assertTag(span, 1, "test");
150150
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‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public void testExecuteStatement() {
9797
assertThat(SegmentHelper.getSpans(segment).size(), is(1));
9898
AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
9999
SpanAssert.assertLayer(span, SpanLayer.DB);
100-
assertThat(span.getOperationName(), is("Impala/JDBI/CallableStatement/"));
100+
assertThat(span.getOperationName(), is("Impala/JDBC/CallableStatement/"));
101101
SpanAssert.assertTag(span, 0, "sql");
102102
SpanAssert.assertTag(span, 1, "test");
103103
SpanAssert.assertTag(span, 2, SQL);
@@ -114,7 +114,7 @@ public void testExecuteStatementWithLimitSqlBody() {
114114
assertThat(SegmentHelper.getSpans(segment).size(), is(1));
115115
AbstractTracingSpan span = SegmentHelper.getSpans(segment).get(0);
116116
SpanAssert.assertLayer(span, SpanLayer.DB);
117-
assertThat(span.getOperationName(), is("Impala/JDBI/CallableStatement/"));
117+
assertThat(span.getOperationName(), is("Impala/JDBC/CallableStatement/"));
118118
SpanAssert.assertTag(span, 0, "sql");
119119
SpanAssert.assertTag(span, 1, "test");
120120
SpanAssert.assertTag(span, 2, "Select * f...");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[]
3939
Class<?>[] argumentsTypes, MethodInterceptResult result) throws Throwable {
4040
ConnectionInfo connectInfo = (ConnectionInfo) objInst.getSkyWalkingDynamicField();
4141
if (connectInfo != null) {
42-
AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/Connection/" + method.getName(), connectInfo
42+
AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBC/Connection/" + method.getName(), connectInfo
4343
.getDatabasePeer());
4444
Tags.DB_TYPE.set(span, "sql");
4545
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class CallableStatementTracing {
3232

3333
public static <R> R execute(java.sql.CallableStatement realStatement, ConnectionInfo connectInfo, String method,
3434
String sql, Executable<R> exec) throws SQLException {
35-
AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/CallableStatement/" + method, connectInfo
35+
AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBC/CallableStatement/" + method, connectInfo
3636
.getDatabasePeer());
3737
try {
3838
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class PreparedStatementTracing {
3232

3333
public static <R> R execute(java.sql.PreparedStatement realStatement, ConnectionInfo connectInfo, String method,
3434
String sql, Executable<R> exec) throws SQLException {
35-
final AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/PreparedStatement/" + method, connectInfo
35+
final AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBC/PreparedStatement/" + method, connectInfo
3636
.getDatabasePeer());
3737
try {
3838
Tags.DB_TYPE.set(span, "sql");

0 commit comments

Comments
 (0)