Skip to content

Commit 27b9daf

Browse files
committed
Remove CommandSchedulerInstrumentation and fix null connectOptions check
CommandSchedulerInstrumentation interfered with Vert.x async context propagation, breaking traces for all pool-based queries (spans ended up in separate traces instead of sharing the parent trace). The 'if (connectOptions == null) return' check in QueryAdvice skipped span creation for ALL pooled connections, not just JDBC-backed ones. Pool is an interface with static pool() methods -- the PoolAdvice type matcher (implementsInterface) matches implementing classes which don't have those static methods, so PoolAdvice never fires and connectOptions are always null for the pool path. Also removes VertxJdbcClientTest since the JDBC suppression mechanism (null connectOptions check) was fundamentally broken.
1 parent e63e091 commit 27b9daf

8 files changed

Lines changed: 0 additions & 388 deletions

File tree

instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/CommandSchedulerInstrumentation.java

Lines changed: 0 additions & 81 deletions
This file was deleted.

instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/QueryExecutorInstrumentation.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,6 @@ public static AdviceScope start(Object queryExecutor, Object[] arguments) {
104104
}
105105

106106
SqlConnectOptions connectOptions = QueryExecutorUtil.getConnectOptions(queryExecutor);
107-
// Skip vertx-sql-client instrumentation for JDBC-backed connections
108-
// (connect options are not available for the JDBC path) —
109-
// let JDBC instrumentation handle them instead
110-
if (connectOptions == null) {
111-
return new AdviceScope(callDepth);
112-
}
113107
// Try db system stored from pool class first (handles generic SqlConnectOptions),
114108
// fall back to class name detection on the connect options itself
115109
String dbSystem = VertxSqlClientSingletons.getConnectOptionsDbSystem(connectOptions);

instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientInstrumentationModule.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public List<String> injectedClassNames() {
4343
@Override
4444
public List<TypeInstrumentation> typeInstrumentations() {
4545
return asList(
46-
new CommandSchedulerInstrumentation(),
4746
new PoolInstrumentation(),
4847
new SqlClientBaseInstrumentation(),
4948
new QueryExecutorInstrumentation(),

instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxJdbcClientTest.java

Lines changed: 0 additions & 106 deletions
This file was deleted.

instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v5_0/sql/CommandSchedulerInstrumentation.java

Lines changed: 0 additions & 81 deletions
This file was deleted.

instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v5_0/sql/QueryExecutorInstrumentation.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,6 @@ public static AdviceScope start(Object queryExecutor, Object[] arguments) {
103103
}
104104

105105
SqlConnectOptions connectOptions = QueryExecutorUtil.getConnectOptions(queryExecutor);
106-
// Skip vertx-sql-client instrumentation for JDBC-backed connections
107-
// (connect options are not available for the JDBC path) —
108-
// let JDBC instrumentation handle them instead
109-
if (connectOptions == null) {
110-
return new AdviceScope(callDepth);
111-
}
112106
String dbSystem = VertxSqlClientSingletons.getConnectOptionsDbSystem(connectOptions);
113107
VertxSqlClientRequest otelRequest =
114108
new VertxSqlClientRequest(sql, connectOptions, preparedStatement, dbSystem);

instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v5_0/sql/VertxSqlClientInstrumentationModule.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public List<String> injectedClassNames() {
4343
@Override
4444
public List<TypeInstrumentation> typeInstrumentations() {
4545
return asList(
46-
new CommandSchedulerInstrumentation(),
4746
new DriverInstrumentation(),
4847
new PoolInstrumentation(),
4948
new SqlClientBaseInstrumentation(),

0 commit comments

Comments
 (0)