minor refactoring

Abhishekkr3003 · Abhishekkr3003 · commit 7f84218b22e5 · 2024-02-11T22:04:40.000+05:30
diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/build.gradle.kts b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/build.gradle.kts
@@ -6,7 +6,7 @@ muzzle {
   pass {
     group.set("com.aerospike")
     module.set("aerospike-client")
-    versions.set("[4.4.9,)")
+    versions.set("[7.0.0,)")
     assertInverse.set(true)
   }
 }
@@ -23,6 +23,7 @@ tasks {
   test {
     jvmArgs("-Djava.net.preferIPv4Stack=true")
     jvmArgs("-Dotel.instrumentation.aerospike.experimental-span-attributes=true")
+    jvmArgs("-Dotel.instrumentation.aerospike.experimental-metrics=true")
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 }
diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_1/AerospikeClientInstrumentationModule.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_1/AerospikeClientInstrumentationModule.java
@@ -23,7 +23,7 @@ public AerospikeClientInstrumentationModule() {
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassesNamed("com.aerospike.client.AerospikeClient");
+    return hasClassesNamed("com.aerospike.client.AerospikeClient").and(hasClassesNamed("com.aerospike.client.metrics.MetricsPolicy"));
   }
 
   @Override
@@ -35,9 +35,4 @@ public List<TypeInstrumentation> typeInstrumentations() {
         new AsyncHandlerInstrumentation(),
         new AsyncScanAllCommandInstrumentation());
   }
-
-  @Override
-  public boolean isIndyModule() {
-    return false;
-  }
 }
diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_1/AerospikeRequestContext.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_1/AerospikeRequestContext.java
@@ -29,16 +29,11 @@ public void detachAndEnd() {
     contextThreadLocal.remove();
   }
 
-  @SuppressWarnings("unchecked")
   public static AerospikeRequestContext current() {
     return contextThreadLocal.get();
   }
 
-  public void endSpan(
-      Instrumenter<AerospikeRequest, Void> instrumenter,
-      Context context,
-      AerospikeRequest request,
-      Throwable throwable) {
+  public void endSpan(Instrumenter<AerospikeRequest, Void> instrumenter, Throwable throwable) {
     instrumenter.end(context, request, null, throwable);
   }
 
diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_1/AersopikeSingletons.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_1/AersopikeSingletons.java
@@ -32,12 +32,14 @@ public final class AersopikeSingletons {
                 INSTRUMENTATION_NAME,
                 DbClientSpanNameExtractor.create(aerospikeDbAttributesGetter))
             .addAttributesExtractor(DbClientAttributesExtractor.create(aerospikeDbAttributesGetter))
-            .addAttributesExtractor(NetworkAttributesExtractor.create(netAttributesGetter))
-            .addOperationMetrics(AerospikeMetrics.get());
-    if (InstrumentationConfig.get()
-        .getBoolean("otel.instrumentation.aerospike.experimental-span-attributes", false)) {
+            .addAttributesExtractor(NetworkAttributesExtractor.create(netAttributesGetter));
+    InstrumentationConfig instrumentationConfig = InstrumentationConfig.get();
+    if (instrumentationConfig.getBoolean("otel.instrumentation.aerospike.experimental-span-attributes", false)) {
       builder.addAttributesExtractor(new AerospikeClientAttributeExtractor());
     }
+    if (instrumentationConfig.getBoolean("otel.instrumentation.aerospike.experimental-metrics", false)) {
+      builder.addOperationMetrics(AerospikeMetrics.get());
+    }
 
     INSTRUMENTER = builder.buildInstrumenter(SpanKindExtractor.alwaysClient());
   }
diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_1/AsyncHandlerInstrumentation.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_1/AsyncHandlerInstrumentation.java
@@ -62,7 +62,7 @@ public static void onExit(@Advice.Thrown Throwable throwable, @Advice.This Comma
         } else {
           request.setStatus(Status.FAILURE);
         }
-        requestContext.endSpan(AersopikeSingletons.instrumenter(), context, request, throwable);
+        requestContext.endSpan(AersopikeSingletons.instrumenter(), throwable);
       }
     }
   }
@@ -80,7 +80,7 @@ public static void onExit(@Advice.Thrown Throwable throwable, @Advice.This Comma
         AerospikeRequest request = requestContext.getRequest();
         Context context = requestContext.getContext();
         request.setStatus(Status.FAILURE);
-        requestContext.endSpan(AersopikeSingletons.instrumenter(), context, request, throwable);
+        requestContext.endSpan(AersopikeSingletons.instrumenter(), throwable);
       }
     }
   }
diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_1/AsyncScanAllCommandInstrumentation.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_1/AsyncScanAllCommandInstrumentation.java
@@ -92,7 +92,7 @@ public static void onExit(
         } else {
           request.setStatus(Status.FAILURE);
         }
-        requestContext.endSpan(AersopikeSingletons.instrumenter(), context, request, throwable);
+        requestContext.endSpan(AersopikeSingletons.instrumenter(), throwable);
       }
     }
   }
@@ -112,7 +112,7 @@ public static void onExit(
         AerospikeRequest request = requestContext.getRequest();
         Context context = requestContext.getContext();
         request.setStatus(Status.FAILURE);
-        requestContext.endSpan(AersopikeSingletons.instrumenter(), context, request, throwable);
+        requestContext.endSpan(AersopikeSingletons.instrumenter(), throwable);
       }
     }
   }
diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_1/SocketInstrumentation.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_1/SocketInstrumentation.java
@@ -78,7 +78,7 @@ public static void stopSpan(
         request.setNode(node);
         if (throwable != null) {
           request.setStatus(FAILURE);
-          requestContext.endSpan(instrumenter(), requestContext.getContext(), request, throwable);
+          requestContext.endSpan(instrumenter(), throwable);
           requestContext.detachAndEnd();
         }
       }
diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_1/SyncCommandInstrumentation.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_1/SyncCommandInstrumentation.java
@@ -123,7 +123,7 @@ public static void stopSpan(
 
       scope.close();
       if (requestContext != null) {
-        requestContext.endSpan(AersopikeSingletons.instrumenter(), context, request, throwable);
+        requestContext.endSpan(AersopikeSingletons.instrumenter(), throwable);
         requestContext.detachAndEnd();
       }
     }
@@ -159,7 +159,7 @@ public static AerospikeRequestContext onEnter(
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static AerospikeRequestContext stopSpan(
+    public static void stopSpan(
         @Advice.Thrown Throwable throwable,
         @Advice.Enter AerospikeRequestContext requestContext,
         @Advice.Local("otelAerospikeRequest") AerospikeRequest request,
@@ -170,16 +170,14 @@ public static AerospikeRequestContext stopSpan(
       } else {
         request.setStatus(Status.SUCCESS);
       }
-      if (scope == null) {
-        return requestContext;
+      if (scope != null) {
+        scope.close();
       }
 
-      scope.close();
       if (requestContext != null) {
-        requestContext.endSpan(AersopikeSingletons.instrumenter(), context, request, throwable);
+        requestContext.endSpan(AersopikeSingletons.instrumenter(), throwable);
         requestContext.detachAndEnd();
       }
-      return requestContext;
     }
   }
 
@@ -195,7 +193,6 @@ public static AerospikeRequestContext onEnter(
         @Advice.Local("otelContext") Context context,
         @Advice.Local("otelScope") Scope scope) {
       Context parentContext = currentContext();
-
       request = AerospikeRequest.create(methodName.toUpperCase(Locale.ROOT), namespace, setName);
       if (!AersopikeSingletons.instrumenter().shouldStart(parentContext, request)) {
         return null;
@@ -206,7 +203,7 @@ public static AerospikeRequestContext onEnter(
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static AerospikeRequestContext stopSpan(
+    public static void stopSpan(
         @Advice.Thrown Throwable throwable,
         @Advice.Enter AerospikeRequestContext requestContext,
         @Advice.Local("otelAerospikeRequest") AerospikeRequest request,
@@ -217,16 +214,13 @@ public static AerospikeRequestContext stopSpan(
       } else {
         request.setStatus(Status.SUCCESS);
       }
-      if (scope == null) {
-        return requestContext;
+      if (scope != null) {
+        scope.close();
       }
-
-      scope.close();
       if (requestContext != null) {
-        requestContext.endSpan(AersopikeSingletons.instrumenter(), context, request, throwable);
+        requestContext.endSpan(AersopikeSingletons.instrumenter(), throwable);
         requestContext.detachAndEnd();
       }
-      return requestContext;
     }
   }
 }
diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_1/AerospikeClientTest.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_1/AerospikeClientTest.java
@@ -15,7 +15,6 @@
 import com.aerospike.client.Bin;
 import com.aerospike.client.Key;
 import com.aerospike.client.Record;
-import com.aerospike.client.async.EventLoops;
 import com.aerospike.client.async.EventPolicy;
 import com.aerospike.client.async.NioEventLoops;
 import com.aerospike.client.policy.ClientPolicy;
@@ -62,11 +61,11 @@ static void setupSpec() {
     port = aerospikeServer.getMappedPort(3000);
     ClientPolicy clientPolicy = new ClientPolicy();
     int eventLoopSize = Runtime.getRuntime().availableProcessors();
+    System.out.println(eventLoopSize);
     EventPolicy eventPolicy = new EventPolicy();
     eventPolicy.commandsPerEventLoop = 2;
-    EventLoops eventLoops = new NioEventLoops(eventPolicy, eventLoopSize);
-    clientPolicy.eventLoops = eventLoops;
-    clientPolicy.maxConnsPerNode = 11;
+    clientPolicy.eventLoops = new NioEventLoops(eventPolicy, eventLoopSize);
+    clientPolicy.maxConnsPerNode = eventLoopSize;
     clientPolicy.failIfNotConnected = true;
     aerospikeClient = new AerospikeClient(clientPolicy, "localhost", port);
   }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ muzzle {`
`6`	`6`	`pass {`
`7`	`7`	`group.set("com.aerospike")`
`8`	`8`	`module.set("aerospike-client")`
`9`		`- versions.set("[4.4.9,)")`
	`9`	`+ versions.set("[7.0.0,)")`
`10`	`10`	`assertInverse.set(true)`
`11`	`11`	`}`
`12`	`12`	`}`
`@@ -23,6 +23,7 @@ tasks {`
`23`	`23`	`test {`
`24`	`24`	`jvmArgs("-Djava.net.preferIPv4Stack=true")`
`25`	`25`	`jvmArgs("-Dotel.instrumentation.aerospike.experimental-span-attributes=true")`
	`26`	`+ jvmArgs("-Dotel.instrumentation.aerospike.experimental-metrics=true")`
`26`	`27`	`usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)`
`27`	`28`	`}`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public AerospikeClientInstrumentationModule() {`
`23`	`23`
`24`	`24`	`@Override`
`25`	`25`	`public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {`
`26`		`- return hasClassesNamed("com.aerospike.client.AerospikeClient");`
	`26`	`+ return hasClassesNamed("com.aerospike.client.AerospikeClient").and(hasClassesNamed("com.aerospike.client.metrics.MetricsPolicy"));`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
`@@ -35,9 +35,4 @@ public List<TypeInstrumentation> typeInstrumentations() {`
`35`	`35`	`new AsyncHandlerInstrumentation(),`
`36`	`36`	`new AsyncScanAllCommandInstrumentation());`
`37`	`37`	`}`
`38`		`-`
`39`		`- @Override`
`40`		`- public boolean isIndyModule() {`
`41`		`- return false;`
`42`		`- }`
`43`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,16 +29,11 @@ public void detachAndEnd() {`
`29`	`29`	`contextThreadLocal.remove();`
`30`	`30`	`}`
`31`	`31`
`32`		`- @SuppressWarnings("unchecked")`
`33`	`32`	`public static AerospikeRequestContext current() {`
`34`	`33`	`return contextThreadLocal.get();`
`35`	`34`	`}`
`36`	`35`
`37`		`- public void endSpan(`
`38`		`- Instrumenter<AerospikeRequest, Void> instrumenter,`
`39`		`- Context context,`
`40`		`- AerospikeRequest request,`
`41`		`- Throwable throwable) {`
	`36`	`+ public void endSpan(Instrumenter<AerospikeRequest, Void> instrumenter, Throwable throwable) {`
`42`	`37`	`instrumenter.end(context, request, null, throwable);`
`43`	`38`	`}`
`44`	`39`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public static void onExit(@Advice.Thrown Throwable throwable, @Advice.This Comma`
`62`	`62`	`} else {`
`63`	`63`	`request.setStatus(Status.FAILURE);`
`64`	`64`	`}`
`65`		`- requestContext.endSpan(AersopikeSingletons.instrumenter(), context, request, throwable);`
	`65`	`+ requestContext.endSpan(AersopikeSingletons.instrumenter(), throwable);`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`}`
`@@ -80,7 +80,7 @@ public static void onExit(@Advice.Thrown Throwable throwable, @Advice.This Comma`
`80`	`80`	`AerospikeRequest request = requestContext.getRequest();`
`81`	`81`	`Context context = requestContext.getContext();`
`82`	`82`	`request.setStatus(Status.FAILURE);`
`83`		`- requestContext.endSpan(AersopikeSingletons.instrumenter(), context, request, throwable);`
	`83`	`+ requestContext.endSpan(AersopikeSingletons.instrumenter(), throwable);`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public static void onExit(`
`92`	`92`	`} else {`
`93`	`93`	`request.setStatus(Status.FAILURE);`
`94`	`94`	`}`
`95`		`- requestContext.endSpan(AersopikeSingletons.instrumenter(), context, request, throwable);`
	`95`	`+ requestContext.endSpan(AersopikeSingletons.instrumenter(), throwable);`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`	`}`
`@@ -112,7 +112,7 @@ public static void onExit(`
`112`	`112`	`AerospikeRequest request = requestContext.getRequest();`
`113`	`113`	`Context context = requestContext.getContext();`
`114`	`114`	`request.setStatus(Status.FAILURE);`
`115`		`- requestContext.endSpan(AersopikeSingletons.instrumenter(), context, request, throwable);`
	`115`	`+ requestContext.endSpan(AersopikeSingletons.instrumenter(), throwable);`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public static void stopSpan(`
`78`	`78`	`request.setNode(node);`
`79`	`79`	`if (throwable != null) {`
`80`	`80`	`request.setStatus(FAILURE);`
`81`		`- requestContext.endSpan(instrumenter(), requestContext.getContext(), request, throwable);`
	`81`	`+ requestContext.endSpan(instrumenter(), throwable);`
`82`	`82`	`requestContext.detachAndEnd();`
`83`	`83`	`}`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public static void stopSpan(`
`123`	`123`
`124`	`124`	`scope.close();`
`125`	`125`	`if (requestContext != null) {`
`126`		`- requestContext.endSpan(AersopikeSingletons.instrumenter(), context, request, throwable);`
	`126`	`+ requestContext.endSpan(AersopikeSingletons.instrumenter(), throwable);`
`127`	`127`	`requestContext.detachAndEnd();`
`128`	`128`	`}`
`129`	`129`	`}`
`@@ -159,7 +159,7 @@ public static AerospikeRequestContext onEnter(`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)`
`162`		`- public static AerospikeRequestContext stopSpan(`
	`162`	`+ public static void stopSpan(`
`163`	`163`	`@Advice.Thrown Throwable throwable,`
`164`	`164`	`@Advice.Enter AerospikeRequestContext requestContext,`
`165`	`165`	`@Advice.Local("otelAerospikeRequest") AerospikeRequest request,`
`@@ -170,16 +170,14 @@ public static AerospikeRequestContext stopSpan(`
`170`	`170`	`} else {`
`171`	`171`	`request.setStatus(Status.SUCCESS);`
`172`	`172`	`}`
`173`		`- if (scope == null) {`
`174`		`- return requestContext;`
	`173`	`+ if (scope != null) {`
	`174`	`+ scope.close();`
`175`	`175`	`}`
`176`	`176`
`177`		`- scope.close();`
`178`	`177`	`if (requestContext != null) {`
`179`		`- requestContext.endSpan(AersopikeSingletons.instrumenter(), context, request, throwable);`
	`178`	`+ requestContext.endSpan(AersopikeSingletons.instrumenter(), throwable);`
`180`	`179`	`requestContext.detachAndEnd();`
`181`	`180`	`}`
`182`		`- return requestContext;`
`183`	`181`	`}`
`184`	`182`	`}`
`185`	`183`
`@@ -195,7 +193,6 @@ public static AerospikeRequestContext onEnter(`
`195`	`193`	`@Advice.Local("otelContext") Context context,`
`196`	`194`	`@Advice.Local("otelScope") Scope scope) {`
`197`	`195`	`Context parentContext = currentContext();`
`198`		`-`
`199`	`196`	`request = AerospikeRequest.create(methodName.toUpperCase(Locale.ROOT), namespace, setName);`
`200`	`197`	`if (!AersopikeSingletons.instrumenter().shouldStart(parentContext, request)) {`
`201`	`198`	`return null;`
`@@ -206,7 +203,7 @@ public static AerospikeRequestContext onEnter(`
`206`	`203`	`}`
`207`	`204`
`208`	`205`	`@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)`
`209`		`- public static AerospikeRequestContext stopSpan(`
	`206`	`+ public static void stopSpan(`
`210`	`207`	`@Advice.Thrown Throwable throwable,`
`211`	`208`	`@Advice.Enter AerospikeRequestContext requestContext,`
`212`	`209`	`@Advice.Local("otelAerospikeRequest") AerospikeRequest request,`
`@@ -217,16 +214,13 @@ public static AerospikeRequestContext stopSpan(`
`217`	`214`	`} else {`
`218`	`215`	`request.setStatus(Status.SUCCESS);`
`219`	`216`	`}`
`220`		`- if (scope == null) {`
`221`		`- return requestContext;`
	`217`	`+ if (scope != null) {`
	`218`	`+ scope.close();`
`222`	`219`	`}`
`223`		`-`
`224`		`- scope.close();`
`225`	`220`	`if (requestContext != null) {`
`226`		`- requestContext.endSpan(AersopikeSingletons.instrumenter(), context, request, throwable);`
	`221`	`+ requestContext.endSpan(AersopikeSingletons.instrumenter(), throwable);`
`227`	`222`	`requestContext.detachAndEnd();`
`228`	`223`	`}`
`229`		`- return requestContext;`
`230`	`224`	`}`
`231`	`225`	`}`
`232`	`226`	`}`