diff --git a/instrumentation/cassandra/cassandra-4.14/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-4.14/javaagent/build.gradle.kts index b938128dc450..02e8f91d4f8b 100644 --- a/instrumentation/cassandra/cassandra-4.14/javaagent/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-4.14/javaagent/build.gradle.kts @@ -6,8 +6,7 @@ muzzle { pass { group.set("com.datastax.oss") module.set("java-driver-core") - versions.set("[4.14,)") - assertInverse.set(true) + versions.set("[4.4,]") } } diff --git a/instrumentation/cassandra/cassandra-4.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_14/CassandraSingletons.java b/instrumentation/cassandra/cassandra-4.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_14/CassandraSingletons.java index 2fe41f1cba72..a74493722928 100644 --- a/instrumentation/cassandra/cassandra-4.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_14/CassandraSingletons.java +++ b/instrumentation/cassandra/cassandra-4.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_14/CassandraSingletons.java @@ -8,9 +8,9 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; +import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; import io.opentelemetry.javaagent.instrumentation.cassandra.v4_0.CassandraRequest; import io.opentelemetry.javaagent.instrumentation.cassandra.v4_0.CassandraTelemetry; -import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; final class CassandraSingletons { // using ExecutionInfo because we can get that from ResultSet, AsyncResultSet and DriverException diff --git a/instrumentation/cassandra/cassandra-4.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_14/CompletionStageFunction.java b/instrumentation/cassandra/cassandra-4.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_14/CompletionStageFunction.java index 449130bbdcfa..2d2f5cae6403 100644 --- a/instrumentation/cassandra/cassandra-4.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_14/CompletionStageFunction.java +++ b/instrumentation/cassandra/cassandra-4.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_14/CompletionStageFunction.java @@ -10,7 +10,7 @@ import com.datastax.oss.driver.api.core.CqlSession; import java.util.function.Function; -class CompletionStageFunction implements Function { +public class CompletionStageFunction implements Function { @Override public Object apply(Object session) { diff --git a/instrumentation/cassandra/cassandra-4.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_14/TracingCqlSession.java b/instrumentation/cassandra/cassandra-4.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_14/TracingCqlSession.java index f4151f0be7e6..540f961ac8b0 100644 --- a/instrumentation/cassandra/cassandra-4.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_14/TracingCqlSession.java +++ b/instrumentation/cassandra/cassandra-4.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_14/TracingCqlSession.java @@ -16,13 +16,16 @@ public class TracingCqlSession extends io.opentelemetry.javaagent.instrumentation.cassandra.v4_0.TracingCqlSession { + private final CqlSession tracingSession; + public TracingCqlSession( CqlSession session, Instrumenter instrumenter) { super(session, instrumenter); + tracingSession = session; } @Override public ReactiveResultSet executeReactive(Statement statement) { - return new DefaultReactiveResultSet(() -> executeAsync(statement)); + return new DefaultReactiveResultSet(() -> tracingSession.executeAsync(statement)); } }