From 60424e0d3883a0664bd06c756265624a27baf6ca Mon Sep 17 00:00:00 2001 From: YuDong Tang <583125614@qq.com> Date: Wed, 18 Aug 2021 22:31:00 +0800 Subject: [PATCH] record exception in dubbo inst (#3851) * record exception in dubbo inst * record exception in dubbo inst * remove unused imports * remove unused imports --- .../instrumentation/apachedubbo/v2_7/DubboHelper.java | 6 ------ .../instrumentation/apachedubbo/v2_7/DubboTracer.java | 7 ++----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHelper.java b/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHelper.java index 94f852e6c2..e06267c405 100644 --- a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHelper.java +++ b/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHelper.java @@ -6,9 +6,7 @@ package io.opentelemetry.instrumentation.apachedubbo.v2_7; import io.opentelemetry.api.trace.SpanBuilder; -import io.opentelemetry.api.trace.StatusCode; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; -import org.apache.dubbo.rpc.Result; class DubboHelper { @@ -22,8 +20,4 @@ class DubboHelper { static String getSpanName(String interfaceName, String methodName) { return interfaceName + "/" + methodName; } - - static StatusCode statusFromResult(Result result) { - return !result.hasException() ? StatusCode.UNSET : StatusCode.ERROR; - } } diff --git a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java b/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java index 682662747f..86fd56f963 100644 --- a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java +++ b/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java @@ -8,9 +8,7 @@ package io.opentelemetry.instrumentation.apachedubbo.v2_7; import static io.opentelemetry.api.trace.SpanKind.CLIENT; import static io.opentelemetry.api.trace.SpanKind.SERVER; -import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanBuilder; -import io.opentelemetry.api.trace.StatusCode; import io.opentelemetry.context.Context; import io.opentelemetry.context.propagation.TextMapGetter; import io.opentelemetry.instrumentation.api.tracer.RpcServerTracer; @@ -46,9 +44,8 @@ class DubboTracer extends RpcServerTracer { } public void end(Context context, Result result) { - StatusCode statusCode = DubboHelper.statusFromResult(result); - if (statusCode != StatusCode.UNSET) { - Span.fromContext(context).setStatus(statusCode); + if (result.hasException()) { + onException(context, result.getException()); } end(context); }