Fix wrong dubbo trace caused by using rpcContext.isProviderSide()

instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/DubboInstrumentationModule.java

@@ -44,7 +44,11 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
   public void injectClasses(ClassInjector injector) {
     injector
         .proxyBuilder(
-            "io.opentelemetry.javaagent.instrumentation.apachedubbo.v2_7.OpenTelemetryFilter")
+            "io.opentelemetry.javaagent.instrumentation.apachedubbo.v2_7.OpenTelemetryClientFilter")
+        .inject(InjectionMode.CLASS_ONLY);
+    injector
+        .proxyBuilder(
+            "io.opentelemetry.javaagent.instrumentation.apachedubbo.v2_7.OpenTelemetryServerFilter")
         .inject(InjectionMode.CLASS_ONLY);
   }
 

instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java → instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/OpenTelemetryClientFilter.java

@@ -16,20 +16,20 @@
 import org.apache.dubbo.rpc.Invoker;
 import org.apache.dubbo.rpc.Result;
 
-@Activate(group = {"consumer", "provider"})
-public class OpenTelemetryFilter implements Filter {
+@Activate(group = {"consumer"})
+public final class OpenTelemetryClientFilter implements Filter {
 
   private final Filter delegate;
 
-  public OpenTelemetryFilter() {
+  public OpenTelemetryClientFilter() {
     delegate =
         DubboTelemetry.builder(GlobalOpenTelemetry.get())
             .addAttributesExtractor(
                 PeerServiceAttributesExtractor.create(
                     new DubboClientNetworkAttributesGetter(),
                     AgentCommonConfig.get().getPeerServiceResolver()))
             .build()
-            .newFilter();
+            .newClientFilter();
   }
 
   @Override

instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/OpenTelemetryServerFilter.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.apachedubbo.v2_7;
+
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.instrumentation.apachedubbo.v2_7.DubboTelemetry;
+import io.opentelemetry.instrumentation.apachedubbo.v2_7.internal.DubboClientNetworkAttributesGetter;
+import io.opentelemetry.instrumentation.api.incubator.semconv.net.PeerServiceAttributesExtractor;
+import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.rpc.Filter;
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.Result;
+
+@Activate(group = {"provider"})
+public final class OpenTelemetryServerFilter implements Filter {
+
+  private final Filter delegate;
+
+  public OpenTelemetryServerFilter() {
+    delegate =
+        DubboTelemetry.builder(GlobalOpenTelemetry.get())
+            .addAttributesExtractor(
+                PeerServiceAttributesExtractor.create(
+                    new DubboClientNetworkAttributesGetter(),
+                    AgentCommonConfig.get().getPeerServiceResolver()))
+            .build()
+            .newServerFilter();
+  }
+
+  @Override
+  public Result invoke(Invoker<?> invoker, Invocation invocation) {
+    return delegate.invoke(invoker, invocation);
+  }
+}

instrumentation/apache-dubbo-2.7/javaagent/src/main/resources/apache-dubbo-2.7/META-INF/org.apache.dubbo.rpc.Filter

@@ -1 +1,2 @@
-io.opentelemetry.javaagent.instrumentation.apachedubbo.v2_7.OpenTelemetryFilter
+io.opentelemetry.javaagent.instrumentation.apachedubbo.v2_7.OpenTelemetryClientFilter
+io.opentelemetry.javaagent.instrumentation.apachedubbo.v2_7.OpenTelemetryServerFilter

instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetry.java

@@ -13,6 +13,9 @@
 /** Entrypoint for instrumenting Apache Dubbo servers and clients. */
 public final class DubboTelemetry {
 
+  private final Instrumenter<DubboRequest, Result> serverInstrumenter;
+  private final Instrumenter<DubboRequest, Result> clientInstrumenter;
+
   /** Returns a new {@link DubboTelemetry} configured with the given {@link OpenTelemetry}. */
   public static DubboTelemetry create(OpenTelemetry openTelemetry) {
     return builder(openTelemetry).build();
@@ -25,18 +28,30 @@ public static DubboTelemetryBuilder builder(OpenTelemetry openTelemetry) {
     return new DubboTelemetryBuilder(openTelemetry);
   }
 
-  private final Instrumenter<DubboRequest, Result> serverInstrumenter;
-  private final Instrumenter<DubboRequest, Result> clientInstrumenter;
-
   DubboTelemetry(
       Instrumenter<DubboRequest, Result> serverInstrumenter,
       Instrumenter<DubboRequest, Result> clientInstrumenter) {
     this.serverInstrumenter = serverInstrumenter;
     this.clientInstrumenter = clientInstrumenter;
   }
 
-  /** Returns a new Dubbo {@link Filter} that traces Dubbo RPC invocations. */
+  /**
+   * Returns a new Dubbo {@link Filter} that traces Dubbo RPC invocations.
+   *
+   * <p>Use {@link #newClientFilter} and {@link #newServerFilter} instead.
+   */
+  @Deprecated
   public Filter newFilter() {
     return new TracingFilter(serverInstrumenter, clientInstrumenter);
   }
+
+  /** Returns a new Dubbo client {@link Filter} that traces Dubbo RPC invocations. */
+  public Filter newClientFilter() {
+    return new TracingFilter(clientInstrumenter, null);
+  }
+
+  /** Returns a new Dubbo server {@link Filter} that traces Dubbo RPC invocations. */
+  public Filter newServerFilter() {
+    return new TracingFilter(null, serverInstrumenter);
+  }
 }

instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java → instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryClientFilter.java

@@ -12,13 +12,13 @@
 import org.apache.dubbo.rpc.Invoker;
 import org.apache.dubbo.rpc.Result;
 
-@Activate(group = {"consumer", "provider"})
-public final class OpenTelemetryFilter implements Filter {
+@Activate(group = {"consumer"})
+public final class OpenTelemetryClientFilter implements Filter {
 
   private final Filter delegate;
 
-  public OpenTelemetryFilter() {
-    delegate = DubboTelemetry.create(GlobalOpenTelemetry.get()).newFilter();
+  public OpenTelemetryClientFilter() {
+    delegate = DubboTelemetry.create(GlobalOpenTelemetry.get()).newClientFilter();
   }
 
   @Override

instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryServerFilter.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.apachedubbo.v2_7;
+
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.rpc.Filter;
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.Result;
+
+@Activate(group = {"provider"})
+public final class OpenTelemetryServerFilter implements Filter {
+
+  private final Filter delegate;
+
+  public OpenTelemetryServerFilter() {
+    delegate = DubboTelemetry.create(GlobalOpenTelemetry.get()).newServerFilter();
+  }
+
+  @Override
+  public Result invoke(Invoker<?> invoker, Invocation invocation) {
+    return delegate.invoke(invoker, invocation);
+  }
+}

instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/TracingFilter.java

@@ -18,14 +18,14 @@
 
 final class TracingFilter implements Filter {
 
-  private final Instrumenter<DubboRequest, Result> serverInstrumenter;
   private final Instrumenter<DubboRequest, Result> clientInstrumenter;
+  private final Instrumenter<DubboRequest, Result> serverInstrumenter;
 
   TracingFilter(
-      Instrumenter<DubboRequest, Result> serverInstrumenter,
-      Instrumenter<DubboRequest, Result> clientInstrumenter) {
-    this.serverInstrumenter = serverInstrumenter;
+      Instrumenter<DubboRequest, Result> clientInstrumenter,
+      Instrumenter<DubboRequest, Result> serverInstrumenter) {
     this.clientInstrumenter = clientInstrumenter;
+    this.serverInstrumenter = serverInstrumenter;
   }
 
   @Override
@@ -40,9 +40,13 @@ public Result invoke(Invoker<?> invoker, Invocation invocation) {
       return invoker.invoke(invocation);
     }
 
-    boolean isServer = rpcContext.isProviderSide();
-    Instrumenter<DubboRequest, Result> instrumenter =
-        isServer ? serverInstrumenter : clientInstrumenter;
+    Instrumenter<DubboRequest, Result> instrumenter;
+    if (clientInstrumenter != null && serverInstrumenter != null) {
+      instrumenter = rpcContext.isProviderSide() ? serverInstrumenter : clientInstrumenter;
+    } else {
+      instrumenter = clientInstrumenter != null ? clientInstrumenter : serverInstrumenter;
+    }
+
     Context parentContext = Context.current();
     DubboRequest request = DubboRequest.create((RpcInvocation) invocation, rpcContext);
 
@@ -55,7 +59,7 @@ public Result invoke(Invoker<?> invoker, Invocation invocation) {
     boolean isSynchronous = true;
     try (Scope ignored = context.makeCurrent()) {
       result = invoker.invoke(invocation);
-      if (!isServer) {
+      if (instrumenter == this.clientInstrumenter) {
         CompletableFuture<Object> future = rpcContext.getCompletableFuture();
         if (future != null) {
           isSynchronous = false;

instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/resources/META-INF/services/org.apache.dubbo.rpc.Filter

@@ -1 +1,2 @@
-io.opentelemetry.instrumentation.apachedubbo.v2_7.OpenTelemetryFilter
+io.opentelemetry.instrumentation.apachedubbo.v2_7.OpenTelemetryClientFilter
+io.opentelemetry.instrumentation.apachedubbo.v2_7.OpenTelemetryServerFilter