fix style

Author: chenlujjj

instrumentation/jsonrpc4j-1.6/javaagent/build.gradle.kts

@@ -11,18 +11,16 @@ muzzle {
   }
 }
 
-val jsonrpcVersion = "1.6"
-
 dependencies {
   implementation(project(":instrumentation:jsonrpc4j-1.6:library"))
-  library("com.github.briandilley.jsonrpc4j:jsonrpc4j:$jsonrpcVersion")
+
+  library("com.github.briandilley.jsonrpc4j:jsonrpc4j:1.6")
+
   testImplementation(project(":instrumentation:jsonrpc4j-1.6:testing"))
 }
 
 tasks {
   test {
-    systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
     jvmArgs("-Dotel.javaagent.experimental.thread-propagation-debugger.enabled=false")
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
   }
 }

instrumentation/jsonrpc4j-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsonrpc4j/v1_6/JsonRpcClientInstrumentation.java

@@ -61,16 +61,7 @@ public static void onEnter(
         @Advice.Argument(1) Object argument,
         @Advice.Argument(3) Map<String, String> extraHeaders,
         @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      Context parentContext = Context.current();
-      SimpleJsonRpcRequest request = new SimpleJsonRpcRequest(methodName, argument);
-      if (!CLIENT_INSTRUMENTER.shouldStart(parentContext, request)) {
-        return;
-      }
-
-      context = CLIENT_INSTRUMENTER.start(parentContext, request);
-      scope = context.makeCurrent();
-    }
+        @Advice.Local("otelScope") Scope scope) {}
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void onExit(

instrumentation/jsonrpc4j-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsonrpc4j/v1_6/JsonRpcServerInstrumentation.java

@@ -6,6 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_6;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
+import static io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_6.JsonRpcSingletons.SERVER_INVOCATION_LISTENER;
 import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -51,7 +52,7 @@ public static void setInvocationListener(
         @Advice.This JsonRpcBasicServer jsonRpcServer,
         @Advice.FieldValue(value = "invocationListener", readOnly = false)
             InvocationListener invocationListener) {
-      invocationListener = JsonRpcSingletons.SERVER_INVOCATION_LISTENER;
+      invocationListener = SERVER_INVOCATION_LISTENER;
     }
   }
 
@@ -67,14 +68,13 @@ public static void setInvocationListener(
           VirtualField.find(JsonRpcBasicServer.class, Boolean.class);
       if (!Boolean.TRUE.equals(instrumented.get(jsonRpcServer))) {
         if (invocationListener == null) {
-          invocationListener = JsonRpcSingletons.SERVER_INVOCATION_LISTENER;
+          invocationListener = SERVER_INVOCATION_LISTENER;
         } else if (invocationListener instanceof MultipleInvocationListener) {
           ((MultipleInvocationListener) invocationListener)
-              .addInvocationListener(JsonRpcSingletons.SERVER_INVOCATION_LISTENER);
+              .addInvocationListener(SERVER_INVOCATION_LISTENER);
         } else {
           invocationListener =
-              new MultipleInvocationListener(
-                  invocationListener, JsonRpcSingletons.SERVER_INVOCATION_LISTENER);
+              new MultipleInvocationListener(invocationListener, SERVER_INVOCATION_LISTENER);
         }
 
         instrumented.set(jsonRpcServer, true);

instrumentation/jsonrpc4j-1.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsonrpc4j/v1_6/AgentJsonRpcTest.java

@@ -11,7 +11,7 @@
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-public class AgentJsonRpcTest extends AbstractJsonRpcTest {
+class AgentJsonRpcTest extends AbstractJsonRpcTest {
 
   @RegisterExtension
   static final InstrumentationExtension testing = AgentInstrumentationExtension.create();

instrumentation/jsonrpc4j-1.6/library/build.gradle.kts

@@ -2,13 +2,12 @@ plugins {
   id("otel.library-instrumentation")
 }
 
-val jsonrpcVersion = "1.6"
 val jacksonVersion = "2.13.3"
 
 dependencies {
-  library("com.github.briandilley.jsonrpc4j:jsonrpc4j:$jsonrpcVersion")
+  library("com.github.briandilley.jsonrpc4j:jsonrpc4j:1.6")
 
-  implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
+  library("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
 
   testImplementation(project(":instrumentation:jsonrpc4j-1.6:testing"))
 }

instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcClientAttributesGetter.java

@@ -21,7 +21,10 @@ public String getSystem(SimpleJsonRpcRequest request) {
   @Override
   public String getService(SimpleJsonRpcRequest request) {
     // TODO
-    return "NOT_IMPLEMENTED";
+    if (request.getMethod() != null) {
+      return request.getMethod().getDeclaringClass().getName();
+    }
+    return "NOT_AVAILABLE";
   }
 
   @Override

instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/SimpleJsonRpcRequest.java

@@ -5,21 +5,34 @@
 
 package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
 
+import java.lang.reflect.Method;
+
 public final class SimpleJsonRpcRequest {
 
   private final String methodName;
   private final Object argument;
+  private Method method;
 
   public SimpleJsonRpcRequest(String methodName, Object argument) {
     this.methodName = methodName;
     this.argument = argument;
   }
 
+  public SimpleJsonRpcRequest(Method method, Object argument) {
+    this.method = method;
+    this.methodName = method.getName();
+    this.argument = argument;
+  }
+
   public String getMethodName() {
     return methodName;
   }
 
   public Object getArgument() {
     return argument;
   }
+
+  public Method getMethod() {
+    return method;
+  }
 }

instrumentation/jsonrpc4j-1.6/testing/build.gradle.kts

@@ -8,7 +8,6 @@ dependencies {
   api(project(":testing-common"))
 
   implementation("com.github.briandilley.jsonrpc4j:jsonrpc4j:$jsonrpcVersion")
-  implementation("com.fasterxml.jackson.core:jackson-databind:2.13.3")
 
-  // ...
+  implementation("com.fasterxml.jackson.core:jackson-databind:2.13.3")
 }