fixes errors

Author: Abhishekkr3003

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

@@ -0,0 +1,4 @@
+kotlin version: 2.0.20
+error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
+    1. Kotlin compile daemon is ready
+

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

@@ -6,13 +6,13 @@ muzzle {
   pass {
     group.set("com.aerospike")
     module.set("aerospike-client")
-    versions.set("[7.0.0,)")
+    versions.set("[4.0.0,)")
     assertInverse.set(true)
   }
 }
 
 dependencies {
-  implementation("com.aerospike:aerospike-client:7.0.0")
+  library("com.aerospike:aerospike-client:8.0.0")
   implementation("io.opentelemetry:opentelemetry-api-incubator")
 
   compileOnly("com.google.auto.value:auto-value-annotations")

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

@@ -7,17 +7,14 @@
 
 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.argumentOfType;
 import static io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.CustomElementMatcher.iterableHasAtLeastOne;
 import static net.bytebuddy.matcher.ElementMatchers.hasSuperType;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.not;
 import static net.bytebuddy.matcher.ElementMatchers.takesGenericArguments;
 
-import com.aerospike.client.AerospikeException;
 import com.aerospike.client.Key;
-import com.aerospike.client.async.EventLoop;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
@@ -28,7 +25,8 @@
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
-public class IAerospikeClientInstrumentation implements TypeInstrumentation {
+public class AerospikeClientInstrumentation implements TypeInstrumentation {
+
   @Override
   public ElementMatcher<TypeDescription> typeMatcher() {
     return hasSuperType(named("com.aerospike.client.IAerospikeClient"));
@@ -38,22 +36,22 @@ public ElementMatcher<TypeDescription> typeMatcher() {
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
         isMethod()
-            .and(takesGenericArguments(iterableHasAtLeastOne(argumentOfType(Key.class))))
+            .and(takesGenericArguments(iterableHasAtLeastOne(named("com.aerospike.client.Key"))))
             .and(
-                not(takesGenericArguments(iterableHasAtLeastOne(argumentOfType(EventLoop.class))))),
+                not(takesGenericArguments(iterableHasAtLeastOne(named("com.aerospike.client.async.EventLoop"))))),
         this.getClass().getName() + "$SyncCommandAdvice");
 
     transformer.applyAdviceToMethod(
         isMethod()
-            .and(takesGenericArguments(iterableHasAtLeastOne(argumentOfType(Key.class))))
-            .and(takesGenericArguments(iterableHasAtLeastOne(argumentOfType(EventLoop.class)))),
+            .and(takesGenericArguments(iterableHasAtLeastOne(named("com.aerospike.client.Key"))))
+            .and(takesGenericArguments(iterableHasAtLeastOne(named("com.aerospike.client.async.EventLoop")))),
         this.getClass().getName() + "$AsyncCommandAdvice");
   }
 
   @SuppressWarnings("unused")
   public static class SyncCommandAdvice {
 
-    @Advice.OnMethodEnter(suppress = AerospikeException.class)
+    @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void startInstrumentation(
         @Advice.Origin("#m") String methodName,
         @Advice.AllArguments Object[] args,
@@ -78,20 +76,20 @@ public static void startInstrumentation(
     }
 
     @Advice.OnMethodExit(
-        onThrowable = AerospikeException.class,
-        suppress = AerospikeException.class)
+        onThrowable = Throwable.class,
+        suppress = Throwable.class)
     public static void stopInstrumentation(
-        @Advice.Thrown AerospikeException ae,
+        @Advice.Thrown Throwable ex,
         @Advice.Local("AerospikeContext") AerospikeRequestContext requestContext) {
-      requestContext.setThrowable(ae);
+      requestContext.setThrowable(ex);
       requestContext.detachAndEnd();
     }
   }
 
   @SuppressWarnings("unused")
   public static class AsyncCommandAdvice {
 
-    @Advice.OnMethodEnter(suppress = AerospikeException.class)
+    @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void startInstrumentation(
         @Advice.Origin("#m") String methodName,
         @Advice.AllArguments Object[] args,
@@ -116,13 +114,13 @@ public static void startInstrumentation(
     }
 
     @Advice.OnMethodExit(
-        onThrowable = AerospikeException.class,
-        suppress = AerospikeException.class)
+        onThrowable = Throwable.class,
+        suppress = Throwable.class)
     public static void stopInstrumentaionIfError(
-        @Advice.Thrown AerospikeException ae,
+        @Advice.Thrown Throwable ex,
         @Advice.Local("AerospikeContext") AerospikeRequestContext requestContext) {
-      if (ae != null) {
-        requestContext.setThrowable(ae);
+      if (ex != null) {
+        requestContext.setThrowable(ex);
         requestContext.detachAndEnd();
       }
     }

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

@@ -23,13 +23,18 @@ public AerospikeClientInstrumentationModule() {
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassesNamed("com.aerospike.client.IAerospikeClient");
+    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"));
   }
 
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(
-        new IAerospikeClientInstrumentation(),
+        new AerospikeClientInstrumentation(),
         new SyncCommandInstrumentation(),
         new AsyncCommandInstrumentation());
   }

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

@@ -11,7 +11,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
-import static net.bytebuddy.matcher.ElementMatchers.takesGenericArguments;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import com.aerospike.client.AerospikeException;
 import com.aerospike.client.cluster.Node;
@@ -48,7 +48,7 @@ public void transform(TypeTransformer transformer) {
         isMethod().and(named("onSuccess")), this.getClass().getName() + "$GetOnSuccessAdvice");
 
     transformer.applyAdviceToMethod(
-        isMethod().and(named("onFailure").and(takesGenericArguments(AerospikeException.class))),
+        isMethod().and(named("onFailure").and(takesArgument(0, named("com.aerospike.client.AerospikeException")))),
         this.getClass().getName() + "$GetOnFailureAdvice");
   }
 

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

@@ -26,8 +26,4 @@ public static ElementMatcher<Iterable<? extends TypeDescription.Generic>> iterab
       return false;
     };
   }
-
-  public static ElementMatcher<TypeDescription.Generic> argumentOfType(Class<?> clazz) {
-    return typeDescription -> typeDescription.asErasure().represents(clazz);
-  }
 }

instrumentation/aerospike-client/aerospike-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/AerospikeClientTest.java

@@ -62,7 +62,6 @@ static void setupSpec() {
     port = 3000;
     ClientPolicy clientPolicy = new ClientPolicy();
     int eventLoopSize = Runtime.getRuntime().availableProcessors();
-    System.out.println(eventLoopSize);
     EventPolicy eventPolicy = new EventPolicy();
     eventPolicy.commandsPerEventLoop = 2;
     clientPolicy.eventLoops = new NioEventLoops(eventPolicy, eventLoopSize);