WIP: use lowest java-driver-core version that supports reactive

open-telemetry · Nov 17, 2022 · 3bc4320 · 3bc4320
1 parent 8841346
commit 3bc4320
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 4 deletions.
diff --git a/...cassandra-4.14/javaagent/build.gradle.kts → .../cassandra-4.4/javaagent/build.gradle.kts b/...cassandra-4.14/javaagent/build.gradle.kts → .../cassandra-4.4/javaagent/build.gradle.kts
@@ -13,7 +13,7 @@ muzzle {
 dependencies {
   implementation(project(":instrumentation:cassandra:cassandra-4.0:javaagent"))
 
-  library("com.datastax.oss:java-driver-core:4.14.1")
+  library("com.datastax.oss:java-driver-core:4.4.0")
 
   compileOnly("com.google.auto.value:auto-value-annotations")
   annotationProcessor("com.google.auto.value:auto-value")

diff --git a/...CassandraClientInstrumentationModule.java → ...CassandraClientInstrumentationModule.java b/...CassandraClientInstrumentationModule.java → ...CassandraClientInstrumentationModule.java
@@ -15,7 +15,7 @@
 @AutoService(InstrumentationModule.class)
 public class CassandraClientInstrumentationModule extends InstrumentationModule {
   public CassandraClientInstrumentationModule() {
-    super("cassandra", "cassandra-4.14");
+    super("cassandra", "cassandra-4.4");
   }
 
   @Override

diff --git a/.../cassandra/v4_14/CassandraSingletons.java → .../cassandra/v4_14/CassandraSingletons.java b/.../cassandra/v4_14/CassandraSingletons.java → .../cassandra/v4_14/CassandraSingletons.java
@@ -19,7 +19,7 @@ final class CassandraSingletons {
   static {
     CassandraTelemetry telemetry =
         CassandraTelemetry.builder(GlobalOpenTelemetry.get())
-            .setInstrumentationName("io.opentelemetry.cassandra-4.14")
+            .setInstrumentationName("io.opentelemetry.cassandra-4.4")
             .setStatementSanitizationEnabled(CommonConfig.get().isStatementSanitizationEnabled())
             .build();
 

diff --git a/...sandra/v4_14/CompletionStageFunction.java → ...sandra/v4_14/CompletionStageFunction.java b/...sandra/v4_14/CompletionStageFunction.java → ...sandra/v4_14/CompletionStageFunction.java
diff --git a/.../v4_14/SessionBuilderInstrumentation.java → .../v4_14/SessionBuilderInstrumentation.java b/.../v4_14/SessionBuilderInstrumentation.java → .../v4_14/SessionBuilderInstrumentation.java
diff --git a/...on/cassandra/v4_14/TracingCqlSession.java → ...on/cassandra/v4_14/TracingCqlSession.java b/...on/cassandra/v4_14/TracingCqlSession.java → ...on/cassandra/v4_14/TracingCqlSession.java
diff --git a/...rc/test/groovy/CassandraClientTest.groovy → ...rc/test/groovy/CassandraClientTest.groovy b/...rc/test/groovy/CassandraClientTest.groovy → ...rc/test/groovy/CassandraClientTest.groovy
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -173,7 +173,7 @@ include(":instrumentation:azure-core:azure-core-1.19:javaagent")
 include(":instrumentation:azure-core:azure-core-1.19:library-instrumentation-shaded")
 include(":instrumentation:cassandra:cassandra-3.0:javaagent")
 include(":instrumentation:cassandra:cassandra-4.0:javaagent")
-include(":instrumentation:cassandra:cassandra-4.14:javaagent")
+include(":instrumentation:cassandra:cassandra-4.4:javaagent")
 include(":instrumentation:cdi-testing")
 include(":instrumentation:graphql-java-12.0:javaagent")
 include(":instrumentation:graphql-java-12.0:library")