fixes muzzle, refactors module, updates classLoadMatcher and added doc

Author: Abhishekkr3003

conventions/.kotlin/errors/errors-1732624750398.log

@@ -19,6 +19,7 @@ These are the supported libraries and frameworks:
 
 | Library/Framework                                                                                                                           | Auto-instrumented versions         | Standalone Library Instrumentation [1]                                                                                                                                                                                                                                                                                                                                                  | Semantic Conventions                                                                                                                    |
 |---------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------|
+| [Aerospike Client](https://github.com/aerospike/aerospike-client-java)                                                                      | 7.1+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | [Database Pool Metrics]                                                                                                                  |
 | [Akka Actors](https://doc.akka.io/docs/akka/current/typed/index.html)                                                                       | 2.3+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | Context propagation                                                                                                                     |
 | [Akka HTTP](https://doc.akka.io/docs/akka-http/current/index.html)                                                                          | 10.0+                              | N/A                                                                                                                                                                                                                                                                                                                                                                                     | [HTTP Client Spans], [HTTP Client Metrics], [HTTP Server Spans], [HTTP Server Metrics], Provides `http.route` [2]                       |
 | [Alibaba Druid](https://github.com/alibaba/druid)                                                                                           | 1.0+                               | [opentelemetry-alibaba-druid-1.0](../instrumentation/alibaba-druid-1.0/library)                                                                                                                                                                                                                                                                                                         | [Database Pool Metrics]                                                                                                                 |

docs/supported-libraries.md

@@ -3,4 +3,4 @@
 | System property                                               | Type    | Default | Description                                                          |
 |---------------------------------------------------------------|---------|---------|----------------------------------------------------------------------|
 | `otel.instrumentation.aerospike.experimental-span-attributes` | Boolean | `false` | Enable the capture of experimental Aerospike client span attributes. |
-| `otel.instrumentation.aerospike.experimental-metrics`         | Boolean | `false` | Enable the recording of experimental Aerospike client metrics        |
+| `otel.instrumentation.aerospike.experimental-metrics`         | Boolean | `false` | Enable the recording of experimental Aerospike client metrics.       |

instrumentation/aerospike-client/README.md

@@ -6,19 +6,32 @@ muzzle {
   pass {
     group.set("com.aerospike")
     module.set("aerospike-client")
-    versions.set("[4.0.0,)")
+    versions.set("[7.1.0,)")
     assertInverse.set(true)
   }
 }
 
+val latestDepTest = findProperty("testLatestDeps") as Boolean
+
 dependencies {
-  library("com.aerospike:aerospike-client:8.0.0")
+  if (latestDepTest) {
+    library("com.aerospike:aerospike-client:+")
+  } else {
+    library("com.aerospike:aerospike-client:7.1.0")
+  }
+
   implementation("io.opentelemetry:opentelemetry-api-incubator")
 
   compileOnly("com.google.auto.value:auto-value-annotations")
   annotationProcessor("com.google.auto.value:auto-value")
 }
 
+if (latestDepTest) {
+  otelJava {
+    minJavaVersionSupported.set(JavaVersion.VERSION_21)
+  }
+}
+
 tasks {
   test {
     jvmArgs("-Djava.net.preferIPv4Stack=true")

instrumentation/aerospike-client/javaagent/build.gradle.kts

@@ -3,15 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
+package io.opentelemetry.javaagent.instrumentation.aerospike;
 
 import com.aerospike.client.AerospikeException;
 import com.aerospike.client.ResultCode;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
-import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeRequest;
-import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeSemanticAttributes;
+import io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeRequest;
+import io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeSemanticAttributes;
 import javax.annotation.Nullable;
 
 final class AerospikeClientAttributeExtractor

instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/AerospikeClientAttributeExtractor.java instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/AerospikeClientAttributeExtractor.java

@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
+package io.opentelemetry.javaagent.instrumentation.aerospike;
 
 import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
-import static io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.AersopikeSingletons.instrumenter;
-import static io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.CustomElementMatcher.iterableHasAtLeastOne;
+import static io.opentelemetry.javaagent.instrumentation.aerospike.AerospikeSingletons.instrumenter;
+import static io.opentelemetry.javaagent.instrumentation.aerospike.internal.CustomElementMatcher.iterableHasAtLeastOne;
 import static net.bytebuddy.matcher.ElementMatchers.hasSuperType;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -18,8 +18,8 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
-import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeRequest;
-import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeRequestContext;
+import io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeRequest;
+import io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeRequestContext;
 import java.util.Locale;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;

instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/AerospikeClientInstrumentation.java instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/AerospikeClientInstrumentation.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
+package io.opentelemetry.javaagent.instrumentation.aerospike;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static java.util.Arrays.asList;
@@ -23,12 +23,7 @@ public AerospikeClientInstrumentationModule() {
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassesNamed("com.aerospike.client.IAerospikeClient")
-        .and(hasClassesNamed("com.aerospike.client.command.Command"))
-        .and(hasClassesNamed("com.aerospike.client.command.SyncCommand"))
-        .and(hasClassesNamed("com.aerospike.client.async.AsyncCommand"))
-        .and(hasClassesNamed("com.aerospike.client.async.EventLoop"))
-        .and(hasClassesNamed("com.aerospike.client.Key"));
+    return hasClassesNamed("com.aerospike.client.metrics.LatencyType");
   }
 
   @Override

instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/AerospikeClientInstrumentationModule.java instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/AerospikeClientInstrumentationModule.java

@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
+package io.opentelemetry.javaagent.instrumentation.aerospike;
 
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;
-import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeRequest;
-import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeSemanticAttributes;
+import io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeRequest;
+import io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeSemanticAttributes;
 import javax.annotation.Nullable;
 
 final class AerospikeDbAttributesGetter implements DbClientAttributesGetter<AerospikeRequest> {

instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/AerospikeDbAttributesGetter.java instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/AerospikeDbAttributesGetter.java

@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
+package io.opentelemetry.javaagent.instrumentation.aerospike;
 
 import com.aerospike.client.cluster.Node;
 import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesGetter;
-import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeRequest;
+import io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeRequest;
 import java.net.InetSocketAddress;
 import javax.annotation.Nullable;
 

instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/AerospikeNetworkAttributesGetter.java instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/AerospikeNetworkAttributesGetter.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
+package io.opentelemetry.javaagent.instrumentation.aerospike;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
@@ -15,10 +15,10 @@
 import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor;
 import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesGetter;
 import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
-import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeRequest;
-import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.metrics.AerospikeMetrics;
+import io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeRequest;
+import io.opentelemetry.javaagent.instrumentation.aerospike.metrics.AerospikeMetrics;
 
-public final class AersopikeSingletons {
+public final class AerospikeSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.aerospike-client";
 
   private static final Instrumenter<AerospikeRequest, Void> INSTRUMENTER;
@@ -52,5 +52,5 @@ public static Instrumenter<AerospikeRequest, Void> instrumenter() {
     return INSTRUMENTER;
   }
 
-  private AersopikeSingletons() {}
+  private AerospikeSingletons() {}
 }

instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/AersopikeSingletons.java instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/AerospikeSingletons.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
+package io.opentelemetry.javaagent.instrumentation.aerospike;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static net.bytebuddy.matcher.ElementMatchers.hasSuperClass;
@@ -19,7 +19,7 @@
 import io.opentelemetry.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
-import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeRequestContext;
+import io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeRequestContext;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;

instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/AsyncCommandInstrumentation.java instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/AsyncCommandInstrumentation.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
+package io.opentelemetry.javaagent.instrumentation.aerospike;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static net.bytebuddy.matcher.ElementMatchers.hasSuperClass;
@@ -13,7 +13,7 @@
 import com.aerospike.client.cluster.Node;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
-import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeRequestContext;
+import io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeRequestContext;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;

instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/SyncCommandInstrumentation.java instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/SyncCommandInstrumentation.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal;
+package io.opentelemetry.javaagent.instrumentation.aerospike.internal;
 
 import com.aerospike.client.cluster.Node;
 import com.google.auto.value.AutoValue;

instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/internal/AerospikeRequest.java instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/internal/AerospikeRequest.java

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal;
+package io.opentelemetry.javaagent.instrumentation.aerospike.internal;
 
-import static io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.AersopikeSingletons.instrumenter;
+import static io.opentelemetry.javaagent.instrumentation.aerospike.AerospikeSingletons.instrumenter;
 
 import io.opentelemetry.context.Context;
 

instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/internal/AerospikeRequestContext.java instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/internal/AerospikeRequestContext.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal;
+package io.opentelemetry.javaagent.instrumentation.aerospike.internal;
 
 import static io.opentelemetry.api.common.AttributeKey.longKey;
 import static io.opentelemetry.api.common.AttributeKey.stringKey;

instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/internal/AerospikeSemanticAttributes.java instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/internal/AerospikeSemanticAttributes.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal;
+package io.opentelemetry.javaagent.instrumentation.aerospike.internal;
 
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;

instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/internal/CustomElementMatcher.java instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/internal/CustomElementMatcher.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.metrics;
+package io.opentelemetry.javaagent.instrumentation.aerospike.metrics;
 
 import static java.util.logging.Level.FINE;
 

instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/metrics/AerospikeMetrics.java instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/metrics/AerospikeMetrics.java

@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.metrics;
+package io.opentelemetry.javaagent.instrumentation.aerospike.metrics;
 
-import static io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeSemanticAttributes.AEROSPIKE_NODE_NAME;
-import static io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeSemanticAttributes.AEROSPIKE_SET_NAME;
-import static io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeSemanticAttributes.AEROSPIKE_STATUS;
+import static io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeSemanticAttributes.AEROSPIKE_NODE_NAME;
+import static io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeSemanticAttributes.AEROSPIKE_SET_NAME;
+import static io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeSemanticAttributes.AEROSPIKE_STATUS;
 import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_ADDRESS;
 import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_PORT;
 import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE;