From 34c1325a3ad4ce04c98ef27463a9a708755dfb32 Mon Sep 17 00:00:00 2001 From: tydhot <583125614@qq.com> Date: Wed, 23 Feb 2022 22:09:27 +0800 Subject: [PATCH 1/3] change rpc type in apache dubbo --- .../apachedubbo/v2_7/DubboRpcAttributesExtractor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboRpcAttributesExtractor.java b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboRpcAttributesExtractor.java index fc72fd12803e..6abd38efa5a2 100644 --- a/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboRpcAttributesExtractor.java +++ b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboRpcAttributesExtractor.java @@ -11,7 +11,7 @@ final class DubboRpcAttributesExtractor extends RpcAttributesExtractor { @Override protected String system(DubboRequest request) { - return "dubbo"; + return "apache-dubbo"; } @Override From 8f21f62616ef378aea80add01657acc9a29091fd Mon Sep 17 00:00:00 2001 From: tydhot <583125614@qq.com> Date: Thu, 24 Feb 2022 10:36:32 +0800 Subject: [PATCH 2/3] fix dubbo test --- .../apachedubbo/v2_7/AbstractDubboTest.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy index 41630674dda8..648654988408 100644 --- a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy +++ b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy @@ -97,7 +97,7 @@ abstract class AbstractDubboTest extends InstrumentationSpecification { kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.RPC_SYSTEM" "dubbo" + "$SemanticAttributes.RPC_SYSTEM" "apache-dubbo" "$SemanticAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" "$SemanticAttributes.RPC_METHOD" "\$invoke" "$SemanticAttributes.NET_PEER_NAME" "localhost" @@ -109,7 +109,7 @@ abstract class AbstractDubboTest extends InstrumentationSpecification { kind SERVER childOf span(1) attributes { - "$SemanticAttributes.RPC_SYSTEM" "dubbo" + "$SemanticAttributes.RPC_SYSTEM" "apache-dubbo" "$SemanticAttributes.RPC_SERVICE" "io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService" "$SemanticAttributes.RPC_METHOD" "hello" "$SemanticAttributes.NET_PEER_IP" String @@ -168,7 +168,7 @@ abstract class AbstractDubboTest extends InstrumentationSpecification { kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.RPC_SYSTEM" "dubbo" + "$SemanticAttributes.RPC_SYSTEM" "apache-dubbo" "$SemanticAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" "$SemanticAttributes.RPC_METHOD" "\$invokeAsync" "$SemanticAttributes.NET_PEER_NAME" "localhost" @@ -180,7 +180,7 @@ abstract class AbstractDubboTest extends InstrumentationSpecification { kind SERVER childOf span(1) attributes { - "$SemanticAttributes.RPC_SYSTEM" "dubbo" + "$SemanticAttributes.RPC_SYSTEM" "apache-dubbo" "$SemanticAttributes.RPC_SERVICE" "io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService" "$SemanticAttributes.RPC_METHOD" "hello" "$SemanticAttributes.NET_PEER_IP" String From 5d93d6684ebabb93c95d3022921466c3ffa30b3a Mon Sep 17 00:00:00 2001 From: tydhot <583125614@qq.com> Date: Fri, 1 Apr 2022 00:44:20 +0800 Subject: [PATCH 3/3] fix test --- .../apachedubbo/v2_7/AbstractDubboTest.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy index 648654988408..0a45206b858f 100644 --- a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy +++ b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy @@ -97,7 +97,7 @@ abstract class AbstractDubboTest extends InstrumentationSpecification { kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.RPC_SYSTEM" "apache-dubbo" + "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" "$SemanticAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" "$SemanticAttributes.RPC_METHOD" "\$invoke" "$SemanticAttributes.NET_PEER_NAME" "localhost" @@ -109,7 +109,7 @@ abstract class AbstractDubboTest extends InstrumentationSpecification { kind SERVER childOf span(1) attributes { - "$SemanticAttributes.RPC_SYSTEM" "apache-dubbo" + "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" "$SemanticAttributes.RPC_SERVICE" "io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService" "$SemanticAttributes.RPC_METHOD" "hello" "$SemanticAttributes.NET_PEER_IP" String @@ -168,7 +168,7 @@ abstract class AbstractDubboTest extends InstrumentationSpecification { kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.RPC_SYSTEM" "apache-dubbo" + "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" "$SemanticAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" "$SemanticAttributes.RPC_METHOD" "\$invokeAsync" "$SemanticAttributes.NET_PEER_NAME" "localhost" @@ -180,7 +180,7 @@ abstract class AbstractDubboTest extends InstrumentationSpecification { kind SERVER childOf span(1) attributes { - "$SemanticAttributes.RPC_SYSTEM" "apache-dubbo" + "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" "$SemanticAttributes.RPC_SERVICE" "io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService" "$SemanticAttributes.RPC_METHOD" "hello" "$SemanticAttributes.NET_PEER_IP" String