From 2493865a92cb655699d39f0bf6bf6c89d5db5479 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Tue, 12 Mar 2019 22:56:41 -0600 Subject: [PATCH] use MethodUtil --- .../interceptor/AbstractMethodInterceptor.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java index bb00062fb..64748a265 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java @@ -31,6 +31,7 @@ import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; +import org.apache.skywalking.apm.agent.core.util.MethodUtil; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; import org.apache.skywalking.apm.plugin.spring.mvc.commons.EnhanceRequireObjectCache; @@ -59,7 +60,7 @@ public abstract class AbstractMethodInterceptor implements InstanceMethodsAround String operationName; if (Config.Plugin.SpringMVC.USE_QUALIFIED_NAME_AS_ENDPOINT_NAME) { - operationName = getFullyQualifiedMethodName(method); + operationName = MethodUtil.generateOperationName(method); } else { EnhanceRequireObjectCache pathMappingCache = (EnhanceRequireObjectCache)objInst.getSkyWalkingDynamicField(); String requestURL = pathMappingCache.findPathMapping(method); @@ -123,17 +124,4 @@ public abstract class AbstractMethodInterceptor implements InstanceMethodsAround Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } - - public static String getFullyQualifiedMethodName(Method method) { - StringBuilder operationName = new StringBuilder(method.getDeclaringClass().getName() + "." + method.getName() + "("); - Class[] parameterTypes = method.getParameterTypes(); - for (int i = 0; i < parameterTypes.length; i++) { - operationName.append(parameterTypes[i].getName()); - if (i < (parameterTypes.length - 1)) { - operationName.append(","); - } - } - operationName.append(")"); - return operationName.toString(); - } }