refactoring module a level up

open-telemetry · Nov 26, 2024 · c34b20d · c34b20d
1 parent 3b6ab9b
commit c34b20d
Show file tree

Hide file tree

Showing 17 changed files with 3 additions and 3 deletions.
diff --git a/...ike-client-7.0/javaagent/build.gradle.kts → ...rospike-client/javaagent/build.gradle.kts b/...ike-client-7.0/javaagent/build.gradle.kts → ...rospike-client/javaagent/build.gradle.kts
diff --git a/..._0/AerospikeClientAttributeExtractor.java → ..._0/AerospikeClientAttributeExtractor.java b/..._0/AerospikeClientAttributeExtractor.java → ..._0/AerospikeClientAttributeExtractor.java
diff --git a/.../v7_0/AerospikeClientInstrumentation.java → .../v7_0/AerospikeClientInstrumentation.java b/.../v7_0/AerospikeClientInstrumentation.java → .../v7_0/AerospikeClientInstrumentation.java
diff --git a/...AerospikeClientInstrumentationModule.java → ...AerospikeClientInstrumentationModule.java b/...AerospikeClientInstrumentationModule.java → ...AerospikeClientInstrumentationModule.java
@@ -18,7 +18,7 @@
 public class AerospikeClientInstrumentationModule extends InstrumentationModule {
 
   public AerospikeClientInstrumentationModule() {
-    super("aerospike-client", "aerospike-client-7.0.0");
+    super("aerospike-client");
   }
 
   @Override

diff --git a/...ike/v7_0/AerospikeDbAttributesGetter.java → ...ike/v7_0/AerospikeDbAttributesGetter.java b/...ike/v7_0/AerospikeDbAttributesGetter.java → ...ike/v7_0/AerospikeDbAttributesGetter.java
diff --git a/...7_0/AerospikeNetworkAttributesGetter.java → ...7_0/AerospikeNetworkAttributesGetter.java b/...7_0/AerospikeNetworkAttributesGetter.java → ...7_0/AerospikeNetworkAttributesGetter.java
diff --git a/...n/aerospike/v7_0/AersopikeSingletons.java → ...n/aerospike/v7_0/AersopikeSingletons.java b/...n/aerospike/v7_0/AersopikeSingletons.java → ...n/aerospike/v7_0/AersopikeSingletons.java
@@ -19,7 +19,7 @@
 import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.metrics.AerospikeMetrics;
 
 public final class AersopikeSingletons {
-  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.aerospike-client-7.0";
+  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.aerospike-client";
 
   private static final Instrumenter<AerospikeRequest, Void> INSTRUMENTER;
 

diff --git a/...ike/v7_0/AsyncCommandInstrumentation.java → ...ike/v7_0/AsyncCommandInstrumentation.java b/...ike/v7_0/AsyncCommandInstrumentation.java → ...ike/v7_0/AsyncCommandInstrumentation.java
diff --git a/...pike/v7_0/SyncCommandInstrumentation.java → ...pike/v7_0/SyncCommandInstrumentation.java b/...pike/v7_0/SyncCommandInstrumentation.java → ...pike/v7_0/SyncCommandInstrumentation.java
diff --git a/...spike/v7_0/internal/AerospikeRequest.java → ...spike/v7_0/internal/AerospikeRequest.java b/...spike/v7_0/internal/AerospikeRequest.java → ...spike/v7_0/internal/AerospikeRequest.java
diff --git a/...7_0/internal/AerospikeRequestContext.java → ...7_0/internal/AerospikeRequestContext.java b/...7_0/internal/AerospikeRequestContext.java → ...7_0/internal/AerospikeRequestContext.java
diff --git a/...internal/AerospikeSemanticAttributes.java → ...internal/AerospikeSemanticAttributes.java b/...internal/AerospikeSemanticAttributes.java → ...internal/AerospikeSemanticAttributes.java
diff --git a/...e/v7_0/internal/CustomElementMatcher.java → ...e/v7_0/internal/CustomElementMatcher.java b/...e/v7_0/internal/CustomElementMatcher.java → ...e/v7_0/internal/CustomElementMatcher.java
diff --git a/...ospike/v7_0/metrics/AerospikeMetrics.java → ...ospike/v7_0/metrics/AerospikeMetrics.java b/...ospike/v7_0/metrics/AerospikeMetrics.java → ...ospike/v7_0/metrics/AerospikeMetrics.java
diff --git a/.../v7_0/metrics/AerospikeMetricsAdvice.java → .../v7_0/metrics/AerospikeMetricsAdvice.java b/.../v7_0/metrics/AerospikeMetricsAdvice.java → .../v7_0/metrics/AerospikeMetricsAdvice.java
diff --git a/...n/aerospike/v7_0/AerospikeClientTest.java → ...n/aerospike/v7_0/AerospikeClientTest.java b/...n/aerospike/v7_0/AerospikeClientTest.java → ...n/aerospike/v7_0/AerospikeClientTest.java
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -172,7 +172,7 @@ include(":smoke-tests-otel-starter:spring-boot-reactive-2")
 include(":smoke-tests-otel-starter:spring-boot-reactive-3")
 include(":smoke-tests-otel-starter:spring-boot-reactive-common")
 
-include(":instrumentation:aerospike-client:aerospike-client-7.0:javaagent")
+include(":instrumentation:aerospike-client:javaagent")
 include(":instrumentation:akka:akka-actor-2.3:javaagent")
 include(":instrumentation:akka:akka-actor-fork-join-2.5:javaagent")
 include(":instrumentation:akka:akka-http-10.0:javaagent")