From 8d381976cd2bffcf63e0bf67fda31290b2a0f4ad Mon Sep 17 00:00:00 2001 From: ascrutae Date: Sun, 25 Feb 2018 16:59:21 +0800 Subject: [PATCH 01/21] [Agent] fix HierarchyMatch donot support generic type --- .../skywalking/apm/agent/core/plugin/match/HierarchyMatch.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/HierarchyMatch.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/HierarchyMatch.java index e89fd486a..f134d383a 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/HierarchyMatch.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/HierarchyMatch.java @@ -85,7 +85,7 @@ public class HierarchyMatch implements IndirectMatch { } private void matchHierarchyClass(TypeDescription.Generic clazz, List parentTypes) { - parentTypes.remove(clazz.getTypeName()); + parentTypes.remove(clazz.asRawType().getTypeName()); if (parentTypes.size() == 0) { return; } From fa99652d5b1e0e15dd4de5046db3de6c12c349f3 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Sun, 25 Feb 2018 21:02:38 +0800 Subject: [PATCH 02/21] [Agent] Support hystrix plugin --- .../table/register/ServerTypeDefine.java | 3 +- .../trace/component/ComponentsDefine.java | 5 +- .../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 24 +++++ .../hystrix/v1/EnhanceRequireObjectCache.java | 42 ++++++++ .../HystrixCommandConstructorInterceptor.java | 57 ++++++++++ .../hystrix/v1/HystrixPluginsInterceptor.java | 44 ++++++++ .../hystrix/v1/SWExecutionHookWrapper.java | 101 ++++++++++++++++++ .../define/HystrixCommandInstrumentation.java | 58 ++++++++++ .../define/HystrixPluginsInstrumentation.java | 65 +++++++++++ .../src/main/resources/skywalking-plugin.def | 2 + apm-sniffer/apm-sdk-plugin/pom.xml | 1 + 11 files changed, 400 insertions(+), 2 deletions(-) create mode 100644 apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml create mode 100644 apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/EnhanceRequireObjectCache.java create mode 100644 apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java create mode 100644 apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java create mode 100644 apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java create mode 100644 apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/resources/skywalking-plugin.def diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefine.java index 71e2ae346..61a91fb66 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefine.java @@ -32,7 +32,7 @@ public class ServerTypeDefine { private ServerType[] serverTypes; private ServerTypeDefine() { - this.serverTypes = new ServerType[29]; + this.serverTypes = new ServerType[30]; this.serverTypeNames = new String[11]; addServerType(new ServerType(ComponentsDefine.TOMCAT.getId(), Const.NONE, Const.EMPTY_STRING)); addServerType(new ServerType(ComponentsDefine.HTTPCLIENT.getId(), Const.NONE, Const.EMPTY_STRING)); @@ -62,6 +62,7 @@ public class ServerTypeDefine { addServerType(new ServerType(ComponentsDefine.HTTP_ASYNC_CLIENT.getId(), Const.NONE, Const.EMPTY_STRING)); addServerType(new ServerType(ComponentsDefine.KAFKA.getId(), 10, ComponentsDefine.KAFKA.getName())); addServerType(new ServerType(ComponentsDefine.SERVICECOMB.getId(), Const.NONE, ComponentsDefine.SERVICECOMB.getName())); + addServerType(new ServerType(ComponentsDefine.HYSTRIX.getId(), Const.NONE, ComponentsDefine.HYSTRIX.getName())); } public static ServerTypeDefine getInstance() { diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java index fa6e9c24e..40bc356f3 100644 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java @@ -82,6 +82,8 @@ public class ComponentsDefine { public static final OfficialComponent SERVICECOMB = new OfficialComponent(28, "ServiceComb"); + public static final OfficialComponent HYSTRIX = new OfficialComponent(29, "Hystrix"); + private static ComponentsDefine INSTANCE = new ComponentsDefine(); private String[] components; @@ -91,7 +93,7 @@ public class ComponentsDefine { } public ComponentsDefine() { - components = new String[29]; + components = new String[30]; addComponent(TOMCAT); addComponent(HTTPCLIENT); addComponent(DUBBO); @@ -120,6 +122,7 @@ public class ComponentsDefine { addComponent(HTTP_ASYNC_CLIENT); addComponent(KAFKA); addComponent(SERVICECOMB); + addComponent(HYSTRIX); } private void addComponent(OfficialComponent component) { diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml new file mode 100644 index 000000000..bbc67f076 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml @@ -0,0 +1,24 @@ + + + + apm-sdk-plugin + org.apache.skywalking + 5.0.0-alpha + + 4.0.0 + + apm-hystrix-1.x-plugin + + + + + com.netflix.hystrix + hystrix-core + 1.4.0 + provided + + + + \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/EnhanceRequireObjectCache.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/EnhanceRequireObjectCache.java new file mode 100644 index 000000000..e6724beb9 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/EnhanceRequireObjectCache.java @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.apm.plugin.hystrix.v1; + +import org.apache.skywalking.apm.agent.core.context.ContextSnapshot; + +public class EnhanceRequireObjectCache { + private final String operationNamePrefix; + private ContextSnapshot contextSnapshot; + + public EnhanceRequireObjectCache(String prefix) { + operationNamePrefix = prefix; + } + + public String getOperationNamePrefix() { + return operationNamePrefix; + } + + public ContextSnapshot getContextSnapshot() { + return contextSnapshot; + } + + public void setContextSnapshot(ContextSnapshot contextSnapshot) { + this.contextSnapshot = contextSnapshot; + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java new file mode 100644 index 000000000..161fb2cb0 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java @@ -0,0 +1,57 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.apm.plugin.hystrix.v1; + +import com.netflix.hystrix.HystrixCollapser; +import com.netflix.hystrix.HystrixCommand; +import com.netflix.hystrix.HystrixObservableCollapser; +import com.netflix.hystrix.HystrixObservableCommand; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; + +public class HystrixCommandConstructorInterceptor implements InstanceConstructorInterceptor { + + @Override + public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { + String identifyKey = ""; + + if (HystrixCommand.class.isAssignableFrom(objInst.getClass())) { + HystrixCommand hystrixCommand = (HystrixCommand)objInst; + identifyKey = hystrixCommand.getCommandKey().name(); + } + + if (HystrixCollapser.class.isAssignableFrom(objInst.getClass())) { + HystrixCollapser hystrixCommand = (HystrixCollapser)objInst; + identifyKey = hystrixCommand.getCollapserKey().name(); + } + + if (HystrixObservableCollapser.class.isAssignableFrom(objInst.getClass())) { + HystrixObservableCollapser hystrixCommand = (HystrixObservableCollapser)objInst; + identifyKey = hystrixCommand.getCollapserKey().name(); + } + + if (HystrixObservableCommand.class.isAssignableFrom(objInst.getClass())) { + HystrixObservableCommand hystrixCommand = (HystrixObservableCommand)objInst; + identifyKey = hystrixCommand.getCommandKey().name(); + } + + objInst.setSkyWalkingDynamicField(new EnhanceRequireObjectCache("Hystrix/" + identifyKey)); + } + +} diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptor.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptor.java new file mode 100644 index 000000000..91a9bf8a9 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptor.java @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.apm.plugin.hystrix.v1; + +import com.netflix.hystrix.strategy.executionhook.HystrixCommandExecutionHook; +import java.lang.reflect.Method; +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; + +public class HystrixPluginsInterceptor implements InstanceMethodsAroundInterceptor { + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + + } + + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + return new SWExecutionHookWrapper((HystrixCommandExecutionHook)ret); + } + + @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { + + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java new file mode 100644 index 000000000..ec8c82407 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java @@ -0,0 +1,101 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.apm.plugin.hystrix.v1; + +import com.netflix.hystrix.HystrixInvokable; +import com.netflix.hystrix.strategy.executionhook.HystrixCommandExecutionHook; +import org.apache.skywalking.apm.agent.core.context.ContextManager; +import org.apache.skywalking.apm.agent.core.context.ContextSnapshot; +import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; +import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; + +public class SWExecutionHookWrapper extends HystrixCommandExecutionHook { + private final HystrixCommandExecutionHook actual; + + public SWExecutionHookWrapper(HystrixCommandExecutionHook actual) { + this.actual = actual; + } + + @Override + public void onStart(HystrixInvokable commandInstance) { + EnhancedInstance enhancedInstance = (EnhancedInstance)commandInstance; + EnhanceRequireObjectCache enhanceRequireObjectCache = (EnhanceRequireObjectCache)enhancedInstance.getSkyWalkingDynamicField(); + enhanceRequireObjectCache.setContextSnapshot(ContextManager.capture()); + actual.onStart(commandInstance); + } + + /** + * execution method + */ + + @Override public void onExecutionStart(HystrixInvokable commandInstance) { + // create a local span, and continued, The `execution method` running in other thread if the + // hystrix strategy is `THREAD`. + EnhancedInstance enhancedInstance = (EnhancedInstance)commandInstance; + EnhanceRequireObjectCache enhanceRequireObjectCache = (EnhanceRequireObjectCache)enhancedInstance.getSkyWalkingDynamicField(); + ContextSnapshot snapshot = enhanceRequireObjectCache.getContextSnapshot(); + + AbstractSpan activeSpan = ContextManager.createLocalSpan(enhanceRequireObjectCache.getOperationNamePrefix() + "/Execution"); + activeSpan.setComponent(ComponentsDefine.HYSTRIX); + ContextManager.continued(snapshot); + actual.onExecutionStart(commandInstance); + + // Because of `fall back` method running in other thread. so we need capture concurrent span for tracing. + enhanceRequireObjectCache.setContextSnapshot(ContextManager.capture()); + } + + @Override public Exception onExecutionError(HystrixInvokable commandInstance, Exception e) { + ContextManager.activeSpan().errorOccurred().log(e); + ContextManager.stopSpan(); + return actual.onExecutionError(commandInstance, e); + } + + @Override public void onExecutionSuccess(HystrixInvokable commandInstance) { + ContextManager.stopSpan(); + actual.onExecutionSuccess(commandInstance); + } + + /** + * Fallback + */ + + @Override public void onFallbackStart(HystrixInvokable commandInstance) { + EnhancedInstance enhancedInstance = (EnhancedInstance)commandInstance; + EnhanceRequireObjectCache enhanceRequireObjectCache = (EnhanceRequireObjectCache)enhancedInstance.getSkyWalkingDynamicField(); + ContextSnapshot snapshot = enhanceRequireObjectCache.getContextSnapshot(); + + AbstractSpan activeSpan = ContextManager.createLocalSpan(enhanceRequireObjectCache.getOperationNamePrefix() + "/Fallback"); + activeSpan.setComponent(ComponentsDefine.HYSTRIX); + ContextManager.continued(snapshot); + + actual.onFallbackStart(commandInstance); + } + + @Override public Exception onFallbackError(HystrixInvokable commandInstance, Exception e) { + ContextManager.activeSpan().errorOccurred().log(e); + ContextManager.stopSpan(); + return actual.onFallbackError(commandInstance, e); + } + + @Override public void onFallbackSuccess(HystrixInvokable commandInstance) { + ContextManager.stopSpan(); + actual.onFallbackSuccess(commandInstance); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java new file mode 100644 index 000000000..ade25d491 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java @@ -0,0 +1,58 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.apm.plugin.hystrix.v1.define; + +import net.bytebuddy.description.method.MethodDescription; +import net.bytebuddy.matcher.ElementMatcher; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; +import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; + +import static net.bytebuddy.matcher.ElementMatchers.any; +import static org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch.byHierarchyMatch; + +public class HystrixCommandInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.hystrix.v1.HystrixCommandConstructorInterceptor"; + public static final String ENHANCE_CLASS = "com.netflix.hystrix.HystrixCommand"; + + @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + return new ConstructorInterceptPoint[] { + new ConstructorInterceptPoint() { + @Override public ElementMatcher getConstructorMatcher() { + return any(); + } + + @Override public String getConstructorInterceptor() { + return INTERCEPT_CLASS; + } + } + }; + } + + @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[0]; + } + + @Override protected ClassMatch enhanceClass() { + return byHierarchyMatch(new String[] {ENHANCE_CLASS}); + } + +} diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java new file mode 100644 index 000000000..0c59115d4 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java @@ -0,0 +1,65 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.apm.plugin.hystrix.v1.define; + +import net.bytebuddy.description.method.MethodDescription; +import net.bytebuddy.matcher.ElementMatcher; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; +import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; + +import static net.bytebuddy.matcher.ElementMatchers.named; +import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; + +public class HystrixPluginsInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.hystrix.v1.HystrixPluginsInterceptor"; + public static final String ENHANCE_METHOD = "getCommandExecutionHook"; + public static final String ENHANCE_CLASS = "com.netflix.hystrix.strategy.HystrixPlugins"; + + @Override + protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + return new ConstructorInterceptPoint[0]; + } + + @Override + protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override public ElementMatcher getMethodsMatcher() { + return named(ENHANCE_METHOD); + } + + @Override public String getMethodsInterceptor() { + return INTERCEPT_CLASS; + } + + @Override public boolean isOverrideArgs() { + return false; + } + } + }; + } + + @Override + protected ClassMatch enhanceClass() { + return byName(ENHANCE_CLASS); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/resources/skywalking-plugin.def new file mode 100644 index 000000000..0c9c9c94f --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/resources/skywalking-plugin.def @@ -0,0 +1,2 @@ +hystrix-1.x=org.apache.skywalking.apm.plugin.hystrix.v1.define.HystrixCommandInstrumentation +hystrix-1.x=org.apache.skywalking.apm.plugin.hystrix.v1.define.HystrixPluginsInstrumentation diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml index be0a02e80..9babd5c1d 100644 --- a/apm-sniffer/apm-sdk-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pom.xml @@ -55,6 +55,7 @@ httpasyncclient-4.x-plugin kafka-v1-plugin servicecomb-plugin + hystrix-1.x-plugin pom From 65456716a3fbfabb2e78814f21a531c69b66e141 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Sun, 25 Feb 2018 21:43:27 +0800 Subject: [PATCH 03/21] add comment --- .../apm/plugin/hystrix/v1/EnhanceRequireObjectCache.java | 6 ++++++ .../hystrix/v1/HystrixCommandConstructorInterceptor.java | 7 +++++++ .../apm/plugin/hystrix/v1/HystrixPluginsInterceptor.java | 8 +++++++- .../apm/plugin/hystrix/v1/SWExecutionHookWrapper.java | 5 +++++ .../hystrix/v1/define/HystrixCommandInstrumentation.java | 7 +++++++ .../hystrix/v1/define/HystrixPluginsInstrumentation.java | 7 +++++++ 6 files changed, 39 insertions(+), 1 deletion(-) diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/EnhanceRequireObjectCache.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/EnhanceRequireObjectCache.java index e6724beb9..2be967ede 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/EnhanceRequireObjectCache.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/EnhanceRequireObjectCache.java @@ -20,6 +20,12 @@ package org.apache.skywalking.apm.plugin.hystrix.v1; import org.apache.skywalking.apm.agent.core.context.ContextSnapshot; +/** + * {@link EnhanceRequireObjectCache} record the prefix operation name of span and {@link ContextSnapshot} object for + * tracing. + * + * @author zhang xin + */ public class EnhanceRequireObjectCache { private final String operationNamePrefix; private ContextSnapshot contextSnapshot; diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java index 161fb2cb0..a6f4ecd06 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java @@ -25,6 +25,13 @@ import com.netflix.hystrix.HystrixObservableCommand; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; +/** + * {@link HystrixCommandConstructorInterceptor} get CommandKey or CollapserKey as the + * operation name prefix of span when the constructor that the class hierarchy com.netflix.hystrix.HystrixCommand + * invoked. + * + * @author zhang xin + */ public class HystrixCommandConstructorInterceptor implements InstanceConstructorInterceptor { @Override diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptor.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptor.java index 91a9bf8a9..d29b62fd4 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptor.java @@ -18,17 +18,23 @@ package org.apache.skywalking.apm.plugin.hystrix.v1; +import com.netflix.hystrix.strategy.HystrixPlugins; import com.netflix.hystrix.strategy.executionhook.HystrixCommandExecutionHook; import java.lang.reflect.Method; 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; +/** + * {@link HystrixPluginsInterceptor} wrapper the {@link HystrixCommandExecutionHook} object by using {@link + * SWExecutionHookWrapper} when the {@link HystrixPlugins#getCommandExecutionHook()} method invoked. + * + * @author zhang xin + */ public class HystrixPluginsInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - } @Override diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java index ec8c82407..cc60c4ebd 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java @@ -26,6 +26,11 @@ import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; +/** + * {@link SWExecutionHookWrapper} wrapper the HystrixCommandExecutionHook object for tracing. + * + * @author zhang xin + */ public class SWExecutionHookWrapper extends HystrixCommandExecutionHook { private final HystrixCommandExecutionHook actual; diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java index ade25d491..54c2faf72 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java @@ -28,6 +28,13 @@ import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import static net.bytebuddy.matcher.ElementMatchers.any; import static org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch.byHierarchyMatch; +/** + * {@link HystrixCommandInstrumentation} represent that the hystrix plugin intercept the constructor in the class that + * hierarchy {@link com.netflix.hystrix.HystrixCommand} class by using the {@link org.apache.skywalking.apm.plugin.hystrix.v1.HystrixCommandConstructorInterceptor} + * class. + * + * @author zhangxin + */ public class HystrixCommandInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.hystrix.v1.HystrixCommandConstructorInterceptor"; diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java index 0c59115d4..e7b82a9de 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java @@ -28,6 +28,13 @@ import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; +/** + * {@link HystrixPluginsInstrumentation} represent that the hystrix plugin intercept the + * getCommandExecutionHook method in the {@link com.netflix.hystrix.strategy.HystrixPlugins} class class by + * using the {@link org.apache.skywalking.apm.plugin.hystrix.v1.HystrixCommandConstructorInterceptor} class. + * + * @author zhangxin + */ public class HystrixPluginsInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.hystrix.v1.HystrixPluginsInterceptor"; From b4d58cd19bf6853d8d96d7c8abb88482a4832e15 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Sun, 25 Feb 2018 23:15:14 +0800 Subject: [PATCH 04/21] Adjust variable name and remove some confuse comment --- .../HystrixCommandConstructorInterceptor.java | 32 ++++++++----------- .../hystrix/v1/SWExecutionHookWrapper.java | 26 +++++++-------- 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java index a6f4ecd06..e6f8aeb31 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java @@ -34,31 +34,27 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceC */ public class HystrixCommandConstructorInterceptor implements InstanceConstructorInterceptor { + public static final String OPERATION_NAME_PREFIX = "Hystrix/"; + @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { - String identifyKey = ""; + String commandIdentify = ""; if (HystrixCommand.class.isAssignableFrom(objInst.getClass())) { HystrixCommand hystrixCommand = (HystrixCommand)objInst; - identifyKey = hystrixCommand.getCommandKey().name(); + commandIdentify = hystrixCommand.getCommandKey().name(); + } else if (HystrixCollapser.class.isAssignableFrom(objInst.getClass())) { + HystrixCollapser hystrixCollapser = (HystrixCollapser)objInst; + commandIdentify = hystrixCollapser.getCollapserKey().name(); + } else if (HystrixObservableCollapser.class.isAssignableFrom(objInst.getClass())) { + HystrixObservableCollapser hystrixObservableCollapser = (HystrixObservableCollapser)objInst; + commandIdentify = hystrixObservableCollapser.getCollapserKey().name(); + } else if (HystrixObservableCommand.class.isAssignableFrom(objInst.getClass())) { + HystrixObservableCommand hystrixObservableCommand = (HystrixObservableCommand)objInst; + commandIdentify = hystrixObservableCommand.getCommandKey().name(); } - if (HystrixCollapser.class.isAssignableFrom(objInst.getClass())) { - HystrixCollapser hystrixCommand = (HystrixCollapser)objInst; - identifyKey = hystrixCommand.getCollapserKey().name(); - } - - if (HystrixObservableCollapser.class.isAssignableFrom(objInst.getClass())) { - HystrixObservableCollapser hystrixCommand = (HystrixObservableCollapser)objInst; - identifyKey = hystrixCommand.getCollapserKey().name(); - } - - if (HystrixObservableCommand.class.isAssignableFrom(objInst.getClass())) { - HystrixObservableCommand hystrixCommand = (HystrixObservableCommand)objInst; - identifyKey = hystrixCommand.getCommandKey().name(); - } - - objInst.setSkyWalkingDynamicField(new EnhanceRequireObjectCache("Hystrix/" + identifyKey)); + objInst.setSkyWalkingDynamicField(new EnhanceRequireObjectCache(OPERATION_NAME_PREFIX + commandIdentify)); } } diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java index cc60c4ebd..dafba818a 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java @@ -46,11 +46,8 @@ public class SWExecutionHookWrapper extends HystrixCommandExecutionHook { actual.onStart(commandInstance); } - /** - * execution method - */ - - @Override public void onExecutionStart(HystrixInvokable commandInstance) { + @Override + public void onExecutionStart(HystrixInvokable commandInstance) { // create a local span, and continued, The `execution method` running in other thread if the // hystrix strategy is `THREAD`. EnhancedInstance enhancedInstance = (EnhancedInstance)commandInstance; @@ -66,22 +63,21 @@ public class SWExecutionHookWrapper extends HystrixCommandExecutionHook { enhanceRequireObjectCache.setContextSnapshot(ContextManager.capture()); } - @Override public Exception onExecutionError(HystrixInvokable commandInstance, Exception e) { + @Override + public Exception onExecutionError(HystrixInvokable commandInstance, Exception e) { ContextManager.activeSpan().errorOccurred().log(e); ContextManager.stopSpan(); return actual.onExecutionError(commandInstance, e); } - @Override public void onExecutionSuccess(HystrixInvokable commandInstance) { + @Override + public void onExecutionSuccess(HystrixInvokable commandInstance) { ContextManager.stopSpan(); actual.onExecutionSuccess(commandInstance); } - /** - * Fallback - */ - - @Override public void onFallbackStart(HystrixInvokable commandInstance) { + @Override + public void onFallbackStart(HystrixInvokable commandInstance) { EnhancedInstance enhancedInstance = (EnhancedInstance)commandInstance; EnhanceRequireObjectCache enhanceRequireObjectCache = (EnhanceRequireObjectCache)enhancedInstance.getSkyWalkingDynamicField(); ContextSnapshot snapshot = enhanceRequireObjectCache.getContextSnapshot(); @@ -93,13 +89,15 @@ public class SWExecutionHookWrapper extends HystrixCommandExecutionHook { actual.onFallbackStart(commandInstance); } - @Override public Exception onFallbackError(HystrixInvokable commandInstance, Exception e) { + @Override + public Exception onFallbackError(HystrixInvokable commandInstance, Exception e) { ContextManager.activeSpan().errorOccurred().log(e); ContextManager.stopSpan(); return actual.onFallbackError(commandInstance, e); } - @Override public void onFallbackSuccess(HystrixInvokable commandInstance) { + @Override + public void onFallbackSuccess(HystrixInvokable commandInstance) { ContextManager.stopSpan(); actual.onFallbackSuccess(commandInstance); } From 158b6ff884f691f46e383bc9639729da0fe76c62 Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Mon, 26 Feb 2018 09:15:10 +0800 Subject: [PATCH 05/21] Fixing javadoc. And try to trigger a ci fail in this commit, in order to make sure javadoc will be checked in further pull request. --- .travis.yml | 2 +- .../apm/commons/datacarrier/DataCarrier.java | 17 ++++++++--------- .../skywalking/apm/agent/core/conf/Config.java | 4 +--- .../core/conf/SnifferConfigInitializer.java | 2 -- .../core/context/AbstractTracerContext.java | 11 ----------- .../apm/agent/core/context/ContextManager.java | 5 ++--- .../apm/agent/core/context/TracingContext.java | 18 +++++++++--------- .../core/context/ids/GlobalIdGenerator.java | 5 ++--- .../context/trace/AbstractTracingSpan.java | 2 +- .../agent/core/context/trace/EntrySpan.java | 2 +- .../apm/agent/core/context/trace/ExitSpan.java | 2 +- .../agent/core/context/trace/TraceSegment.java | 6 +++--- .../AbstractClassEnhancePluginDefine.java | 2 +- .../bytebuddy/ArgumentTypeNameMatch.java | 2 +- ...lassInstanceMethodsEnhancePluginDefine.java | 2 +- .../ClassStaticMethodsEnhancePluginDefine.java | 2 +- .../InstanceMethodsAroundInterceptor.java | 1 - .../enhance/MethodInterceptResult.java | 9 +++++---- .../agent/core/sampling/SamplingService.java | 2 +- pom.xml | 6 ++++++ 20 files changed, 45 insertions(+), 57 deletions(-) diff --git a/.travis.yml b/.travis.yml index 031635c67..8bffa1ac8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,5 +9,5 @@ before_install: install: - jdk_switcher use oraclejdk8 - - mvn clean install --quiet jacoco:report coveralls:report + - mvn clean install -Papache-release --quiet jacoco:report coveralls:report diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrier.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrier.java index 081b25a6f..d53fda539 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrier.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrier.java @@ -41,11 +41,10 @@ public class DataCarrier { } /** - * set a new IDataPartitioner. It will cover the current one or default one.(Default is {@link - * SimpleRollingPartitioner)} + * set a new IDataPartitioner. It will cover the current one or default one.(Default is {@link SimpleRollingPartitioner} * - * @param dataPartitioner - * @return + * @param dataPartitioner to partition data into different channel by some rules. + * @return DataCarrier instance for chain */ public DataCarrier setPartitioner(IDataPartitioner dataPartitioner) { this.channels.setPartitioner(dataPartitioner); @@ -53,7 +52,7 @@ public class DataCarrier { } /** - * override the strategy at runtime. Notice, {@link Channels} will override several channels one by one. + * override the strategy at runtime. Notice, {@link Channels} will override several channels one by one. * * @param strategy */ @@ -84,7 +83,7 @@ public class DataCarrier { } /** - * set consumers to this Carrier. consumer begin to run when {@link DataCarrier#produce(T)} begin to work. + * set consumers to this Carrier. consumer begin to run when {@link DataCarrier#produce} begin to work. * * @param consumerClass class of consumer * @param num number of consumer threads @@ -99,7 +98,7 @@ public class DataCarrier { } /** - * set consumers to this Carrier. consumer begin to run when {@link DataCarrier#produce(T)} begin to work with 20 + * set consumers to this Carrier. consumer begin to run when {@link DataCarrier#produce} begin to work with 20 * millis consume cycle. * * @param consumerClass class of consumer @@ -110,7 +109,7 @@ public class DataCarrier { } /** - * set consumers to this Carrier. consumer begin to run when {@link DataCarrier#produce(T)} begin to work. + * set consumers to this Carrier. consumer begin to run when {@link DataCarrier#produce} begin to work. * * @param consumer single instance of consumer, all consumer threads will all use this instance. * @param num number of consumer threads @@ -126,7 +125,7 @@ public class DataCarrier { } /** - * set consumers to this Carrier. consumer begin to run when {@link DataCarrier#produce(T)} begin to work with 20 + * set consumers to this Carrier. consumer begin to run when {@link DataCarrier#produce} begin to work with 20 * millis consume cycle. * * @param consumer single instance of consumer, all consumer threads will all use this instance. diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java index abfbf348e..86fbebb49 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java @@ -117,7 +117,7 @@ public class Config { /** * Log files directory. Default is blank string, means, use "system.out" to output logs. * - * @see {@link WriterFactory#getLogWriter()} + * Ref to {@link WriterFactory#getLogWriter()} */ public static String DIR = ""; @@ -129,8 +129,6 @@ public class Config { /** * The log level. Default is debug. - * - * @see {@link LogLevel} */ public static LogLevel LEVEL = LogLevel.DEBUG; } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java index 2e674177f..f96f84cbd 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.conf; import java.io.File; @@ -37,7 +36,6 @@ import org.apache.skywalking.apm.util.StringUtil; * The SnifferConfigInitializer initializes all configs in several way. * * @author wusheng - * @see {@link #initialize()}, to learn more about how to initialzie. */ public class SnifferConfigInitializer { private static final ILog logger = LogManager.getLogger(SnifferConfigInitializer.class); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AbstractTracerContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AbstractTracerContext.java index df1278512..e3ffdace7 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AbstractTracerContext.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AbstractTracerContext.java @@ -20,9 +20,6 @@ package org.apache.skywalking.apm.agent.core.context; import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; -import org.apache.skywalking.apm.agent.core.context.trace.EntrySpan; -import org.apache.skywalking.apm.agent.core.context.trace.ExitSpan; -import org.apache.skywalking.apm.agent.core.context.trace.LocalSpan; /** * The AbstractTracerContext represents the tracer context manager. @@ -35,7 +32,6 @@ public interface AbstractTracerContext { * How to initialize the carrier, depends on the implementation. * * @param carrier to carry the context for crossing process. - * @see {@link TracingContext} and {@link IgnoredTracerContext} */ void inject(ContextCarrier carrier); @@ -44,7 +40,6 @@ public interface AbstractTracerContext { * How to build, depends on the implementation. * * @param carrier carried the context from a cross-process segment. - * @see {@link TracingContext} and {@link IgnoredTracerContext} */ void extract(ContextCarrier carrier); @@ -54,7 +49,6 @@ public interface AbstractTracerContext { * How to build, depends on the implementation. * * @return the {@link ContextSnapshot} , which includes the reference context. - * @see {@link TracingContext} and {@link IgnoredTracerContext} */ ContextSnapshot capture(); @@ -63,7 +57,6 @@ public interface AbstractTracerContext { * How to build, depends on the implementation. * * @param snapshot from {@link #capture()} in the parent thread. - * @see {@link TracingContext} and {@link IgnoredTracerContext} */ void continued(ContextSnapshot snapshot); @@ -72,7 +65,6 @@ public interface AbstractTracerContext { * How to build, depends on the implementation. * * @return the string represents the id. - * @see {@link TracingContext} and {@link IgnoredTracerContext} */ String getReadableGlobalTraceId(); @@ -81,7 +73,6 @@ public interface AbstractTracerContext { * * @param operationName most likely a service name * @return the span represents an entry point of this segment. - * @see {@link EntrySpan} if the implementation is {@link TracingContext} */ AbstractSpan createEntrySpan(String operationName); @@ -90,7 +81,6 @@ public interface AbstractTracerContext { * * @param operationName most likely a local method signature, or business name. * @return the span represents a local logic block. - * @see {@link LocalSpan} if the implementation is {@link TracingContext} */ AbstractSpan createLocalSpan(String operationName); @@ -100,7 +90,6 @@ public interface AbstractTracerContext { * @param operationName most likely a service name of remote * @param remotePeer the network id(ip:port, hostname:port or ip1:port1,ip2,port, etc.) * @return the span represent an exit point of this segment. - * @see {@link ExitSpan} if the implementation is {@link TracingContext} */ AbstractSpan createExitSpan(String operationName, String remotePeer); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java index 3ead3c3c8..16b6a1dd2 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.context; import org.apache.skywalking.apm.agent.core.boot.BootService; @@ -34,8 +33,8 @@ import org.apache.skywalking.apm.util.StringUtil; /** * {@link ContextManager} controls the whole context of {@link TraceSegment}. Any {@link TraceSegment} relates to * single-thread, so this context use {@link ThreadLocal} to maintain the context, and make sure, since a {@link - * TraceSegment} starts, all ChildOf spans are in the same context.

What is 'ChildOf'? {@see - * https://github.com/opentracing/specification/blob/master/specification.md#references-between-spans} + * TraceSegment} starts, all ChildOf spans are in the same context.

What is 'ChildOf'? + * https://github.com/opentracing/specification/blob/master/specification.md#references-between-spans * *

Also, {@link ContextManager} delegates to all {@link AbstractTracerContext}'s major methods. * diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContext.java index f848502b7..16c9b3218 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContext.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContext.java @@ -94,8 +94,8 @@ public class TracingContext implements AbstractTracerContext { * Inject the context into the given carrier, only when the active span is an exit one. * * @param carrier to carry the context for crossing process. - * @throws IllegalStateException, if the active span isn't an exit one. - * @see {@link AbstractTracerContext#inject(ContextCarrier)} + * @throws IllegalStateException if the active span isn't an exit one. + * Ref to {@link AbstractTracerContext#inject(ContextCarrier)} */ @Override public void inject(ContextCarrier carrier) { @@ -155,7 +155,7 @@ public class TracingContext implements AbstractTracerContext { * Extract the carrier to build the reference for the pre segment. * * @param carrier carried the context from a cross-process segment. - * @see {@link AbstractTracerContext#extract(ContextCarrier)} + * Ref to {@link AbstractTracerContext#extract(ContextCarrier)} */ @Override public void extract(ContextCarrier carrier) { @@ -172,7 +172,7 @@ public class TracingContext implements AbstractTracerContext { * Capture the snapshot of current context. * * @return the snapshot of context for cross-thread propagation - * @see {@link AbstractTracerContext#capture()} + * Ref to {@link AbstractTracerContext#capture()} */ @Override public ContextSnapshot capture() { @@ -214,7 +214,7 @@ public class TracingContext implements AbstractTracerContext { * Continue the context from the given snapshot of parent thread. * * @param snapshot from {@link #capture()} in the parent thread. - * @see {@link AbstractTracerContext#continued(ContextSnapshot)} + * Ref to {@link AbstractTracerContext#continued(ContextSnapshot)} */ @Override public void continued(ContextSnapshot snapshot) { @@ -237,7 +237,7 @@ public class TracingContext implements AbstractTracerContext { * * @param operationName most likely a service name * @return span instance. - * @see {@link EntrySpan} + * Ref to {@link EntrySpan} */ @Override public AbstractSpan createEntrySpan(final String operationName) { @@ -285,7 +285,7 @@ public class TracingContext implements AbstractTracerContext { * * @param operationName most likely a local method signature, or business name. * @return the span represents a local logic block. - * @see {@link LocalSpan} + * Ref to {@link LocalSpan} */ @Override public AbstractSpan createLocalSpan(final String operationName) { @@ -318,7 +318,7 @@ public class TracingContext implements AbstractTracerContext { * @param operationName most likely a service name of remote * @param remotePeer the network id(ip:port, hostname:port or ip1:port1,ip2,port, etc.) * @return the span represent an exit point of this segment. - * @see {@link ExitSpan} + * @see ExitSpan */ @Override public AbstractSpan createExitSpan(final String operationName, final String remotePeer) { @@ -443,7 +443,7 @@ public class TracingContext implements AbstractTracerContext { /** * The ListenerManager represents an event notify for every registered listener, which are notified - * when the TracingContext finished, and {@link #segment} is ready for further process. + * when the TracingContext finished, and {@link #segment} is ready for further process. */ public static class ListenerManager { private static List LISTENERS = new LinkedList(); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/GlobalIdGenerator.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/GlobalIdGenerator.java index e5188dfb8..b6060f785 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/GlobalIdGenerator.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/GlobalIdGenerator.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.context.ids; import java.util.Random; @@ -42,8 +41,8 @@ public final class GlobalIdGenerator { * * The second one represents thread id. (most likely just an integer value, would be helpful in protobuf) * - * The third one also has two parts,
- * 1) a timestamp, measured in milliseconds
+ * The third one also has two parts, + * 1) a timestamp, measured in milliseconds * 2) a seq, in current thread, between 0(included) and 9999(included) * * Notice, a long costs 8 bytes, three longs cost 24 bytes. And at the same time, a char costs 2 bytes. So diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java index 2028215ae..4b80e0d30 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java @@ -59,7 +59,7 @@ public abstract class AbstractTracingSpan implements AbstractSpan { protected String componentName; /** - * Log is a concept from OpenTracing spec.

{@see https://github.com/opentracing/specification/blob/master/specification.md#log-structured-data} + * Log is a concept from OpenTracing spec. https://github.com/opentracing/specification/blob/master/specification.md#log-structured-data */ protected List logs; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java index b8b3b00fc..a96308747 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java @@ -29,7 +29,7 @@ import org.apache.skywalking.apm.network.trace.component.Component; * * But with the last EntrySpan's tags and logs, which have more details about a service provider. * - * Such as: Tomcat Embed -> Dubbox The EntrySpan represents the Dubbox span. + * Such as: Tomcat Embed - Dubbox The EntrySpan represents the Dubbox span. * * @author wusheng */ diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java index 4280bad23..2a2776d01 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java @@ -31,7 +31,7 @@ import org.apache.skywalking.apm.network.trace.component.Component; * * The ExitSpan only presents the first one. * - * Such as: Dubbox -> Apache Httpcomponent -> ....(Remote) + * Such as: Dubbox - Apache Httpcomponent - ...(Remote) * The ExitSpan represents the Dubbox span, and ignore the httpcomponent span's info. * * @author wusheng diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegment.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegment.java index bf33b6829..d60728e7e 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegment.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegment.java @@ -22,16 +22,16 @@ package org.apache.skywalking.apm.agent.core.context.trace; import java.util.LinkedList; import java.util.List; import org.apache.skywalking.apm.agent.core.conf.RemoteDownstreamConfig; -import org.apache.skywalking.apm.agent.core.context.ids.DistributedTraceIds; -import org.apache.skywalking.apm.agent.core.context.ids.ID; import org.apache.skywalking.apm.agent.core.context.ids.DistributedTraceId; +import org.apache.skywalking.apm.agent.core.context.ids.DistributedTraceIds; import org.apache.skywalking.apm.agent.core.context.ids.GlobalIdGenerator; +import org.apache.skywalking.apm.agent.core.context.ids.ID; import org.apache.skywalking.apm.agent.core.context.ids.NewDistributedTraceId; import org.apache.skywalking.apm.network.proto.TraceSegmentObject; import org.apache.skywalking.apm.network.proto.UpstreamSegment; /** - * {@link TraceSegment} is a segment or fragment of the distributed trace. {@see https://github.com/opentracing/specification/blob/master/specification.md#the-opentracing-data-model} + * {@link TraceSegment} is a segment or fragment of the distributed trace. See https://github.com/opentracing/specification/blob/master/specification.md#the-opentracing-data-model * A {@link TraceSegment} means the segment, which exists in current {@link Thread}. And the distributed trace is formed * by multi {@link TraceSegment}s, because the distributed trace crosses multi-processes, multi-threads.

* diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefine.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefine.java index abad6f141..ed975e500 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefine.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefine.java @@ -42,7 +42,7 @@ public abstract class AbstractClassEnhancePluginDefine { * @param builder byte-buddy's builder to manipulate target class's bytecode. * @param classLoader load the given transformClass * @return the new builder, or null if not be enhanced. - * @throws PluginException, when set builder failure. + * @throws PluginException when set builder failure. */ public DynamicType.Builder define(String transformClassName, DynamicType.Builder builder, ClassLoader classLoader, EnhanceContext context) throws PluginException { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/ArgumentTypeNameMatch.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/ArgumentTypeNameMatch.java index 367468a96..de73e6b5a 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/ArgumentTypeNameMatch.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/ArgumentTypeNameMatch.java @@ -71,7 +71,7 @@ public class ArgumentTypeNameMatch implements ElementMatcher /** * The static method to create {@link ArgumentTypeNameMatch} - * This is a delegate method to follow byte-buddy {@link ElementMatcher}'s code style. + * This is a delegate method to follow byte-buddy {@link ElementMatcher}'s code style. * * @param index the index of arguments list. * @param argumentTypeName target argument type diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java index fa979894f..3837a9c03 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java @@ -24,7 +24,7 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.StaticMethodsInte /** * Plugins, which only need enhance class static methods. Actually, inherit from {@link * ClassInstanceMethodsEnhancePluginDefine} has no differences with inherit from {@link ClassEnhancePluginDefine}. Just - * override {@link ClassEnhancePluginDefine#getStaticMethodsInterceptPoints}, and return {@link null}, which means + * override {@link ClassEnhancePluginDefine#getStaticMethodsInterceptPoints}, and return NULL, which means * nothing to enhance. * * @author wusheng diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java index 987fd8512..abc69dcad 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java @@ -26,7 +26,7 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterc * Plugins, which only need enhance class static methods. Actually, inherit from {@link * ClassStaticMethodsEnhancePluginDefine} has no differences with inherit from {@link ClassEnhancePluginDefine}. Just * override {@link ClassEnhancePluginDefine#getConstructorsInterceptPoints} and {@link - * ClassEnhancePluginDefine#getInstanceMethodsInterceptPoints}, and return {@link null}, which means nothing to + * ClassEnhancePluginDefine#getInstanceMethodsInterceptPoints}, and return NULL, which means nothing to * enhance. * * @author wusheng diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java index 1d67e78b4..4d7fa5d33 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java @@ -31,7 +31,6 @@ public interface InstanceMethodsAroundInterceptor { /** * called before target method invocation. * - * @param method * @param result change this result, if you want to truncate the method. * @throws Throwable */ diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/MethodInterceptResult.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/MethodInterceptResult.java index 052ac8675..925e2a332 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/MethodInterceptResult.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/MethodInterceptResult.java @@ -16,13 +16,14 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance; +import java.lang.reflect.Method; + /** - * This is a method return value manipulator. When a interceptor's method, such as {@link - * InstanceMethodsAroundInterceptor#beforeMethod(org.apache.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext, - * InstanceMethodInvokeContext, MethodInterceptResult)}, has this as a method argument, the interceptor can manipulate + * This is a method return value manipulator. When a interceptor's method, such as + * {@link InstanceMethodsAroundInterceptor#beforeMethod(EnhancedInstance, Method, Object[], Class[], MethodInterceptResult)} (org.apache.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext, + * has this as a method argument, the interceptor can manipulate * the method's return value.

The new value set to this object, by {@link MethodInterceptResult#defineReturnValue(Object)}, * will override the origin return value. * diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/sampling/SamplingService.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/sampling/SamplingService.java index c902e90fd..666a00409 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/sampling/SamplingService.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/sampling/SamplingService.java @@ -37,7 +37,7 @@ import org.apache.skywalking.apm.util.RunnableWithExceptionProtection; * have been traced, but, considering CPU cost of serialization/deserialization, and network bandwidth, the agent do NOT * send all of them to collector, if SAMPLING is on. *

- * By default, SAMPLING is on, and {@see {@link Config.Agent#SAMPLE_N_PER_3_SECS }} + * By default, SAMPLING is on, and {@link Config.Agent#SAMPLE_N_PER_3_SECS } * * @author wusheng */ diff --git a/pom.xml b/pom.xml index 83985a493..7911cfcf7 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,12 @@ apm 5.0.0-alpha + + org.apache + apache + 19 + + Wu Sheng From 1d6ca31b62be57432206b4eff2c28b3f2bc1c0b6 Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Mon, 26 Feb 2018 12:01:24 +0800 Subject: [PATCH 06/21] Commit many java doc fixes. --- .travis.yml | 3 ++- ...dJdbcConnectionConstructorInterceptor.java | 4 ---- .../AbstractConnectionInstrumentation.java | 2 +- .../AbstractHttpClientInstrumentation.java | 10 +++------ ...DefaultRequestDirectorInstrumentation.java | 7 +++--- .../InternalHttpClientInstrumentation.java | 6 ++--- .../MinimalHttpClientInstrumentation.java | 5 +---- .../connectionurl/parser/H2URLParser.java | 8 +------ .../connectionurl/parser/MysqlURLParser.java | 5 ----- .../connectionurl/parser/OracleURLParser.java | 8 ++----- .../parser/PostgreSQLURLParser.java | 5 ----- .../apm/plugin/jdbc/trace/ConnectionInfo.java | 2 +- .../MongoDBCollectionMethodInterceptor.java | 4 ++-- .../mongodb/v2/define/InterceptPoint.java | 2 +- .../MongoDBCollectionImplInstrumentation.java | 16 +++++++------- .../MongoDBCollectionInstrumentation.java | 21 +++++++++--------- .../CreateCallableStatementInterceptor.java | 3 --- .../CreatePreparedStatementInterceptor.java | 6 +---- .../mysql/CreateStatementInterceptor.java | 3 --- .../mysql/define/CallableInstrumentation.java | 10 ++++----- .../define/ConnectionInstrumentation.java | 4 ++-- .../Mysql50ConnectionInstrumentation.java | 2 +- .../PreparedStatementInstrumentation.java | 14 ++++++------ .../define/StatementInstrumentation.java | 22 +++++++++---------- .../plugin/okhttp/v3/RealCallInterceptor.java | 12 ++-------- .../v3/define/RealCallInstrumentation.java | 4 ---- .../CreateCallableStatementInterceptor.java | 5 +---- .../CreatePreparedStatementInterceptor.java | 5 +---- .../CreateStatementInterceptor.java | 4 ---- ...AbstractJdbc2StatementInstrumentation.java | 6 ++--- .../define/ConnectionInstrumentation.java | 6 ++--- .../Jdbc3ConnectionInstrumentation.java | 8 +++---- .../Jdbc4ConnectionInstrumentation.java | 6 ++--- .../ExecutorEngineConstructorInterceptor.java | 4 ++-- .../patch/CreateAopProxyInterceptor.java | 2 +- .../define/TomcatInstrumentation.java | 5 ----- ...dConstructorWithComplexArgInterceptor.java | 11 ---------- ...ConstructorWithHostPortArgInterceptor.java | 4 ---- ...orWithInetSocketAddressArgInterceptor.java | 4 ---- ...thInetSocketAddressListArgInterceptor.java | 3 --- .../v2/define/XMemcachedInstrumentation.java | 9 +------- 41 files changed, 86 insertions(+), 184 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8bffa1ac8..dda8acbef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,5 +9,6 @@ before_install: install: - jdk_switcher use oraclejdk8 - - mvn clean install -Papache-release --quiet jacoco:report coveralls:report + - mvn clean install --quiet jacoco:report coveralls:report + - mvn javadoc:javadoc diff --git a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/PooledJdbcConnectionConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/PooledJdbcConnectionConstructorInterceptor.java index beaff5a6d..30121a13d 100644 --- a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/PooledJdbcConnectionConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/PooledJdbcConnectionConstructorInterceptor.java @@ -21,12 +21,8 @@ package org.apache.skywalking.apm.plugin.jdbc.h2; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; -import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; /** - * {@link PooledJdbcConnectionConstructorInterceptor } store {@link ConnectionInfo} - * when the client new instance of {@link org.h2.jdbcx.JdbcXAConnection$PooledJdbcConnection}. - * * @author zhangxin */ public class PooledJdbcConnectionConstructorInterceptor implements InstanceConstructorInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/AbstractConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/AbstractConnectionInstrumentation.java index 5a904f988..804fd78cd 100644 --- a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/AbstractConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/AbstractConnectionInstrumentation.java @@ -31,7 +31,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; /** * {@link AbstractConnectionInstrumentation} define how to enhance the following methods that the class which extend - * {@link java.sql.Connection}.
+ * {@link java.sql.Connection}. * * 1. Enhance prepareStatement by org.apache.skywalking.apm.plugin.jdbc.define.JDBCPrepareStatementInterceptor * 3. Enhance prepareCall by org.apache.skywalking.apm.plugin.jdbc.define.JDBCPrepareCallInterceptor diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java index c664c2145..26c84c348 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java @@ -21,9 +21,6 @@ package org.apache.skywalking.apm.plugin.httpClient.v4.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; -import org.apache.http.HttpHost; -import org.apache.http.HttpRequest; -import org.apache.http.protocol.HttpContext; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; @@ -32,7 +29,7 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName /** * {@link AbstractHttpClientInstrumentation} presents that skywalking intercepts - * {@link org.apache.http.impl.client.AbstractHttpClient#doExecute(HttpHost, HttpRequest, HttpContext)} + * AbstractHttpClient#doExecute * by using {@link HttpClientInstrumentation#INTERCEPT_CLASS}. * * @author zhangxin @@ -47,9 +44,8 @@ public class AbstractHttpClientInstrumentation extends HttpClientInstrumentation } /** - * version 4.2, intercept method: execute, intercept
- * public final HttpResponse execute(HttpHost target, HttpRequest request, - * HttpContext context)
+ * version 4.2, intercept method: execute, intercept + * public final HttpResponse execute(HttpHost target, HttpRequest request, HttpContext context) */ @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java index 959c0f9ab..ce80550fd 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java @@ -16,14 +16,13 @@ * */ - package org.apache.skywalking.apm.plugin.httpClient.v4.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; -import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; +import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -35,8 +34,8 @@ public class DefaultRequestDirectorInstrumentation extends HttpClientInstrumenta private static final String ENHANCE_CLASS = "org.apache.http.impl.client.DefaultRequestDirector"; /** - * DefaultRequestDirector is default implement.
- * usually use in version 4.0-4.2
+ * DefaultRequestDirector is default implement. + * usually use in version 4.0-4.2 * since 4.3, this class is Deprecated. */ @Override diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java index a83789c29..31340bf68 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java @@ -28,9 +28,9 @@ import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link AbstractHttpClientInstrumentation} presents that skywalking intercepts {@link - * org.apache.http.impl.client.InternalHttpClient#doExecute(org.apache.http.HttpHost, org.apache.http.HttpRequest, - * org.apache.http.protocol.HttpContext)} by using {@link HttpClientInstrumentation#INTERCEPT_CLASS}. + * {@link AbstractHttpClientInstrumentation} presents that skywalking intercepts + * InternalHttpClient#doExecute + * by using {@link HttpClientInstrumentation#INTERCEPT_CLASS}. * * @author zhangxin */ diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java index bd731ad51..d74088830 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java @@ -21,9 +21,6 @@ package org.apache.skywalking.apm.plugin.httpClient.v4.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; -import org.apache.http.HttpHost; -import org.apache.http.HttpRequest; -import org.apache.http.protocol.HttpContext; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; @@ -32,7 +29,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** * {@link AbstractHttpClientInstrumentation} presents that skywalking - * intercepts {@link org.apache.http.impl.client.MinimalHttpClient#doExecute(HttpHost, HttpRequest, HttpContext)} + * intercepts MinimalHttpClient#doExecute * by using {@link HttpClientInstrumentation#INTERCEPT_CLASS}. * * @author zhangxin diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/H2URLParser.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/H2URLParser.java index 08c4b636d..6c7d48080 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/H2URLParser.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/H2URLParser.java @@ -24,16 +24,10 @@ import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; /** * {@link H2URLParser} presents that skywalking how to parse the connection url of H2 database. - * {@link ConnectionInfo#host} will return localhost and {@link ConnectionInfo#port} will return - * -1 if H2 running with memory mode or file mode, or it will return the host and the port. - *

+ * * {@link H2URLParser} check the connection url if contains "file" or "mem". if yes. the database * name substring the connection url from the index after "file" index or the "mem" index to the * index of first charset ";". - *

- * The {@link ConnectionInfo#host} be set the string between charset "//" and the first charset "/" after - * the charset "//", and {@link ConnectionInfo#databaseName} be set the string between the last index of "/" and - * the first charset ";". * * @author zhangxin */ diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/MysqlURLParser.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/MysqlURLParser.java index c45750fd7..5a81d078a 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/MysqlURLParser.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/MysqlURLParser.java @@ -24,11 +24,6 @@ import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; /** * {@link MysqlURLParser} parse connection url of mysql. - *

- * The {@link ConnectionInfo#host} be set the string between charset "//" and the first - * charset "/" after the charset "//", and {@link ConnectionInfo#databaseName} be set the - * string between the last index of "/" and the first charset "?". but one more thing, the - * {@link ConnectionInfo#hosts} be set if the host container multiple host. * * @author zhangxin */ diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/OracleURLParser.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/OracleURLParser.java index 2f5b24a32..d3cf33635 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/OracleURLParser.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/OracleURLParser.java @@ -27,13 +27,9 @@ import org.apache.skywalking.apm.util.StringUtil; /** * {@link OracleURLParser} presents that how to parse oracle connection url. - *

- * The {@link ConnectionInfo#host} be set the string between charset "@" and the last - * charset ":" after the charset "@", and {@link ConnectionInfo#databaseName} be set the - * string that after the last index of ":". - *

+ * * Note: {@link OracleURLParser} can parse the commons connection url. the commons - * connection url is of the form: jdbc:oracle::@,the other + * connection url is of the form: jdbc:oracle:(drivertype):@(database),the other * the form of connection url cannot be parsed success. * * @author zhangxin diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/PostgreSQLURLParser.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/PostgreSQLURLParser.java index c099ffaa5..5c6a18675 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/PostgreSQLURLParser.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/PostgreSQLURLParser.java @@ -24,11 +24,6 @@ import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; /** * {@link PostgreSQLURLParser} parse connection url of mysql. - *

- * The {@link ConnectionInfo#host} be set the string between charset "//" and the first - * charset "/" after the charset "//", and {@link ConnectionInfo#databaseName} be set the - * string between the last index of "/" and the first charset "?". but one more thing, the - * {@link ConnectionInfo#hosts} be set if the host container multiple host. * * @author zhangxin */ diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/ConnectionInfo.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/ConnectionInfo.java index a925197a3..cd7352286 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/ConnectionInfo.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/ConnectionInfo.java @@ -23,7 +23,7 @@ import org.apache.skywalking.apm.network.trace.component.OfficialComponent; /** * {@link ConnectionInfo} stored the jdbc connection info, the connection info contains db type, host, port, database - * name. The {@link #hosts} be null if {@link #host} is not null. + * name. * * @author zhangxin */ diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/MongoDBCollectionMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/MongoDBCollectionMethodInterceptor.java index 4b8a4404f..c87187c28 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/MongoDBCollectionMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/MongoDBCollectionMethodInterceptor.java @@ -38,8 +38,8 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInt import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; /** - * {@link MongoDBCollectionMethodInterceptor} intercepts constructor of {@link com.mongodb.DBCollection}or {@link - * com.mongodb.DBCollectionImpl} recording the ServerAddress and creating the exit span. + * {@link MongoDBCollectionMethodInterceptor} intercepts constructor of {@link com.mongodb.DBCollection} or + * {@link com.mongodb.DBCollectionImpl} recording the ServerAddress and creating the exit span. * * @author liyuntao */ diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/InterceptPoint.java b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/InterceptPoint.java index dda178020..c6492fb67 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/InterceptPoint.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/InterceptPoint.java @@ -22,7 +22,7 @@ package org.apache.skywalking.apm.plugin.mongodb.v2.define; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; /** - * @auther liyuntao + * @author liyuntao */ public abstract class InterceptPoint implements InstanceMethodsInterceptPoint { private static final String MONGDB_METHOD_INTERCET_CLASS = "MongoDBCollectionMethodInterceptor"; diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/MongoDBCollectionImplInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/MongoDBCollectionImplInstrumentation.java index e61cee0db..33269739c 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/MongoDBCollectionImplInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/MongoDBCollectionImplInstrumentation.java @@ -33,14 +33,14 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; /** * {@link MongoDBCollectionImplInstrumentation} define that the MongoDB Java Driver 2.13.x-2.14.x plugin intercepts the - * following methods in the {@link com.mongodb.DBCollectionImpl}class: - * 1. find
- * 2. insert
- * 3. insertImpl
- * 4. update
- * 5. updateImpl
- * 6. remove
- * 7. createIndex
+ * following methods in the com.mongodb.DBCollectionImpl class: + * 1. find + * 2. insert + * 3. insertImpl + * 4. update + * 5. updateImpl + * 6. remove + * 7. createIndex * * @author liyuntao */ diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/MongoDBCollectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/MongoDBCollectionInstrumentation.java index 253c275ed..332bd8f00 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/MongoDBCollectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/MongoDBCollectionInstrumentation.java @@ -16,14 +16,13 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v2.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import static net.bytebuddy.matcher.ElementMatchers.any; @@ -35,16 +34,16 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName /** * {@link MongoDBCollectionInstrumentation} define that the MongoDB Java Driver 2.13.x-2.14.x plugin intercepts the * following methods in the {@link com.mongodb.DBCollection}class: - * 1. aggregate
- * 2. findAndModify
+ * 1. aggregate + * 2. findAndModify * 3. getCount - *
- * 4. drop
- * 5. dropIndexes
- * 6. rename
- * 7. group
- * 8. distinct
- * 9. mapReduce
+ * + * 4. drop + * 5. dropIndexes + * 6. rename + * 7. group + * 8. distinct + * 9. mapReduce * * @author liyuntao */ diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateCallableStatementInterceptor.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateCallableStatementInterceptor.java index 2d9062db7..16383b2f8 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateCallableStatementInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateCallableStatementInterceptor.java @@ -27,9 +27,6 @@ import org.apache.skywalking.apm.plugin.jdbc.define.StatementEnhanceInfos; import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; /** - * {@link CreateStatementInterceptor} intercepts the {@link com.mysql.jdbc.ConnectionImpl#createStatement()} method in - * the {@link com.mysql.jdbc.ConnectionImpl} class. - * * @author zhangxin */ public class CreateCallableStatementInterceptor implements InstanceMethodsAroundInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptor.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptor.java index a95d5a8de..e3ba58f5f 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptor.java @@ -16,20 +16,16 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql; import java.lang.reflect.Method; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; -import org.apache.skywalking.apm.plugin.jdbc.define.StatementEnhanceInfos; 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.plugin.jdbc.define.StatementEnhanceInfos; import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; /** - * {@link CreateStatementInterceptor} intercepts the {@link com.mysql.jdbc.ConnectionImpl#prepareStatement()} method in - * the {@link com.mysql.jdbc.ConnectionImpl} class. - * * @author zhangxin */ public class CreatePreparedStatementInterceptor implements InstanceMethodsAroundInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateStatementInterceptor.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateStatementInterceptor.java index acf026c1e..328213d3e 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateStatementInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateStatementInterceptor.java @@ -27,9 +27,6 @@ import org.apache.skywalking.apm.plugin.jdbc.define.StatementEnhanceInfos; import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; /** - * {@link CreateStatementInterceptor} intercepts the {@link com.mysql.jdbc.ConnectionImpl#createStatement()} method in - * the {@link com.mysql.jdbc.ConnectionImpl} class. - * * @author zhangxin */ public class CreateStatementInterceptor implements InstanceMethodsAroundInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/CallableInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/CallableInstrumentation.java index 4afeb7f0c..707ba66fa 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/CallableInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/CallableInstrumentation.java @@ -30,11 +30,11 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch.byMultiClassMatch; /** - * {@link CallableInstrumentation} define that the mysql-2.x plugin intercepts the following methods in the {@link - * com.mysql.jdbc.CallableStatement} by {@link org.apache.skywalking.apm.plugin.jdbc.mysql.CallableStatementInterceptor}: - * 1. execute
- * 2. executeQuery
- * 3. executeUpdate
+ * {@link CallableInstrumentation} define that the mysql-2.x plugin intercepts the following methods in the + * com.mysql.jdbc.CallableStatement + * 1. execute + * 2. executeQuery + * 3. executeUpdate * * @author zhangxin */ diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/ConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/ConnectionInstrumentation.java index 5a77e6257..b9e2a9edb 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/ConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/ConnectionInstrumentation.java @@ -31,8 +31,8 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; /** - * {@link ConnectionInstrumentation} intercepts the following methods that the class which extend {@link - * com.mysql.jdbc.ConnectionImpl}.
+ * {@link ConnectionInstrumentation} intercepts the following methods that the class which extend + * com.mysql.jdbc.ConnectionImpl. * * 1. Enhance prepareStatement by org.apache.skywalking.apm.plugin.jdbc.define.JDBCPrepareStatementInterceptor * 2. Enhance prepareCall by org.apache.skywalking.apm.plugin.jdbc.define.JDBCPrepareCallInterceptor diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/Mysql50ConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/Mysql50ConnectionInstrumentation.java index 28a3f7ed7..97c1b959a 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/Mysql50ConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/Mysql50ConnectionInstrumentation.java @@ -24,7 +24,7 @@ import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * {@link Mysql50ConnectionInstrumentation} interceptor the {@link com.mysql.jdbc.Connection} class in the 5.0.x verison + * {@link Mysql50ConnectionInstrumentation} interceptor the com.mysql.jdbc.Connection class in the 5.0.x verison * of mysql driver jar. * * @author zhangxin diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/PreparedStatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/PreparedStatementInstrumentation.java index dc268942a..0f7b6b2b0 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/PreparedStatementInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/PreparedStatementInstrumentation.java @@ -31,13 +31,13 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMa /** * {@link PreparedStatementInstrumentation} define that the mysql-2.x plugin intercepts the following methods in the - * {@link com.mysql.jdbc.JDBC42PreparedStatement}, {@link com.mysql.jdbc.PreparedStatement} and {@link - * com.mysql.cj.jdbc.PreparedStatement} class: - * 1. execute
- * 2. executeQuery
- * 3. executeUpdate
- * 4. executeLargeUpdate
- * 5. addBatch
+ * com.mysql.jdbc.JDBC42PreparedStatement, com.mysql.jdbc.PreparedStatement and + * com.mysql.cj.jdbc.PreparedStatement class: + * 1. execute + * 2. executeQuery + * 3. executeUpdate + * 4. executeLargeUpdate + * 5. addBatch * * @author zhangxin */ diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/StatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/StatementInstrumentation.java index a5078cad3..903a0c5ea 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/StatementInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/StatementInstrumentation.java @@ -30,17 +30,17 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch.byMultiClassMatch; /** - * {@link StatementInstrumentation} intercepts the following methods in the {@link - * com.mysql.jdbc.StatementImpl} and {@link com.mysql.cj.jdbc.StatementImpl}class. - * 1. execute
- * 2. executeQuery
- * 3. executeUpdate
- * 4. executeLargeUpdate
- * 5. addBatch
- * 6. executeBatchInternal
- * 7. executeUpdateInternal
- * 8. executeQuery
- * 9. executeBatch
+ * {@link StatementInstrumentation} intercepts the following methods in the + * com.mysql.jdbc.StatementImpl and com.mysql.cj.jdbc.StatementImpl class. + * 1. execute + * 2. executeQuery + * 3. executeUpdate + * 4. executeLargeUpdate + * 5. addBatch + * 6. executeBatchInternal + * 7. executeUpdateInternal + * 8. executeQuery + * 9. executeBatch * * @author zhangxin */ diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java index d9ec0f8a0..e00c74715 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java @@ -24,13 +24,12 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import okhttp3.Headers; import okhttp3.HttpUrl; -import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import org.apache.skywalking.apm.agent.core.context.ContextCarrier; -import org.apache.skywalking.apm.agent.core.context.tag.Tags; import org.apache.skywalking.apm.agent.core.context.CarrierItem; +import org.apache.skywalking.apm.agent.core.context.ContextCarrier; import org.apache.skywalking.apm.agent.core.context.ContextManager; +import org.apache.skywalking.apm.agent.core.context.tag.Tags; import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; @@ -46,13 +45,6 @@ import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; */ public class RealCallInterceptor implements InstanceMethodsAroundInterceptor, InstanceConstructorInterceptor { - /** - * Intercept the {@link okhttp3.RealCall#RealCall(OkHttpClient, Request, boolean)}, then put the second argument of - * {@link okhttp3.Request} into {@link EnhancedInstance}. - * - * @param objInst a new added instance field - * @param allArguments constructor invocation context. - */ @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { objInst.setSkyWalkingDynamicField(allArguments[1]); diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/RealCallInstrumentation.java b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/RealCallInstrumentation.java index 517b97d4d..d0cc78106 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/RealCallInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/RealCallInstrumentation.java @@ -25,16 +25,12 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsIn import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; -import org.apache.skywalking.apm.plugin.okhttp.v3.RealCallInterceptor; import static net.bytebuddy.matcher.ElementMatchers.any; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; /** - * {@link RealCallInstrumentation} presents that skywalking intercepts {@link okhttp3.RealCall#RealCall(OkHttpClient, - * Request, boolean)}, {@link okhttp3.RealCall#execute()} by using {@link RealCallInterceptor}. - * * @author peng-yongsheng */ public class RealCallInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateCallableStatementInterceptor.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateCallableStatementInterceptor.java index c1fafe0b2..8c93ce986 100644 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateCallableStatementInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateCallableStatementInterceptor.java @@ -21,15 +21,12 @@ package org.apache.skywalking.apm.plugin.jdbc.postgresql; import java.lang.reflect.Method; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; -import org.apache.skywalking.apm.plugin.jdbc.define.StatementEnhanceInfos; 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.plugin.jdbc.define.StatementEnhanceInfos; import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; /** - * {@link CreateStatementInterceptor} intercepts the {@link org.postgresql.jdbc.PgConnection#prepareCall} method in - * {@link org.postgresql.jdbc.PgConnection}, {@link org.postgresql.jdbc.PgConnection} or {@link org.postgresql.jdbc3.Jdbc3Connection} class. - * * @author zhangxin */ public class CreateCallableStatementInterceptor implements InstanceMethodsAroundInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreatePreparedStatementInterceptor.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreatePreparedStatementInterceptor.java index 05c7d7c59..ef084ba60 100644 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreatePreparedStatementInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreatePreparedStatementInterceptor.java @@ -21,15 +21,12 @@ package org.apache.skywalking.apm.plugin.jdbc.postgresql; import java.lang.reflect.Method; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; -import org.apache.skywalking.apm.plugin.jdbc.define.StatementEnhanceInfos; 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.plugin.jdbc.define.StatementEnhanceInfos; import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; /** - * {@link CreatePreparedStatementInterceptor} intercepts the {@link org.postgresql.jdbc.PgConnection#prepareStatement} method in - * {@link org.postgresql.jdbc.PgConnection}, {@link org.postgresql.jdbc.PgConnection} or {@link org.postgresql.jdbc3.Jdbc3Connection} class. - * * @author zhangxin */ public class CreatePreparedStatementInterceptor implements InstanceMethodsAroundInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateStatementInterceptor.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateStatementInterceptor.java index a5bab1d30..9ce90e7f0 100644 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateStatementInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateStatementInterceptor.java @@ -25,12 +25,8 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceM import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.plugin.jdbc.define.StatementEnhanceInfos; import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; -import org.postgresql.jdbc.PgConnection; /** - * {@link CreateStatementInterceptor} intercepts the {@link PgConnection#createStatement} method in - * {@link org.postgresql.jdbc.PgConnection}, {@link org.postgresql.jdbc.PgConnection} or {@link org.postgresql.jdbc3.Jdbc3Connection} class. - * * @author zhangxin */ public class CreateStatementInterceptor implements InstanceMethodsAroundInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/AbstractJdbc2StatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/AbstractJdbc2StatementInstrumentation.java index 1e4e6107b..2001fb283 100644 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/AbstractJdbc2StatementInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/AbstractJdbc2StatementInstrumentation.java @@ -21,9 +21,9 @@ package org.apache.skywalking.apm.plugin.jdbc.postgresql.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import org.apache.skywalking.apm.plugin.jdbc.postgresql.StatementExecuteMethodsInterceptor; @@ -34,8 +34,8 @@ import static org.apache.skywalking.apm.plugin.jdbc.postgresql.Variables.PG_PREP import static org.apache.skywalking.apm.plugin.jdbc.postgresql.Variables.PG_STATEMENT_EXECUTE_METHOD_INTERCEPTOR; /** - * {@link AbstractJdbc2StatementInstrumentation} intercept the following methods that the class which extend {@link - * org.postgresql.jdbc2.AbstractJdbc2Statement} by {@link StatementExecuteMethodsInterceptor}.
+ * {@link AbstractJdbc2StatementInstrumentation} intercept the following methods that the class which extend + * org.postgresql.jdbc2.AbstractJdbc2Statement by {@link StatementExecuteMethodsInterceptor}. * 1. the execute with non parameter * 2. the execute with one parameter * 3. the executeBatch diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/ConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/ConnectionInstrumentation.java index 64250bc0e..423ced1ca 100644 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/ConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/ConnectionInstrumentation.java @@ -21,9 +21,9 @@ package org.apache.skywalking.apm.plugin.jdbc.postgresql.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -32,8 +32,8 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentType import static org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch.byMultiClassMatch; /** - * {@link ConnectionInstrumentation} intercept the following methods that the class which extend {@link - * org.postgresql.jdbc.PgConnection}.
+ * {@link ConnectionInstrumentation} intercept the following methods that the class which extend + * {@link org.postgresql.jdbc.PgConnection}. * * 1. Enhance prepareStatement by org.apache.skywalking.apm.plugin.jdbc.define.JDBCPrepareStatementInterceptor * 2. Enhance prepareStatement that the seconds argument type is java.lang.String[] by diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc3ConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc3ConnectionInstrumentation.java index e43bd95fb..b48139f6d 100644 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc3ConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc3ConnectionInstrumentation.java @@ -21,18 +21,18 @@ package org.apache.skywalking.apm.plugin.jdbc.postgresql.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; +import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; /** - * {@link Jdbc3ConnectionInstrumentation} intercept the following methods that the class which extend {@link - * org.postgresql.jdbc3.Jdbc3Connection}.
+ * {@link Jdbc3ConnectionInstrumentation} intercept the following methods that the class which extend + * org.postgresql.jdbc3.Jdbc3Connection * * 1. Enhance prepareStatement by org.apache.skywalking.apm.plugin.jdbc.define.JDBCPrepareStatementInterceptor * 2. Enhance prepareCall by diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc4ConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc4ConnectionInstrumentation.java index 89af73087..ba3043559 100644 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc4ConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc4ConnectionInstrumentation.java @@ -21,9 +21,9 @@ package org.apache.skywalking.apm.plugin.jdbc.postgresql.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -31,8 +31,8 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * {@link Jdbc4ConnectionInstrumentation} intercept the following methods that the class which extend {@link - * org.postgresql.jdbc4.Jdbc4Connection}.
+ * {@link Jdbc4ConnectionInstrumentation} intercept the following methods that the class which extend + * org.postgresql.jdbc4.Jdbc4Connection. * * 1. Enhance prepareStatement by org.apache.skywalking.apm.plugin.jdbc.define.JDBCPrepareStatementInterceptor * 2. Enhance prepareCall by diff --git a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/ExecutorEngineConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/ExecutorEngineConstructorInterceptor.java index a4ce11060..9917467be 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/ExecutorEngineConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/ExecutorEngineConstructorInterceptor.java @@ -19,13 +19,13 @@ package org.apache.skywalking.apm.plugin.sjdbc.define; -import com.dangdang.ddframe.rdb.sharding.executor.ExecutorEngine; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; import org.apache.skywalking.apm.plugin.sjdbc.ExecuteEventListener; /** - * {@link ExecutorEngineConstructorInterceptor} enhances {@link ExecutorEngine#}'s constructor, initializing {@link ExecuteEventListener} + * {@link ExecutorEngineConstructorInterceptor} enhances {@link com.dangdang.ddframe.rdb.sharding.executor.ExecutorEngine}'s constructor, + * initializing {@link ExecuteEventListener} * * @author gaohongtao */ diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptor.java index 96afb6a10..2186bc1b3 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptor.java @@ -26,7 +26,7 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInt import org.springframework.aop.framework.AdvisedSupport; /** - * CreateAopProxyInterceptor check that the bean has been implement {@link EnhancedInstance}.

+ * CreateAopProxyInterceptor check that the bean has been implement {@link EnhancedInstance}. * if yes, true will be returned. * * @author zhang xin diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/define/TomcatInstrumentation.java b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/define/TomcatInstrumentation.java index aa5ef0986..23d127383 100644 --- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/define/TomcatInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/define/TomcatInstrumentation.java @@ -30,11 +30,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * {@link TomcatInstrumentation} presents that skywalking using class {@link org.apache.skywalking.apm.plugin.tomcat78x.TomcatInvokeInterceptor} to intercept - * {@link org.apache.catalina.core.StandardWrapperValve#invoke} and using class {@link - * org.apache.skywalking.apm.plugin.tomcat78x.TomcatExceptionInterceptor} to intercept {@link - * org.apache.catalina.core.StandardWrapperValve#exception}. - * * @author zhangxin */ public class TomcatInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithComplexArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithComplexArgInterceptor.java index c6794af93..ec430a059 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithComplexArgInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithComplexArgInterceptor.java @@ -27,17 +27,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedI import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; /** - * {@link XMemcachedConstructorWithComplexArgInterceptor} intercept constructor of - * {@link XMemcachedClient(MemcachedSessionLocator locator,BufferAllocator allocator, Configuration conf, - * Map socketOptions, CommandFactory commandFactory, Transcoder transcoder, - * Map addressMap, List stateListeners, - * Map map, int poolSize, long connectTimeout, String name, boolean failureMode)} or - * {@link XMemcachedClient(MemcachedSessionLocator locator, BufferAllocator allocator, Configuration conf, - * Map socketOptions, CommandFactory commandFactory, Transcoder transcoder, - * Map addressMap, int[] weights, List stateListeners, - * Map infoMap, int poolSize, long connectTimeout, final String name, boolean failureMode)}. - * For parameter addressMap, every k-v is a master standby mode. - * * @author IluckySi */ public class XMemcachedConstructorWithComplexArgInterceptor implements InstanceConstructorInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithHostPortArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithHostPortArgInterceptor.java index b6e4f0407..b114651bd 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithHostPortArgInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithHostPortArgInterceptor.java @@ -23,10 +23,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedI import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; /** - * {@link XMemcachedConstructorWithHostPortArgInterceptor} intercept constructor of - * {@link XMemcachedClient(final String host, final int port)} or - * {@link XMemcachedClient(final String host, final int port, int weight)}. - * * @author IluckySi */ public class XMemcachedConstructorWithHostPortArgInterceptor implements InstanceConstructorInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressArgInterceptor.java index 326f7f96a..b9962274b 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressArgInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressArgInterceptor.java @@ -25,10 +25,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedI import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; /** - * {@link XMemcachedConstructorWithInetSocketAddressArgInterceptor} intercept constructor of - * {@link XMemcachedClient(final InetSocketAddress inetSocketAddress)} or - * {@link XMemcachedClient(final InetSocketAddress inetSocketAddress, int weight)}. - * * @author IluckySi */ public class XMemcachedConstructorWithInetSocketAddressArgInterceptor implements InstanceConstructorInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressListArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressListArgInterceptor.java index 321c407c2..b7496e30c 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressListArgInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressListArgInterceptor.java @@ -26,9 +26,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedI import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; /** - * {@link XMemcachedConstructorWithInetSocketAddressListArgInterceptor} intercept constructor of - * {@link XMemcachedClient(List addressList). - * * @author IluckySi */ public class XMemcachedConstructorWithInetSocketAddressListArgInterceptor implements InstanceConstructorInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/define/XMemcachedInstrumentation.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/define/XMemcachedInstrumentation.java index 99261694f..30f9d0c2a 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/define/XMemcachedInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/define/XMemcachedInstrumentation.java @@ -36,15 +36,8 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; /** - * {@link MemcachedInstrumentation} presents that skywalking intercept all constructors and methods of + * {@link XMemcachedInstrumentation} presents that skywalking intercept all constructors and methods of * {@link net.rubyeye.xmemcached.XMemcachedClient}. - * {@link XMemcachedConstructorWithHostPortArgInterceptor} intercepts the constructor with - * ip and port arguments. - * {@link XMemcachedConstructorWithInetSocketAddressArgInterceptor} intercepts the constructor with - * argument {@link java.net.InetSocketAddress}. - * {@link XMemcachedConstructorWithInetSocketAddressListArgInterceptor} intercepts the constructor with - * argument {@link java.net.InetSocketAddress}. - * {@link XMemcachedConstructorWithComplexArgInterceptor} intercepts the constructor with complex arguments. * * @author IluckySi */ From 400ad41a64c0afcbd391e1d173ea0de5fe8cc08b Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Mon, 26 Feb 2018 15:47:19 +0800 Subject: [PATCH 07/21] Fix all javadoc issues. --- .travis.yml | 2 +- .../toolkit/log/log4j/v2/x/TraceIdConverter.java | 2 +- .../AbstractNIOConnPoolInstrumentation.java | 4 ++-- ...efaultConnectingIOReactorInstrumentation.java | 4 ++-- .../v4/define/ExecuteInstrumentation.java | 2 +- .../define/ProcessResponseInstrumentation.java | 5 ++--- .../SessionRequestImplInstrumentation.java | 5 +++-- .../v4/define/StateInstrumentation.java | 3 +-- .../kafka/v1/KafkaConsumerInterceptor.java | 2 +- .../v2/MongoDBCollectionMethodInterceptor.java | 7 ++----- .../ProducerOperationHandlerInterceptor.java | 3 --- .../TransportClientHandlerInterceptor.java | 3 --- .../ProducerOperationHandlerInstrumentation.java | 6 +++--- .../TransportClientHandlerInstrumentation.java | 4 ++-- .../v1/ProducerOperationHandlerInterceptor.java | 3 --- .../v1/TransportClientHandlerInterceptor.java | 3 --- .../ProducerOperationHandlerInstrumentation.java | 6 +++--- .../TransportClientHandlerInstrumentation.java | 6 +++--- .../span/SkywalkingSpanActivation.java | 2 +- docs/en/How-to-release.md | 16 ++++++++++++++++ 20 files changed, 44 insertions(+), 44 deletions(-) create mode 100644 docs/en/How-to-release.md diff --git a/.travis.yml b/.travis.yml index dda8acbef..147a13bd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,5 @@ before_install: install: - jdk_switcher use oraclejdk8 - mvn clean install --quiet jacoco:report coveralls:report - - mvn javadoc:javadoc + - mvn javadoc:javadoc --quiet diff --git a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java b/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java index 6ca4532f1..3bf772a08 100644 --- a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java +++ b/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java @@ -27,7 +27,7 @@ import org.apache.logging.log4j.core.pattern.LogEventPatternConverter; /** * {@link TraceIdConverter} is a log4j2 plugin, by annotation as {@link Plugin}. * It convert the pattern key: traceId. - * Use '%traceId' in log4j2's config: , + * Use '%traceId' in log4j2's config. * '%traceId' will output as TID:xxxx *

* Created by wusheng on 2016/12/7. diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/AbstractNIOConnPoolInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/AbstractNIOConnPoolInstrumentation.java index 4b2618626..8a1ff20f4 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/AbstractNIOConnPoolInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/AbstractNIOConnPoolInstrumentation.java @@ -29,8 +29,8 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * {@link AbstractNIOConnPoolInstrumentation} presents that skywalking intercept {@link - * org.apache.http.nio.protocol.AbstractNIOConnPool #requestCompleted}. + * {@link AbstractNIOConnPoolInstrumentation} presents that skywalking intercept + * org.apache.http.nio.protocol.AbstractNIOConnPool#requestCompleted * * @author liyuntao */ diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/DefaultConnectingIOReactorInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/DefaultConnectingIOReactorInstrumentation.java index 80254acb6..92cf49de4 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/DefaultConnectingIOReactorInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/DefaultConnectingIOReactorInstrumentation.java @@ -29,8 +29,8 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * {@link DefaultConnectingIOReactorInstrumentation} presents that skywalking intercepts {@link - * org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor#processEvent} + * {@link DefaultConnectingIOReactorInstrumentation} presents that skywalking intercepts + * org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor#processEvent * * @author liyuntao */ diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/ExecuteInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/ExecuteInstrumentation.java index d0e7e7d8b..51bcd9ab4 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/ExecuteInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/ExecuteInstrumentation.java @@ -31,7 +31,7 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentType import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * {@link ExecuteInstrumentation} presents that skywalking intercepts {@link org.apache.http.impl.nio.client.CloseableHttpAsyncClient#execute} + * {@link ExecuteInstrumentation} presents that skywalking intercepts org.apache.http.impl.nio.client.CloseableHttpAsyncClient#execute * * @author liyuntao */ diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/ProcessResponseInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/ProcessResponseInstrumentation.java index fe4291c67..9bd870887 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/ProcessResponseInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/ProcessResponseInstrumentation.java @@ -28,12 +28,11 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * {@link ProcessResponseInstrumentation} presents that skywalking intercept {@link - * org.apache.http.nio.protocol.HttpAsyncRequestExecutor#processResponse,#connected} . + * {@link ProcessResponseInstrumentation} presents that skywalking intercept + * org.apache.http.nio.protocol.HttpAsyncRequestExecutor#processResponse and #connected * * @author liyuntao */ - public class ProcessResponseInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "org.apache.http.nio.protocol.HttpAsyncRequestExecutor"; diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/SessionRequestImplInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/SessionRequestImplInstrumentation.java index 0fac8ab40..a36f3bdea 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/SessionRequestImplInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/SessionRequestImplInstrumentation.java @@ -18,6 +18,7 @@ package org.apache.skywalking.apm.plugin.httpasyncclient.v4.define; +import java.io.IOException; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; @@ -29,8 +30,8 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * {@link SessionRequestImplInstrumentation} presents that skywalking intercepts {@link - * org.apache.http.impl.nio.reactor.SessionRequestImpl#failed(final IOException exception)} + * {@link SessionRequestImplInstrumentation} presents that skywalking intercepts + * {@link org.apache.http.impl.nio.reactor.SessionRequestImpl#failed(IOException)} } * * @author liyuntao */ diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/StateInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/StateInstrumentation.java index 8e5d4f7ef..8da43e57f 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/StateInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/StateInstrumentation.java @@ -29,8 +29,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * {@link StateInstrumentation} presents that skywalking intercept {@link org.apache.http.nio.protocol.HttpAsyncRequestExecutor$State#setRequest - * #setResponse} . + * {@link StateInstrumentation} presents that skywalking intercept org.apache.http.nio.protocol.HttpAsyncRequestExecutor$State#setRequest * * @author liyuntao */ diff --git a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/KafkaConsumerInterceptor.java b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/KafkaConsumerInterceptor.java index db790b8b0..c47a81650 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/KafkaConsumerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/KafkaConsumerInterceptor.java @@ -37,7 +37,7 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInt import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; /** - * @autor zhang xin + * @author zhang xin */ public class KafkaConsumerInterceptor implements InstanceMethodsAroundInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/MongoDBCollectionMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/MongoDBCollectionMethodInterceptor.java index c87187c28..569a21bfd 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/MongoDBCollectionMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/MongoDBCollectionMethodInterceptor.java @@ -38,9 +38,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInt import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; /** - * {@link MongoDBCollectionMethodInterceptor} intercepts constructor of {@link com.mongodb.DBCollection} or - * {@link com.mongodb.DBCollectionImpl} recording the ServerAddress and creating the exit span. - * * @author liyuntao */ @@ -54,8 +51,8 @@ public class MongoDBCollectionMethodInterceptor implements InstanceMethodsAround Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { String remotePeer = (String)objInst.getSkyWalkingDynamicField(); - String opertaion = method.getName(); - AbstractSpan span = ContextManager.createExitSpan(MONGO_DB_OP_PREFIX + opertaion, new ContextCarrier(), remotePeer); + String operation = method.getName(); + AbstractSpan span = ContextManager.createExitSpan(MONGO_DB_OP_PREFIX + operation, new ContextCarrier(), remotePeer); span.setComponent(ComponentsDefine.MONGODB); Tags.DB_TYPE.set(span, DB_TYPE); SpanLayer.asDB(span); 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/ProducerOperationHandlerInterceptor.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptor.java index 4c0e97840..b17d9542e 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptor.java @@ -32,9 +32,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInt import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; /** - * {org.apache.skywalking.apm.plugin.servicecomb.ProducerOperationHandlerInterceptor} define how to enhance class {@link - * ProducerOperationHandler#handle(io.servicecomb.core.Invocation, io.servicecomb.swagger.invocation.AsyncResponse)}. - * * @author lytscu */ public class ProducerOperationHandlerInterceptor implements InstanceMethodsAroundInterceptor { 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/TransportClientHandlerInterceptor.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptor.java index c3d40d339..3dd8bb62e 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptor.java @@ -33,9 +33,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInt import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; /** - * {@link TransportClientHandlerInterceptor} define how to enhance class {@link TransportClientHandler#handle(io.servicecomb.core.Invocation, - * io.servicecomb.swagger.invocation.AsyncResponse)}. - * * @author lytscu */ public class TransportClientHandlerInterceptor implements InstanceMethodsAroundInterceptor { 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/define/ProducerOperationHandlerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/ProducerOperationHandlerInstrumentation.java index 3151782b8..26882dac1 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/ProducerOperationHandlerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/ProducerOperationHandlerInstrumentation.java @@ -29,9 +29,9 @@ import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link ProducerOperationHandlerInstrumentation} represents that skywalking intercept {@link - * ProducerOperationHandler#handle(io.servicecomb.core.Invocation, io.servicecomb.swagger.invocation.AsyncResponse)}by - * using {@link ProducerOperationHandlerInterceptor} + * {@link ProducerOperationHandlerInstrumentation} represents that skywalking intercept + * {@link io.servicecomb.core.handler.impl.ProducerOperationHandler#handle(io.servicecomb.core.Invocation, io.servicecomb.swagger.invocation.AsyncResponse)}by + * using ProducerOperationHandlerInterceptor * * @author lytscu */ 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/define/TransportClientHandlerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/TransportClientHandlerInstrumentation.java index 5c0848243..2f43f95b1 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/TransportClientHandlerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/TransportClientHandlerInstrumentation.java @@ -30,8 +30,8 @@ import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link TransportClientHandlerInstrumentation} represents that skywalking intercept {@link TransportClientHandler}by - * using {@linkTransportClientHandlerInterceptor } + * {@link TransportClientHandlerInstrumentation} represents that skywalking intercept {@link TransportClientHandler} by + * using linkTransportClientHandlerInterceptor * * @author lytscu */ diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/ProducerOperationHandlerInterceptor.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/ProducerOperationHandlerInterceptor.java index 90f437d70..d6702dd26 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/ProducerOperationHandlerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/ProducerOperationHandlerInterceptor.java @@ -32,9 +32,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInt import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; /** - * {ProducerOperationHandlerInterceptor} define how to enhance class {@link - * ProducerOperationHandler#handle(org.apache.servicecomb.core.Invocation, org.apache.servicecomb.swagger.invocation.AsyncResponse)}. - * * @author lytscu */ public class ProducerOperationHandlerInterceptor implements InstanceMethodsAroundInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/TransportClientHandlerInterceptor.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/TransportClientHandlerInterceptor.java index 6079976c6..86ce22416 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/TransportClientHandlerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/TransportClientHandlerInterceptor.java @@ -33,9 +33,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInt import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; /** - * {@link TransportClientHandlerInterceptor} define how to enhance class {@link TransportClientHandler#handle(org.apache.servicecomb.core.Invocation, - * org.apache.servicecomb.swagger.invocation.AsyncResponse)}. - * * @author lytscu */ public class TransportClientHandlerInterceptor implements InstanceMethodsAroundInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/define/ProducerOperationHandlerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/define/ProducerOperationHandlerInstrumentation.java index ff55dc307..6dac20b24 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/define/ProducerOperationHandlerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/define/ProducerOperationHandlerInstrumentation.java @@ -29,9 +29,9 @@ import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link ProducerOperationHandlerInstrumentation} represents that skywalking intercept {@link - * ProducerOperationHandler#handle(org.apache.servicecomb.core.Invocation, org.apache.servicecomb.swagger.invocation.AsyncResponse)}by - * using {@link ProducerOperationHandlerInterceptor} + * {@link ProducerOperationHandlerInstrumentation} represents that skywalking intercept + * {@link org.apache.servicecomb.core.handler.impl.ProducerOperationHandler#handle(org.apache.servicecomb.core.Invocation, org.apache.servicecomb.swagger.invocation.AsyncResponse)} + * by using ProducerOperationHandlerInterceptor * * @author lytscu */ diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/define/TransportClientHandlerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/define/TransportClientHandlerInstrumentation.java index 888300218..8e86d6e18 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/define/TransportClientHandlerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/define/TransportClientHandlerInstrumentation.java @@ -20,7 +20,6 @@ package org.apache.skywalking.apm.plugin.servicecomb.v1.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; -import org.apache.servicecomb.core.handler.impl.TransportClientHandler; import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; @@ -30,8 +29,9 @@ import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link TransportClientHandlerInstrumentation} represents that skywalking intercept {@link TransportClientHandler}by - * using {@linkTransportClientHandlerInterceptor } + * {@link TransportClientHandlerInstrumentation} represents that skywalking intercept + * {@link org.apache.servicecomb.core.handler.impl.TransportClientHandler} by + * using linkTransportClientHandlerInterceptor * * @author lytscu */ diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SkywalkingSpanActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SkywalkingSpanActivation.java index 7a9303e47..83ae80de3 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SkywalkingSpanActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SkywalkingSpanActivation.java @@ -49,7 +49,7 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentType * * 4. The SpanLogInterceptor * interceptor enhance the log method that the first argument type is {@link Long} and the second - * argument type is {@link Map} + * argument type is {@link Map} * * 5. The SpanSetOperationNameInterceptor * interceptor enhance the setOperationName method diff --git a/docs/en/How-to-release.md b/docs/en/How-to-release.md new file mode 100644 index 000000000..41176be97 --- /dev/null +++ b/docs/en/How-to-release.md @@ -0,0 +1,16 @@ +Apache SkyWalking release guide +-------------------- + +Ref: +* http://tiles.apache.org/framework/dev/release.html +* http://www.apache.org/dev/publishing-maven-artifacts.html#dev-env + +Important things list: +* Maven releases, and the nexus staging repository, and download artifacts upload +* All artifacts are published with .asc, .md5, *sha1 files +* The *.asc files are signed with a gpg key that's part of apache's ring of trust +* Sync'ing this to releases and tags in github +* Making the internal announcements +* Calling a vote +* Moving the staging repository to a public repository, making download artifacts public +* Making the final public announcement \ No newline at end of file From 64d0660d21e9dd7664bedee7c9ca5b179d1ccf8f Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Mon, 26 Feb 2018 16:49:52 +0800 Subject: [PATCH 08/21] Fix optional plugin javadoc --- .../jdbc/oracle/define/ConnectionInstrumentation.java | 6 +++--- .../jdbc/oracle/define/OracleCallableInstrumentation.java | 4 ++-- .../define/OraclePrepareStatementInstrumentation.java | 2 +- .../jdbc/oracle/define/OracleStatementInstrumentation.java | 4 ++-- .../skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java | 3 --- .../apm/plugin/resin/v3/define/ResinV3Instrumentation.java | 5 +++-- .../apm/plugin/resin/v4/define/ResinV4Instrumentation.java | 5 +++-- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/ConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/ConnectionInstrumentation.java index f4542100f..275b10129 100644 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/ConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/ConnectionInstrumentation.java @@ -32,13 +32,13 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; /** * {@link ConnectionInstrumentation} define that the oracle plugin intercept the following methods that the class which - * extend {@link oracle.jdbc.driver.PhysicalConnection}.
- * 

+ * extend {@link oracle.jdbc.driver.PhysicalConnection}. 
+ * 
  * 1. Enhance prepareStatement by org.apache.skywalking.apm.plugin.jdbc.oracle.CreatePreparedStatementInterceptor
  * 2. Enhance prepareCall by org.apache.skywalking.apm.plugin.jdbc.oracle.CreateCallableInterceptor
  * 3. Enhance createStatement by org.apache.skywalking.apm.plugin.jdbc.oracle.CreateStatementInterceptor
  * 4. Enhance commit, rollback, close, releaseSavepoint by org.apache.skywalking.apm.plugin.jdbc.define.ConnectionServiceMethodInterceptor
- *
+ * * * @author zhangxin */ diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleCallableInstrumentation.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleCallableInstrumentation.java index 1d0be4a5e..992fa8e4c 100644 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleCallableInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleCallableInstrumentation.java @@ -31,8 +31,8 @@ import static org.apache.skywalking.apm.plugin.jdbc.oracle.Constants.PREPARED_ST /** * {@link OracleCallableInstrumentation} define that the oracle plugin intercept the execute, executeQuery and - * executeUpdate method in {@link oracle.jdbc.driver.OracleCallableStatement} class by ${@link - * org.apache.skywalking.apm.plugin.jdbc.oracle.StatementExecuteMethodsInterceptor} + * executeUpdate method in {@link oracle.jdbc.driver.OracleCallableStatement} class by + * {@link org.apache.skywalking.apm.plugin.jdbc.oracle.StatementExecuteMethodsInterceptor} * * @author zhangxin */ diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OraclePrepareStatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OraclePrepareStatementInstrumentation.java index 093ded3eb..bbeacf716 100644 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OraclePrepareStatementInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OraclePrepareStatementInstrumentation.java @@ -31,7 +31,7 @@ import static org.apache.skywalking.apm.plugin.jdbc.oracle.Constants.PREPARED_ST /** * {@link OraclePrepareStatementInstrumentation} define that the oracle plugin intercept the execute, - * executeQuery, executeUpdate and executeLargeUpdate method in {@link oracle.jdbc.driver.OraclePreparedStatement} + * executeQuery, executeUpdate and executeLargeUpdate method in oracle.jdbc.driver.OraclePreparedStatement * class by ${@link org.apache.skywalking.apm.plugin.jdbc.oracle.StatementExecuteMethodsInterceptor} * * @author zhangxin diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleStatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleStatementInstrumentation.java index 94c15f2c7..1a1db468a 100644 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleStatementInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleStatementInstrumentation.java @@ -31,8 +31,8 @@ import static org.apache.skywalking.apm.plugin.jdbc.oracle.Constants.STATEMENT_I /** * {@link OracleStatementInstrumentation} define that the oracle plugin intercept the execute, executeQuery, - * executeUpdate and executeLargeUpdate method in {@link oracle.jdbc.driver.OracleStatement} class by ${@link - * org.apache.skywalking.apm.plugin.jdbc.oracle.StatementExecuteMethodsInterceptor} + * executeUpdate and executeLargeUpdate method in {@link oracle.jdbc.driver.OracleStatement} class by + * {@link org.apache.skywalking.apm.plugin.jdbc.oracle.StatementExecuteMethodsInterceptor} * * @author zhangxin */ diff --git a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java index c305f85a7..e61fbe7f2 100644 --- a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java +++ b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java @@ -34,9 +34,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInt import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; /** - * {@link ResinV3Interceptor} intercept method of{@link com.caucho.server.dispatch.ServletInvocation#service(javax.servlet.ServletRequest, - * javax.servlet.ServletResponse)} record the resin host, port ,url. - * * @author baiyang */ public class ResinV3Interceptor implements InstanceMethodsAroundInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java index 814783982..37a91d488 100644 --- a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java @@ -31,8 +31,9 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterc import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link ResinV3Instrumentation} presents that skywalking intercepts {@link com.caucho.server.dispatch.ServletInvocation#service(javax.servlet.ServletRequest, - * javax.servlet.ServletResponse)} by using {@link ResinV3Interceptor}. + * {@link ResinV3Instrumentation} presents that skywalking intercepts + * {@link com.caucho.server.dispatch.ServletInvocation#service(javax.servlet.ServletRequest,javax.servlet.ServletResponse)} + * by using {@link ResinV3Interceptor}. * * @author baiyang */ diff --git a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java index ff4225746..d605f07d8 100644 --- a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java @@ -31,8 +31,9 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * {@link ResinV4Instrumentation} presents that skywalking intercepts {@link com.caucho.server.dispatch.ServletInvocation#service(javax.servlet.ServletRequest, - * javax.servlet.ServletResponse)} by using {@link ResinV4Interceptor}. + * {@link ResinV4Instrumentation} presents that skywalking intercepts + * {@link com.caucho.server.dispatch.ServletInvocation#service(javax.servlet.ServletRequest,javax.servlet.ServletResponse)} + * by using {@link ResinV4Interceptor}. * * @author baiyang */ From 5ba864d88dcf51eed698c579103dbdb833a88c46 Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Mon, 26 Feb 2018 16:55:50 +0800 Subject: [PATCH 09/21] Fix an oracle javadoc. --- .../plugin/jdbc/oracle/define/ConnectionInstrumentation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/ConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/ConnectionInstrumentation.java index 275b10129..9702c25b3 100644 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/ConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/ConnectionInstrumentation.java @@ -32,7 +32,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; /** * {@link ConnectionInstrumentation} define that the oracle plugin intercept the following methods that the class which - * extend {@link oracle.jdbc.driver.PhysicalConnection}. + * extend oracle.jdbc.driver.PhysicalConnection * * 1. Enhance prepareStatement by org.apache.skywalking.apm.plugin.jdbc.oracle.CreatePreparedStatementInterceptor * 2. Enhance prepareCall by org.apache.skywalking.apm.plugin.jdbc.oracle.CreateCallableInterceptor From df328b6ea7fca193a7ab56dc9d5d7966b294d8e8 Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Mon, 26 Feb 2018 17:43:48 +0800 Subject: [PATCH 10/21] Try another ci command to speed up. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 147a13bd9..8b2c7b1d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,5 @@ before_install: install: - jdk_switcher use oraclejdk8 - mvn clean install --quiet jacoco:report coveralls:report - - mvn javadoc:javadoc --quiet + - mvn clean javadoc:javadoc -Dmaven.test.skip=true --quiet From f7fdd9f854e0e23fd082b9f6ff4971f716faa989 Mon Sep 17 00:00:00 2001 From: wusheng Date: Mon, 26 Feb 2018 23:22:10 +0800 Subject: [PATCH 11/21] Fix assmbly for mvn clean install -Papache-release and update version to SNAPSHOT for SNAPSHOT release. --- .../apm-toolkit-log4j-1.x/pom.xml | 2 +- .../apm-toolkit-log4j-2.x/pom.xml | 2 +- .../apm-toolkit-logback-1.x/pom.xml | 2 +- .../apm-toolkit-opentracing/pom.xml | 2 +- .../apm-toolkit-trace/pom.xml | 2 +- apm-application-toolkit/pom.xml | 2 +- .../agent-grpc/agent-grpc-define/pom.xml | 2 +- .../agent-grpc/agent-grpc-provider/pom.xml | 2 +- .../apm-collector-agent/agent-grpc/pom.xml | 2 +- .../agent-jetty/agent-jetty-define/pom.xml | 2 +- .../agent-jetty/agent-jetty-provider/pom.xml | 2 +- .../apm-collector-agent/agent-jetty/pom.xml | 2 +- apm-collector/apm-collector-agent/pom.xml | 2 +- .../analysis-alarm/alarm-define/pom.xml | 2 +- .../analysis-alarm/alarm-provider/pom.xml | 2 +- .../analysis-alarm/pom.xml | 2 +- .../baseline-computing-define/pom.xml | 2 +- .../baseline-computing-provider/pom.xml | 2 +- .../analysis-baseline/pom.xml | 2 +- .../analysis-jvm/jvm-define/pom.xml | 2 +- .../analysis-jvm/jvm-provider/pom.xml | 2 +- .../analysis-jvm/pom.xml | 2 +- .../analysis-metric/metric-define/pom.xml | 2 +- .../analysis-metric/metric-provider/pom.xml | 2 +- .../analysis-metric/pom.xml | 2 +- .../analysis-register/pom.xml | 2 +- .../analysis-register/register-define/pom.xml | 2 +- .../register-provider/pom.xml | 2 +- .../analysis-segment-parser/pom.xml | 2 +- .../segment-parser-define/pom.xml | 2 +- .../segment-parser-provider/pom.xml | 2 +- .../analysis-worker-model/pom.xml | 4 +- apm-collector/apm-collector-analysis/pom.xml | 2 +- apm-collector/apm-collector-boot/pom.xml | 23 +++++- .../collector-cache-define/pom.xml | 2 +- .../collector-cache-guava-provider/pom.xml | 2 +- apm-collector/apm-collector-cache/pom.xml | 2 +- .../collector-cluster-define/pom.xml | 2 +- .../collector-cluster-redis-provider/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- apm-collector/apm-collector-cluster/pom.xml | 2 +- .../client-component/pom.xml | 2 +- apm-collector/apm-collector-component/pom.xml | 2 +- .../server-component/pom.xml | 2 +- .../collector-configuration-define/pom.xml | 2 +- .../collector-configuration-provider/pom.xml | 2 +- .../apm-collector-configuration/pom.xml | 2 +- apm-collector/apm-collector-core/pom.xml | 2 +- .../collector-grpc-manager-define/pom.xml | 2 +- .../collector-grpc-manager-provider/pom.xml | 2 +- .../apm-collector-grpc-manager/pom.xml | 2 +- .../apm-collector-instrument/pom.xml | 2 +- .../collector-jetty-manager-define/pom.xml | 2 +- .../collector-jetty-manager-provider/pom.xml | 2 +- .../apm-collector-jetty-manager/pom.xml | 2 +- .../collector-naming-define/pom.xml | 2 +- .../collector-naming-jetty-provider/pom.xml | 2 +- apm-collector/apm-collector-naming/pom.xml | 2 +- .../collector-remote-define/pom.xml | 2 +- .../collector-remote-grpc-provider/pom.xml | 2 +- .../collector-remote-kafka-provider/pom.xml | 2 +- apm-collector/apm-collector-remote/pom.xml | 2 +- .../collector-storage-define/pom.xml | 2 +- .../collector-storage-es-provider/pom.xml | 2 +- .../collector-storage-h2-provider/pom.xml | 2 +- apm-collector/apm-collector-storage/pom.xml | 2 +- .../collector-ui-define/pom.xml | 2 +- .../collector-ui-graphql/pom.xml | 2 +- .../collector-ui-jetty-provider/pom.xml | 2 +- apm-collector/apm-collector-ui/pom.xml | 2 +- apm-collector/pom.xml | 2 +- apm-commons/apm-datacarrier/pom.xml | 2 +- apm-commons/apm-util/pom.xml | 2 +- apm-commons/pom.xml | 2 +- apm-protocol/apm-network/pom.xml | 2 +- apm-protocol/apm-ui-protocol/pom.xml | 2 +- apm-protocol/pom.xml | 2 +- apm-sniffer/apm-agent-core/pom.xml | 2 +- apm-sniffer/apm-agent/pom.xml | 2 +- .../apm-sdk-plugin/dubbo-plugin/pom.xml | 2 +- .../elastic-job-2.x-plugin/pom.xml | 2 +- .../feign-default-http-9.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/h2-1.x-plugin/pom.xml | 2 +- .../httpClient-4.x-plugin/pom.xml | 2 +- .../httpasyncclient-4.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/jdbc-commons/pom.xml | 2 +- .../apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 2 +- .../jetty-client-9.0-plugin/pom.xml | 2 +- .../jetty-client-9.x-plugin/pom.xml | 2 +- .../jetty-server-9.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/jetty-plugin/pom.xml | 2 +- .../apm-sdk-plugin/kafka-v1-plugin/pom.xml | 2 +- .../apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/motan-plugin/pom.xml | 2 +- .../apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 2 +- .../nutz-plugins/http-1.x-plugin/pom.xml | 2 +- .../mvc-annotation-1.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/nutz-plugins/pom.xml | 2 +- .../apm-sdk-plugin/okhttp-3.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/oracle-10.x-plugin/pom.xml | 2 +- .../oracle-10.x-plugin/pom.xml.versionsBackup | 76 +++++++++++++++++++ apm-sniffer/apm-sdk-plugin/pom.xml | 2 +- .../postgresql-8.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/resin-3.x-plugin/pom.xml | 2 +- .../resin-3.x-plugin/pom.xml.versionsBackup | 75 ++++++++++++++++++ .../apm-sdk-plugin/resin-4.x-plugin/pom.xml | 2 +- .../resin-4.x-plugin/pom.xml.versionsBackup | 76 +++++++++++++++++++ .../rocketMQ-4.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/servicecomb-plugin/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../sharding-jdbc-1.5.x-plugin/pom.xml | 2 +- .../concurrent-util-4.x-plugin/pom.xml | 2 +- .../spring-plugins/core-patch/pom.xml | 2 +- .../mvc-annotation-3.x-plugin/pom.xml | 2 +- .../mvc-annotation-4.x-plugin/pom.xml | 2 +- .../mvc-annotation-commons/pom.xml | 2 +- .../apm-sdk-plugin/spring-plugins/pom.xml | 2 +- .../resttemplate-4.x-plugin/pom.xml | 2 +- .../spring-cloud/netflix-plugins/pom.xml | 2 +- .../spring-cloud-feign-1.x-plugin/pom.xml | 2 +- .../spring-plugins/spring-cloud/pom.xml | 2 +- .../spymemcached-2.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 2 +- .../tomcat-7.x-8.x-plugin/pom.xml | 2 +- .../xmemcached-2.x-plugin/pom.xml | 2 +- apm-sniffer/apm-test-tools/pom.xml | 2 +- .../apm-toolkit-log4j-1.x-activation/pom.xml | 2 +- .../apm-toolkit-log4j-2.x-activation/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../apm-toolkit-trace-activation/pom.xml | 2 +- apm-sniffer/apm-toolkit-activation/pom.xml | 2 +- .../optional-spring-plugins/pom.xml | 2 +- .../spring-annotation-plugin/pom.xml | 2 +- apm-sniffer/optional-plugins/pom.xml | 2 +- apm-sniffer/pom.xml | 2 +- pom.xml | 2 +- 141 files changed, 386 insertions(+), 140 deletions(-) create mode 100644 apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml.versionsBackup create mode 100644 apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml.versionsBackup create mode 100644 apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml.versionsBackup diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml b/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml index f2627e541..c019fe1a5 100644 --- a/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml +++ b/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml @@ -23,7 +23,7 @@ apm-application-toolkit org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml b/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml index e94f8ba88..a85dff077 100644 --- a/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml +++ b/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml @@ -23,7 +23,7 @@ apm-application-toolkit org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml b/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml index 3d9285693..c0ec486fb 100644 --- a/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml +++ b/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml @@ -23,7 +23,7 @@ apm-application-toolkit org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-application-toolkit/apm-toolkit-opentracing/pom.xml b/apm-application-toolkit/apm-toolkit-opentracing/pom.xml index 3c085e5f6..b05e70ca0 100644 --- a/apm-application-toolkit/apm-toolkit-opentracing/pom.xml +++ b/apm-application-toolkit/apm-toolkit-opentracing/pom.xml @@ -23,7 +23,7 @@ apm-application-toolkit org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-application-toolkit/apm-toolkit-trace/pom.xml b/apm-application-toolkit/apm-toolkit-trace/pom.xml index 1803306ca..394ccb2a3 100644 --- a/apm-application-toolkit/apm-toolkit-trace/pom.xml +++ b/apm-application-toolkit/apm-toolkit-trace/pom.xml @@ -22,7 +22,7 @@ apm-application-toolkit org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-application-toolkit/pom.xml b/apm-application-toolkit/pom.xml index 810ed8244..e2603cb8f 100644 --- a/apm-application-toolkit/pom.xml +++ b/apm-application-toolkit/pom.xml @@ -21,7 +21,7 @@ apm org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 apm-application-toolkit diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/pom.xml b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/pom.xml index 6f3835bfc..16a9dd4b8 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/pom.xml +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/pom.xml @@ -23,7 +23,7 @@ agent-grpc org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml index 0c5c6a316..d0f7ad887 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml @@ -23,7 +23,7 @@ agent-grpc org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-agent/agent-grpc/pom.xml b/apm-collector/apm-collector-agent/agent-grpc/pom.xml index c411f4f72..01edfdc3d 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/pom.xml +++ b/apm-collector/apm-collector-agent/agent-grpc/pom.xml @@ -23,7 +23,7 @@ apm-collector-agent org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/pom.xml b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/pom.xml index 6a54c7f62..befd2001e 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/pom.xml +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/pom.xml @@ -23,7 +23,7 @@ agent-jetty org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml index 3de56cd05..48211e35b 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml @@ -23,7 +23,7 @@ agent-jetty org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-agent/agent-jetty/pom.xml b/apm-collector/apm-collector-agent/agent-jetty/pom.xml index 9ad00a524..8544b7c7b 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/pom.xml +++ b/apm-collector/apm-collector-agent/agent-jetty/pom.xml @@ -23,7 +23,7 @@ apm-collector-agent org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-agent/pom.xml b/apm-collector/apm-collector-agent/pom.xml index 72c071e24..4895b047a 100644 --- a/apm-collector/apm-collector-agent/pom.xml +++ b/apm-collector/apm-collector-agent/pom.xml @@ -23,7 +23,7 @@ apm-collector org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/pom.xml b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/pom.xml index 7f762747e..12be43b35 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/pom.xml @@ -23,7 +23,7 @@ analysis-alarm org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml index 5afb68de9..1b2babe5e 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml @@ -23,7 +23,7 @@ analysis-alarm org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/pom.xml b/apm-collector/apm-collector-analysis/analysis-alarm/pom.xml index 1d9f94990..09cf471c4 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-alarm/pom.xml @@ -23,7 +23,7 @@ apm-collector-analysis org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/pom.xml b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/pom.xml index cb03b4324..c6ac8f1e0 100644 --- a/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/pom.xml @@ -23,7 +23,7 @@ analysis-baseline org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/pom.xml b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/pom.xml index 361828810..63db71329 100644 --- a/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/pom.xml @@ -23,7 +23,7 @@ analysis-baseline org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-baseline/pom.xml b/apm-collector/apm-collector-analysis/analysis-baseline/pom.xml index 6d7adefd0..4ae34b71f 100644 --- a/apm-collector/apm-collector-analysis/analysis-baseline/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-baseline/pom.xml @@ -23,7 +23,7 @@ apm-collector-analysis org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/pom.xml b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/pom.xml index 0cd511794..dd2501e23 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/pom.xml @@ -23,7 +23,7 @@ analysis-jvm org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/pom.xml b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/pom.xml index 466dbba61..560f25924 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/pom.xml @@ -23,7 +23,7 @@ analysis-jvm org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/pom.xml b/apm-collector/apm-collector-analysis/analysis-jvm/pom.xml index e2241daad..f15747a4d 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-jvm/pom.xml @@ -23,7 +23,7 @@ apm-collector-analysis org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-define/pom.xml b/apm-collector/apm-collector-analysis/analysis-metric/metric-define/pom.xml index 2d274cb39..0ad2524a4 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-define/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-define/pom.xml @@ -23,7 +23,7 @@ analysis-metric org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/pom.xml b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/pom.xml index da1815f39..63da7a015 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/pom.xml @@ -23,7 +23,7 @@ analysis-metric org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-metric/pom.xml b/apm-collector/apm-collector-analysis/analysis-metric/pom.xml index da8b6bbd2..4f481b55f 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-metric/pom.xml @@ -23,7 +23,7 @@ apm-collector-analysis org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-register/pom.xml b/apm-collector/apm-collector-analysis/analysis-register/pom.xml index 6e8138262..062f55848 100644 --- a/apm-collector/apm-collector-analysis/analysis-register/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-register/pom.xml @@ -23,7 +23,7 @@ apm-collector-analysis org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-define/pom.xml b/apm-collector/apm-collector-analysis/analysis-register/register-define/pom.xml index 31517f891..39f10c178 100644 --- a/apm-collector/apm-collector-analysis/analysis-register/register-define/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-register/register-define/pom.xml @@ -23,7 +23,7 @@ analysis-register org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-provider/pom.xml b/apm-collector/apm-collector-analysis/analysis-register/register-provider/pom.xml index 80ee62ebf..cca451756 100644 --- a/apm-collector/apm-collector-analysis/analysis-register/register-provider/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/pom.xml @@ -23,7 +23,7 @@ analysis-register org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/pom.xml b/apm-collector/apm-collector-analysis/analysis-segment-parser/pom.xml index e37496181..20cdd1376 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/pom.xml @@ -23,7 +23,7 @@ apm-collector-analysis org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/pom.xml b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/pom.xml index b11ad2445..aa4661c26 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/pom.xml @@ -23,7 +23,7 @@ analysis-segment-parser org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/pom.xml b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/pom.xml index aee7752e0..6a134bcad 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/pom.xml @@ -23,7 +23,7 @@ analysis-segment-parser org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/pom.xml b/apm-collector/apm-collector-analysis/analysis-worker-model/pom.xml index 8a32c350c..c1279445a 100644 --- a/apm-collector/apm-collector-analysis/analysis-worker-model/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/pom.xml @@ -23,7 +23,7 @@ apm-collector-analysis org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 @@ -39,7 +39,7 @@ org.apache.skywalking apm-datacarrier - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/pom.xml b/apm-collector/apm-collector-analysis/pom.xml index a5a08c31c..82853e469 100644 --- a/apm-collector/apm-collector-analysis/pom.xml +++ b/apm-collector/apm-collector-analysis/pom.xml @@ -23,7 +23,7 @@ apm-collector org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-boot/pom.xml b/apm-collector/apm-collector-boot/pom.xml index efbe70f4d..99605cca1 100644 --- a/apm-collector/apm-collector-boot/pom.xml +++ b/apm-collector/apm-collector-boot/pom.xml @@ -23,7 +23,7 @@ apm-collector org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 @@ -223,7 +223,26 @@ src/main/assembly/assembly.xml - ${project.basedir}/../../packages + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + package + + run + + + + + + diff --git a/apm-collector/apm-collector-cache/collector-cache-define/pom.xml b/apm-collector/apm-collector-cache/collector-cache-define/pom.xml index 9b9312af4..434106c3d 100644 --- a/apm-collector/apm-collector-cache/collector-cache-define/pom.xml +++ b/apm-collector/apm-collector-cache/collector-cache-define/pom.xml @@ -23,7 +23,7 @@ apm-collector-cache org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml b/apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml index 23ac33181..3960c31ce 100644 --- a/apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml +++ b/apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml @@ -23,7 +23,7 @@ apm-collector-cache org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-cache/pom.xml b/apm-collector/apm-collector-cache/pom.xml index 5bded7f60..9d40d6366 100644 --- a/apm-collector/apm-collector-cache/pom.xml +++ b/apm-collector/apm-collector-cache/pom.xml @@ -23,7 +23,7 @@ apm-collector org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml b/apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml index 947927043..d1d230dc2 100644 --- a/apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml +++ b/apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml @@ -23,7 +23,7 @@ apm-collector-cluster org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml b/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml index c316c4e0b..429481b84 100644 --- a/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml +++ b/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml @@ -23,7 +23,7 @@ apm-collector-cluster org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml b/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml index 175fb8735..75ed35260 100644 --- a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml +++ b/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml @@ -23,7 +23,7 @@ apm-collector-cluster org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml b/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml index 3ff14ab62..1210e3d9a 100644 --- a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml +++ b/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml @@ -23,7 +23,7 @@ apm-collector-cluster org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-cluster/pom.xml b/apm-collector/apm-collector-cluster/pom.xml index 8c51cbc6f..333ddd2b1 100644 --- a/apm-collector/apm-collector-cluster/pom.xml +++ b/apm-collector/apm-collector-cluster/pom.xml @@ -23,7 +23,7 @@ apm-collector org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-component/client-component/pom.xml b/apm-collector/apm-collector-component/client-component/pom.xml index 513abc506..f57014afd 100644 --- a/apm-collector/apm-collector-component/client-component/pom.xml +++ b/apm-collector/apm-collector-component/client-component/pom.xml @@ -23,7 +23,7 @@ apm-collector-component org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-component/pom.xml b/apm-collector/apm-collector-component/pom.xml index 2f50ca6a4..d3ac6e803 100644 --- a/apm-collector/apm-collector-component/pom.xml +++ b/apm-collector/apm-collector-component/pom.xml @@ -23,7 +23,7 @@ apm-collector org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-component/server-component/pom.xml b/apm-collector/apm-collector-component/server-component/pom.xml index 808e56b58..4ba8a125a 100644 --- a/apm-collector/apm-collector-component/server-component/pom.xml +++ b/apm-collector/apm-collector-component/server-component/pom.xml @@ -23,7 +23,7 @@ apm-collector-component org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-configuration/collector-configuration-define/pom.xml b/apm-collector/apm-collector-configuration/collector-configuration-define/pom.xml index 2f8680d25..eab8bc4c5 100644 --- a/apm-collector/apm-collector-configuration/collector-configuration-define/pom.xml +++ b/apm-collector/apm-collector-configuration/collector-configuration-define/pom.xml @@ -23,7 +23,7 @@ apm-collector-configuration org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-configuration/collector-configuration-provider/pom.xml b/apm-collector/apm-collector-configuration/collector-configuration-provider/pom.xml index 104486f37..7dc37febb 100644 --- a/apm-collector/apm-collector-configuration/collector-configuration-provider/pom.xml +++ b/apm-collector/apm-collector-configuration/collector-configuration-provider/pom.xml @@ -23,7 +23,7 @@ apm-collector-configuration org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-configuration/pom.xml b/apm-collector/apm-collector-configuration/pom.xml index ace457240..05c9032bc 100644 --- a/apm-collector/apm-collector-configuration/pom.xml +++ b/apm-collector/apm-collector-configuration/pom.xml @@ -23,7 +23,7 @@ apm-collector org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-core/pom.xml b/apm-collector/apm-collector-core/pom.xml index aef472f42..78ab84054 100644 --- a/apm-collector/apm-collector-core/pom.xml +++ b/apm-collector/apm-collector-core/pom.xml @@ -23,7 +23,7 @@ apm-collector org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml index 8bcd37209..80de4d9a8 100644 --- a/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml +++ b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml @@ -23,7 +23,7 @@ apm-collector-grpc-manager org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml index 2bc5745b0..b4e7e65ed 100644 --- a/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml +++ b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml @@ -23,7 +23,7 @@ apm-collector-grpc-manager org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-grpc-manager/pom.xml b/apm-collector/apm-collector-grpc-manager/pom.xml index 007019902..2649f4dac 100644 --- a/apm-collector/apm-collector-grpc-manager/pom.xml +++ b/apm-collector/apm-collector-grpc-manager/pom.xml @@ -23,7 +23,7 @@ apm-collector org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-instrument/pom.xml b/apm-collector/apm-collector-instrument/pom.xml index 928de89c1..d55617bf4 100644 --- a/apm-collector/apm-collector-instrument/pom.xml +++ b/apm-collector/apm-collector-instrument/pom.xml @@ -23,7 +23,7 @@ apm-collector org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml index c3fd5fdf0..d2760e064 100644 --- a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml +++ b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml @@ -23,7 +23,7 @@ apm-collector-jetty-manager org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml index 85507671e..1cb0f030a 100644 --- a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml +++ b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml @@ -23,7 +23,7 @@ apm-collector-jetty-manager org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-jetty-manager/pom.xml b/apm-collector/apm-collector-jetty-manager/pom.xml index 3aa9d9005..301aacc16 100644 --- a/apm-collector/apm-collector-jetty-manager/pom.xml +++ b/apm-collector/apm-collector-jetty-manager/pom.xml @@ -23,7 +23,7 @@ apm-collector org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-naming/collector-naming-define/pom.xml b/apm-collector/apm-collector-naming/collector-naming-define/pom.xml index bbb0bb981..4562a572b 100644 --- a/apm-collector/apm-collector-naming/collector-naming-define/pom.xml +++ b/apm-collector/apm-collector-naming/collector-naming-define/pom.xml @@ -23,7 +23,7 @@ apm-collector-naming org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-naming/collector-naming-jetty-provider/pom.xml b/apm-collector/apm-collector-naming/collector-naming-jetty-provider/pom.xml index 5dc439287..6af0e2268 100644 --- a/apm-collector/apm-collector-naming/collector-naming-jetty-provider/pom.xml +++ b/apm-collector/apm-collector-naming/collector-naming-jetty-provider/pom.xml @@ -23,7 +23,7 @@ apm-collector-naming org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-naming/pom.xml b/apm-collector/apm-collector-naming/pom.xml index ec61afb94..c227268cc 100644 --- a/apm-collector/apm-collector-naming/pom.xml +++ b/apm-collector/apm-collector-naming/pom.xml @@ -23,7 +23,7 @@ apm-collector org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-remote/collector-remote-define/pom.xml b/apm-collector/apm-collector-remote/collector-remote-define/pom.xml index 6b6bc9b38..2bc93421a 100644 --- a/apm-collector/apm-collector-remote/collector-remote-define/pom.xml +++ b/apm-collector/apm-collector-remote/collector-remote-define/pom.xml @@ -23,7 +23,7 @@ apm-collector-remote org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml index f97a6576e..c650200d9 100644 --- a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml +++ b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml @@ -23,7 +23,7 @@ apm-collector-remote org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml b/apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml index e98fdb9b7..13f9a5148 100644 --- a/apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml +++ b/apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml @@ -23,7 +23,7 @@ apm-collector-remote org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-remote/pom.xml b/apm-collector/apm-collector-remote/pom.xml index 0efbf7331..4ff7f25c5 100644 --- a/apm-collector/apm-collector-remote/pom.xml +++ b/apm-collector/apm-collector-remote/pom.xml @@ -23,7 +23,7 @@ apm-collector org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-storage/collector-storage-define/pom.xml b/apm-collector/apm-collector-storage/collector-storage-define/pom.xml index 93ec45b99..63f74c519 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/pom.xml +++ b/apm-collector/apm-collector-storage/collector-storage-define/pom.xml @@ -23,7 +23,7 @@ apm-collector-storage org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/pom.xml b/apm-collector/apm-collector-storage/collector-storage-es-provider/pom.xml index 02ac35f9f..558b4952f 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/pom.xml +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/pom.xml @@ -23,7 +23,7 @@ apm-collector-storage org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/pom.xml b/apm-collector/apm-collector-storage/collector-storage-h2-provider/pom.xml index a36c5e439..1b4b3879d 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/pom.xml +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/pom.xml @@ -23,7 +23,7 @@ apm-collector-storage org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-storage/pom.xml b/apm-collector/apm-collector-storage/pom.xml index bfaf5f323..15cc0b48a 100644 --- a/apm-collector/apm-collector-storage/pom.xml +++ b/apm-collector/apm-collector-storage/pom.xml @@ -23,7 +23,7 @@ apm-collector org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-ui/collector-ui-define/pom.xml b/apm-collector/apm-collector-ui/collector-ui-define/pom.xml index e9ab307c1..86bd13833 100644 --- a/apm-collector/apm-collector-ui/collector-ui-define/pom.xml +++ b/apm-collector/apm-collector-ui/collector-ui-define/pom.xml @@ -23,7 +23,7 @@ apm-collector-ui org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-ui/collector-ui-graphql/pom.xml b/apm-collector/apm-collector-ui/collector-ui-graphql/pom.xml index 7e82b5ad6..5c171ef68 100644 --- a/apm-collector/apm-collector-ui/collector-ui-graphql/pom.xml +++ b/apm-collector/apm-collector-ui/collector-ui-graphql/pom.xml @@ -23,7 +23,7 @@ apm-collector-ui org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml index 94469c388..0e7ab3ed8 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml @@ -23,7 +23,7 @@ apm-collector-ui org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/apm-collector-ui/pom.xml b/apm-collector/apm-collector-ui/pom.xml index a34095e71..75d8ffb1c 100644 --- a/apm-collector/apm-collector-ui/pom.xml +++ b/apm-collector/apm-collector-ui/pom.xml @@ -23,7 +23,7 @@ apm-collector org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-collector/pom.xml b/apm-collector/pom.xml index 70699a1dd..9f50d325b 100644 --- a/apm-collector/pom.xml +++ b/apm-collector/pom.xml @@ -23,7 +23,7 @@ apm org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-commons/apm-datacarrier/pom.xml b/apm-commons/apm-datacarrier/pom.xml index fb581e1e2..82be9e9ea 100644 --- a/apm-commons/apm-datacarrier/pom.xml +++ b/apm-commons/apm-datacarrier/pom.xml @@ -23,7 +23,7 @@ apm-commons org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-commons/apm-util/pom.xml b/apm-commons/apm-util/pom.xml index 166c6e26d..d172dc3c9 100644 --- a/apm-commons/apm-util/pom.xml +++ b/apm-commons/apm-util/pom.xml @@ -21,7 +21,7 @@ apm-commons org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-commons/pom.xml b/apm-commons/pom.xml index a3a7a8af8..08e1c51af 100644 --- a/apm-commons/pom.xml +++ b/apm-commons/pom.xml @@ -21,7 +21,7 @@ apm org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-protocol/apm-network/pom.xml b/apm-protocol/apm-network/pom.xml index ceef97708..cbfa87108 100644 --- a/apm-protocol/apm-network/pom.xml +++ b/apm-protocol/apm-network/pom.xml @@ -23,7 +23,7 @@ apm-protocol org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-protocol/apm-ui-protocol/pom.xml b/apm-protocol/apm-ui-protocol/pom.xml index ca05ad164..d2a5e45d1 100644 --- a/apm-protocol/apm-ui-protocol/pom.xml +++ b/apm-protocol/apm-ui-protocol/pom.xml @@ -23,7 +23,7 @@ apm-protocol org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-protocol/pom.xml b/apm-protocol/pom.xml index fa5708532..3d15e1dad 100644 --- a/apm-protocol/pom.xml +++ b/apm-protocol/pom.xml @@ -23,7 +23,7 @@ apm org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml index 9ea7e33d6..72fa406fb 100644 --- a/apm-sniffer/apm-agent-core/pom.xml +++ b/apm-sniffer/apm-agent-core/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sniffer - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT apm-agent-core diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml index 066191deb..492a97eaa 100644 --- a/apm-sniffer/apm-agent/pom.xml +++ b/apm-sniffer/apm-agent/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sniffer - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT apm-agent diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml index 528147804..8f1a3cca8 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml index 07bbfe166..9b983fc96 100644 --- a/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml @@ -23,7 +23,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml index 5c745b81d..894821864 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml index c6798d086..92e0f2386 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.skywalking apm-sdk-plugin - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT apm-grpc-1.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml index b3c344831..0249864f4 100755 --- a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml index 52e1eb16d..4bd2bdb25 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.skywalking apm-sdk-plugin - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT apm-httpClient-4.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml index 3c4baf902..a12eb9955 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.skywalking apm-sdk-plugin - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT apm-httpasyncclient-4.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml b/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml index f39b15bc3..53b3ee3da 100755 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml index 7f75d1a5a..6b3e82cca 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.skywalking apm-sdk-plugin - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT apm-jedis-2.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml index bc51af148..1b69a5b6e 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml @@ -21,7 +21,7 @@ jetty-plugins org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml index 3c13eddc6..fd140dac0 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml @@ -21,7 +21,7 @@ jetty-plugins org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml index 345ca3eeb..e58331085 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml @@ -21,7 +21,7 @@ jetty-plugins org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml index c80d1c488..068efaa59 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.skywalking apm-sdk-plugin - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT jetty-plugins diff --git a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml index 33a6c4b19..089500852 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml @@ -23,7 +23,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml index 841cb635b..4ee904bad 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml @@ -23,7 +23,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml index 35916df57..2cf376eb0 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml @@ -22,7 +22,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT apm-mongodb-3.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml index df5dcf95a..4f45133b6 100644 --- a/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml index fb146fc2e..bfa2c373d 100755 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml index bced900db..390b1b618 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml @@ -21,7 +21,7 @@ nutz-plugins org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml index 616c87f4a..b705227cc 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml @@ -21,7 +21,7 @@ nutz-plugins org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml index 0b89c2de9..f6ba088c8 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml @@ -24,7 +24,7 @@ org.apache.skywalking apm-sdk-plugin - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT nutz-plugins diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml index 0f1829ccd..0a27f6663 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml index 8efdb3968..b8b242089 100755 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml.versionsBackup b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml.versionsBackup new file mode 100644 index 000000000..8efdb3968 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml.versionsBackup @@ -0,0 +1,76 @@ + + + + + apm-sdk-plugin + org.apache.skywalking + 5.0.0-alpha + + 4.0.0 + + apm-oracle-10.x-plugin + jar + + oracle-10.x-plugin + http://maven.apache.org + + + UTF-8 + + + + + com.oracle + ojdbc14 + 10.2.0.4.0 + provided + + + org.apache.skywalking + apm-jdbc-commons + ${project.version} + provided + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + + org.apache.maven.plugins + maven-source-plugin + + + + attach-sources + none + + jar + + + + + + + diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml index be0a02e80..3218855d9 100644 --- a/apm-sniffer/apm-sdk-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.skywalking apm-sniffer - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT apm-sdk-plugin diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml index b8e77dbf1..6976764ec 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml index b509193b7..775d97d8a 100644 --- a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml @@ -25,7 +25,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT apm-resin-3.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml.versionsBackup b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml.versionsBackup new file mode 100644 index 000000000..b509193b7 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml.versionsBackup @@ -0,0 +1,75 @@ + + + + + 4.0.0 + + + apm-sdk-plugin + org.apache.skywalking + 5.0.0-alpha + + + apm-resin-3.x-plugin + jar + + resin-3.x-plugin + http://maven.apache.org + + + UTF-8 + + + + + com.caucho + resin + 3.0.9 + provided + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + + attach-sources + none + + jar + + + + + + + diff --git a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml index 8ef50789d..67aab6b90 100644 --- a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml @@ -25,7 +25,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT apm-resin-4.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml.versionsBackup b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml.versionsBackup new file mode 100644 index 000000000..8ef50789d --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml.versionsBackup @@ -0,0 +1,76 @@ + + + + + 4.0.0 + + + apm-sdk-plugin + org.apache.skywalking + 5.0.0-alpha + + + apm-resin-4.x-plugin + jar + + resin-4.x-plugin + http://maven.apache.org + + + UTF-8 + + + + + com.caucho + resin + 4.0.41 + provided + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + + attach-sources + none + + jar + + + + + + + + diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml index 905fa2afb..3d1a94ac2 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml @@ -23,7 +23,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml index ae14a3306..1adf1e55f 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml @@ -5,7 +5,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml index bdac6da88..2d12fba8b 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml @@ -5,7 +5,7 @@ servicecomb-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml index bd4339c26..fd3fcbd1b 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml @@ -5,7 +5,7 @@ servicecomb-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml index 8555d4c08..94cc274ea 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml @@ -23,7 +23,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml index 7bda5b68a..01cda925a 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml @@ -21,7 +21,7 @@ spring-plugins org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml index bdb06bb2d..4460d45f8 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml @@ -23,7 +23,7 @@ spring-plugins org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml index da8a3eb0d..34f855fab 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml @@ -21,7 +21,7 @@ spring-plugins org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml index 7a6371d8a..e7d821e7f 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml @@ -21,7 +21,7 @@ spring-plugins org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml index 4544f40f1..c8ec70f64 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml @@ -21,7 +21,7 @@ spring-plugins org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml index 0aa9d4512..10b496ade 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml @@ -24,7 +24,7 @@ org.apache.skywalking apm-sdk-plugin - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT spring-plugins diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml index 73f4e799e..f3410f576 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml @@ -21,7 +21,7 @@ spring-plugins org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml index a43eead1c..280ab2a9b 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml @@ -24,7 +24,7 @@ org.apache.skywalking spring-cloud - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT netflix-plugins diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml index 359c9a2d2..0d37f0936 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.skywalking netflix-plugins - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT apm-spring-cloud-feign-1.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml index f4effb611..356ad0cc6 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml @@ -24,7 +24,7 @@ org.apache.skywalking spring-plugins - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT spring-cloud diff --git a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml index d8e6e7f9d..41c7ce8a7 100644 --- a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.skywalking apm-sdk-plugin - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT apm-spymemcached-2.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml index 694e97b91..bb9e9c025 100644 --- a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml index 031be376c..927024575 100644 --- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml index 6ef2b92e2..3c4b54e14 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT apm-xmemcached-2.x-plugin diff --git a/apm-sniffer/apm-test-tools/pom.xml b/apm-sniffer/apm-test-tools/pom.xml index fa6848c87..6be8cd99c 100644 --- a/apm-sniffer/apm-test-tools/pom.xml +++ b/apm-sniffer/apm-test-tools/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sniffer - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT apm-test-tools diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml index 46e48f0f3..00bc556c6 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml @@ -23,7 +23,7 @@ apm-toolkit-activation org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml index 657655d52..03c30d2ff 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml @@ -23,7 +23,7 @@ apm-toolkit-activation org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml index 49a6ee005..3fdac5a67 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml @@ -23,7 +23,7 @@ apm-toolkit-activation org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml index f5f81257b..f276a0c13 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml @@ -23,7 +23,7 @@ apm-toolkit-activation org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml index 69827c39a..5ee2b5cd7 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml @@ -23,7 +23,7 @@ apm-toolkit-activation org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-toolkit-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/pom.xml index efea4b81c..c0bd677f4 100644 --- a/apm-sniffer/apm-toolkit-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/pom.xml @@ -23,7 +23,7 @@ apm-sniffer org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 pom diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml index e3b38f27c..d182813a9 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml @@ -23,7 +23,7 @@ optional-plugins org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 pom diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml index 03413fc0b..23728b0ab 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml @@ -23,7 +23,7 @@ optional-spring-plugins org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 jar diff --git a/apm-sniffer/optional-plugins/pom.xml b/apm-sniffer/optional-plugins/pom.xml index 4c9b3f925..b2b8830c4 100644 --- a/apm-sniffer/optional-plugins/pom.xml +++ b/apm-sniffer/optional-plugins/pom.xml @@ -23,7 +23,7 @@ apm-sniffer org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/pom.xml b/apm-sniffer/pom.xml index c5a7607c0..2692e4b3c 100644 --- a/apm-sniffer/pom.xml +++ b/apm-sniffer/pom.xml @@ -23,7 +23,7 @@ apm org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 7911cfcf7..ba3e8bb78 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT org.apache From 107eaacfa7a08029a1c4e0577c856c5035b27eea Mon Sep 17 00:00:00 2001 From: ascrutae Date: Tue, 27 Feb 2018 00:23:33 +0800 Subject: [PATCH 12/21] Adjust hystrix plugin buried point --- .../HystrixCommandGetFallbackInterceptor.java | 53 +++++++ .../v1/HystrixCommandRunInterceptor.java | 57 ++++++++ .../hystrix/v1/SWExecutionHookWrapper.java | 134 ++++++++++++++---- .../define/HystrixCommandInstrumentation.java | 30 +++- 4 files changed, 244 insertions(+), 30 deletions(-) create mode 100644 apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandGetFallbackInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandRunInterceptor.java diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandGetFallbackInterceptor.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandGetFallbackInterceptor.java new file mode 100644 index 000000000..f935c77eb --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandGetFallbackInterceptor.java @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.apm.plugin.hystrix.v1; + +import java.lang.reflect.Method; +import org.apache.skywalking.apm.agent.core.context.ContextManager; +import org.apache.skywalking.apm.agent.core.context.ContextSnapshot; +import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; +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.network.trace.component.ComponentsDefine; + +public class HystrixCommandGetFallbackInterceptor implements InstanceMethodsAroundInterceptor { + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + EnhanceRequireObjectCache enhanceRequireObjectCache = (EnhanceRequireObjectCache)objInst.getSkyWalkingDynamicField(); + ContextSnapshot snapshot = enhanceRequireObjectCache.getContextSnapshot(); + + AbstractSpan activeSpan = ContextManager.createLocalSpan(enhanceRequireObjectCache.getOperationNamePrefix() + "/Fallback"); + activeSpan.setComponent(ComponentsDefine.HYSTRIX); + ContextManager.continued(snapshot); + } + + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + ContextManager.stopSpan(); + return ret; + } + + @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { + ContextManager.activeSpan().errorOccurred().log(t); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandRunInterceptor.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandRunInterceptor.java new file mode 100644 index 000000000..c281f59f9 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandRunInterceptor.java @@ -0,0 +1,57 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.apm.plugin.hystrix.v1; + +import java.lang.reflect.Method; +import org.apache.skywalking.apm.agent.core.context.ContextManager; +import org.apache.skywalking.apm.agent.core.context.ContextSnapshot; +import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; +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.network.trace.component.ComponentsDefine; + +public class HystrixCommandRunInterceptor implements InstanceMethodsAroundInterceptor { + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + // create a local span, and continued, The `execution method` running in other thread if the + // hystrix strategy is `THREAD`. + EnhanceRequireObjectCache enhanceRequireObjectCache = (EnhanceRequireObjectCache)objInst.getSkyWalkingDynamicField(); + ContextSnapshot snapshot = enhanceRequireObjectCache.getContextSnapshot(); + + AbstractSpan activeSpan = ContextManager.createLocalSpan(enhanceRequireObjectCache.getOperationNamePrefix() + "/Execution"); + activeSpan.setComponent(ComponentsDefine.HYSTRIX); + ContextManager.continued(snapshot); + // Because of `fall back` method running in other thread. so we need capture concurrent span for tracing. + enhanceRequireObjectCache.setContextSnapshot(ContextManager.capture()); + } + + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + ContextManager.stopSpan(); + return ret; + } + + @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { + ContextManager.activeSpan().errorOccurred().log(t); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java index dafba818a..eedc646cd 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java @@ -18,13 +18,12 @@ package org.apache.skywalking.apm.plugin.hystrix.v1; +import com.netflix.hystrix.HystrixCommand; import com.netflix.hystrix.HystrixInvokable; +import com.netflix.hystrix.exception.HystrixRuntimeException; import com.netflix.hystrix.strategy.executionhook.HystrixCommandExecutionHook; import org.apache.skywalking.apm.agent.core.context.ContextManager; -import org.apache.skywalking.apm.agent.core.context.ContextSnapshot; -import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; -import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; /** * {@link SWExecutionHookWrapper} wrapper the HystrixCommandExecutionHook object for tracing. @@ -48,57 +47,134 @@ public class SWExecutionHookWrapper extends HystrixCommandExecutionHook { @Override public void onExecutionStart(HystrixInvokable commandInstance) { - // create a local span, and continued, The `execution method` running in other thread if the - // hystrix strategy is `THREAD`. - EnhancedInstance enhancedInstance = (EnhancedInstance)commandInstance; - EnhanceRequireObjectCache enhanceRequireObjectCache = (EnhanceRequireObjectCache)enhancedInstance.getSkyWalkingDynamicField(); - ContextSnapshot snapshot = enhanceRequireObjectCache.getContextSnapshot(); - - AbstractSpan activeSpan = ContextManager.createLocalSpan(enhanceRequireObjectCache.getOperationNamePrefix() + "/Execution"); - activeSpan.setComponent(ComponentsDefine.HYSTRIX); - ContextManager.continued(snapshot); actual.onExecutionStart(commandInstance); - - // Because of `fall back` method running in other thread. so we need capture concurrent span for tracing. - enhanceRequireObjectCache.setContextSnapshot(ContextManager.capture()); } @Override public Exception onExecutionError(HystrixInvokable commandInstance, Exception e) { - ContextManager.activeSpan().errorOccurred().log(e); - ContextManager.stopSpan(); return actual.onExecutionError(commandInstance, e); } @Override public void onExecutionSuccess(HystrixInvokable commandInstance) { - ContextManager.stopSpan(); actual.onExecutionSuccess(commandInstance); } @Override public void onFallbackStart(HystrixInvokable commandInstance) { - EnhancedInstance enhancedInstance = (EnhancedInstance)commandInstance; - EnhanceRequireObjectCache enhanceRequireObjectCache = (EnhanceRequireObjectCache)enhancedInstance.getSkyWalkingDynamicField(); - ContextSnapshot snapshot = enhanceRequireObjectCache.getContextSnapshot(); - - AbstractSpan activeSpan = ContextManager.createLocalSpan(enhanceRequireObjectCache.getOperationNamePrefix() + "/Fallback"); - activeSpan.setComponent(ComponentsDefine.HYSTRIX); - ContextManager.continued(snapshot); - actual.onFallbackStart(commandInstance); } @Override public Exception onFallbackError(HystrixInvokable commandInstance, Exception e) { - ContextManager.activeSpan().errorOccurred().log(e); - ContextManager.stopSpan(); return actual.onFallbackError(commandInstance, e); } @Override public void onFallbackSuccess(HystrixInvokable commandInstance) { - ContextManager.stopSpan(); actual.onFallbackSuccess(commandInstance); } + + @Override public Exception onRunError(HystrixInvokable commandInstance, Exception e) { + return actual.onRunError(commandInstance, e); + } + + @Override public Exception onRunError(HystrixCommand commandInstance, Exception e) { + return actual.onRunError(commandInstance, e); + } + + @Override + public Exception onError(HystrixInvokable commandInstance, HystrixRuntimeException.FailureType failureType, + Exception e) { + return actual.onError(commandInstance, failureType, e); + } + + @Override public void onSuccess(HystrixInvokable commandInstance) { + actual.onSuccess(commandInstance); + } + + @Override public T onEmit(HystrixInvokable commandInstance, T value) { + return actual.onEmit(commandInstance, value); + } + + @Override public T onExecutionEmit(HystrixInvokable commandInstance, T value) { + return actual.onExecutionEmit(commandInstance, value); + } + + @Override public T onFallbackEmit(HystrixInvokable commandInstance, T value) { + return actual.onFallbackEmit(commandInstance, value); + } + + @Override public void onCacheHit(HystrixInvokable commandInstance) { + actual.onCacheHit(commandInstance); + } + + @Override public void onThreadComplete(HystrixInvokable commandInstance) { + actual.onThreadComplete(commandInstance); + } + + @Override public void onThreadStart(HystrixInvokable commandInstance) { + actual.onThreadStart(commandInstance); + } + + @Override + public Exception onError(HystrixCommand commandInstance, HystrixRuntimeException.FailureType failureType, + Exception e) { + return actual.onError(commandInstance, failureType, e); + } + + @Override public Exception onFallbackError(HystrixCommand commandInstance, Exception e) { + return actual.onFallbackError(commandInstance, e); + } + + @Override public T onComplete(HystrixCommand commandInstance, T response) { + return actual.onComplete(commandInstance, response); + } + + @Override public T onComplete(HystrixInvokable commandInstance, T response) { + return actual.onComplete(commandInstance, response); + } + + @Override public T onFallbackSuccess(HystrixCommand commandInstance, T fallbackResponse) { + return actual.onFallbackSuccess(commandInstance, fallbackResponse); + } + + @Override public T onFallbackSuccess(HystrixInvokable commandInstance, T fallbackResponse) { + return actual.onFallbackSuccess(commandInstance, fallbackResponse); + } + + @Override public T onRunSuccess(HystrixCommand commandInstance, T response) { + return actual.onRunSuccess(commandInstance, response); + } + + @Override public T onRunSuccess(HystrixInvokable commandInstance, T response) { + return actual.onRunSuccess(commandInstance, response); + } + + @Override public void onFallbackStart(HystrixCommand commandInstance) { + actual.onFallbackStart(commandInstance); + } + + @Override public void onRunStart(HystrixCommand commandInstance) { + actual.onRunStart(commandInstance); + } + + @Override public void onRunStart(HystrixInvokable commandInstance) { + actual.onRunStart(commandInstance); + } + + @Override public void onStart(HystrixCommand commandInstance) { + EnhancedInstance enhancedInstance = (EnhancedInstance)commandInstance; + EnhanceRequireObjectCache enhanceRequireObjectCache = (EnhanceRequireObjectCache)enhancedInstance.getSkyWalkingDynamicField(); + enhanceRequireObjectCache.setContextSnapshot(ContextManager.capture()); + actual.onStart(commandInstance); + } + + @Override public void onThreadComplete(HystrixCommand commandInstance) { + actual.onThreadComplete(commandInstance); + } + + @Override public void onThreadStart(HystrixCommand commandInstance) { + actual.onThreadStart(commandInstance); + } } diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java index 54c2faf72..fe23ef30d 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java @@ -26,6 +26,7 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInst import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import static net.bytebuddy.matcher.ElementMatchers.any; +import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch.byHierarchyMatch; /** @@ -55,7 +56,34 @@ public class HystrixCommandInstrumentation extends ClassInstanceMethodsEnhancePl } @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[0]; + return new InstanceMethodsInterceptPoint[]{ + new InstanceMethodsInterceptPoint() { + @Override public ElementMatcher getMethodsMatcher() { + return named("run"); + } + + @Override public String getMethodsInterceptor() { + return "org.apache.skywalking.apm.plugin.hystrix.v1.HystrixCommandRunInterceptor"; + } + + @Override public boolean isOverrideArgs() { + return false; + } + }, + new InstanceMethodsInterceptPoint() { + @Override public ElementMatcher getMethodsMatcher() { + return named("getFallback"); + } + + @Override public String getMethodsInterceptor() { + return "org.apache.skywalking.apm.plugin.hystrix.v1.HystrixCommandGetFallbackInterceptor"; + } + + @Override public boolean isOverrideArgs() { + return false; + } + } + }; } @Override protected ClassMatch enhanceClass() { From a1711f73903be8f604b3577e1fd4eae39d866fd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Tue, 27 Feb 2018 08:33:59 +0800 Subject: [PATCH 13/21] Update pom.xml --- apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml index bbc67f076..bc7b8bedd 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml @@ -5,7 +5,7 @@ apm-sdk-plugin org.apache.skywalking - 5.0.0-alpha + 5.0.0-alpha-SNAPSHOT 4.0.0 @@ -21,4 +21,4 @@ - \ No newline at end of file + From 0d6233dd54c4084ca41690f010acba4aca4a6af9 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Tue, 27 Feb 2018 11:29:18 +0800 Subject: [PATCH 14/21] [Agent] fix that javadoc import unused class cause classloader issue --- .../apm/plugin/dubbo/DubboInstrumentation.java | 11 ++--------- .../DefaultHttpClientInstrumentation.java | 10 ---------- ...stractServerImplBuilderInstrumentation.java | 7 ------- .../v1/define/AbstractStubInstrumentation.java | 7 ------- .../v4/define/HttpClientInstrumentation.java | 10 +--------- .../define/AbstractDriverInstrumentation.java | 5 ----- .../v2/define/JedisClusterInstrumentation.java | 15 +-------------- .../jedis/v2/define/JedisInstrumentation.java | 16 +--------------- .../v1/define/CallbackInstrumentation.java | 6 ------ .../define/KafkaConsumerInstrumentation.java | 4 ---- .../define/KafkaProducerInstrumentation.java | 4 ---- .../define/ProducerRecordInstrumentation.java | 8 -------- .../define/MotanConsumerInstrumentation.java | 10 +--------- .../define/MotanProviderInstrumentation.java | 14 ++------------ .../define/OracleCallableInstrumentation.java | 7 ------- .../OraclePrepareStatementInstrumentation.java | 7 ------- .../define/OracleStatementInstrumentation.java | 7 ------- .../AbstractJdbc2StatementInstrumentation.java | 18 ------------------ .../v3/define/ResinV3Instrumentation.java | 7 ------- .../v4/define/ResinV4Instrumentation.java | 7 ------- ...sumeMessageConcurrentlyInstrumentation.java | 8 -------- .../ConsumeMessageOrderlyInstrumentation.java | 10 +--------- .../define/MQClientAPIImplInstrumentation.java | 12 ------------ .../v4/define/SendCallbackInstrumentation.java | 12 +----------- .../define/FailureCallbackInstrumentation.java | 10 +--------- .../define/AopProxyFactoryInstrumentation.java | 8 -------- .../define/NetflixFeignInstrumentation.java | 10 +--------- 27 files changed, 12 insertions(+), 238 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/apache/skywalking/apm/plugin/dubbo/DubboInstrumentation.java b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/apache/skywalking/apm/plugin/dubbo/DubboInstrumentation.java index 5c63e9566..779153efc 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/apache/skywalking/apm/plugin/dubbo/DubboInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/apache/skywalking/apm/plugin/dubbo/DubboInstrumentation.java @@ -16,25 +16,18 @@ * */ - package org.apache.skywalking.apm.plugin.dubbo; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; +import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; import static net.bytebuddy.matcher.ElementMatchers.named; -/** - * {@link DubboInstrumentation} presents that skywalking intercepts {@link com.alibaba.dubbo.monitor.support.MonitorFilter#invoke(com.alibaba.dubbo.rpc.Invoker, - * com.alibaba.dubbo.rpc.Invocation)} by using {@link DubboInterceptor}. - * - * @author zhangxin - */ public class DubboInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "com.alibaba.dubbo.monitor.support.MonitorFilter"; diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/define/DefaultHttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/define/DefaultHttpClientInstrumentation.java index 15c08d2b9..ea83395f2 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/define/DefaultHttpClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/define/DefaultHttpClientInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.feign.http.v9.define; import net.bytebuddy.description.method.MethodDescription; @@ -25,19 +24,10 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterc import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; -import org.apache.skywalking.apm.plugin.feign.http.v9.DefaultHttpClientInterceptor; import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * {@link DefaultHttpClientInstrumentation} presents that skywalking intercepts {@link - * feign.Client.Default#execute(feign.Request, feign.Request.Options)} by using {@link DefaultHttpClientInterceptor}. - * If feign did't run in default mode, the instrumentation depend on the http discovery implementation. - * e.g. okhttp discovery implementation depend on okhttp-plugin. - * - * @author peng-yongsheng - */ public class DefaultHttpClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { /** diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/AbstractServerImplBuilderInstrumentation.java b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/AbstractServerImplBuilderInstrumentation.java index 0abe6d741..681d28f72 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/AbstractServerImplBuilderInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/AbstractServerImplBuilderInstrumentation.java @@ -29,13 +29,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * {@link AbstractServerImplBuilderInstrumentation} present that the GRPC plugin intercept the method - * addService in the {@link io.grpc.internal.AbstractServerImplBuilder} class by using the {@link - * org.apache.skywalking.apm.plugin.grpc.v1.AbstractServerImplBuilderInterceptor} class. - * - * @author zhang xin - */ public class AbstractServerImplBuilderInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { public static final String ENHANCE_CLASS = "io.grpc.internal.AbstractServerImplBuilder"; diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/AbstractStubInstrumentation.java b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/AbstractStubInstrumentation.java index 270676aa9..fd3f0739e 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/AbstractStubInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/AbstractStubInstrumentation.java @@ -29,13 +29,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * {@link AbstractStubInstrumentation} present that the GRPC plugin intercept the method getChannel in the - * {@link io.grpc.stub.AbstractStub} class by using the {@link org.apache.skywalking.apm.plugin.grpc.v1.AbstractStubInterceptor} - * class. - * - * @author zhang xin - */ public class AbstractStubInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.grpc.v1.AbstractStubInterceptor"; diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/HttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/HttpClientInstrumentation.java index d239ffea7..4d2f006fb 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/HttpClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/HttpClientInstrumentation.java @@ -16,19 +16,11 @@ * */ - package org.apache.skywalking.apm.plugin.httpClient.v4.define; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import org.apache.skywalking.apm.plugin.httpClient.v4.HttpClientExecuteInterceptor; import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -/** - * {@link HttpClientInstrumentation} present that skywalking intercepts {@link HttpClientInstrumentation#enhanceClass()} - * by using {@link HttpClientExecuteInterceptor} - * - * @author zhangxin - */ public abstract class HttpClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.httpClient.v4.HttpClientExecuteInterceptor"; diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/AbstractDriverInstrumentation.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/AbstractDriverInstrumentation.java index 2c6a9b49b..85be8c4c0 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/AbstractDriverInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/AbstractDriverInstrumentation.java @@ -28,11 +28,6 @@ import org.apache.skywalking.apm.plugin.jdbc.JDBCDriverInterceptor; import static net.bytebuddy.matcher.ElementMatchers.named; -/** - * JDBC plugin using {@link JDBCDriverInterceptor} to intercept the connect method of all driver class. - * - * @author zhangxin - */ public abstract class AbstractDriverInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String DRIVER_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.JDBCDriverInterceptor"; diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/JedisClusterInstrumentation.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/JedisClusterInstrumentation.java index d50896605..2d5b4c248 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/JedisClusterInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/JedisClusterInstrumentation.java @@ -16,34 +16,21 @@ * */ - package org.apache.skywalking.apm.plugin.jedis.v2.define; import java.util.Set; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; -import org.apache.skywalking.apm.plugin.jedis.v2.JedisClusterConstructorWithHostAndPortArgInterceptor; -import org.apache.skywalking.apm.plugin.jedis.v2.JedisClusterConstructorWithListHostAndPortArgInterceptor; -import org.apache.skywalking.apm.plugin.jedis.v2.JedisMethodInterceptor; import org.apache.skywalking.apm.plugin.jedis.v2.RedisMethodMatch; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * {@link JedisClusterInstrumentation} presents that skywalking intercepts all constructors and methods of {@link - * redis.clients.jedis.JedisCluster}. {@link JedisClusterConstructorWithHostAndPortArgInterceptor} - * intercepts all constructor with argument {@link redis.clients.jedis.HostAndPort} and the other constructor intercept - * by class {@link JedisClusterConstructorWithListHostAndPortArgInterceptor}. {@link JedisMethodInterceptor} intercept - * all methods of {@link redis.clients.jedis.JedisCluster} - * - * @author zhangxin - */ public class JedisClusterInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ARGUMENT_TYPE_NAME = "redis.clients.jedis.HostAndPort"; diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/JedisInstrumentation.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/JedisInstrumentation.java index ee4d1a82e..96a310af8 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/JedisInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/JedisInstrumentation.java @@ -16,35 +16,21 @@ * */ - package org.apache.skywalking.apm.plugin.jedis.v2.define; import java.net.URI; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import org.apache.skywalking.apm.plugin.jedis.v2.JedisConstructorWithShardInfoArgInterceptor; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; -import org.apache.skywalking.apm.plugin.jedis.v2.JedisConstructorWithUriArgInterceptor; -import org.apache.skywalking.apm.plugin.jedis.v2.JedisMethodInterceptor; import org.apache.skywalking.apm.plugin.jedis.v2.RedisMethodMatch; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * {@link JedisInstrumentation} presents that skywalking intercept all constructors and methods of {@link - * redis.clients.jedis.Jedis}. {@link JedisConstructorWithShardInfoArgInterceptor} intercepts all constructor with - * argument {@link redis.clients.jedis.HostAndPort} ,{@link JedisConstructorWithUriArgInterceptor} intercepts the - * constructors with uri argument and the other constructor intercept by class {@link - * JedisConstructorWithShardInfoArgInterceptor}. {@link JedisMethodInterceptor} intercept all methods of {@link - * redis.clients.jedis.Jedis}. - * - * @author zhangxin - */ public class JedisInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String HOST_AND_PORT_ARG_TYPE_NAME = "redis.clients.jedis.HostAndPort"; diff --git a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/CallbackInstrumentation.java b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/CallbackInstrumentation.java index 1744ce702..5ba32023e 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/CallbackInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/CallbackInstrumentation.java @@ -29,12 +29,6 @@ import org.apache.skywalking.apm.plugin.kafka.v1.CallbackInterceptor; import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch.byHierarchyMatch; -/** - * {@link CallbackInstrumentation} defined that {@link CallbackInterceptor} - * intercept the method onCompletion in the class org.apache.kafka.clients.producer.Callback. - * - * @author zhangxin - */ public class CallbackInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { public static final String ENHANCE_CLASS = "org.apache.kafka.clients.producer.Callback"; diff --git a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/KafkaConsumerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/KafkaConsumerInstrumentation.java index 878a8302c..f817aa36b 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/KafkaConsumerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/KafkaConsumerInstrumentation.java @@ -24,18 +24,14 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterc import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; -import org.apache.skywalking.apm.plugin.kafka.v1.KafkaConsumerInterceptor; import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * {@link KafkaProducerInstrumentation} define that {@link KafkaConsumerInterceptor} - * intercept the method send in the class org.apache.kafka.clients.producer.KafkaProducer. * Here is the intercept process steps. * - * * 
  *  1. Record the topic when the client invoke subscribed method
  *  2. Create the entry span when the client invoke the method pollOnce.
diff --git a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/KafkaProducerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/KafkaProducerInstrumentation.java
index f93e936c6..b44ccff48 100644
--- a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/KafkaProducerInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/KafkaProducerInstrumentation.java
@@ -24,18 +24,14 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterc
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
 import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
-import org.apache.skywalking.apm.plugin.kafka.v1.KafkaProducerInterceptor;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType;
 import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName;
 
 /**
- * {@link KafkaProducerInstrumentation} define that {@link KafkaProducerInterceptor}
- * intercept the method send in the class org.apache.kafka.clients.producer.KafkaProducer.
  * Here is the intercept process steps.
  *
- *
  * 
  *  1. Record the broker address when the client create the org.apache.kafka.clients.producer.KafkaProducer
  * instance
diff --git a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/ProducerRecordInstrumentation.java b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/ProducerRecordInstrumentation.java
index e2035b29f..4cd2daf84 100644
--- a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/ProducerRecordInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/ProducerRecordInstrumentation.java
@@ -29,14 +29,6 @@ import org.apache.skywalking.apm.plugin.kafka.v1.ProducerRecordConstructorInterc
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName;
 
-/**
- * {@link ProducerRecordInstrumentation} define that {@link ProducerRecordConstructorInterceptor}
- * intercept the constructor in the class org.apache.kafka.clients.producer.ProducerRecord for record the
- * topic name and propagate the Context of trace.
- *
- * @author zhang xin
- * @see org.apache.skywalking.apm.plugin.kafka.v1.define.KafkaProducerInstrumentation
- */
 public class ProducerRecordInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
 
     public static final String CONSTRUCTOR_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.kafka.v1.ProducerRecordConstructorInterceptor";
diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java
index f3fc77fb8..21328955a 100644
--- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java
@@ -16,26 +16,18 @@
  *
  */
 
-
 package org.apache.skywalking.apm.plugin.motan.define;
 
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.matcher.ElementMatcher;
+import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
 import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
 import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch;
-import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
-import org.apache.skywalking.apm.plugin.motan.MotanProviderInterceptor;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
-/**
- * {@link MotanConsumerInstrumentation} presents that skywalking intercept {@link com.weibo.api.motan.cluster.support.ClusterSpi#call(com.weibo.api.motan.rpc.Request)}
- * by using {@link MotanProviderInterceptor}.
- *
- * @author zhangxin
- */
 public class MotanConsumerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
 
     private static final String ENHANCE_CLASS = "com.weibo.api.motan.transport.ProviderMessageRouter";
diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java
index 32456c3d8..36159da97 100644
--- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java
@@ -16,30 +16,20 @@
  *
  */
 
-
 package org.apache.skywalking.apm.plugin.motan.define;
 
 import com.weibo.api.motan.rpc.Request;
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.matcher.ElementMatcher;
+import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
-import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch;
-import org.apache.skywalking.apm.plugin.motan.MotanConsumerInterceptor;
-import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
+import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch;
 
 import static net.bytebuddy.matcher.ElementMatchers.any;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
-/**
- * {@link MotanProviderInstrumentation} presents that skywalking will use
- * {@link MotanConsumerInterceptor} to intercept
- * all constructor of {@link com.weibo.api.motan.rpc.AbstractProvider} and
- * {@link com.weibo.api.motan.rpc.AbstractProvider#call(Request)}.
- *
- * @author zhangxin
- */
 public class MotanProviderInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
 
     /**
diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleCallableInstrumentation.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleCallableInstrumentation.java
index 992fa8e4c..d4f4a0c3f 100644
--- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleCallableInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleCallableInstrumentation.java
@@ -29,13 +29,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named;
 import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName;
 import static org.apache.skywalking.apm.plugin.jdbc.oracle.Constants.PREPARED_STATEMENT_INTERCEPT_CLASS;
 
-/**
- * {@link OracleCallableInstrumentation} define that the oracle plugin intercept the execute, executeQuery and
- * executeUpdate method in {@link oracle.jdbc.driver.OracleCallableStatement} class by
- * {@link org.apache.skywalking.apm.plugin.jdbc.oracle.StatementExecuteMethodsInterceptor}
- *
- * @author zhangxin
- */
 public class OracleCallableInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
 
     public static final String ENHANCE_CLASS = "oracle.jdbc.driver.OracleCallableStatement";
diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OraclePrepareStatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OraclePrepareStatementInstrumentation.java
index bbeacf716..fe69675ee 100644
--- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OraclePrepareStatementInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OraclePrepareStatementInstrumentation.java
@@ -29,13 +29,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named;
 import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName;
 import static org.apache.skywalking.apm.plugin.jdbc.oracle.Constants.PREPARED_STATEMENT_INTERCEPT_CLASS;
 
-/**
- * {@link OraclePrepareStatementInstrumentation} define that the oracle plugin intercept the execute,
- * executeQuery, executeUpdate and executeLargeUpdate method in  oracle.jdbc.driver.OraclePreparedStatement
- * class by ${@link org.apache.skywalking.apm.plugin.jdbc.oracle.StatementExecuteMethodsInterceptor}
- *
- * @author zhangxin
- */
 public class OraclePrepareStatementInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
 
     public static final String ENHANCE_CLASS = "oracle.jdbc.driver.OraclePreparedStatement";
diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleStatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleStatementInstrumentation.java
index 1a1db468a..e55f82f34 100644
--- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleStatementInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleStatementInstrumentation.java
@@ -29,13 +29,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named;
 import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName;
 import static org.apache.skywalking.apm.plugin.jdbc.oracle.Constants.STATEMENT_INTERCEPT_CLASS;
 
-/**
- * {@link OracleStatementInstrumentation} define that the oracle plugin intercept the execute, executeQuery,
- * executeUpdate and executeLargeUpdate method in {@link oracle.jdbc.driver.OracleStatement} class by
- * {@link org.apache.skywalking.apm.plugin.jdbc.oracle.StatementExecuteMethodsInterceptor}
- *
- * @author zhangxin
- */
 public class OracleStatementInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
 
     public static final String ENHANCE_CLASS = "oracle.jdbc.driver.OracleStatement";
diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/AbstractJdbc2StatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/AbstractJdbc2StatementInstrumentation.java
index 2001fb283..9919d71e9 100644
--- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/AbstractJdbc2StatementInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/AbstractJdbc2StatementInstrumentation.java
@@ -16,7 +16,6 @@
  *
  */
 
-
 package org.apache.skywalking.apm.plugin.jdbc.postgresql.define;
 
 import net.bytebuddy.description.method.MethodDescription;
@@ -25,7 +24,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterc
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
 import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
-import org.apache.skywalking.apm.plugin.jdbc.postgresql.StatementExecuteMethodsInterceptor;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
@@ -33,26 +31,10 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName
 import static org.apache.skywalking.apm.plugin.jdbc.postgresql.Variables.PG_PREPARED_STATEMENT_EXECUTE_METHOD_INTERCEPTOR;
 import static org.apache.skywalking.apm.plugin.jdbc.postgresql.Variables.PG_STATEMENT_EXECUTE_METHOD_INTERCEPTOR;
 
-/**
- * {@link AbstractJdbc2StatementInstrumentation} intercept the following methods that the class which extend
- * org.postgresql.jdbc2.AbstractJdbc2Statement by {@link StatementExecuteMethodsInterceptor}.
- * 1. the execute with non parameter
- * 2. the execute with one parameter
- * 3. the executeBatch
- * 4. the executeQuery with non parameter
- * 5. the executeQuery with one parameter
- * 6. the executeUpdate with non parameter
- * 7. the executeUpdate with one parameter
- * 8. the addBatch with non parameter
- * 9. the addBatch with one parameter
- *
- * @author zhangxin
- */
 public class AbstractJdbc2StatementInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
 
     private static final String ENHANCE_CLASS = "org.postgresql.jdbc2.AbstractJdbc2Statement";
 
-
     @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
         return new ConstructorInterceptPoint[0];
     }
diff --git a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java
index 37a91d488..e755994ee 100644
--- a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java
@@ -30,13 +30,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterc
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
-/**
- * {@link ResinV3Instrumentation} presents that skywalking intercepts
- * {@link com.caucho.server.dispatch.ServletInvocation#service(javax.servlet.ServletRequest,javax.servlet.ServletResponse)}
- * by using {@link ResinV3Interceptor}.
- *
- * @author baiyang
- */
 public class ResinV3Instrumentation extends ClassInstanceMethodsEnhancePluginDefine {
 
     private static final String ENHANCE_CLASS = "com.caucho.server.dispatch.ServletInvocation";
diff --git a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java
index d605f07d8..8a15f2f8c 100644
--- a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java
@@ -30,13 +30,6 @@ import org.apache.skywalking.apm.plugin.resin.v4.ResinV4Interceptor;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName;
 
-/**
- * {@link ResinV4Instrumentation} presents that skywalking intercepts
- * {@link com.caucho.server.dispatch.ServletInvocation#service(javax.servlet.ServletRequest,javax.servlet.ServletResponse)}
- * by using {@link ResinV4Interceptor}.
- *
- * @author baiyang
- */
 public class ResinV4Instrumentation extends ClassInstanceMethodsEnhancePluginDefine {
     private static final String ENHANCE_CLASS = "com.caucho.server.dispatch.ServletInvocation";
 
diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/ConsumeMessageConcurrentlyInstrumentation.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/ConsumeMessageConcurrentlyInstrumentation.java
index 87949fee1..1d2aadf17 100644
--- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/ConsumeMessageConcurrentlyInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/ConsumeMessageConcurrentlyInstrumentation.java
@@ -16,7 +16,6 @@
  *
  */
 
-
 package org.apache.skywalking.apm.plugin.rocketMQ.v4.define;
 
 import net.bytebuddy.description.method.MethodDescription;
@@ -29,13 +28,6 @@ import org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
-/**
- * {@link ConsumeMessageConcurrentlyInstrumentation} intercepts the {@link org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently#consumeMessage(java.util.List,
- * org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext)} method by using {@link
- * org.apache.skywalking.apm.plugin.rocketMQ.v4.MessageConcurrentlyConsumeInterceptor}.
- *
- * @author zhang xin
- */
 public class ConsumeMessageConcurrentlyInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
     private static final String ENHANCE_CLASS = "org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently";
     private static final String CONSUMER_MESSAGE_METHOD = "consumeMessage";
diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/ConsumeMessageOrderlyInstrumentation.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/ConsumeMessageOrderlyInstrumentation.java
index 42b1b24f9..4a76ccd37 100644
--- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/ConsumeMessageOrderlyInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/ConsumeMessageOrderlyInstrumentation.java
@@ -16,26 +16,18 @@
  *
  */
 
-
 package org.apache.skywalking.apm.plugin.rocketMQ.v4.define;
 
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.matcher.ElementMatcher;
+import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
-import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch.byHierarchyMatch;
 
-/**
- * {@link ConsumeMessageOrderlyInstrumentation} intercepts the {@link org.apache.rocketmq.client.consumer.listener.MessageListenerOrderly#consumeMessage(java.util.List,
- * org.apache.rocketmq.client.consumer.listener.ConsumeOrderlyContext)} method by using {@link
- * org.apache.skywalking.apm.plugin.rocketMQ.v4.MessageConcurrentlyConsumeInterceptor}.
- *
- * @author zhang xin
- */
 public class ConsumeMessageOrderlyInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
     private static final String ENHANCE_CLASS = "org.apache.rocketmq.client.consumer.listener.MessageListenerOrderly";
     private static final String ENHANCE_METHOD = "consumeMessage";
diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/MQClientAPIImplInstrumentation.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/MQClientAPIImplInstrumentation.java
index 727dfe193..e0469a958 100644
--- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/MQClientAPIImplInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/MQClientAPIImplInstrumentation.java
@@ -16,7 +16,6 @@
  *
  */
 
-
 package org.apache.skywalking.apm.plugin.rocketMQ.v4.define;
 
 import net.bytebuddy.description.method.MethodDescription;
@@ -25,22 +24,11 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterc
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
 import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
-import org.apache.skywalking.apm.plugin.rocketMQ.v4.MessageSendInterceptor;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName;
 
-/**
- * {@link MQClientAPIImplInstrumentation} intercepts the {@link org.apache.rocketmq.client.impl.MQClientAPIImpl#sendMessage(String,
- * String, org.apache.rocketmq.common.message.Message, org.apache.rocketmq.common.protocol.header.SendMessageRequestHeader,
- * long, org.apache.rocketmq.client.impl.CommunicationMode, org.apache.rocketmq.client.producer.SendCallback,
- * org.apache.rocketmq.client.impl.producer.TopicPublishInfo, org.apache.rocketmq.client.impl.factory.MQClientInstance,
- * int, org.apache.rocketmq.client.hook.SendMessageContext, org.apache.rocketmq.client.impl.producer.DefaultMQProducerImpl)}
- * method by using {@link MessageSendInterceptor}.
- *
- * @author zhang xin
- */
 public class MQClientAPIImplInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
 
     private static final String ENHANCE_CLASS = "org.apache.rocketmq.client.impl.MQClientAPIImpl";
diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/SendCallbackInstrumentation.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/SendCallbackInstrumentation.java
index 5dac86ddf..c34cf7154 100644
--- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/SendCallbackInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/SendCallbackInstrumentation.java
@@ -16,29 +16,19 @@
  *
  */
 
-
 package org.apache.skywalking.apm.plugin.rocketMQ.v4.define;
 
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.matcher.ElementMatcher;
-import org.apache.rocketmq.client.producer.SendResult;
+import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
-import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType;
 import static org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch.byHierarchyMatch;
 
-/**
- * {@link SendCallbackInstrumentation} intercepts {@link org.apache.rocketmq.client.producer.SendCallback#onSuccess(SendResult)}
- * method by using {@link org.apache.skywalking.apm.plugin.rocketMQ.v4.OnSuccessInterceptor} and also intercepts {@link
- * org.apache.rocketmq.client.producer.SendCallback#onException(Throwable)} by using {@link
- * org.apache.skywalking.apm.plugin.rocketMQ.v4.OnExceptionInterceptor}.
- *
- * @author zhang xin
- */
 public class SendCallbackInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
 
     private static final String ENHANCE_CLASS = "org.apache.rocketmq.client.producer.SendCallback";
diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/define/FailureCallbackInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/define/FailureCallbackInstrumentation.java
index 2c03cc13e..7d9d3b582 100644
--- a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/define/FailureCallbackInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/define/FailureCallbackInstrumentation.java
@@ -16,26 +16,18 @@
  *
  */
 
-
 package org.apache.skywalking.apm.plugin.spring.concurrent.define;
 
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.matcher.ElementMatcher;
+import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
-import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
-import org.apache.skywalking.apm.plugin.spring.concurrent.FailureCallbackInterceptor;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static org.apache.skywalking.apm.plugin.spring.concurrent.match.FailedCallbackMatch.failedCallbackMatch;
 
-/**
- * {@link FailureCallbackInstrumentation} enhance the onFailure method that class inherited
- * org.springframework.util.concurrent.FailureCallback by {@link FailureCallbackInterceptor}.
- *
- * @author zhangxin
- */
 public class FailureCallbackInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
 
     public static final String FAILURE_CALLBACK_INTERCEPTOR = "org.apache.skywalking.apm.plugin.spring.concurrent.FailureCallbackInterceptor";
diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AopProxyFactoryInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AopProxyFactoryInstrumentation.java
index 0220a4678..d68536390 100644
--- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AopProxyFactoryInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AopProxyFactoryInstrumentation.java
@@ -16,7 +16,6 @@
  *
  */
 
-
 package org.apache.skywalking.apm.plugin.spring.patch.define;
 
 import net.bytebuddy.description.method.MethodDescription;
@@ -29,13 +28,6 @@ import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
-/**
- * {@link AopProxyFactoryInstrumentation} indicate that spring core patch plugin intercepts the {@link
- * org.springframework.aop.framework.DefaultAopProxyFactory#hasNoUserSuppliedProxyInterfaces} method by using {@link
- * org.apache.skywalking.apm.plugin.spring.patch.CreateAopProxyInterceptor} class.
- *
- * @author zhangxin
- */
 public class AopProxyFactoryInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
 
     private static final String ENHANCE_CLASS = "org.springframework.aop.framework.DefaultAopProxyFactory";
diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/netflix/feign/v11/define/NetflixFeignInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/netflix/feign/v11/define/NetflixFeignInstrumentation.java
index 68fc362db..94895c2d9 100644
--- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/netflix/feign/v11/define/NetflixFeignInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/netflix/feign/v11/define/NetflixFeignInstrumentation.java
@@ -16,26 +16,18 @@
  *
  */
 
-
 package org.apache.skywalking.apm.plugin.spring.cloud.netflix.feign.v11.define;
 
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.matcher.ElementMatcher;
+import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
-import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
-import org.apache.skywalking.apm.plugin.feign.http.v9.DefaultHttpClientInterceptor;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName;
 
-/**
- * {@link NetflixFeignInstrumentation} presents that skywalking intercepts {@link org.springframework.cloud.netflix.feign.ribbon.LoadBalancerFeignClient#execute(feign.Request,
- * feign.Request.Options)} by using {@link DefaultHttpClientInterceptor}.
- *
- * @author zhangxin
- */
 public class NetflixFeignInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
     /**
      * Enhance class.

From 64c48ea7a78375187e140620fec2c2994d9219dd Mon Sep 17 00:00:00 2001
From: ascrutae 
Date: Tue, 27 Feb 2018 11:32:17 +0800
Subject: [PATCH 15/21] remove javadoc

---
 .../hystrix/v1/define/HystrixCommandInstrumentation.java | 9 +--------
 .../hystrix/v1/define/HystrixPluginsInstrumentation.java | 7 -------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java
index fe23ef30d..780db9359 100644
--- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java
@@ -29,13 +29,6 @@ import static net.bytebuddy.matcher.ElementMatchers.any;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch.byHierarchyMatch;
 
-/**
- * {@link HystrixCommandInstrumentation} represent that the hystrix plugin intercept the constructor in the class that
- * hierarchy {@link com.netflix.hystrix.HystrixCommand} class by using the {@link org.apache.skywalking.apm.plugin.hystrix.v1.HystrixCommandConstructorInterceptor}
- * class.
- *
- * @author zhangxin
- */
 public class HystrixCommandInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
 
     public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.hystrix.v1.HystrixCommandConstructorInterceptor";
@@ -56,7 +49,7 @@ public class HystrixCommandInstrumentation extends ClassInstanceMethodsEnhancePl
     }
 
     @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
-        return new InstanceMethodsInterceptPoint[]{
+        return new InstanceMethodsInterceptPoint[] {
             new InstanceMethodsInterceptPoint() {
                 @Override public ElementMatcher getMethodsMatcher() {
                     return named("run");
diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java
index e7b82a9de..0c59115d4 100644
--- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java
@@ -28,13 +28,6 @@ import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName;
 
-/**
- * {@link HystrixPluginsInstrumentation} represent that the hystrix plugin intercept the
- * getCommandExecutionHook method in the {@link com.netflix.hystrix.strategy.HystrixPlugins} class class by
- * using the {@link org.apache.skywalking.apm.plugin.hystrix.v1.HystrixCommandConstructorInterceptor} class.
- *
- * @author zhangxin
- */
 public class HystrixPluginsInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
 
     public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.hystrix.v1.HystrixPluginsInterceptor";

From a3cb3e41307ccd4b53edd83720538c5a512bb7e2 Mon Sep 17 00:00:00 2001
From: ascrutae 
Date: Tue, 27 Feb 2018 11:51:12 +0800
Subject: [PATCH 16/21] add hystrix framework to support list

---
 docs/Supported-list.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Supported-list.md b/docs/Supported-list.md
index cf1e4a26e..17cb5fc63 100644
--- a/docs/Supported-list.md
+++ b/docs/Supported-list.md
@@ -47,6 +47,7 @@
 * Scheduler
   * [Elastic Job](https://github.com/elasticjob/elastic-job) 2.x
 * OpenTracing community supported
+* [Hystrix: Latency and Fault Tolerance for Distributed Systems](https://github.com/Netflix/Hystrix) 1.4.20 -> 1.5.12
 
 ¹Required dependencies for these components must be first manually downloaded before being built, due to license incompatibilities. For this reason these components are not by default included in the SkyWalking releases.
 

From b090cfaf37930cf9fa4467a9e723237e7e1e68fb Mon Sep 17 00:00:00 2001
From: ascrutae 
Date: Tue, 27 Feb 2018 11:57:49 +0800
Subject: [PATCH 17/21] Move Hystrix to Spring Ecosystem

---
 docs/Supported-list.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Supported-list.md b/docs/Supported-list.md
index 17cb5fc63..d804e0aa9 100644
--- a/docs/Supported-list.md
+++ b/docs/Supported-list.md
@@ -44,10 +44,10 @@
 * Spring Ecosystem
   * Spring Bean annotations(@Bean, @Service, @Component, @Repository) 3.x and 4.x (Optional²)
   * Spring Core Async SuccessCallback/FailureCallback/ListenableFutureCallback 4.x
+  * [Hystrix](https://github.com/Netflix/Hystrix) 1.4.20 -> 1.5.12
 * Scheduler
   * [Elastic Job](https://github.com/elasticjob/elastic-job) 2.x
 * OpenTracing community supported
-* [Hystrix: Latency and Fault Tolerance for Distributed Systems](https://github.com/Netflix/Hystrix) 1.4.20 -> 1.5.12
 
 ¹Required dependencies for these components must be first manually downloaded before being built, due to license incompatibilities. For this reason these components are not by default included in the SkyWalking releases.
 

From 49b4314aeb9757c289c0c020e2fa5bd2dcfd18f6 Mon Sep 17 00:00:00 2001
From: ascrutae 
Date: Tue, 27 Feb 2018 12:04:12 +0800
Subject: [PATCH 18/21] fix check style failed

---
 .../apm/plugin/jdbc/define/AbstractDriverInstrumentation.java | 4 +---
 .../apm/plugin/kafka/v1/define/CallbackInstrumentation.java   | 1 -
 .../plugin/kafka/v1/define/ProducerRecordInstrumentation.java | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/AbstractDriverInstrumentation.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/AbstractDriverInstrumentation.java
index 85be8c4c0..ff430a75d 100644
--- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/AbstractDriverInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/AbstractDriverInstrumentation.java
@@ -16,15 +16,13 @@
  *
  */
 
-
 package org.apache.skywalking.apm.plugin.jdbc.define;
 
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.matcher.ElementMatcher;
+import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
-import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
-import org.apache.skywalking.apm.plugin.jdbc.JDBCDriverInterceptor;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
diff --git a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/CallbackInstrumentation.java b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/CallbackInstrumentation.java
index 5ba32023e..918da0d60 100644
--- a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/CallbackInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/CallbackInstrumentation.java
@@ -24,7 +24,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterc
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
 import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
-import org.apache.skywalking.apm.plugin.kafka.v1.CallbackInterceptor;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch.byHierarchyMatch;
diff --git a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/ProducerRecordInstrumentation.java b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/ProducerRecordInstrumentation.java
index 4cd2daf84..f79c44a99 100644
--- a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/ProducerRecordInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/ProducerRecordInstrumentation.java
@@ -24,7 +24,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterc
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
 import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
-import org.apache.skywalking.apm.plugin.kafka.v1.ProducerRecordConstructorInterceptor;
 
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName;

From 83461aa6793c9b33f0b4ab18b0facfb6a499955e Mon Sep 17 00:00:00 2001
From: ascrutae 
Date: Tue, 27 Feb 2018 13:22:11 +0800
Subject: [PATCH 19/21] fix checkstyle failed

---
 .../apm/plugin/resin/v3/define/ResinV3Instrumentation.java    | 4 +---
 .../apm/plugin/resin/v4/define/ResinV4Instrumentation.java    | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java
index e755994ee..59d773082 100644
--- a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java
@@ -16,17 +16,15 @@
  *
  */
 
-
 package org.apache.skywalking.apm.plugin.resin.v3.define;
 
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.matcher.ElementMatcher;
+import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
 import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
 import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch;
-import org.apache.skywalking.apm.plugin.resin.v3.ResinV3Interceptor;
-import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
diff --git a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java
index 8a15f2f8c..915d2a932 100644
--- a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java
@@ -16,7 +16,6 @@
  *
  */
 
-
 package org.apache.skywalking.apm.plugin.resin.v4.define;
 
 import net.bytebuddy.description.method.MethodDescription;
@@ -25,7 +24,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterc
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
 import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
-import org.apache.skywalking.apm.plugin.resin.v4.ResinV4Interceptor;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName;

From 66e3eb0765913be0c918686c6472fc50cc52e739 Mon Sep 17 00:00:00 2001
From: ascrutae 
Date: Tue, 27 Feb 2018 14:37:22 +0800
Subject: [PATCH 20/21] [Agent] fix some intercept package name about toolkit's
 class is incorrect

---
 .../log4j/v1/x/TraceIdPatternConverterActivation.java | 11 ++++++++---
 .../log4j/v2/x/Log4j2OutputAppenderActivation.java    | 11 ++++++++---
 .../v1/x/LogbackPatternConverterActivation.java       | 11 ++++++++---
 .../log/logback/v1/x/mdc/MDCConverterActivation.java  | 10 +++++++---
 .../activation/trace/TraceContextActivation.java      | 11 ++++++++---
 5 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java
index 4e13bd648..37a7246db 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java
@@ -38,12 +38,17 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName
  * @author wusheng
  */
 public class TraceIdPatternConverterActivation extends ClassInstanceMethodsEnhancePluginDefine {
+
+    public static final String ENHANCE_CLASS = "org.apache.skywalking.apm.toolkit.log.log4j.v1.x.TraceIdPatternConverter";
+    public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.toolkit.activation.log.log4j.v1.x.PrintTraceIdInterceptor";
+    public static final String ENHANCE_METHOD = "convert";
+
     /**
      * @return the target class, which needs active.
      */
     @Override
     protected ClassMatch enhanceClass() {
-        return byName("TraceIdPatternConverter");
+        return byName(ENHANCE_CLASS);
     }
 
     /**
@@ -64,12 +69,12 @@ public class TraceIdPatternConverterActivation extends ClassInstanceMethodsEnhan
             new InstanceMethodsInterceptPoint() {
                 @Override
                 public ElementMatcher getMethodsMatcher() {
-                    return named("convert");
+                    return named(ENHANCE_METHOD);
                 }
 
                 @Override
                 public String getMethodsInterceptor() {
-                    return "PrintTraceIdInterceptor";
+                    return INTERCEPT_CLASS;
                 }
 
                 @Override public boolean isOverrideArgs() {
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java
index fc337bdf0..fcc98f638 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java
@@ -37,12 +37,17 @@ import static net.bytebuddy.matcher.ElementMatchers.named;
  * @author wusheng
  */
 public class Log4j2OutputAppenderActivation extends ClassStaticMethodsEnhancePluginDefine {
+
+    public static final String ENHANCE_CLASS = "org.apache.skywalking.apm.toolkit.log.log4j.v2.x.Log4j2OutputAppender";
+    public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.toolkit.activation.log.log4j.v2.x.PrintTraceIdInterceptor";
+    public static final String ENHANCE_METHOD = "append";
+
     /**
      * @return the target class, which needs active.
      */
     @Override
     protected ClassMatch enhanceClass() {
-        return NameMatch.byName("org.apache.skywalking.apm.toolkit.log.log4j.v2.x.Log4j2OutputAppender");
+        return NameMatch.byName(ENHANCE_CLASS);
     }
 
     /**
@@ -55,12 +60,12 @@ public class Log4j2OutputAppenderActivation extends ClassStaticMethodsEnhancePlu
             new StaticMethodsInterceptPoint() {
                 @Override
                 public ElementMatcher getMethodsMatcher() {
-                    return named("append");
+                    return named(ENHANCE_METHOD);
                 }
 
                 @Override
                 public String getMethodsInterceptor() {
-                    return "PrintTraceIdInterceptor";
+                    return INTERCEPT_CLASS;
                 }
 
                 @Override public boolean isOverrideArgs() {
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java
index d3c599266..57c567369 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java
@@ -39,12 +39,17 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName
  * Created by wusheng on 2016/12/7.
  */
 public class LogbackPatternConverterActivation extends ClassInstanceMethodsEnhancePluginDefine {
+
+    public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.toolkit.activation.log.logback.v1.x.PrintTraceIdInterceptor";
+    public static final String ENHANCE_CLASS = "org.apache.skywalking.apm.toolkit.log.logback.v1.x.LogbackPatternConverter";
+    public static final String ENHANCE_METHOD = "convert";
+
     /**
      * @return the target class, which needs active.
      */
     @Override
     protected ClassMatch enhanceClass() {
-        return byName("org.apache.skywalking.apm.toolkit.log.logback.v1.x.LogbackPatternConverter");
+        return byName(ENHANCE_CLASS);
     }
 
     /**
@@ -65,12 +70,12 @@ public class LogbackPatternConverterActivation extends ClassInstanceMethodsEnhan
             new InstanceMethodsInterceptPoint() {
                 @Override
                 public ElementMatcher getMethodsMatcher() {
-                    return named("convert");
+                    return named(ENHANCE_METHOD);
                 }
 
                 @Override
                 public String getMethodsInterceptor() {
-                    return "PrintTraceIdInterceptor";
+                    return INTERCEPT_CLASS;
                 }
 
                 @Override public boolean isOverrideArgs() {
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/mdc/MDCConverterActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/mdc/MDCConverterActivation.java
index 202486bc9..dea164bab 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/mdc/MDCConverterActivation.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/mdc/MDCConverterActivation.java
@@ -34,6 +34,10 @@ import static net.bytebuddy.matcher.ElementMatchers.named;
  */
 public class MDCConverterActivation extends ClassInstanceMethodsEnhancePluginDefine {
 
+    public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.toolkit.activation.log.logback.v1.x.mdc.PrintMDCTraceIdInterceptor";
+    public static final String ENHANCE_CLASS = "org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc.LogbackMDCPatternConverter";
+    public static final String ENHANCE_METHOD = "convertTID";
+
     @Override
     protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
         return null;
@@ -45,12 +49,12 @@ public class MDCConverterActivation extends ClassInstanceMethodsEnhancePluginDef
             new InstanceMethodsInterceptPoint() {
                 @Override
                 public ElementMatcher getMethodsMatcher() {
-                    return named("convertTID");
+                    return named(ENHANCE_METHOD);
                 }
 
                 @Override
                 public String getMethodsInterceptor() {
-                    return "PrintMDCTraceIdInterceptor";
+                    return INTERCEPT_CLASS;
                 }
 
                 @Override public boolean isOverrideArgs() {
@@ -62,6 +66,6 @@ public class MDCConverterActivation extends ClassInstanceMethodsEnhancePluginDef
 
     @Override
     protected ClassMatch enhanceClass() {
-        return NameMatch.byName("org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc.LogbackMDCPatternConverter");
+        return NameMatch.byName(ENHANCE_CLASS);
     }
 }
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java
index 301424893..3d04f0914 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java
@@ -37,12 +37,17 @@ import static net.bytebuddy.matcher.ElementMatchers.named;
  * Created by xin on 2016/12/15.
  */
 public class TraceContextActivation extends ClassStaticMethodsEnhancePluginDefine {
+
+    public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.toolkit.activation.trace.TraceContextInterceptor";
+    public static final String ENHANCE_CLASS = "org.apache.skywalking.apm.toolkit.trace.TraceContext";
+    public static final String ENHANCE_METHOD = "traceId";
+
     /**
      * @return the target class, which needs active.
      */
     @Override
     protected ClassMatch enhanceClass() {
-        return NameMatch.byName("TraceContext");
+        return NameMatch.byName(ENHANCE_CLASS);
     }
 
     /**
@@ -55,12 +60,12 @@ public class TraceContextActivation extends ClassStaticMethodsEnhancePluginDefin
             new StaticMethodsInterceptPoint() {
                 @Override
                 public ElementMatcher getMethodsMatcher() {
-                    return named("traceId");
+                    return named(ENHANCE_METHOD);
                 }
 
                 @Override
                 public String getMethodsInterceptor() {
-                    return "TraceContextInterceptor";
+                    return INTERCEPT_CLASS;
                 }
 
                 @Override public boolean isOverrideArgs() {

From fe587c8f297b7f0c02f6390bcce12d0d284a4bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= 
Date: Tue, 27 Feb 2018 15:52:31 +0800
Subject: [PATCH 21/21] Update Supported-list.md

---
 docs/Supported-list.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Supported-list.md b/docs/Supported-list.md
index d804e0aa9..e0db31239 100644
--- a/docs/Supported-list.md
+++ b/docs/Supported-list.md
@@ -44,7 +44,7 @@
 * Spring Ecosystem
   * Spring Bean annotations(@Bean, @Service, @Component, @Repository) 3.x and 4.x (Optional²)
   * Spring Core Async SuccessCallback/FailureCallback/ListenableFutureCallback 4.x
-  * [Hystrix](https://github.com/Netflix/Hystrix) 1.4.20 -> 1.5.12
+* [Hystrix: Latency and Fault Tolerance for Distributed Systems](https://github.com/Netflix/Hystrix) 1.4.20 -> 1.5.12
 * Scheduler
   * [Elastic Job](https://github.com/elasticjob/elastic-job) 2.x
 * OpenTracing community supported