Use the lowest cassandra version possible

open-telemetry · Nov 14, 2022 · 7113aa6 · 7113aa6
1 parent 128f0f6
commit 7113aa6
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 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
@@ -6,15 +6,15 @@ muzzle {
   pass {
     group.set("com.datastax.oss")
     module.set("java-driver-core")
-    versions.set("[4.14,)")
+    versions.set("[4.4,)")
     assertInverse.set(true)
   }
 }
 
 dependencies {
   implementation(project(":instrumentation:cassandra:cassandra-4.0:library"))
 
-  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
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.cassandra.v4_14;
+package io.opentelemetry.javaagent.instrumentation.cassandra.v4_4;
 
 import static java.util.Collections.singletonList;
 
@@ -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 → ...n/cassandra/v4_4/CassandraSingletons.java b/.../cassandra/v4_14/CassandraSingletons.java → ...n/cassandra/v4_4/CassandraSingletons.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.cassandra.v4_14;
+package io.opentelemetry.javaagent.instrumentation.cassandra.v4_4;
 
 import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
 import io.opentelemetry.api.GlobalOpenTelemetry;
@@ -19,7 +19,7 @@ public 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 → ...ssandra/v4_4/CompletionStageFunction.java b/...sandra/v4_14/CompletionStageFunction.java → ...ssandra/v4_4/CompletionStageFunction.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.cassandra.v4_14;
+package io.opentelemetry.javaagent.instrumentation.cassandra.v4_4;
 
-import static io.opentelemetry.javaagent.instrumentation.cassandra.v4_14.CassandraSingletons.instrumenter;
+import static io.opentelemetry.javaagent.instrumentation.cassandra.v4_4.CassandraSingletons.instrumenter;
 
 import com.datastax.oss.driver.api.core.CqlSession;
 import java.util.function.Function;

diff --git a/.../v4_14/SessionBuilderInstrumentation.java → ...a/v4_4/SessionBuilderInstrumentation.java b/.../v4_14/SessionBuilderInstrumentation.java → ...a/v4_4/SessionBuilderInstrumentation.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.cassandra.v4_14;
+package io.opentelemetry.javaagent.instrumentation.cassandra.v4_4;
 
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;

diff --git a/...on/cassandra/v4_14/TracingCqlSession.java → ...ion/cassandra/v4_4/TracingCqlSession.java b/...on/cassandra/v4_14/TracingCqlSession.java → ...ion/cassandra/v4_4/TracingCqlSession.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.cassandra.v4_14;
+package io.opentelemetry.javaagent.instrumentation.cassandra.v4_4;
 
 import com.datastax.dse.driver.api.core.cql.reactive.ReactiveResultSet;
 import com.datastax.dse.driver.internal.core.cql.reactive.DefaultReactiveResultSet;

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
@@ -178,7 +178,7 @@ include(":instrumentation:azure-core:azure-core-1.19:library-instrumentation-sha
 include(":instrumentation:cassandra:cassandra-3.0:javaagent")
 include(":instrumentation:cassandra:cassandra-4.0:javaagent")
 include(":instrumentation:cassandra:cassandra-4.0:library")
-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")