From bbd33115d19272212c4c2bfc882b94e801482508 Mon Sep 17 00:00:00 2001 From: zmapleshine <715017@163.com> Date: Wed, 30 Jun 2021 23:47:46 +0800 Subject: [PATCH] Fix dubbo trace/span cross-process propagation (#3442) * fix(instrument): fix dubbo client trace inject adapter. * fix(instrument): fix dubbo client trace inject adapter. --- .../apachedubbo/v2_7/DubboInjectAdapter.java | 8 ++++---- .../apachedubbo/v2_7/OpenTelemetryFilter.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboInjectAdapter.java b/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboInjectAdapter.java index 46b4efcb25..9380f8ccee 100644 --- a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboInjectAdapter.java +++ b/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboInjectAdapter.java @@ -6,14 +6,14 @@ package io.opentelemetry.instrumentation.apachedubbo.v2_7; import io.opentelemetry.context.propagation.TextMapSetter; -import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcContext; -class DubboInjectAdapter implements TextMapSetter { +class DubboInjectAdapter implements TextMapSetter { static final DubboInjectAdapter SETTER = new DubboInjectAdapter(); @Override - public void set(RpcInvocation rpcInvocation, String key, String value) { - rpcInvocation.setAttachment(key, value); + public void set(RpcContext rpcContext, String key, String value) { + rpcContext.setAttachment(key, value); } } diff --git a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java b/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java index 4b926ac5e1..9a683fa418 100644 --- a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java +++ b/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java @@ -40,7 +40,7 @@ public class OpenTelemetryFilter implements Filter { final Context context; if (kind.equals(CLIENT)) { context = tracer.startClientSpan(interfaceName, methodName); - tracer.inject(context, (RpcInvocation) invocation, DubboInjectAdapter.SETTER); + tracer.inject(context, rpcContext, DubboInjectAdapter.SETTER); } else { context = tracer.startServerSpan(interfaceName, methodName, (RpcInvocation) invocation); }