inject trace data to headers

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

@@ -1,6 +1,5 @@
 package io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_6;
 
-import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@@ -11,13 +10,15 @@
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
+import io.opentelemetry.instrumentation.jsonrpc4j.v1_6.HeadersSetter;
 import io.opentelemetry.instrumentation.jsonrpc4j.v1_6.SimpleJsonRpcRequest;
 import io.opentelemetry.instrumentation.jsonrpc4j.v1_6.SimpleJsonRpcResponse;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
+import java.util.Map;
 
 public class JsonRpcClientBuilderInstrumentation implements TypeInstrumentation {
 
@@ -53,9 +54,10 @@ public static class InvokeAdvice {
     public static void onEnter(
         @Advice.Argument(0) String methodName,
         @Advice.Argument(1) Object argument,
+        @Advice.Argument(3) Map<String, String> extraHeaders,
         @Advice.Local("otelContext") Context context,
         @Advice.Local("otelScope") Scope scope) {
-      Context parentContext = currentContext();
+      Context parentContext = Context.current();
       SimpleJsonRpcRequest request = new SimpleJsonRpcRequest(
           methodName,
           argument
@@ -65,13 +67,16 @@ public static void onEnter(
       }
 
       context = JsonRpcSingletons.CLIENT_INSTRUMENTER.start(parentContext, request);
+      JsonRpcSingletons.PROPAGATORS.getTextMapPropagator().inject(context, extraHeaders, HeadersSetter.INSTANCE);
+
       scope = context.makeCurrent();
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void onExit(
         @Advice.Argument(0) String methodName,
         @Advice.Argument(1) Object argument,
+        @Advice.Argument(3) Map<String, String> extraHeaders,
         @Advice.Return Object result,
         @Advice.Thrown Throwable throwable,
         @Advice.Local("otelContext") Context context,
@@ -82,6 +87,7 @@ public static void onExit(
 
       scope.close();
       JsonRpcSingletons.CLIENT_INSTRUMENTER.end(context, new SimpleJsonRpcRequest(methodName, argument), new SimpleJsonRpcResponse(result), throwable);
+      System.out.println(extraHeaders);
     }
   }
 }

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

@@ -2,6 +2,7 @@
 
 import com.googlecode.jsonrpc4j.InvocationListener;
 import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.jsonrpc4j.v1_6.JsonRpcTelemetry;
 import io.opentelemetry.instrumentation.jsonrpc4j.v1_6.SimpleJsonRpcRequest;
@@ -14,6 +15,7 @@ public final class JsonRpcSingletons {
 
   public static final Instrumenter<SimpleJsonRpcRequest, SimpleJsonRpcResponse> CLIENT_INSTRUMENTER;
 
+  public static final ContextPropagators PROPAGATORS;
 
   static {
     JsonRpcTelemetry telemetry =
@@ -22,6 +24,7 @@ public final class JsonRpcSingletons {
 
     SERVER_INVOCATION_LISTENER = telemetry.newServerInvocationListener();
     CLIENT_INSTRUMENTER = telemetry.getClientInstrumenter();
+    PROPAGATORS = telemetry.getPropagators();
   }
 
 

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

@@ -0,0 +1,14 @@
+package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
+
+import io.opentelemetry.context.propagation.TextMapSetter;
+import java.util.Map;
+
+public enum HeadersSetter implements TextMapSetter<Map<String, String>> {
+  INSTANCE;
+
+  @Override
+  public void set(Map<String, String> carrier, String key, String value) {
+    assert carrier != null;
+    carrier.put(key, value);
+  }
+}

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

@@ -17,13 +17,15 @@ public static JsonRpcTelemetryBuilder builder(OpenTelemetry openTelemetry) {
 
   private final Instrumenter<JsonRpcRequest, JsonRpcResponse> serverInstrumenter;
   private final Instrumenter<SimpleJsonRpcRequest, SimpleJsonRpcResponse> clientInstrumenter;
+  private final ContextPropagators propagators;
 
   JsonRpcTelemetry(
       Instrumenter<JsonRpcRequest, JsonRpcResponse> serverInstrumenter,
       Instrumenter<SimpleJsonRpcRequest, SimpleJsonRpcResponse> clientInstrumenter,
       ContextPropagators propagators) {
     this.serverInstrumenter = serverInstrumenter;
     this.clientInstrumenter = clientInstrumenter;
+    this.propagators = propagators;
   }
 
 
@@ -34,4 +36,8 @@ public InvocationListener newServerInvocationListener() {
   public Instrumenter<SimpleJsonRpcRequest, SimpleJsonRpcResponse> getClientInstrumenter() {
     return clientInstrumenter;
   }
+
+  public ContextPropagators getPropagators() {
+    return propagators;
+  }
 }

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

@@ -54,9 +54,6 @@ public JsonRpcTelemetryBuilder addServerAttributeExtractor(
     return this;
   }
 
-
-
-
   public JsonRpcTelemetry build() {
     SpanNameExtractor<SimpleJsonRpcRequest> clientSpanNameExtractor = new JsonRpcClientSpanNameExtractor();
     SpanNameExtractor<JsonRpcRequest> serverSpanNameExtractor = new JsonRpcServerSpanNameExtractor();