From 5e8bc0090e77e1f320a41fa9998b5c1e454276a7 Mon Sep 17 00:00:00 2001 From: lytscu Date: Fri, 26 Jan 2018 10:07:16 +0800 Subject: [PATCH] Modify operationName to invocation.getInvocationQualifiedName --- .../apm/plugin/servicecomb/InvocationInterceptor.java | 2 +- .../skywalking/apm/plugin/servicecomb/NextInterceptor.java | 2 +- .../src/main/resources/skywalking-plugin.def | 2 +- .../apm/plugin/servicecomb/InvocationInterceptorTest.java | 2 +- .../skywalking/apm/plugin/servicecomb/NextInterceptorTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/InvocationInterceptor.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/InvocationInterceptor.java index d27ad3555..5a76896d2 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/InvocationInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/InvocationInterceptor.java @@ -58,7 +58,7 @@ public class InvocationInterceptor implements InstanceMethodsAroundInterceptor { next = next.next(); next.setHeadValue(invocation.getContext().get(next.getHeadKey())); } - String operationName = invocation.getOperationName(); + String operationName = invocation.getInvocationQualifiedName(); span = ContextManager.createEntrySpan(operationName, contextCarrier); String url = invocation.getOperationMeta().getOperationPath(); Tags.URL.set(span, url); diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/NextInterceptor.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/NextInterceptor.java index 24a7ee3da..bde064c99 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/NextInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/NextInterceptor.java @@ -66,7 +66,7 @@ public class NextInterceptor implements InstanceMethodsAroundInterceptor { URI uri = new URI(invocation.getEndpoint().toString()); String peer = uri.getHost() + ":" + uri.getPort(); final ContextCarrier contextCarrier = new ContextCarrier(); - span = ContextManager.createExitSpan(invocation.getOperationName(), contextCarrier, peer); + span = ContextManager.createExitSpan(invocation.getInvocationQualifiedName(), contextCarrier, peer); CarrierItem next = contextCarrier.items(); while (next.hasNext()) { next = next.next(); diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/resources/skywalking-plugin.def index 89240686e..2b17f4d6a 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/resources/skywalking-plugin.def @@ -1 +1 @@ -servicecomb-0.6=org.apache.skywalking.apm.plugin.servicecomb.define.InvocationInstrumentation +servicecomb-0.x=org.apache.skywalking.apm.plugin.servicecomb.define.InvocationInstrumentation diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/InvocationInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/InvocationInterceptorTest.java index c06dde790..f93eea237 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/InvocationInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/InvocationInterceptorTest.java @@ -98,7 +98,7 @@ public class InvocationInterceptorTest { when(operationMeta.getSchemaMeta()).thenReturn(schemaMeta); when(endpoint.getAddress()).thenReturn("0.0.0.0:7777"); when(enhancedInstance.getEndpoint()).thenReturn(endpoint); - when(enhancedInstance.getOperationName()).thenReturn("productorTest"); + when(enhancedInstance.getInvocationQualifiedName()).thenReturn("productorTest"); when(operationMeta.getOperationPath()).thenReturn("/bmi"); when(enhancedInstance.getOperationMeta()).thenReturn(operationMeta); when(enhancedInstance.getStatus()).thenReturn(statusType); diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/NextInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/NextInterceptorTest.java index 9c3576246..80af9f20b 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/NextInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/NextInterceptorTest.java @@ -99,7 +99,7 @@ public class NextInterceptorTest { when(operationMeta.getSchemaMeta()).thenReturn(schemaMeta); when(endpoint.getAddress()).thenReturn("0.0.0.0:7777"); when(enhancedInstance.getEndpoint()).thenReturn(endpoint); - when(enhancedInstance.getOperationName()).thenReturn("consumerTest"); + when(enhancedInstance.getInvocationQualifiedName()).thenReturn("consumerTest"); when(operationMeta.getOperationPath()).thenReturn("/bmi"); when(enhancedInstance.getOperationMeta()).thenReturn(operationMeta); when(enhancedInstance.getStatus()).thenReturn(statusType);