From 129fb46b55d202d910c3b13b3f4071ebc4948c9d Mon Sep 17 00:00:00 2001 From: jang65953 <675953827@qq.com> Date: Fri, 26 Apr 2019 22:03:59 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0HBase=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apm-sdk-plugin/hbase-plugin/pom.xml | 37 +++++++++ .../plugin/hbase/AsyncProcessInterceptor.java | 40 +++++++++ .../hbase/AsyncRpcClientInterceptor.java | 40 +++++++++ .../plugin/hbase/HBaseAdminInterceptor.java | 50 ++++++++++++ .../plugin/hbase/HBasePluginConstants.java | 24 ++++++ .../apm/plugin/hbase/HTableInterceptor.java | 81 +++++++++++++++++++ .../HbaseClientConstructorInterceptor.java | 34 ++++++++ .../hbase/HbaseClientMethodInterceptor.java | 39 +++++++++ .../hbase/RpcClientImplInterceptor.java | 39 +++++++++ .../define/AsyncProcessInstrumentation.java | 44 ++++++++++ .../define/AsyncRpcClientInstrumentation.java | 46 +++++++++++ .../define/HBaseAdminInstrumentation.java | 50 ++++++++++++ .../hbase/define/HTableInstrumentation.java | 50 ++++++++++++ .../define/HbaseClientInstrumentation.java | 66 +++++++++++++++ .../define/RpcClientImplInstrumentation.java | 46 +++++++++++ .../src/main/resources/skywalking-plugin.def | 22 +++++ apm-sniffer/apm-sdk-plugin/pom.xml | 1 + 17 files changed, 709 insertions(+) create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/pom.xml create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientConstructorInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientMethodInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HbaseClientInstrumentation.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/resources/skywalking-plugin.def diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/hbase-plugin/pom.xml new file mode 100644 index 000000000000..627621a9025a --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/pom.xml @@ -0,0 +1,37 @@ + + + + apm-sdk-plugin + org.apache.skywalking + 6.1.0-SNAPSHOT + + 4.0.0 + + apm-hbase-plugin + + apm-hbase-plugin + + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + + + jar + + + + org.apache.hbase + hbase-shaded-client + 2.1.2 + provided + + + \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java new file mode 100644 index 000000000000..59f57ce48758 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java @@ -0,0 +1,40 @@ +package org.apache.skywalking.apm.plugin.hbase; + +import java.lang.reflect.Method; +import org.apache.skywalking.apm.agent.core.context.ContextManager; +import org.apache.skywalking.apm.agent.core.context.tag.StringTag; +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.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; +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 AsyncProcessInterceptor implements InstanceMethodsAroundInterceptor { + + private static final ILog LOGGER = LogManager.getLogger(AsyncProcessInterceptor.class); + + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + LOGGER.info("method is {} ", method.getName()); + AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_ASYNC_CLIENT + "/" + method.getName(), ""); + span.setComponent(ComponentsDefine.HBASE); + SpanLayer.asDB(span); + + } + + @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/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java new file mode 100644 index 000000000000..a7097bb4e90d --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java @@ -0,0 +1,40 @@ +package org.apache.skywalking.apm.plugin.hbase; + +import java.lang.reflect.Method; +import org.apache.skywalking.apm.agent.core.context.ContextManager; +import org.apache.skywalking.apm.agent.core.context.tag.StringTag; +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.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; +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 AsyncRpcClientInterceptor implements InstanceMethodsAroundInterceptor { + + private static final ILog LOGGER = LogManager.getLogger(AsyncRpcClientInterceptor.class); + + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + LOGGER.info("method is {} ", method.getName()); + AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_ASYNC_CLIENT + "/" + method.getName(), ""); + span.setComponent(ComponentsDefine.HBASE); + SpanLayer.asDB(span); + + } + + @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/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java new file mode 100644 index 000000000000..c5903b6c93da --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java @@ -0,0 +1,50 @@ +package org.apache.skywalking.apm.plugin.hbase; + +import java.lang.reflect.Method; +import java.util.Arrays; +import org.apache.skywalking.apm.agent.core.context.ContextManager; +import org.apache.skywalking.apm.agent.core.context.tag.StringTag; +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.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; +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 HBaseAdminInterceptor implements InstanceMethodsAroundInterceptor { + + private static final ILog LOGGER = LogManager.getLogger(HBaseAdminInterceptor.class); + + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + LOGGER.info("method is {} ", method.getName()); + AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_CLIENT_ADMIN + "/" + method.getName(), ""); + span.setComponent(ComponentsDefine.HBASE); + span.tag(new StringTag("args"), parseAttributes(allArguments)); + SpanLayer.asDB(span); + + } + + @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); + } + + protected String parseAttributes(Object[] args) { + + if (args != null && args.length > 0) { // if has params, print all params. + return Arrays.toString(args); + } + return null; + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java new file mode 100644 index 000000000000..56a3c968773f --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java @@ -0,0 +1,24 @@ +package org.apache.skywalking.apm.plugin.hbase; + +public interface HBasePluginConstants { + + /** + * The constant HBASE_CLIENT. + */ + String HBASE_CLIENT = "HBASE_CLIENT"; + + /** + * The constant HBASE_CLIENT_ADMIN. + */ + String HBASE_CLIENT_ADMIN = "HBASE_CLIENT_ADMIN"; + + /** + * The constant HBASE_CLIENT_TABLE. + */ + String HBASE_CLIENT_TABLE = "HBASE_CLIENT_TABLE"; + + /** + * The constant HBASE_ASYNC_CLIENT. + */ + String HBASE_ASYNC_CLIENT = "HBASE_ASYNC_CLIENT"; +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java new file mode 100644 index 000000000000..f502bf82bdbc --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java @@ -0,0 +1,81 @@ +package org.apache.skywalking.apm.plugin.hbase; + +import java.lang.reflect.Method; +import java.util.List; +import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.Mutation; +import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.skywalking.apm.agent.core.context.ContextManager; +import org.apache.skywalking.apm.agent.core.context.tag.StringTag; +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.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; +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 HTableInterceptor implements InstanceMethodsAroundInterceptor { + + private static final ILog LOGGER = LogManager.getLogger(HTableInterceptor.class); + + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + LOGGER.info("method is {} ", method.getName()); + AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_CLIENT_TABLE + "/" + method.getName(), ""); + span.setComponent(ComponentsDefine.HBASE); + span.tag(new StringTag("args"), parseAttributes(allArguments)); + SpanLayer.asDB(span); + + } + + @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) { + + } + + protected String parseAttributes(Object[] args) { + + Object param = null; + + if (args != null && args.length == 1) { // only one + param = args[0]; + } else if (args != null && args.length > 1) { // last param + param = args[args.length - 1]; + } else { + return null; + } + + // Put/Delete/Append/Increment + if (param instanceof Mutation) { + Mutation mutation = (Mutation)param; + return "rowKey: " + Bytes.toStringBinary(mutation.getRow()); + } + if (param instanceof Get) { + Get get = (Get)param; + return "rowKey: " + Bytes.toStringBinary(get.getRow()); + } + if (param instanceof Scan) { + Scan scan = (Scan)param; + String startRowKey = Bytes.toStringBinary(scan.getStartRow()); + String stopRowKey = Bytes.toStringBinary(scan.getStopRow()); + return "startRowKey: " + startRowKey + " stopRowKey: " + stopRowKey; + } + // if param instanceof List. + if (param instanceof List) { + List list = (List)param; + return "size: " + list.size(); + } + return null; + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientConstructorInterceptor.java new file mode 100644 index 000000000000..b998370fcaa1 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientConstructorInterceptor.java @@ -0,0 +1,34 @@ +package org.apache.skywalking.apm.plugin.hbase; + +import java.lang.reflect.Method; +import org.apache.skywalking.apm.agent.core.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; +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 HbaseClientConstructorInterceptor implements InstanceMethodsAroundInterceptor { + + private static final ILog LOGGER = LogManager.getLogger(HbaseClientConstructorInterceptor.class); + + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + LOGGER.info("method is {} ", method.getName()); + for (Object argument : allArguments) { + LOGGER.info("argument is {} ", argument.getClass()); + } + + } + + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + return ret; + } + + @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { + + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientMethodInterceptor.java new file mode 100644 index 000000000000..76b878af9779 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientMethodInterceptor.java @@ -0,0 +1,39 @@ +package org.apache.skywalking.apm.plugin.hbase; + +import java.lang.reflect.Method; +import org.apache.skywalking.apm.agent.core.context.ContextManager; +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.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; +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 HbaseClientMethodInterceptor implements InstanceMethodsAroundInterceptor { + + private static final ILog LOGGER = LogManager.getLogger(HbaseClientMethodInterceptor.class); + + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + LOGGER.info("method is {} ", method.getName()); + AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_CLIENT + "/" + method.getName(), ""); + span.setComponent(ComponentsDefine.HBASE); + SpanLayer.asDB(span); + + } + + @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/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java new file mode 100644 index 000000000000..d4f6737c9ac7 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java @@ -0,0 +1,39 @@ +package org.apache.skywalking.apm.plugin.hbase; + +import java.lang.reflect.Method; +import org.apache.skywalking.apm.agent.core.context.ContextManager; +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.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; +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 RpcClientImplInterceptor implements InstanceMethodsAroundInterceptor { + + private static final ILog LOGGER = LogManager.getLogger(RpcClientImplInterceptor.class); + + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + LOGGER.info("method is {} ", method.getName()); + AbstractSpan span = ContextManager.createExitSpan(method.getName(), ""); + span.setComponent(ComponentsDefine.HBASE); + SpanLayer.asDB(span); + + } + + @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/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java new file mode 100644 index 000000000000..fc30af31d259 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java @@ -0,0 +1,44 @@ +package org.apache.skywalking.apm.plugin.hbase.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 static net.bytebuddy.matcher.ElementMatchers.named; + +public class AsyncProcessInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.HBaseAdmin"; + + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.AsyncProcessInterceptor"; + + @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + return new ConstructorInterceptPoint[0]; + } + + @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override public ElementMatcher getMethodsMatcher() { + return named("submit").or(named("submitAll")); + } + + @Override public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override public boolean isOverrideArgs() { + return false; + } + } + }; + } + + @Override protected ClassMatch enhanceClass() { + return NameMatch.byName(ENHANCE_CLASS); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java new file mode 100644 index 000000000000..118b19afe065 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java @@ -0,0 +1,46 @@ +package org.apache.skywalking.apm.plugin.hbase.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 static net.bytebuddy.matcher.ElementMatchers.named; + +public class AsyncRpcClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.ipc.AsyncRpcClient"; + + private static final String ENHANCE_METHOD = "call"; + + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.AsyncRpcClientInterceptor"; + + @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 INTERCEPTOR_CLASS; + } + + @Override public boolean isOverrideArgs() { + return false; + } + } + }; + } + + @Override protected ClassMatch enhanceClass() { + return NameMatch.byName(ENHANCE_CLASS); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java new file mode 100644 index 000000000000..d76a9278c992 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java @@ -0,0 +1,50 @@ +package org.apache.skywalking.apm.plugin.hbase.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 static net.bytebuddy.matcher.ElementMatchers.named; + +public class HBaseAdminInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.HBaseAdmin"; + + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HBaseAdminInterceptor"; + + @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + return new ConstructorInterceptPoint[0]; + } + + @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override public ElementMatcher getMethodsMatcher() { + return named("tableExists").or(named("listTables")).or(named("listTableNames")).or(named("getTableDescriptor")) + .or(named("createTable")).or(named("deleteTable")).or(named("modifyTable")).or(named("truncateTable")) + .or(named("enableTable")).or(named("enableTableAsync")).or(named("enableTables")).or(named("disableTableAsync")) + .or(named("disableTable")).or(named("disableTables")).or(named("getAlterStatus")).or(named("addColumn")) + .or(named("deleteColumn")).or(named("modifyColumn")).or(named("compact")).or(named("majorCompact")) + .or(named("split")).or(named("getTableRegions")).or(named("snapshot")).or(named("restoreSnapshot")) + .or(named("cloneSnapshot")).or(named("listSnapshots")).or(named("deleteSnapshot")); + } + + @Override public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override public boolean isOverrideArgs() { + return false; + } + } + }; + } + + @Override protected ClassMatch enhanceClass() { + return NameMatch.byName(ENHANCE_CLASS); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java new file mode 100644 index 000000000000..82c25e7e8b17 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java @@ -0,0 +1,50 @@ +package org.apache.skywalking.apm.plugin.hbase.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 static net.bytebuddy.matcher.ElementMatchers.anyOf; +import static net.bytebuddy.matcher.ElementMatchers.named; + +public class HTableInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.HTable"; + + private static final ElementMatcher.Junction[] JUNCTIONS = new ElementMatcher.Junction[] { + }; + + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HTableInterceptor"; + + @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + return new ConstructorInterceptPoint[0]; + } + + @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override public ElementMatcher getMethodsMatcher() { + return named("append").or(named("increment")).or(named("exists")).or(named("existsAll")) + .or(named("get")).or(named("getScanner")).or(named("put")).or(named("checkAndPut")) + .or(named("delete")).or(named("checkAndDelete")).or(named("mutateRow")).or(named("checkAndMutate")); + } + + @Override public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override public boolean isOverrideArgs() { + return false; + } + } + }; + } + + @Override protected ClassMatch enhanceClass() { + return NameMatch.byName(ENHANCE_CLASS); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HbaseClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HbaseClientInstrumentation.java new file mode 100644 index 000000000000..9c30ae7a0e23 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HbaseClientInstrumentation.java @@ -0,0 +1,66 @@ +package org.apache.skywalking.apm.plugin.hbase.define; + +import java.util.Set; +import net.bytebuddy.description.method.MethodDescription; +import net.bytebuddy.matcher.ElementMatcher; +import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.client.AsyncRequestFuture; +import org.apache.hadoop.hbase.client.MultiAction; +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 static net.bytebuddy.matcher.ElementMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; + +public class HbaseClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.AsyncProcess$AsyncRequestFutureImpl$SingleServerRequestRunnable"; + + private static final String ENHANCE_METHOD = "run"; + + private static final String CONSTRUCTOR_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HbaseClientConstructorInterceptor"; + private static final String METHOD_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HBaseAdminInterceptor"; + + @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + return new ConstructorInterceptPoint[] { + new ConstructorInterceptPoint() { + @Override public ElementMatcher getConstructorMatcher() { + return takesArgument(0, AsyncRequestFuture.class) + .and(takesArgument(1, MultiAction.class)) + .and(takesArgument(2, int.class)) + .and(takesArgument(3, ServerName.class)) + .and(takesArgument(4, Set.class)); + } + + @Override public String getConstructorInterceptor() { + return CONSTRUCTOR_INTERCEPTOR_CLASS; + } + } + }; + } + + @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override public ElementMatcher getMethodsMatcher() { + return named(ENHANCE_METHOD); + } + + @Override public String getMethodsInterceptor() { + return METHOD_INTERCEPTOR_CLASS; + } + + @Override public boolean isOverrideArgs() { + return false; + } + } + }; + } + + @Override protected ClassMatch enhanceClass() { + return NameMatch.byName(ENHANCE_CLASS); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java new file mode 100644 index 000000000000..22e987ef9bf9 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java @@ -0,0 +1,46 @@ +package org.apache.skywalking.apm.plugin.hbase.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 static net.bytebuddy.matcher.ElementMatchers.named; + +public class RpcClientImplInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.ipc.RpcClientImpl"; + + private static final String ENHANCE_METHOD = "call"; + + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.RpcClientImplInterceptor"; + + @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 INTERCEPTOR_CLASS; + } + + @Override public boolean isOverrideArgs() { + return false; + } + } + }; + } + + @Override protected ClassMatch enhanceClass() { + return NameMatch.byName(ENHANCE_CLASS); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/resources/skywalking-plugin.def new file mode 100644 index 000000000000..6bf3a41115ba --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/resources/skywalking-plugin.def @@ -0,0 +1,22 @@ +# 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. + +hbase=org.apache.skywalking.apm.plugin.hbase.define.HBaseAdminInstrumentation +hbase=org.apache.skywalking.apm.plugin.hbase.define.HTableInstrumentation +hbase=org.apache.skywalking.apm.plugin.hbase.define.AsyncProcessInstrumentation +hbase=org.apache.skywalking.apm.plugin.hbase.define.AsyncRpcClientInstrumentation +hbase=org.apache.skywalking.apm.plugin.hbase.define.HbaseClientInstrumentation +hbase=org.apache.skywalking.apm.plugin.hbase.define.RpcClientImplInstrumentation \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml index 98a3227ecf89..664effdefcb5 100644 --- a/apm-sniffer/apm-sdk-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pom.xml @@ -70,6 +70,7 @@ dubbo-2.7.x-plugin dubbo-2.7.x-conflict-patch vertx-plugins + hbase-plugin pom From 055630f40b0ae6daa32e75737ffe22a05391006a Mon Sep 17 00:00:00 2001 From: jang65953 <675953827@qq.com> Date: Fri, 26 Apr 2019 22:32:15 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=9C=E8=80=85?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trace/component/ComponentsDefine.java | 3 + .../plugin/hbase/AsyncProcessInterceptor.java | 15 +++-- .../hbase/AsyncRpcClientInterceptor.java | 19 ++++-- .../plugin/hbase/HBaseAdminInterceptor.java | 15 +++-- .../plugin/hbase/HBasePluginConstants.java | 5 ++ .../apm/plugin/hbase/HTableInterceptor.java | 23 ++++--- .../HbaseClientConstructorInterceptor.java | 15 +++-- .../hbase/HbaseClientMethodInterceptor.java | 15 +++-- .../hbase/RpcClientImplInterceptor.java | 15 +++-- .../define/AsyncProcessInstrumentation.java | 43 +++++++----- .../define/AsyncRpcClientInstrumentation.java | 43 +++++++----- .../define/HBaseAdminInstrumentation.java | 55 +++++++++------- .../hbase/define/HTableInstrumentation.java | 49 ++++++++------ .../define/HbaseClientInstrumentation.java | 66 +++++++++++-------- .../define/RpcClientImplInstrumentation.java | 43 +++++++----- 15 files changed, 275 insertions(+), 149 deletions(-) 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 2a3116148669..535390dbbf87 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 @@ -116,6 +116,8 @@ public class ComponentsDefine { public static final OfficialComponent VERTX = new OfficialComponent(59, "Vert.x"); + public static final OfficialComponent HBASE = new OfficialComponent(59, "HBase"); + private static ComponentsDefine INSTANCE = new ComponentsDefine(); private String[] components; @@ -170,6 +172,7 @@ public ComponentsDefine() { addComponent(LETTUCE); addComponent(ZOOKEEPER); addComponent(VERTX); + addComponent(HBASE); } private void addComponent(OfficialComponent component) { diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java index 59f57ce48758..732af7531dd3 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java @@ -1,6 +1,7 @@ package org.apache.skywalking.apm.plugin.hbase; import java.lang.reflect.Method; + import org.apache.skywalking.apm.agent.core.context.ContextManager; import org.apache.skywalking.apm.agent.core.context.tag.StringTag; import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; @@ -12,13 +13,18 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; +/** + * @author zhangbin + * @email 675953827@qq.com + * @date 2019/4/26 22:14 + */ public class AsyncProcessInterceptor implements InstanceMethodsAroundInterceptor { private static final ILog LOGGER = LogManager.getLogger(AsyncProcessInterceptor.class); @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { LOGGER.info("method is {} ", method.getName()); AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_ASYNC_CLIENT + "/" + method.getName(), ""); span.setComponent(ComponentsDefine.HBASE); @@ -28,13 +34,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + @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/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java index a7097bb4e90d..3e29e11e28bd 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java @@ -1,8 +1,6 @@ package org.apache.skywalking.apm.plugin.hbase; -import java.lang.reflect.Method; import org.apache.skywalking.apm.agent.core.context.ContextManager; -import org.apache.skywalking.apm.agent.core.context.tag.StringTag; 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.logging.api.ILog; @@ -12,13 +10,21 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; +import java.lang.reflect.Method; + +/** + * @author zhangbin + * @email 675953827@qq.com + * @date 2019/4/26 22:14 + */ + public class AsyncRpcClientInterceptor implements InstanceMethodsAroundInterceptor { private static final ILog LOGGER = LogManager.getLogger(AsyncRpcClientInterceptor.class); @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { LOGGER.info("method is {} ", method.getName()); AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_ASYNC_CLIENT + "/" + method.getName(), ""); span.setComponent(ComponentsDefine.HBASE); @@ -28,13 +34,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + @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/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java index c5903b6c93da..2d4ee9fd3eff 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java @@ -2,6 +2,7 @@ import java.lang.reflect.Method; import java.util.Arrays; + import org.apache.skywalking.apm.agent.core.context.ContextManager; import org.apache.skywalking.apm.agent.core.context.tag.StringTag; import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; @@ -13,13 +14,18 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; +/** + * @author zhangbin + * @email 675953827@qq.com + * @date 2019/4/26 22:14 + */ public class HBaseAdminInterceptor implements InstanceMethodsAroundInterceptor { private static final ILog LOGGER = LogManager.getLogger(HBaseAdminInterceptor.class); @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { LOGGER.info("method is {} ", method.getName()); AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_CLIENT_ADMIN + "/" + method.getName(), ""); span.setComponent(ComponentsDefine.HBASE); @@ -30,13 +36,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + @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/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java index 56a3c968773f..a925eac14b17 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java @@ -1,5 +1,10 @@ package org.apache.skywalking.apm.plugin.hbase; +/** + * @author zhangbin + * @email 675953827@qq.com + * @date 2019/4/26 22:14 + */ public interface HBasePluginConstants { /** diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java index f502bf82bdbc..f8187db1878f 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java @@ -2,6 +2,7 @@ import java.lang.reflect.Method; import java.util.List; + import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Mutation; import org.apache.hadoop.hbase.client.Scan; @@ -17,13 +18,18 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; +/** + * @author zhangbin + * @email 675953827@qq.com + * @date 2019/4/26 22:14 + */ public class HTableInterceptor implements InstanceMethodsAroundInterceptor { private static final ILog LOGGER = LogManager.getLogger(HTableInterceptor.class); @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { LOGGER.info("method is {} ", method.getName()); AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_CLIENT_TABLE + "/" + method.getName(), ""); span.setComponent(ComponentsDefine.HBASE); @@ -34,13 +40,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { } @@ -58,22 +65,22 @@ protected String parseAttributes(Object[] args) { // Put/Delete/Append/Increment if (param instanceof Mutation) { - Mutation mutation = (Mutation)param; + Mutation mutation = (Mutation) param; return "rowKey: " + Bytes.toStringBinary(mutation.getRow()); } if (param instanceof Get) { - Get get = (Get)param; + Get get = (Get) param; return "rowKey: " + Bytes.toStringBinary(get.getRow()); } if (param instanceof Scan) { - Scan scan = (Scan)param; + Scan scan = (Scan) param; String startRowKey = Bytes.toStringBinary(scan.getStartRow()); String stopRowKey = Bytes.toStringBinary(scan.getStopRow()); return "startRowKey: " + startRowKey + " stopRowKey: " + stopRowKey; } // if param instanceof List. if (param instanceof List) { - List list = (List)param; + List list = (List) param; return "size: " + list.size(); } return null; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientConstructorInterceptor.java index b998370fcaa1..893b42ed43b5 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientConstructorInterceptor.java @@ -1,19 +1,25 @@ package org.apache.skywalking.apm.plugin.hbase; import java.lang.reflect.Method; + import org.apache.skywalking.apm.agent.core.logging.api.ILog; import org.apache.skywalking.apm.agent.core.logging.api.LogManager; 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; +/** + * @author zhangbin + * @email 675953827@qq.com + * @date 2019/4/26 22:14 + */ public class HbaseClientConstructorInterceptor implements InstanceMethodsAroundInterceptor { private static final ILog LOGGER = LogManager.getLogger(HbaseClientConstructorInterceptor.class); @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { LOGGER.info("method is {} ", method.getName()); for (Object argument : allArguments) { LOGGER.info("argument is {} ", argument.getClass()); @@ -23,12 +29,13 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientMethodInterceptor.java index 76b878af9779..1d09887a242b 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientMethodInterceptor.java @@ -1,6 +1,7 @@ package org.apache.skywalking.apm.plugin.hbase; import java.lang.reflect.Method; + import org.apache.skywalking.apm.agent.core.context.ContextManager; import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; @@ -11,13 +12,18 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; +/** + * @author zhangbin + * @email 675953827@qq.com + * @date 2019/4/26 22:14 + */ public class HbaseClientMethodInterceptor implements InstanceMethodsAroundInterceptor { private static final ILog LOGGER = LogManager.getLogger(HbaseClientMethodInterceptor.class); @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { LOGGER.info("method is {} ", method.getName()); AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_CLIENT + "/" + method.getName(), ""); span.setComponent(ComponentsDefine.HBASE); @@ -27,13 +33,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + @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/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java index d4f6737c9ac7..820082d0e7e6 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java @@ -1,6 +1,7 @@ package org.apache.skywalking.apm.plugin.hbase; import java.lang.reflect.Method; + import org.apache.skywalking.apm.agent.core.context.ContextManager; import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; @@ -11,13 +12,18 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; +/** + * @author zhangbin + * @email 675953827@qq.com + * @date 2019/4/26 22:14 + */ public class RpcClientImplInterceptor implements InstanceMethodsAroundInterceptor { private static final ILog LOGGER = LogManager.getLogger(RpcClientImplInterceptor.class); @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { LOGGER.info("method is {} ", method.getName()); AbstractSpan span = ContextManager.createExitSpan(method.getName(), ""); span.setComponent(ComponentsDefine.HBASE); @@ -27,13 +33,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + @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/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java index fc30af31d259..cadd3fade224 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java @@ -10,35 +10,46 @@ import static net.bytebuddy.matcher.ElementMatchers.named; +/** + * @author zhangbin + * @email 675953827@qq.com + * @date 2019/4/26 22:14 + */ public class AsyncProcessInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.HBaseAdmin"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.AsyncProcessInterceptor"; - @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[] { - new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named("submit").or(named("submitAll")); + @Override + protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[]{ + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("submit").or(named("submitAll")); + } + + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } } - - @Override public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } - - @Override public boolean isOverrideArgs() { - return false; - } - } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java index 118b19afe065..ec35885fbf8d 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java @@ -10,6 +10,11 @@ import static net.bytebuddy.matcher.ElementMatchers.named; +/** + * @author zhangbin + * @email 675953827@qq.com + * @date 2019/4/26 22:14 + */ public class AsyncRpcClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.ipc.AsyncRpcClient"; @@ -18,29 +23,35 @@ public class AsyncRpcClientInstrumentation extends ClassInstanceMethodsEnhancePl private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.AsyncRpcClientInterceptor"; - @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @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 + protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[]{ + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named(ENHANCE_METHOD); + } + + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } } - - @Override public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } - - @Override public boolean isOverrideArgs() { - return false; - } - } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java index d76a9278c992..07cb8cccc8a9 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java @@ -10,41 +10,52 @@ import static net.bytebuddy.matcher.ElementMatchers.named; +/** + * @author zhangbin + * @email 675953827@qq.com + * @date 2019/4/26 22:14 + */ public class HBaseAdminInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.HBaseAdmin"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HBaseAdminInterceptor"; - @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[] { - new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named("tableExists").or(named("listTables")).or(named("listTableNames")).or(named("getTableDescriptor")) - .or(named("createTable")).or(named("deleteTable")).or(named("modifyTable")).or(named("truncateTable")) - .or(named("enableTable")).or(named("enableTableAsync")).or(named("enableTables")).or(named("disableTableAsync")) - .or(named("disableTable")).or(named("disableTables")).or(named("getAlterStatus")).or(named("addColumn")) - .or(named("deleteColumn")).or(named("modifyColumn")).or(named("compact")).or(named("majorCompact")) - .or(named("split")).or(named("getTableRegions")).or(named("snapshot")).or(named("restoreSnapshot")) - .or(named("cloneSnapshot")).or(named("listSnapshots")).or(named("deleteSnapshot")); + @Override + protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[]{ + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("tableExists").or(named("listTables")).or(named("listTableNames")).or(named("getTableDescriptor")) + .or(named("createTable")).or(named("deleteTable")).or(named("modifyTable")).or(named("truncateTable")) + .or(named("enableTable")).or(named("enableTableAsync")).or(named("enableTables")).or(named("disableTableAsync")) + .or(named("disableTable")).or(named("disableTables")).or(named("getAlterStatus")).or(named("addColumn")) + .or(named("deleteColumn")).or(named("modifyColumn")).or(named("compact")).or(named("majorCompact")) + .or(named("split")).or(named("getTableRegions")).or(named("snapshot")).or(named("restoreSnapshot")) + .or(named("cloneSnapshot")).or(named("listSnapshots")).or(named("deleteSnapshot")); + } + + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } } - - @Override public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } - - @Override public boolean isOverrideArgs() { - return false; - } - } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java index 82c25e7e8b17..83b3516342e2 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java @@ -11,40 +11,51 @@ import static net.bytebuddy.matcher.ElementMatchers.anyOf; import static net.bytebuddy.matcher.ElementMatchers.named; +/** + * @author zhangbin + * @email 675953827@qq.com + * @date 2019/4/26 22:14 + */ public class HTableInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.HTable"; - private static final ElementMatcher.Junction[] JUNCTIONS = new ElementMatcher.Junction[] { + private static final ElementMatcher.Junction[] JUNCTIONS = new ElementMatcher.Junction[]{ }; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HTableInterceptor"; - @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[] { - new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named("append").or(named("increment")).or(named("exists")).or(named("existsAll")) - .or(named("get")).or(named("getScanner")).or(named("put")).or(named("checkAndPut")) - .or(named("delete")).or(named("checkAndDelete")).or(named("mutateRow")).or(named("checkAndMutate")); + @Override + protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[]{ + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("append").or(named("increment")).or(named("exists")).or(named("existsAll")) + .or(named("get")).or(named("getScanner")).or(named("put")).or(named("checkAndPut")) + .or(named("delete")).or(named("checkAndDelete")).or(named("mutateRow")).or(named("checkAndMutate")); + } + + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } } - - @Override public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } - - @Override public boolean isOverrideArgs() { - return false; - } - } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HbaseClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HbaseClientInstrumentation.java index 9c30ae7a0e23..a702ece46e05 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HbaseClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HbaseClientInstrumentation.java @@ -1,6 +1,7 @@ package org.apache.skywalking.apm.plugin.hbase.define; import java.util.Set; + import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; import org.apache.hadoop.hbase.ServerName; @@ -15,6 +16,11 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +/** + * @author zhangbin + * @email 675953827@qq.com + * @date 2019/4/26 22:14 + */ public class HbaseClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.AsyncProcess$AsyncRequestFutureImpl$SingleServerRequestRunnable"; @@ -24,43 +30,51 @@ public class HbaseClientInstrumentation extends ClassInstanceMethodsEnhancePlugi private static final String CONSTRUCTOR_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HbaseClientConstructorInterceptor"; private static final String METHOD_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HBaseAdminInterceptor"; - @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[] { - new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { - return takesArgument(0, AsyncRequestFuture.class) - .and(takesArgument(1, MultiAction.class)) - .and(takesArgument(2, int.class)) - .and(takesArgument(3, ServerName.class)) - .and(takesArgument(4, Set.class)); - } + @Override + protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + return new ConstructorInterceptPoint[]{ + new ConstructorInterceptPoint() { + @Override + public ElementMatcher getConstructorMatcher() { + return takesArgument(0, AsyncRequestFuture.class) + .and(takesArgument(1, MultiAction.class)) + .and(takesArgument(2, int.class)) + .and(takesArgument(3, ServerName.class)) + .and(takesArgument(4, Set.class)); + } - @Override public String getConstructorInterceptor() { - return CONSTRUCTOR_INTERCEPTOR_CLASS; + @Override + public String getConstructorInterceptor() { + return CONSTRUCTOR_INTERCEPTOR_CLASS; + } } - } }; } - @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[] { - new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(ENHANCE_METHOD); - } + @Override + protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[]{ + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named(ENHANCE_METHOD); + } - @Override public String getMethodsInterceptor() { - return METHOD_INTERCEPTOR_CLASS; - } + @Override + public String getMethodsInterceptor() { + return METHOD_INTERCEPTOR_CLASS; + } - @Override public boolean isOverrideArgs() { - return false; + @Override + public boolean isOverrideArgs() { + return false; + } } - } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java index 22e987ef9bf9..6967d1f8bcdd 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java @@ -10,6 +10,11 @@ import static net.bytebuddy.matcher.ElementMatchers.named; +/** + * @author zhangbin + * @email 675953827@qq.com + * @date 2019/4/26 22:14 + */ public class RpcClientImplInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.ipc.RpcClientImpl"; @@ -18,29 +23,35 @@ public class RpcClientImplInstrumentation extends ClassInstanceMethodsEnhancePlu private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.RpcClientImplInterceptor"; - @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @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 + protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[]{ + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named(ENHANCE_METHOD); + } + + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } } - - @Override public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } - - @Override public boolean isOverrideArgs() { - return false; - } - } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } } From 3ce40c4d96ec2148b8b67be81f1cbf80f3b989ab Mon Sep 17 00:00:00 2001 From: jang65953 <675953827@qq.com> Date: Fri, 26 Apr 2019 23:11:04 +0800 Subject: [PATCH 03/14] add license and delete the redundant enhancement --- .../trace/component/ComponentsDefine.java | 2 +- .../plugin/hbase/AsyncProcessInterceptor.java | 28 +++++-- .../hbase/AsyncRpcClientInterceptor.java | 26 ++++-- .../plugin/hbase/HBaseAdminInterceptor.java | 27 +++++-- ...java => HBaseClientMethodInterceptor.java} | 30 +++++-- .../plugin/hbase/HBasePluginConstants.java | 20 ++++- .../apm/plugin/hbase/HTableInterceptor.java | 35 +++++--- .../HbaseClientConstructorInterceptor.java | 41 ---------- .../hbase/RpcClientImplInterceptor.java | 26 ++++-- .../define/AsyncProcessInstrumentation.java | 52 +++++++----- .../define/AsyncRpcClientInstrumentation.java | 52 +++++++----- .../define/HBaseAdminInstrumentation.java | 65 +++++++++------ .../define/HBaseClientInstrumentation.java | 55 +++++++++++++ .../hbase/define/HTableInstrumentation.java | 65 ++++++++------- .../define/HbaseClientInstrumentation.java | 80 ------------------- .../define/RpcClientImplInstrumentation.java | 52 +++++++----- .../src/main/resources/skywalking-plugin.def | 2 +- 17 files changed, 388 insertions(+), 270 deletions(-) rename apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{HbaseClientMethodInterceptor.java => HBaseClientMethodInterceptor.java} (60%) delete mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientConstructorInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java delete mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HbaseClientInstrumentation.java 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 535390dbbf87..a2e2437e9559 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 @@ -116,7 +116,7 @@ public class ComponentsDefine { public static final OfficialComponent VERTX = new OfficialComponent(59, "Vert.x"); - public static final OfficialComponent HBASE = new OfficialComponent(59, "HBase"); + public static final OfficialComponent HBASE = new OfficialComponent(60, "HBase"); private static ComponentsDefine INSTANCE = new ComponentsDefine(); diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java index 732af7531dd3..1d0500a18983 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java @@ -1,9 +1,25 @@ +/* + * 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.hbase; import java.lang.reflect.Method; - import org.apache.skywalking.apm.agent.core.context.ContextManager; -import org.apache.skywalking.apm.agent.core.context.tag.StringTag; 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.logging.api.ILog; @@ -15,8 +31,6 @@ /** * @author zhangbin - * @email 675953827@qq.com - * @date 2019/4/26 22:14 */ public class AsyncProcessInterceptor implements InstanceMethodsAroundInterceptor { @@ -24,7 +38,7 @@ public class AsyncProcessInterceptor implements InstanceMethodsAroundInterceptor @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { LOGGER.info("method is {} ", method.getName()); AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_ASYNC_CLIENT + "/" + method.getName(), ""); span.setComponent(ComponentsDefine.HBASE); @@ -34,14 +48,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java index 3e29e11e28bd..cc26fd273ffb 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java @@ -1,3 +1,21 @@ +/* + * 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.hbase; import org.apache.skywalking.apm.agent.core.context.ContextManager; @@ -14,8 +32,6 @@ /** * @author zhangbin - * @email 675953827@qq.com - * @date 2019/4/26 22:14 */ public class AsyncRpcClientInterceptor implements InstanceMethodsAroundInterceptor { @@ -24,7 +40,7 @@ public class AsyncRpcClientInterceptor implements InstanceMethodsAroundIntercept @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { LOGGER.info("method is {} ", method.getName()); AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_ASYNC_CLIENT + "/" + method.getName(), ""); span.setComponent(ComponentsDefine.HBASE); @@ -34,14 +50,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java index 2d4ee9fd3eff..663f21f04536 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java @@ -1,3 +1,22 @@ +/* + * 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.hbase; import java.lang.reflect.Method; @@ -16,8 +35,6 @@ /** * @author zhangbin - * @email 675953827@qq.com - * @date 2019/4/26 22:14 */ public class HBaseAdminInterceptor implements InstanceMethodsAroundInterceptor { @@ -25,7 +42,7 @@ public class HBaseAdminInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { LOGGER.info("method is {} ", method.getName()); AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_CLIENT_ADMIN + "/" + method.getName(), ""); span.setComponent(ComponentsDefine.HBASE); @@ -36,14 +53,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseClientMethodInterceptor.java similarity index 60% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientMethodInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseClientMethodInterceptor.java index 1d09887a242b..2705053aac1d 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseClientMethodInterceptor.java @@ -1,3 +1,21 @@ +/* + * 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.hbase; import java.lang.reflect.Method; @@ -14,16 +32,14 @@ /** * @author zhangbin - * @email 675953827@qq.com - * @date 2019/4/26 22:14 */ -public class HbaseClientMethodInterceptor implements InstanceMethodsAroundInterceptor { +public class HBaseClientMethodInterceptor implements InstanceMethodsAroundInterceptor { - private static final ILog LOGGER = LogManager.getLogger(HbaseClientMethodInterceptor.class); + private static final ILog LOGGER = LogManager.getLogger(HBaseClientMethodInterceptor.class); @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { LOGGER.info("method is {} ", method.getName()); AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_CLIENT + "/" + method.getName(), ""); span.setComponent(ComponentsDefine.HBASE); @@ -33,14 +49,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java index a925eac14b17..589307ae7fa6 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java @@ -1,9 +1,25 @@ +/* + * 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.hbase; /** * @author zhangbin - * @email 675953827@qq.com - * @date 2019/4/26 22:14 */ public interface HBasePluginConstants { diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java index f8187db1878f..19b5b23f6a05 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java @@ -1,3 +1,21 @@ +/* + * 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.hbase; import java.lang.reflect.Method; @@ -20,8 +38,6 @@ /** * @author zhangbin - * @email 675953827@qq.com - * @date 2019/4/26 22:14 */ public class HTableInterceptor implements InstanceMethodsAroundInterceptor { @@ -29,25 +45,24 @@ public class HTableInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { LOGGER.info("method is {} ", method.getName()); AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_CLIENT_TABLE + "/" + method.getName(), ""); span.setComponent(ComponentsDefine.HBASE); span.tag(new StringTag("args"), parseAttributes(allArguments)); SpanLayer.asDB(span); - } @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { } @@ -65,22 +80,22 @@ protected String parseAttributes(Object[] args) { // Put/Delete/Append/Increment if (param instanceof Mutation) { - Mutation mutation = (Mutation) param; + Mutation mutation = (Mutation)param; return "rowKey: " + Bytes.toStringBinary(mutation.getRow()); } if (param instanceof Get) { - Get get = (Get) param; + Get get = (Get)param; return "rowKey: " + Bytes.toStringBinary(get.getRow()); } if (param instanceof Scan) { - Scan scan = (Scan) param; + Scan scan = (Scan)param; String startRowKey = Bytes.toStringBinary(scan.getStartRow()); String stopRowKey = Bytes.toStringBinary(scan.getStopRow()); return "startRowKey: " + startRowKey + " stopRowKey: " + stopRowKey; } // if param instanceof List. if (param instanceof List) { - List list = (List) param; + List list = (List)param; return "size: " + list.size(); } return null; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientConstructorInterceptor.java deleted file mode 100644 index 893b42ed43b5..000000000000 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HbaseClientConstructorInterceptor.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.apache.skywalking.apm.plugin.hbase; - -import java.lang.reflect.Method; - -import org.apache.skywalking.apm.agent.core.logging.api.ILog; -import org.apache.skywalking.apm.agent.core.logging.api.LogManager; -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; - -/** - * @author zhangbin - * @email 675953827@qq.com - * @date 2019/4/26 22:14 - */ -public class HbaseClientConstructorInterceptor implements InstanceMethodsAroundInterceptor { - - private static final ILog LOGGER = LogManager.getLogger(HbaseClientConstructorInterceptor.class); - - @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { - LOGGER.info("method is {} ", method.getName()); - for (Object argument : allArguments) { - LOGGER.info("argument is {} ", argument.getClass()); - } - - } - - @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { - return ret; - } - - @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { - - } -} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java index 820082d0e7e6..11ac907b5a0c 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java @@ -1,3 +1,21 @@ +/* + * 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.hbase; import java.lang.reflect.Method; @@ -14,8 +32,6 @@ /** * @author zhangbin - * @email 675953827@qq.com - * @date 2019/4/26 22:14 */ public class RpcClientImplInterceptor implements InstanceMethodsAroundInterceptor { @@ -23,7 +39,7 @@ public class RpcClientImplInterceptor implements InstanceMethodsAroundIntercepto @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { LOGGER.info("method is {} ", method.getName()); AbstractSpan span = ContextManager.createExitSpan(method.getName(), ""); span.setComponent(ComponentsDefine.HBASE); @@ -33,14 +49,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java index cadd3fade224..bf13109cbda1 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java @@ -1,3 +1,21 @@ +/* + * 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.hbase.define; import net.bytebuddy.description.method.MethodDescription; @@ -12,8 +30,6 @@ /** * @author zhangbin - * @email 675953827@qq.com - * @date 2019/4/26 22:14 */ public class AsyncProcessInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -28,23 +44,23 @@ protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ - new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("submit").or(named("submitAll")); - } - - @Override - public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } - - @Override - public boolean isOverrideArgs() { - return false; - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("submit").or(named("submitAll")); + } + + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; } + } }; } diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java index ec35885fbf8d..53d7b39cb305 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java @@ -1,3 +1,21 @@ +/* + * 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.hbase.define; import net.bytebuddy.description.method.MethodDescription; @@ -12,8 +30,6 @@ /** * @author zhangbin - * @email 675953827@qq.com - * @date 2019/4/26 22:14 */ public class AsyncRpcClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -30,23 +46,23 @@ protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ - new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named(ENHANCE_METHOD); - } - - @Override - public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } - - @Override - public boolean isOverrideArgs() { - return false; - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named(ENHANCE_METHOD); + } + + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; } + } }; } diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java index 07cb8cccc8a9..9507949396b4 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java @@ -1,3 +1,21 @@ +/* + * 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.hbase.define; import net.bytebuddy.description.method.MethodDescription; @@ -12,8 +30,6 @@ /** * @author zhangbin - * @email 675953827@qq.com - * @date 2019/4/26 22:14 */ public class HBaseAdminInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -28,29 +44,30 @@ protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ - new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("tableExists").or(named("listTables")).or(named("listTableNames")).or(named("getTableDescriptor")) - .or(named("createTable")).or(named("deleteTable")).or(named("modifyTable")).or(named("truncateTable")) - .or(named("enableTable")).or(named("enableTableAsync")).or(named("enableTables")).or(named("disableTableAsync")) - .or(named("disableTable")).or(named("disableTables")).or(named("getAlterStatus")).or(named("addColumn")) - .or(named("deleteColumn")).or(named("modifyColumn")).or(named("compact")).or(named("majorCompact")) - .or(named("split")).or(named("getTableRegions")).or(named("snapshot")).or(named("restoreSnapshot")) - .or(named("cloneSnapshot")).or(named("listSnapshots")).or(named("deleteSnapshot")); - } - - @Override - public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } - - @Override - public boolean isOverrideArgs() { - return false; - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("tableExists").or(named("listTables")) + .or(named("listTableNames")).or(named("getTableDescriptor")).or(named("createTable")).or(named("deleteTable")) + .or(named("modifyTable")).or(named("truncateTable")).or(named("enableTable")).or(named("enableTableAsync")) + .or(named("enableTables")).or(named("disableTableAsync")).or(named("disableTable")).or(named("disableTables")) + .or(named("getAlterStatus")).or(named("addColumn")).or(named("deleteColumn")).or(named("modifyColumn")) + .or(named("compact")).or(named("majorCompact")).or(named("split")).or(named("getTableRegions")) + .or(named("snapshot")).or(named("restoreSnapshot")).or(named("cloneSnapshot")).or(named("listSnapshots")) + .or(named("deleteSnapshot")); + } + + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; } + } }; } diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java new file mode 100644 index 000000000000..9cc7385dac42 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java @@ -0,0 +1,55 @@ +package org.apache.skywalking.apm.plugin.hbase.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 static net.bytebuddy.matcher.ElementMatchers.named; + +/** + * @author zhangbin + */ +public class HBaseClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.AsyncProcess$AsyncRequestFutureImpl$SingleServerRequestRunnable"; + + private static final String ENHANCE_METHOD = "run"; + + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HBaseClientMethodInterceptor"; + + @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 INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } + } + }; + } + + @Override + protected ClassMatch enhanceClass() { + return NameMatch.byName(ENHANCE_CLASS); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java index 83b3516342e2..79989fab35d7 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java @@ -1,3 +1,21 @@ +/* + * 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.hbase.define; import net.bytebuddy.description.method.MethodDescription; @@ -8,54 +26,45 @@ 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.anyOf; import static net.bytebuddy.matcher.ElementMatchers.named; /** * @author zhangbin - * @email 675953827@qq.com - * @date 2019/4/26 22:14 */ public class HTableInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.HTable"; - private static final ElementMatcher.Junction[] JUNCTIONS = new ElementMatcher.Junction[]{ + private static final ElementMatcher.Junction[] JUNCTIONS = new ElementMatcher.Junction[] { }; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HTableInterceptor"; - @Override - protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override - protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ - new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("append").or(named("increment")).or(named("exists")).or(named("existsAll")) - .or(named("get")).or(named("getScanner")).or(named("put")).or(named("checkAndPut")) - .or(named("delete")).or(named("checkAndDelete")).or(named("mutateRow")).or(named("checkAndMutate")); - } - - @Override - public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } - - @Override - public boolean isOverrideArgs() { - return false; - } + @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override public ElementMatcher getMethodsMatcher() { + return named("append").or(named("increment")).or(named("exists")).or(named("existsAll")) + .or(named("get")).or(named("getScanner")).or(named("put")).or(named("checkAndPut")) + .or(named("delete")).or(named("checkAndDelete")).or(named("mutateRow")).or(named("checkAndMutate")); + } + + @Override public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override public boolean isOverrideArgs() { + return false; } + } }; } - @Override - protected ClassMatch enhanceClass() { + @Override protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HbaseClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HbaseClientInstrumentation.java deleted file mode 100644 index a702ece46e05..000000000000 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HbaseClientInstrumentation.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.apache.skywalking.apm.plugin.hbase.define; - -import java.util.Set; - -import net.bytebuddy.description.method.MethodDescription; -import net.bytebuddy.matcher.ElementMatcher; -import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.client.AsyncRequestFuture; -import org.apache.hadoop.hbase.client.MultiAction; -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 static net.bytebuddy.matcher.ElementMatchers.named; -import static net.bytebuddy.matcher.ElementMatchers.takesArgument; - -/** - * @author zhangbin - * @email 675953827@qq.com - * @date 2019/4/26 22:14 - */ -public class HbaseClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - - private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.AsyncProcess$AsyncRequestFutureImpl$SingleServerRequestRunnable"; - - private static final String ENHANCE_METHOD = "run"; - - private static final String CONSTRUCTOR_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HbaseClientConstructorInterceptor"; - private static final String METHOD_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HBaseAdminInterceptor"; - - @Override - protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ - new ConstructorInterceptPoint() { - @Override - public ElementMatcher getConstructorMatcher() { - return takesArgument(0, AsyncRequestFuture.class) - .and(takesArgument(1, MultiAction.class)) - .and(takesArgument(2, int.class)) - .and(takesArgument(3, ServerName.class)) - .and(takesArgument(4, Set.class)); - } - - @Override - public String getConstructorInterceptor() { - return CONSTRUCTOR_INTERCEPTOR_CLASS; - } - } - }; - } - - @Override - protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ - new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named(ENHANCE_METHOD); - } - - @Override - public String getMethodsInterceptor() { - return METHOD_INTERCEPTOR_CLASS; - } - - @Override - public boolean isOverrideArgs() { - return false; - } - } - }; - } - - @Override - protected ClassMatch enhanceClass() { - return NameMatch.byName(ENHANCE_CLASS); - } -} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java index 6967d1f8bcdd..9ea46a26e457 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java @@ -1,3 +1,21 @@ +/* + * 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.hbase.define; import net.bytebuddy.description.method.MethodDescription; @@ -12,8 +30,6 @@ /** * @author zhangbin - * @email 675953827@qq.com - * @date 2019/4/26 22:14 */ public class RpcClientImplInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -30,23 +46,23 @@ protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ - new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named(ENHANCE_METHOD); - } - - @Override - public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } - - @Override - public boolean isOverrideArgs() { - return false; - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named(ENHANCE_METHOD); + } + + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; } + } }; } diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/resources/skywalking-plugin.def index 6bf3a41115ba..9a1d950e245e 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/resources/skywalking-plugin.def @@ -18,5 +18,5 @@ hbase=org.apache.skywalking.apm.plugin.hbase.define.HBaseAdminInstrumentation hbase=org.apache.skywalking.apm.plugin.hbase.define.HTableInstrumentation hbase=org.apache.skywalking.apm.plugin.hbase.define.AsyncProcessInstrumentation hbase=org.apache.skywalking.apm.plugin.hbase.define.AsyncRpcClientInstrumentation -hbase=org.apache.skywalking.apm.plugin.hbase.define.HbaseClientInstrumentation +hbase=org.apache.skywalking.apm.plugin.hbase.define.HBaseClientInstrumentation hbase=org.apache.skywalking.apm.plugin.hbase.define.RpcClientImplInstrumentation \ No newline at end of file From 8d7e947c1a1a8d61109181f60fae6761fb5277b1 Mon Sep 17 00:00:00 2001 From: jang65953 <675953827@qq.com> Date: Sat, 27 Apr 2019 10:26:36 +0800 Subject: [PATCH 04/14] fix initialize error --- .../apm/network/trace/component/ComponentsDefine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a2e2437e9559..47fd7392e9f2 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 @@ -127,7 +127,7 @@ public static ComponentsDefine getInstance() { } public ComponentsDefine() { - components = new String[60]; + components = new String[61]; addComponent(TOMCAT); addComponent(HTTPCLIENT); addComponent(DUBBO); From 15080ada152fca5361605e790089875fc951ac5a Mon Sep 17 00:00:00 2001 From: jang65953 <675953827@qq.com> Date: Sat, 27 Apr 2019 12:50:55 +0800 Subject: [PATCH 05/14] fix enhance class error --- .../apm/plugin/hbase/define/AsyncProcessInstrumentation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java index bf13109cbda1..34f19e1f0421 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java @@ -33,7 +33,7 @@ */ public class AsyncProcessInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.HBaseAdmin"; + private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.AsyncProcess"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.AsyncProcessInterceptor"; From d24199ae0963343f903db62a3a013a90043f68f3 Mon Sep 17 00:00:00 2001 From: jang65953 <675953827@qq.com> Date: Sat, 27 Apr 2019 16:01:22 +0800 Subject: [PATCH 06/14] add remote peer info --- .../plugin/hbase/AsyncProcessInterceptor.java | 2 +- .../hbase/AsyncRpcClientInterceptor.java | 2 +- .../hbase/ConnectionFactoryInterceptor.java | 36 +++++++++++++ .../apm/plugin/hbase/ConnectionInfo.java | 9 ++++ .../plugin/hbase/HBaseAdminInterceptor.java | 2 +- .../apm/plugin/hbase/HTableInterceptor.java | 2 +- .../hbase/RpcClientImplInterceptor.java | 2 +- .../ConnectionFactoryInstrumentation.java | 52 +++++++++++++++++++ .../src/main/resources/skywalking-plugin.def | 13 ++--- 9 files changed, 109 insertions(+), 11 deletions(-) create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java index 1d0500a18983..47fbd0d5b2cc 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java @@ -40,7 +40,7 @@ public class AsyncProcessInterceptor implements InstanceMethodsAroundInterceptor public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { LOGGER.info("method is {} ", method.getName()); - AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_ASYNC_CLIENT + "/" + method.getName(), ""); + AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_ASYNC_CLIENT + "/" + method.getName(), ConnectionInfo.REMOTE_PEER); span.setComponent(ComponentsDefine.HBASE); SpanLayer.asDB(span); diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java index cc26fd273ffb..f98275049a6e 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java @@ -42,7 +42,7 @@ public class AsyncRpcClientInterceptor implements InstanceMethodsAroundIntercept public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { LOGGER.info("method is {} ", method.getName()); - AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_ASYNC_CLIENT + "/" + method.getName(), ""); + AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_ASYNC_CLIENT + "/" + method.getName(), ConnectionInfo.REMOTE_PEER); span.setComponent(ComponentsDefine.HBASE); SpanLayer.asDB(span); diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java new file mode 100644 index 000000000000..9e75002969b4 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java @@ -0,0 +1,36 @@ +package org.apache.skywalking.apm.plugin.hbase; + +import java.lang.reflect.Method; +import org.apache.hadoop.conf.Configuration; +import org.apache.skywalking.apm.agent.core.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.StaticMethodsAroundInterceptor; + +/** + * @author zhangbin + */ + +public class ConnectionFactoryInterceptor implements StaticMethodsAroundInterceptor { + + private static final ILog LOGGER = LogManager.getLogger(ConnectionFactoryInterceptor.class); + + @Override public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + MethodInterceptResult result) { + Configuration configuration = (Configuration)allArguments[0]; + String remotePeer = configuration.get("hadoop.registry.zk.quorum"); + LOGGER.info("remotePeer is {}!", remotePeer); + ConnectionInfo.REMOTE_PEER = remotePeer; + } + + @Override public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Object ret) { + return ret; + } + + @Override + public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Throwable t) { + + } +} \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java new file mode 100644 index 000000000000..95e3f682a870 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java @@ -0,0 +1,9 @@ +package org.apache.skywalking.apm.plugin.hbase; + +/** + * @author zhangbin + */ + +public class ConnectionInfo { + public static String REMOTE_PEER = ""; +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java index 663f21f04536..d95e7956a279 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java @@ -44,7 +44,7 @@ public class HBaseAdminInterceptor implements InstanceMethodsAroundInterceptor { public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { LOGGER.info("method is {} ", method.getName()); - AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_CLIENT_ADMIN + "/" + method.getName(), ""); + AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_CLIENT_ADMIN + "/" + method.getName(), ConnectionInfo.REMOTE_PEER); span.setComponent(ComponentsDefine.HBASE); span.tag(new StringTag("args"), parseAttributes(allArguments)); SpanLayer.asDB(span); diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java index 19b5b23f6a05..1657ea0deb6b 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java @@ -47,7 +47,7 @@ public class HTableInterceptor implements InstanceMethodsAroundInterceptor { public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { LOGGER.info("method is {} ", method.getName()); - AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_CLIENT_TABLE + "/" + method.getName(), ""); + AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_CLIENT_TABLE + "/" + method.getName(), ConnectionInfo.REMOTE_PEER); span.setComponent(ComponentsDefine.HBASE); span.tag(new StringTag("args"), parseAttributes(allArguments)); SpanLayer.asDB(span); diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java index 11ac907b5a0c..9126de1453a6 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java @@ -41,7 +41,7 @@ public class RpcClientImplInterceptor implements InstanceMethodsAroundIntercepto public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { LOGGER.info("method is {} ", method.getName()); - AbstractSpan span = ContextManager.createExitSpan(method.getName(), ""); + AbstractSpan span = ContextManager.createExitSpan(method.getName(), ConnectionInfo.REMOTE_PEER); span.setComponent(ComponentsDefine.HBASE); SpanLayer.asDB(span); diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java new file mode 100644 index 000000000000..e3604ee820c3 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java @@ -0,0 +1,52 @@ +package org.apache.skywalking.apm.plugin.hbase.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.StaticMethodsInterceptPoint; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassStaticMethodsEnhancePluginDefine; +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; + +/** + * @author zhangbin + */ + +public class ConnectionFactoryInstrumentation extends ClassStaticMethodsEnhancePluginDefine { + + private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.ConnectionFactory"; + + private static final String ENHANCE_METHOD = "createConnection"; + + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.ConnectionFactoryInterceptor"; + + @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + return new ConstructorInterceptPoint[0]; + } + + @Override protected StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { + return new StaticMethodsInterceptPoint[] { + new StaticMethodsInterceptPoint() { + @Override public ElementMatcher getMethodsMatcher() { + return named(ENHANCE_METHOD) + .and(takesArguments(3)); + } + + @Override public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override public boolean isOverrideArgs() { + return false; + } + } + }; + } + + @Override protected ClassMatch enhanceClass() { + return NameMatch.byName(ENHANCE_CLASS); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/resources/skywalking-plugin.def index 9a1d950e245e..ea4a59f353d4 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/resources/skywalking-plugin.def @@ -14,9 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -hbase=org.apache.skywalking.apm.plugin.hbase.define.HBaseAdminInstrumentation -hbase=org.apache.skywalking.apm.plugin.hbase.define.HTableInstrumentation -hbase=org.apache.skywalking.apm.plugin.hbase.define.AsyncProcessInstrumentation -hbase=org.apache.skywalking.apm.plugin.hbase.define.AsyncRpcClientInstrumentation -hbase=org.apache.skywalking.apm.plugin.hbase.define.HBaseClientInstrumentation -hbase=org.apache.skywalking.apm.plugin.hbase.define.RpcClientImplInstrumentation \ No newline at end of file +hBase-client=org.apache.skywalking.apm.plugin.hbase.define.ConnectionFactoryInstrumentation +hBase-client=org.apache.skywalking.apm.plugin.hbase.define.HBaseAdminInstrumentation +hBase-client=org.apache.skywalking.apm.plugin.hbase.define.HTableInstrumentation +hBase-client=org.apache.skywalking.apm.plugin.hbase.define.AsyncProcessInstrumentation +hBase-client=org.apache.skywalking.apm.plugin.hbase.define.AsyncRpcClientInstrumentation +hBase-client=org.apache.skywalking.apm.plugin.hbase.define.HBaseClientInstrumentation +hBase-client=org.apache.skywalking.apm.plugin.hbase.define.RpcClientImplInstrumentation From f8a0e8cb8dfafed392d02554255b6330d24dcb54 Mon Sep 17 00:00:00 2001 From: jang65953 <675953827@qq.com> Date: Sun, 28 Apr 2019 21:51:40 +0800 Subject: [PATCH 07/14] support hbase-client-1.x and hbase-client-2.x --- .../hbase-client-1.x-plugin/pom.xml | 37 +++++++ .../plugin/hbase/AsyncProcessInterceptor.java | 0 .../hbase/AsyncRpcClientInterceptor.java | 0 .../hbase/ConnectionFactoryInterceptor.java | 0 .../apm/plugin/hbase/ConnectionInfo.java | 0 .../plugin/hbase/HBaseAdminInterceptor.java | 0 .../hbase/HBaseClientMethodInterceptor.java | 0 .../plugin/hbase/HBasePluginConstants.java | 0 .../apm/plugin/hbase/HTableInterceptor.java | 0 .../hbase/RpcClientImplInterceptor.java | 0 .../define/AsyncProcessInstrumentation.java | 0 .../define/AsyncRpcClientInstrumentation.java | 0 .../ConnectionFactoryInstrumentation.java | 0 .../define/HBaseAdminInstrumentation.java | 0 .../define/HBaseClientInstrumentation.java | 0 .../hbase/define/HTableInstrumentation.java | 0 .../define/RpcClientImplInstrumentation.java | 0 .../src/main/resources/skywalking-plugin.def | 14 +-- .../pom.xml | 4 +- .../hbase/AbstractRpcClientInterceptor.java | 63 +++++++++++ .../plugin/hbase/AsyncProcessInterceptor.java | 61 +++++++++++ .../hbase/ConnectionFactoryInterceptor.java | 36 ++++++ .../apm/plugin/hbase/ConnectionInfo.java | 9 ++ .../plugin/hbase/HBaseAdminInterceptor.java | 74 +++++++++++++ .../hbase/HBaseClientMethodInterceptor.java | 62 +++++++++++ .../plugin/hbase/HBasePluginConstants.java | 45 ++++++++ .../apm/plugin/hbase/HTableInterceptor.java | 103 ++++++++++++++++++ .../AbstractRpcClientInstrumentation.java | 73 +++++++++++++ .../define/AsyncProcessInstrumentation.java | 71 ++++++++++++ .../ConnectionFactoryInstrumentation.java | 52 +++++++++ .../define/HBaseAdminInstrumentation.java | 78 +++++++++++++ .../define/HBaseClientInstrumentation.java | 55 ++++++++++ .../hbase/define/HTableInstrumentation.java | 70 ++++++++++++ .../src/main/resources/skywalking-plugin.def | 23 ++++ apm-sniffer/apm-sdk-plugin/pom.xml | 3 +- 35 files changed, 923 insertions(+), 10 deletions(-) create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/pom.xml rename apm-sniffer/apm-sdk-plugin/{hbase-plugin => hbase-client-1.x-plugin}/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java (100%) rename apm-sniffer/apm-sdk-plugin/{hbase-plugin => hbase-client-1.x-plugin}/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java (100%) rename apm-sniffer/apm-sdk-plugin/{hbase-plugin => hbase-client-1.x-plugin}/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java (100%) rename apm-sniffer/apm-sdk-plugin/{hbase-plugin => hbase-client-1.x-plugin}/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java (100%) rename apm-sniffer/apm-sdk-plugin/{hbase-plugin => hbase-client-1.x-plugin}/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java (100%) rename apm-sniffer/apm-sdk-plugin/{hbase-plugin => hbase-client-1.x-plugin}/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseClientMethodInterceptor.java (100%) rename apm-sniffer/apm-sdk-plugin/{hbase-plugin => hbase-client-1.x-plugin}/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java (100%) rename apm-sniffer/apm-sdk-plugin/{hbase-plugin => hbase-client-1.x-plugin}/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java (100%) rename apm-sniffer/apm-sdk-plugin/{hbase-plugin => hbase-client-1.x-plugin}/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java (100%) rename apm-sniffer/apm-sdk-plugin/{hbase-plugin => hbase-client-1.x-plugin}/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java (100%) rename apm-sniffer/apm-sdk-plugin/{hbase-plugin => hbase-client-1.x-plugin}/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java (100%) rename apm-sniffer/apm-sdk-plugin/{hbase-plugin => hbase-client-1.x-plugin}/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java (100%) rename apm-sniffer/apm-sdk-plugin/{hbase-plugin => hbase-client-1.x-plugin}/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java (100%) rename apm-sniffer/apm-sdk-plugin/{hbase-plugin => hbase-client-1.x-plugin}/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java (100%) rename apm-sniffer/apm-sdk-plugin/{hbase-plugin => hbase-client-1.x-plugin}/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java (100%) rename apm-sniffer/apm-sdk-plugin/{hbase-plugin => hbase-client-1.x-plugin}/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java (100%) rename apm-sniffer/apm-sdk-plugin/{hbase-plugin => hbase-client-1.x-plugin}/src/main/resources/skywalking-plugin.def (55%) rename apm-sniffer/apm-sdk-plugin/{hbase-plugin => hbase-client-2.x-plugin}/pom.xml (92%) create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AbstractRpcClientInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseClientMethodInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AbstractRpcClientInstrumentation.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/resources/skywalking-plugin.def diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/pom.xml new file mode 100644 index 000000000000..f5e6ea672641 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/pom.xml @@ -0,0 +1,37 @@ + + + + apm-sdk-plugin + org.apache.skywalking + 6.1.0-SNAPSHOT + + 4.0.0 + + hbase-client-1.x-plugin + + hbase-client-1.x-plugin + + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + + + jar + + + + org.apache.hbase + hbase-shaded-client + 1.2.6.1 + provided + + + \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java similarity index 100% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java similarity index 100% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java similarity index 100% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java similarity index 100% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java similarity index 100% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseClientMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseClientMethodInterceptor.java similarity index 100% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseClientMethodInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseClientMethodInterceptor.java diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java similarity index 100% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java similarity index 100% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java similarity index 100% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java similarity index 100% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java similarity index 100% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java similarity index 100% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java similarity index 100% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java similarity index 100% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java similarity index 100% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java similarity index 100% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/resources/skywalking-plugin.def similarity index 55% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/resources/skywalking-plugin.def rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/resources/skywalking-plugin.def index ea4a59f353d4..6149bda86a6c 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/resources/skywalking-plugin.def @@ -14,10 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -hBase-client=org.apache.skywalking.apm.plugin.hbase.define.ConnectionFactoryInstrumentation -hBase-client=org.apache.skywalking.apm.plugin.hbase.define.HBaseAdminInstrumentation -hBase-client=org.apache.skywalking.apm.plugin.hbase.define.HTableInstrumentation -hBase-client=org.apache.skywalking.apm.plugin.hbase.define.AsyncProcessInstrumentation -hBase-client=org.apache.skywalking.apm.plugin.hbase.define.AsyncRpcClientInstrumentation -hBase-client=org.apache.skywalking.apm.plugin.hbase.define.HBaseClientInstrumentation -hBase-client=org.apache.skywalking.apm.plugin.hbase.define.RpcClientImplInstrumentation +hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.define.ConnectionFactoryInstrumentation +hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.define.HBaseAdminInstrumentation +hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.define.HTableInstrumentation +hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.define.AsyncProcessInstrumentation +hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.define.AbstractRpcClientInstrumentation +hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.define.HBaseClientInstrumentation +hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.define.RpcClientImplInstrumentation diff --git a/apm-sniffer/apm-sdk-plugin/hbase-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/pom.xml similarity index 92% rename from apm-sniffer/apm-sdk-plugin/hbase-plugin/pom.xml rename to apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/pom.xml index 627621a9025a..2495cc376e88 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/pom.xml @@ -9,9 +9,9 @@ 4.0.0 - apm-hbase-plugin + hbase-client-2.x-plugin - apm-hbase-plugin + hbase-client-2.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AbstractRpcClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AbstractRpcClientInterceptor.java new file mode 100644 index 000000000000..3798a3551ef0 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AbstractRpcClientInterceptor.java @@ -0,0 +1,63 @@ +/* + * 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.hbase; + +import org.apache.skywalking.apm.agent.core.context.ContextManager; +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.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; +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; + +import java.lang.reflect.Method; + +/** + * @author zhangbin + */ + +public class AbstractRpcClientInterceptor implements InstanceMethodsAroundInterceptor { + + private static final ILog LOGGER = LogManager.getLogger(AbstractRpcClientInterceptor.class); + + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + LOGGER.info("method is {} ", method.getName()); + AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_ASYNC_CLIENT + "/" + method.getName(), ConnectionInfo.REMOTE_PEER); + span.setComponent(ComponentsDefine.HBASE); + SpanLayer.asDB(span); + + } + + @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/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java new file mode 100644 index 000000000000..47fbd0d5b2cc --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java @@ -0,0 +1,61 @@ +/* + * 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.hbase; + +import java.lang.reflect.Method; +import org.apache.skywalking.apm.agent.core.context.ContextManager; +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.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; +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; + +/** + * @author zhangbin + */ +public class AsyncProcessInterceptor implements InstanceMethodsAroundInterceptor { + + private static final ILog LOGGER = LogManager.getLogger(AsyncProcessInterceptor.class); + + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + LOGGER.info("method is {} ", method.getName()); + AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_ASYNC_CLIENT + "/" + method.getName(), ConnectionInfo.REMOTE_PEER); + span.setComponent(ComponentsDefine.HBASE); + SpanLayer.asDB(span); + + } + + @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/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java new file mode 100644 index 000000000000..9e75002969b4 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java @@ -0,0 +1,36 @@ +package org.apache.skywalking.apm.plugin.hbase; + +import java.lang.reflect.Method; +import org.apache.hadoop.conf.Configuration; +import org.apache.skywalking.apm.agent.core.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.StaticMethodsAroundInterceptor; + +/** + * @author zhangbin + */ + +public class ConnectionFactoryInterceptor implements StaticMethodsAroundInterceptor { + + private static final ILog LOGGER = LogManager.getLogger(ConnectionFactoryInterceptor.class); + + @Override public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + MethodInterceptResult result) { + Configuration configuration = (Configuration)allArguments[0]; + String remotePeer = configuration.get("hadoop.registry.zk.quorum"); + LOGGER.info("remotePeer is {}!", remotePeer); + ConnectionInfo.REMOTE_PEER = remotePeer; + } + + @Override public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Object ret) { + return ret; + } + + @Override + public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Throwable t) { + + } +} \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java new file mode 100644 index 000000000000..95e3f682a870 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java @@ -0,0 +1,9 @@ +package org.apache.skywalking.apm.plugin.hbase; + +/** + * @author zhangbin + */ + +public class ConnectionInfo { + public static String REMOTE_PEER = ""; +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java new file mode 100644 index 000000000000..d95e7956a279 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java @@ -0,0 +1,74 @@ +/* + * 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.hbase; + +import java.lang.reflect.Method; +import java.util.Arrays; + +import org.apache.skywalking.apm.agent.core.context.ContextManager; +import org.apache.skywalking.apm.agent.core.context.tag.StringTag; +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.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; +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; + +/** + * @author zhangbin + */ +public class HBaseAdminInterceptor implements InstanceMethodsAroundInterceptor { + + private static final ILog LOGGER = LogManager.getLogger(HBaseAdminInterceptor.class); + + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + LOGGER.info("method is {} ", method.getName()); + AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_CLIENT_ADMIN + "/" + method.getName(), ConnectionInfo.REMOTE_PEER); + span.setComponent(ComponentsDefine.HBASE); + span.tag(new StringTag("args"), parseAttributes(allArguments)); + SpanLayer.asDB(span); + + } + + @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); + } + + protected String parseAttributes(Object[] args) { + + if (args != null && args.length > 0) { // if has params, print all params. + return Arrays.toString(args); + } + return null; + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseClientMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseClientMethodInterceptor.java new file mode 100644 index 000000000000..2705053aac1d --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseClientMethodInterceptor.java @@ -0,0 +1,62 @@ +/* + * 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.hbase; + +import java.lang.reflect.Method; + +import org.apache.skywalking.apm.agent.core.context.ContextManager; +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.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; +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; + +/** + * @author zhangbin + */ +public class HBaseClientMethodInterceptor implements InstanceMethodsAroundInterceptor { + + private static final ILog LOGGER = LogManager.getLogger(HBaseClientMethodInterceptor.class); + + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + LOGGER.info("method is {} ", method.getName()); + AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_CLIENT + "/" + method.getName(), ""); + span.setComponent(ComponentsDefine.HBASE); + SpanLayer.asDB(span); + + } + + @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/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java new file mode 100644 index 000000000000..589307ae7fa6 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java @@ -0,0 +1,45 @@ +/* + * 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.hbase; + +/** + * @author zhangbin + */ +public interface HBasePluginConstants { + + /** + * The constant HBASE_CLIENT. + */ + String HBASE_CLIENT = "HBASE_CLIENT"; + + /** + * The constant HBASE_CLIENT_ADMIN. + */ + String HBASE_CLIENT_ADMIN = "HBASE_CLIENT_ADMIN"; + + /** + * The constant HBASE_CLIENT_TABLE. + */ + String HBASE_CLIENT_TABLE = "HBASE_CLIENT_TABLE"; + + /** + * The constant HBASE_ASYNC_CLIENT. + */ + String HBASE_ASYNC_CLIENT = "HBASE_ASYNC_CLIENT"; +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java new file mode 100644 index 000000000000..1657ea0deb6b --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java @@ -0,0 +1,103 @@ +/* + * 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.hbase; + +import java.lang.reflect.Method; +import java.util.List; + +import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.Mutation; +import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.skywalking.apm.agent.core.context.ContextManager; +import org.apache.skywalking.apm.agent.core.context.tag.StringTag; +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.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; +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; + +/** + * @author zhangbin + */ +public class HTableInterceptor implements InstanceMethodsAroundInterceptor { + + private static final ILog LOGGER = LogManager.getLogger(HTableInterceptor.class); + + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + LOGGER.info("method is {} ", method.getName()); + AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_CLIENT_TABLE + "/" + method.getName(), ConnectionInfo.REMOTE_PEER); + span.setComponent(ComponentsDefine.HBASE); + span.tag(new StringTag("args"), parseAttributes(allArguments)); + SpanLayer.asDB(span); + } + + @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) { + + } + + protected String parseAttributes(Object[] args) { + + Object param = null; + + if (args != null && args.length == 1) { // only one + param = args[0]; + } else if (args != null && args.length > 1) { // last param + param = args[args.length - 1]; + } else { + return null; + } + + // Put/Delete/Append/Increment + if (param instanceof Mutation) { + Mutation mutation = (Mutation)param; + return "rowKey: " + Bytes.toStringBinary(mutation.getRow()); + } + if (param instanceof Get) { + Get get = (Get)param; + return "rowKey: " + Bytes.toStringBinary(get.getRow()); + } + if (param instanceof Scan) { + Scan scan = (Scan)param; + String startRowKey = Bytes.toStringBinary(scan.getStartRow()); + String stopRowKey = Bytes.toStringBinary(scan.getStopRow()); + return "startRowKey: " + startRowKey + " stopRowKey: " + stopRowKey; + } + // if param instanceof List. + if (param instanceof List) { + List list = (List)param; + return "size: " + list.size(); + } + return null; + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AbstractRpcClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AbstractRpcClientInstrumentation.java new file mode 100644 index 000000000000..4308e953bf6f --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AbstractRpcClientInstrumentation.java @@ -0,0 +1,73 @@ +/* + * 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.hbase.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.HierarchyMatch; + +import static net.bytebuddy.matcher.ElementMatchers.named; + +/** + * @author zhangbin + */ +public class AbstractRpcClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + private static final String[] ENHANCE_CLASS = new String[] {"org.apache.hadoop.hbase.ipc.AbstractRpcClient"}; + + private static final String ENHANCE_METHOD = "callMethod"; + + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.AbstractRpcClientInterceptor"; + + @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 INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } + } + }; + } + + @Override + protected ClassMatch enhanceClass() { + return HierarchyMatch.byHierarchyMatch(ENHANCE_CLASS); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java new file mode 100644 index 000000000000..34f19e1f0421 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java @@ -0,0 +1,71 @@ +/* + * 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.hbase.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 static net.bytebuddy.matcher.ElementMatchers.named; + +/** + * @author zhangbin + */ +public class AsyncProcessInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.AsyncProcess"; + + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.AsyncProcessInterceptor"; + + @Override + protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + return new ConstructorInterceptPoint[0]; + } + + @Override + protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("submit").or(named("submitAll")); + } + + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } + } + }; + } + + @Override + protected ClassMatch enhanceClass() { + return NameMatch.byName(ENHANCE_CLASS); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java new file mode 100644 index 000000000000..e3604ee820c3 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java @@ -0,0 +1,52 @@ +package org.apache.skywalking.apm.plugin.hbase.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.StaticMethodsInterceptPoint; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassStaticMethodsEnhancePluginDefine; +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; + +/** + * @author zhangbin + */ + +public class ConnectionFactoryInstrumentation extends ClassStaticMethodsEnhancePluginDefine { + + private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.ConnectionFactory"; + + private static final String ENHANCE_METHOD = "createConnection"; + + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.ConnectionFactoryInterceptor"; + + @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + return new ConstructorInterceptPoint[0]; + } + + @Override protected StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { + return new StaticMethodsInterceptPoint[] { + new StaticMethodsInterceptPoint() { + @Override public ElementMatcher getMethodsMatcher() { + return named(ENHANCE_METHOD) + .and(takesArguments(3)); + } + + @Override public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override public boolean isOverrideArgs() { + return false; + } + } + }; + } + + @Override protected ClassMatch enhanceClass() { + return NameMatch.byName(ENHANCE_CLASS); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java new file mode 100644 index 000000000000..9507949396b4 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java @@ -0,0 +1,78 @@ +/* + * 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.hbase.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 static net.bytebuddy.matcher.ElementMatchers.named; + +/** + * @author zhangbin + */ +public class HBaseAdminInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.HBaseAdmin"; + + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HBaseAdminInterceptor"; + + @Override + protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + return new ConstructorInterceptPoint[0]; + } + + @Override + protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("tableExists").or(named("listTables")) + .or(named("listTableNames")).or(named("getTableDescriptor")).or(named("createTable")).or(named("deleteTable")) + .or(named("modifyTable")).or(named("truncateTable")).or(named("enableTable")).or(named("enableTableAsync")) + .or(named("enableTables")).or(named("disableTableAsync")).or(named("disableTable")).or(named("disableTables")) + .or(named("getAlterStatus")).or(named("addColumn")).or(named("deleteColumn")).or(named("modifyColumn")) + .or(named("compact")).or(named("majorCompact")).or(named("split")).or(named("getTableRegions")) + .or(named("snapshot")).or(named("restoreSnapshot")).or(named("cloneSnapshot")).or(named("listSnapshots")) + .or(named("deleteSnapshot")); + } + + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } + } + }; + } + + @Override + protected ClassMatch enhanceClass() { + return NameMatch.byName(ENHANCE_CLASS); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java new file mode 100644 index 000000000000..8205865540ff --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java @@ -0,0 +1,55 @@ +package org.apache.skywalking.apm.plugin.hbase.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 static net.bytebuddy.matcher.ElementMatchers.named; + +/** + * @author zhangbin + */ +public class HBaseClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.AsyncRequestFutureImpl$SingleServerRequestRunnable"; + + private static final String ENHANCE_METHOD = "run"; + + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HBaseClientMethodInterceptor"; + + @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 INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } + } + }; + } + + @Override + protected ClassMatch enhanceClass() { + return NameMatch.byName(ENHANCE_CLASS); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java new file mode 100644 index 000000000000..79989fab35d7 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java @@ -0,0 +1,70 @@ +/* + * 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.hbase.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 static net.bytebuddy.matcher.ElementMatchers.named; + +/** + * @author zhangbin + */ +public class HTableInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.HTable"; + + private static final ElementMatcher.Junction[] JUNCTIONS = new ElementMatcher.Junction[] { + }; + + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HTableInterceptor"; + + @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + return new ConstructorInterceptPoint[0]; + } + + @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override public ElementMatcher getMethodsMatcher() { + return named("append").or(named("increment")).or(named("exists")).or(named("existsAll")) + .or(named("get")).or(named("getScanner")).or(named("put")).or(named("checkAndPut")) + .or(named("delete")).or(named("checkAndDelete")).or(named("mutateRow")).or(named("checkAndMutate")); + } + + @Override public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override public boolean isOverrideArgs() { + return false; + } + } + }; + } + + @Override protected ClassMatch enhanceClass() { + return NameMatch.byName(ENHANCE_CLASS); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/resources/skywalking-plugin.def new file mode 100644 index 000000000000..f59088da779b --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/resources/skywalking-plugin.def @@ -0,0 +1,23 @@ +# 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. + +hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.define.ConnectionFactoryInstrumentation +hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.define.HBaseAdminInstrumentation +hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.define.HTableInstrumentation +hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.define.AsyncProcessInstrumentation +hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.define.AbstractRpcClientInstrumentation +hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.define.HBaseClientInstrumentation +hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.define.RpcClientImplInstrumentation diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml index 664effdefcb5..5ab991d56d5b 100644 --- a/apm-sniffer/apm-sdk-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pom.xml @@ -70,7 +70,8 @@ dubbo-2.7.x-plugin dubbo-2.7.x-conflict-patch vertx-plugins - hbase-plugin + hbase-client-1.x-plugin + hbase-client-2.x-plugin pom From ebbe96d2ca3e6d7566d86ee727e09f5bc6c35cc5 Mon Sep 17 00:00:00 2001 From: jang65953 <675953827@qq.com> Date: Sun, 28 Apr 2019 21:57:55 +0800 Subject: [PATCH 08/14] add hbaseclient-1.x and hbaseclient-2.x --- .../hbase/{ => v1}/AsyncProcessInterceptor.java | 2 +- .../hbase/{ => v1}/AsyncRpcClientInterceptor.java | 2 +- .../hbase/v1}/ConnectionFactoryInterceptor.java | 2 +- .../apm/plugin/hbase/v1}/ConnectionInfo.java | 2 +- .../plugin/hbase/v1}/HBaseAdminInterceptor.java | 2 +- .../{ => v1}/HBaseClientMethodInterceptor.java | 2 +- .../hbase/{ => v1}/HBasePluginConstants.java | 2 +- .../apm/plugin/hbase/v1}/HTableInterceptor.java | 2 +- .../hbase/{ => v1}/RpcClientImplInterceptor.java | 2 +- .../v1}/define/AsyncProcessInstrumentation.java | 2 +- .../define/AsyncRpcClientInstrumentation.java | 2 +- .../define/ConnectionFactoryInstrumentation.java | 2 +- .../{ => v1}/define/HBaseAdminInstrumentation.java | 2 +- .../define/HBaseClientInstrumentation.java | 2 +- .../hbase/v1}/define/HTableInstrumentation.java | 2 +- .../define/RpcClientImplInstrumentation.java | 2 +- .../src/main/resources/skywalking-plugin.def | 14 +++++++------- .../{ => v2}/AbstractRpcClientInterceptor.java | 2 +- .../hbase/{ => v2}/AsyncProcessInterceptor.java | 2 +- .../hbase/v2}/ConnectionFactoryInterceptor.java | 2 +- .../apm/plugin/hbase/v2}/ConnectionInfo.java | 2 +- .../plugin/hbase/v2}/HBaseAdminInterceptor.java | 2 +- .../{ => v2}/HBaseClientMethodInterceptor.java | 2 +- .../hbase/{ => v2}/HBasePluginConstants.java | 2 +- .../apm/plugin/hbase/v2}/HTableInterceptor.java | 2 +- .../define/AbstractRpcClientInstrumentation.java | 2 +- .../v2}/define/AsyncProcessInstrumentation.java | 2 +- .../define/ConnectionFactoryInstrumentation.java | 2 +- .../{ => v2}/define/HBaseAdminInstrumentation.java | 2 +- .../define/HBaseClientInstrumentation.java | 2 +- .../hbase/v2}/define/HTableInstrumentation.java | 2 +- .../src/main/resources/skywalking-plugin.def | 13 ++++++------- 32 files changed, 43 insertions(+), 44 deletions(-) rename apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{ => v1}/AsyncProcessInterceptor.java (98%) rename apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{ => v1}/AsyncRpcClientInterceptor.java (98%) rename apm-sniffer/apm-sdk-plugin/{hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase => hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1}/ConnectionFactoryInterceptor.java (96%) rename apm-sniffer/apm-sdk-plugin/{hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase => hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1}/ConnectionInfo.java (67%) rename apm-sniffer/apm-sdk-plugin/{hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase => hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1}/HBaseAdminInterceptor.java (98%) rename apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{ => v1}/HBaseClientMethodInterceptor.java (98%) rename apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{ => v1}/HBasePluginConstants.java (96%) rename apm-sniffer/apm-sdk-plugin/{hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase => hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1}/HTableInterceptor.java (98%) rename apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{ => v1}/RpcClientImplInterceptor.java (98%) rename apm-sniffer/apm-sdk-plugin/{hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase => hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1}/define/AsyncProcessInstrumentation.java (97%) rename apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{ => v1}/define/AsyncRpcClientInstrumentation.java (97%) rename apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{ => v1}/define/ConnectionFactoryInstrumentation.java (97%) rename apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{ => v1}/define/HBaseAdminInstrumentation.java (98%) rename apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{ => v1}/define/HBaseClientInstrumentation.java (97%) rename apm-sniffer/apm-sdk-plugin/{hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase => hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1}/define/HTableInstrumentation.java (98%) rename apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{ => v1}/define/RpcClientImplInstrumentation.java (97%) rename apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{ => v2}/AbstractRpcClientInterceptor.java (98%) rename apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{ => v2}/AsyncProcessInterceptor.java (98%) rename apm-sniffer/apm-sdk-plugin/{hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase => hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2}/ConnectionFactoryInterceptor.java (96%) rename apm-sniffer/apm-sdk-plugin/{hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase => hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2}/ConnectionInfo.java (67%) rename apm-sniffer/apm-sdk-plugin/{hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase => hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2}/HBaseAdminInterceptor.java (98%) rename apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{ => v2}/HBaseClientMethodInterceptor.java (98%) rename apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{ => v2}/HBasePluginConstants.java (96%) rename apm-sniffer/apm-sdk-plugin/{hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase => hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2}/HTableInterceptor.java (98%) rename apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{ => v2}/define/AbstractRpcClientInstrumentation.java (97%) rename apm-sniffer/apm-sdk-plugin/{hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase => hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2}/define/AsyncProcessInstrumentation.java (97%) rename apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{ => v2}/define/ConnectionFactoryInstrumentation.java (97%) rename apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{ => v2}/define/HBaseAdminInstrumentation.java (98%) rename apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/{ => v2}/define/HBaseClientInstrumentation.java (97%) rename apm-sniffer/apm-sdk-plugin/{hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase => hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2}/define/HTableInstrumentation.java (98%) diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/AsyncProcessInterceptor.java similarity index 98% rename from apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/AsyncProcessInterceptor.java index 47fbd0d5b2cc..12e356ea3a4c 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/AsyncProcessInterceptor.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase; +package org.apache.skywalking.apm.plugin.hbase.v1; import java.lang.reflect.Method; import org.apache.skywalking.apm.agent.core.context.ContextManager; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/AsyncRpcClientInterceptor.java similarity index 98% rename from apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/AsyncRpcClientInterceptor.java index f98275049a6e..d3ed96ddc903 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncRpcClientInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/AsyncRpcClientInterceptor.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase; +package org.apache.skywalking.apm.plugin.hbase.v1; import org.apache.skywalking.apm.agent.core.context.ContextManager; import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/ConnectionFactoryInterceptor.java similarity index 96% rename from apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/ConnectionFactoryInterceptor.java index 9e75002969b4..4320fb012680 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/ConnectionFactoryInterceptor.java @@ -1,4 +1,4 @@ -package org.apache.skywalking.apm.plugin.hbase; +package org.apache.skywalking.apm.plugin.hbase.v1; import java.lang.reflect.Method; import org.apache.hadoop.conf.Configuration; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/ConnectionInfo.java similarity index 67% rename from apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/ConnectionInfo.java index 95e3f682a870..536f1c1c953c 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/ConnectionInfo.java @@ -1,4 +1,4 @@ -package org.apache.skywalking.apm.plugin.hbase; +package org.apache.skywalking.apm.plugin.hbase.v1; /** * @author zhangbin diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/HBaseAdminInterceptor.java similarity index 98% rename from apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/HBaseAdminInterceptor.java index d95e7956a279..58de954bfdaf 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/HBaseAdminInterceptor.java @@ -17,7 +17,7 @@ */ -package org.apache.skywalking.apm.plugin.hbase; +package org.apache.skywalking.apm.plugin.hbase.v1; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseClientMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/HBaseClientMethodInterceptor.java similarity index 98% rename from apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseClientMethodInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/HBaseClientMethodInterceptor.java index 2705053aac1d..8fcff1b8f07f 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseClientMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/HBaseClientMethodInterceptor.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase; +package org.apache.skywalking.apm.plugin.hbase.v1; import java.lang.reflect.Method; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/HBasePluginConstants.java similarity index 96% rename from apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/HBasePluginConstants.java index 589307ae7fa6..2894853cf602 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/HBasePluginConstants.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase; +package org.apache.skywalking.apm.plugin.hbase.v1; /** * @author zhangbin diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/HTableInterceptor.java similarity index 98% rename from apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/HTableInterceptor.java index 1657ea0deb6b..76b0ecdb66f7 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/HTableInterceptor.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase; +package org.apache.skywalking.apm.plugin.hbase.v1; import java.lang.reflect.Method; import java.util.List; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/RpcClientImplInterceptor.java similarity index 98% rename from apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/RpcClientImplInterceptor.java index 9126de1453a6..31a40960b88c 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/RpcClientImplInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/RpcClientImplInterceptor.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase; +package org.apache.skywalking.apm.plugin.hbase.v1; import java.lang.reflect.Method; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/AsyncProcessInstrumentation.java similarity index 97% rename from apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/AsyncProcessInstrumentation.java index 34f19e1f0421..35cdcb009a4c 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/AsyncProcessInstrumentation.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase.define; +package org.apache.skywalking.apm.plugin.hbase.v1.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/AsyncRpcClientInstrumentation.java similarity index 97% rename from apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/AsyncRpcClientInstrumentation.java index 53d7b39cb305..a764bb947872 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncRpcClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/AsyncRpcClientInstrumentation.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase.define; +package org.apache.skywalking.apm.plugin.hbase.v1.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/ConnectionFactoryInstrumentation.java similarity index 97% rename from apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/ConnectionFactoryInstrumentation.java index e3604ee820c3..b1b678547f77 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/ConnectionFactoryInstrumentation.java @@ -1,4 +1,4 @@ -package org.apache.skywalking.apm.plugin.hbase.define; +package org.apache.skywalking.apm.plugin.hbase.v1.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HBaseAdminInstrumentation.java similarity index 98% rename from apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HBaseAdminInstrumentation.java index 9507949396b4..be3d54f3f175 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HBaseAdminInstrumentation.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase.define; +package org.apache.skywalking.apm.plugin.hbase.v1.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HBaseClientInstrumentation.java similarity index 97% rename from apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HBaseClientInstrumentation.java index 9cc7385dac42..c5acc4e7423f 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HBaseClientInstrumentation.java @@ -1,4 +1,4 @@ -package org.apache.skywalking.apm.plugin.hbase.define; +package org.apache.skywalking.apm.plugin.hbase.v1.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HTableInstrumentation.java similarity index 98% rename from apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HTableInstrumentation.java index 79989fab35d7..0af23067179a 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HTableInstrumentation.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase.define; +package org.apache.skywalking.apm.plugin.hbase.v1.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/RpcClientImplInstrumentation.java similarity index 97% rename from apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/RpcClientImplInstrumentation.java index 9ea46a26e457..6f5dbe69d695 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/RpcClientImplInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/RpcClientImplInstrumentation.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase.define; +package org.apache.skywalking.apm.plugin.hbase.v1.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/resources/skywalking-plugin.def index 6149bda86a6c..1acca3e452db 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/resources/skywalking-plugin.def @@ -14,10 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.define.ConnectionFactoryInstrumentation -hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.define.HBaseAdminInstrumentation -hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.define.HTableInstrumentation -hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.define.AsyncProcessInstrumentation -hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.define.AbstractRpcClientInstrumentation -hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.define.HBaseClientInstrumentation -hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.define.RpcClientImplInstrumentation +hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.v1.define.ConnectionFactoryInstrumentation +hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.v1.define.HBaseAdminInstrumentation +hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.v1.define.HTableInstrumentation +hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.v1.define.AsyncProcessInstrumentation +hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.v1.define.AbstractRpcClientInstrumentation +hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.v1.define.HBaseClientInstrumentation +hBase-client-1.x=org.apache.skywalking.apm.plugin.hbase.v1.define.RpcClientImplInstrumentation diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AbstractRpcClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/AbstractRpcClientInterceptor.java similarity index 98% rename from apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AbstractRpcClientInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/AbstractRpcClientInterceptor.java index 3798a3551ef0..4a325697696f 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AbstractRpcClientInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/AbstractRpcClientInterceptor.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase; +package org.apache.skywalking.apm.plugin.hbase.v2; import org.apache.skywalking.apm.agent.core.context.ContextManager; import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/AsyncProcessInterceptor.java similarity index 98% rename from apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/AsyncProcessInterceptor.java index 47fbd0d5b2cc..4f179be5ce0b 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/AsyncProcessInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/AsyncProcessInterceptor.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase; +package org.apache.skywalking.apm.plugin.hbase.v2; import java.lang.reflect.Method; import org.apache.skywalking.apm.agent.core.context.ContextManager; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/ConnectionFactoryInterceptor.java similarity index 96% rename from apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/ConnectionFactoryInterceptor.java index 9e75002969b4..dac61a376102 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionFactoryInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/ConnectionFactoryInterceptor.java @@ -1,4 +1,4 @@ -package org.apache.skywalking.apm.plugin.hbase; +package org.apache.skywalking.apm.plugin.hbase.v2; import java.lang.reflect.Method; import org.apache.hadoop.conf.Configuration; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/ConnectionInfo.java similarity index 67% rename from apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/ConnectionInfo.java index 95e3f682a870..d480edabff48 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/ConnectionInfo.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/ConnectionInfo.java @@ -1,4 +1,4 @@ -package org.apache.skywalking.apm.plugin.hbase; +package org.apache.skywalking.apm.plugin.hbase.v2; /** * @author zhangbin diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/HBaseAdminInterceptor.java similarity index 98% rename from apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/HBaseAdminInterceptor.java index d95e7956a279..69d41f4f4af7 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseAdminInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/HBaseAdminInterceptor.java @@ -17,7 +17,7 @@ */ -package org.apache.skywalking.apm.plugin.hbase; +package org.apache.skywalking.apm.plugin.hbase.v2; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseClientMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/HBaseClientMethodInterceptor.java similarity index 98% rename from apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseClientMethodInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/HBaseClientMethodInterceptor.java index 2705053aac1d..56922604f135 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBaseClientMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/HBaseClientMethodInterceptor.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase; +package org.apache.skywalking.apm.plugin.hbase.v2; import java.lang.reflect.Method; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/HBasePluginConstants.java similarity index 96% rename from apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/HBasePluginConstants.java index 589307ae7fa6..3d568fbe9e3e 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HBasePluginConstants.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/HBasePluginConstants.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase; +package org.apache.skywalking.apm.plugin.hbase.v2; /** * @author zhangbin diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/HTableInterceptor.java similarity index 98% rename from apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/HTableInterceptor.java index 1657ea0deb6b..360e380de6d5 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/HTableInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/HTableInterceptor.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase; +package org.apache.skywalking.apm.plugin.hbase.v2; import java.lang.reflect.Method; import java.util.List; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AbstractRpcClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AbstractRpcClientInstrumentation.java similarity index 97% rename from apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AbstractRpcClientInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AbstractRpcClientInstrumentation.java index 4308e953bf6f..889b2aa89b2d 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AbstractRpcClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AbstractRpcClientInstrumentation.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase.define; +package org.apache.skywalking.apm.plugin.hbase.v2.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AsyncProcessInstrumentation.java similarity index 97% rename from apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AsyncProcessInstrumentation.java index 34f19e1f0421..2d5eff21f99d 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/AsyncProcessInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AsyncProcessInstrumentation.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase.define; +package org.apache.skywalking.apm.plugin.hbase.v2.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/ConnectionFactoryInstrumentation.java similarity index 97% rename from apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/ConnectionFactoryInstrumentation.java index e3604ee820c3..46052cdab292 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/ConnectionFactoryInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/ConnectionFactoryInstrumentation.java @@ -1,4 +1,4 @@ -package org.apache.skywalking.apm.plugin.hbase.define; +package org.apache.skywalking.apm.plugin.hbase.v2.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HBaseAdminInstrumentation.java similarity index 98% rename from apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HBaseAdminInstrumentation.java index 9507949396b4..6f0c46a2c3ea 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseAdminInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HBaseAdminInstrumentation.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase.define; +package org.apache.skywalking.apm.plugin.hbase.v2.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HBaseClientInstrumentation.java similarity index 97% rename from apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HBaseClientInstrumentation.java index 8205865540ff..3559a1a5690f 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HBaseClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HBaseClientInstrumentation.java @@ -1,4 +1,4 @@ -package org.apache.skywalking.apm.plugin.hbase.define; +package org.apache.skywalking.apm.plugin.hbase.v2.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HTableInstrumentation.java similarity index 98% rename from apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java rename to apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HTableInstrumentation.java index 79989fab35d7..f3f3a5942fe8 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/define/HTableInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HTableInstrumentation.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.apm.plugin.hbase.define; +package org.apache.skywalking.apm.plugin.hbase.v2.define; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/resources/skywalking-plugin.def index f59088da779b..5b36c2f3173d 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/resources/skywalking-plugin.def @@ -14,10 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.define.ConnectionFactoryInstrumentation -hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.define.HBaseAdminInstrumentation -hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.define.HTableInstrumentation -hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.define.AsyncProcessInstrumentation -hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.define.AbstractRpcClientInstrumentation -hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.define.HBaseClientInstrumentation -hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.define.RpcClientImplInstrumentation +hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.v2.define.ConnectionFactoryInstrumentation +hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.v2.define.HBaseAdminInstrumentation +hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.v2.define.HTableInstrumentation +hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.v2.define.AsyncProcessInstrumentation +hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.v2.define.AbstractRpcClientInstrumentation +hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.v2.define.HBaseClientInstrumentation \ No newline at end of file From f4bce24917c1438d0c7cab487ffd1504e3fb378a Mon Sep 17 00:00:00 2001 From: jang65953 <675953827@qq.com> Date: Mon, 29 Apr 2019 22:12:16 +0800 Subject: [PATCH 09/14] fix and add enhance class instance method --- .../define/AsyncProcessInstrumentation.java | 2 +- .../define/AsyncRpcClientInstrumentation.java | 2 +- .../ConnectionFactoryInstrumentation.java | 2 +- .../v1/define/HBaseAdminInstrumentation.java | 2 +- .../v1/define/HBaseClientInstrumentation.java | 2 +- .../v1/define/HTableInstrumentation.java | 2 +- .../define/RpcClientImplInstrumentation.java | 2 +- .../hbase/v2/AsyncAdminInterceptor.java | 73 +++++++++++++++++ .../hbase/v2/AsyncTableInterceptor.java | 73 +++++++++++++++++ .../AbstractRpcClientInstrumentation.java | 2 +- .../v2/define/AsyncAdminInstrumentation.java | 79 +++++++++++++++++++ .../define/AsyncProcessInstrumentation.java | 2 +- .../v2/define/AsyncTableInstrumentation.java | 72 +++++++++++++++++ .../ConnectionFactoryInstrumentation.java | 2 +- .../v2/define/HBaseAdminInstrumentation.java | 2 +- .../v2/define/HBaseClientInstrumentation.java | 2 +- .../v2/define/HTableInstrumentation.java | 5 +- .../src/main/resources/skywalking-plugin.def | 4 +- 18 files changed, 313 insertions(+), 17 deletions(-) create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/AsyncAdminInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/AsyncTableInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AsyncAdminInstrumentation.java create mode 100644 apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AsyncTableInstrumentation.java diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/AsyncProcessInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/AsyncProcessInstrumentation.java index 35cdcb009a4c..d2fcaa2cb00d 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/AsyncProcessInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/AsyncProcessInstrumentation.java @@ -35,7 +35,7 @@ public class AsyncProcessInstrumentation extends ClassInstanceMethodsEnhancePlug private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.AsyncProcess"; - private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.AsyncProcessInterceptor"; + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.v1.AsyncProcessInterceptor"; @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/AsyncRpcClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/AsyncRpcClientInstrumentation.java index a764bb947872..693a899f2f25 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/AsyncRpcClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/AsyncRpcClientInstrumentation.java @@ -37,7 +37,7 @@ public class AsyncRpcClientInstrumentation extends ClassInstanceMethodsEnhancePl private static final String ENHANCE_METHOD = "call"; - private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.AsyncRpcClientInterceptor"; + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.v1.AsyncRpcClientInterceptor"; @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/ConnectionFactoryInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/ConnectionFactoryInstrumentation.java index b1b678547f77..f60afe1fc035 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/ConnectionFactoryInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/ConnectionFactoryInstrumentation.java @@ -21,7 +21,7 @@ public class ConnectionFactoryInstrumentation extends ClassStaticMethodsEnhanceP private static final String ENHANCE_METHOD = "createConnection"; - private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.ConnectionFactoryInterceptor"; + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.v1.ConnectionFactoryInterceptor"; @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HBaseAdminInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HBaseAdminInstrumentation.java index be3d54f3f175..fcca2c0598df 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HBaseAdminInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HBaseAdminInstrumentation.java @@ -35,7 +35,7 @@ public class HBaseAdminInstrumentation extends ClassInstanceMethodsEnhancePlugin private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.HBaseAdmin"; - private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HBaseAdminInterceptor"; + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.v1.HBaseAdminInterceptor"; @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HBaseClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HBaseClientInstrumentation.java index c5acc4e7423f..f05aa51693d1 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HBaseClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HBaseClientInstrumentation.java @@ -19,7 +19,7 @@ public class HBaseClientInstrumentation extends ClassInstanceMethodsEnhancePlugi private static final String ENHANCE_METHOD = "run"; - private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HBaseClientMethodInterceptor"; + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.v1.HBaseClientMethodInterceptor"; @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HTableInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HTableInstrumentation.java index 0af23067179a..81724be70f75 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HTableInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/HTableInstrumentation.java @@ -38,7 +38,7 @@ public class HTableInstrumentation extends ClassInstanceMethodsEnhancePluginDefi private static final ElementMatcher.Junction[] JUNCTIONS = new ElementMatcher.Junction[] { }; - private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HTableInterceptor"; + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.v1.HTableInterceptor"; @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/RpcClientImplInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/RpcClientImplInstrumentation.java index 6f5dbe69d695..6331e486ba09 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/RpcClientImplInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v1/define/RpcClientImplInstrumentation.java @@ -37,7 +37,7 @@ public class RpcClientImplInstrumentation extends ClassInstanceMethodsEnhancePlu private static final String ENHANCE_METHOD = "call"; - private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.RpcClientImplInterceptor"; + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.v1.RpcClientImplInterceptor"; @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/AsyncAdminInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/AsyncAdminInterceptor.java new file mode 100644 index 000000000000..498c15701b8a --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/AsyncAdminInterceptor.java @@ -0,0 +1,73 @@ +/* + * 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.hbase.v2; + +import java.lang.reflect.Method; +import java.util.Arrays; +import org.apache.skywalking.apm.agent.core.context.ContextManager; +import org.apache.skywalking.apm.agent.core.context.tag.StringTag; +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.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; +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; + +/** + * @author zhangbin + */ +public class AsyncAdminInterceptor implements InstanceMethodsAroundInterceptor { + + private static final ILog LOGGER = LogManager.getLogger(AsyncAdminInterceptor.class); + + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + LOGGER.info("method is {} ", method.getName()); + AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_CLIENT_ADMIN + "/" + method.getName(), ConnectionInfo.REMOTE_PEER); + span.setComponent(ComponentsDefine.HBASE); + span.tag(new StringTag("args"), parseAttributes(allArguments)); + SpanLayer.asDB(span); + + } + + @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); + } + + protected String parseAttributes(Object[] args) { + + if (args != null && args.length > 0) { // if has params, print all params. + return Arrays.toString(args); + } + return null; + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/AsyncTableInterceptor.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/AsyncTableInterceptor.java new file mode 100644 index 000000000000..5d7118265bbd --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/AsyncTableInterceptor.java @@ -0,0 +1,73 @@ +/* + * 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.hbase.v2; + +import java.lang.reflect.Method; +import java.util.Arrays; +import org.apache.skywalking.apm.agent.core.context.ContextManager; +import org.apache.skywalking.apm.agent.core.context.tag.StringTag; +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.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; +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; + +/** + * @author zhangbin + */ +public class AsyncTableInterceptor implements InstanceMethodsAroundInterceptor { + + private static final ILog LOGGER = LogManager.getLogger(AsyncTableInterceptor.class); + + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + LOGGER.info("method is {} ", method.getName()); + AbstractSpan span = ContextManager.createExitSpan(HBasePluginConstants.HBASE_CLIENT_ADMIN + "/" + method.getName(), ConnectionInfo.REMOTE_PEER); + span.setComponent(ComponentsDefine.HBASE); + span.tag(new StringTag("args"), parseAttributes(allArguments)); + SpanLayer.asDB(span); + + } + + @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); + } + + protected String parseAttributes(Object[] args) { + + if (args != null && args.length > 0) { // if has params, print all params. + return Arrays.toString(args); + } + return null; + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AbstractRpcClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AbstractRpcClientInstrumentation.java index 889b2aa89b2d..f0c85801e155 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AbstractRpcClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AbstractRpcClientInstrumentation.java @@ -37,7 +37,7 @@ public class AbstractRpcClientInstrumentation extends ClassInstanceMethodsEnhanc private static final String ENHANCE_METHOD = "callMethod"; - private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.AbstractRpcClientInterceptor"; + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.v2.AbstractRpcClientInterceptor"; @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AsyncAdminInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AsyncAdminInstrumentation.java new file mode 100644 index 000000000000..f01388d460af --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AsyncAdminInstrumentation.java @@ -0,0 +1,79 @@ +/* + * 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.hbase.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.match.ClassMatch; +import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; + +import static net.bytebuddy.matcher.ElementMatchers.named; + +/** + * @author zhangbin + */ +public class AsyncAdminInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.AsyncAdmin"; + + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.v2.AsyncAdminInterceptor"; + + @Override + protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + return new ConstructorInterceptPoint[0]; + } + + @Override + protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("tableExists").or(named("disableTable")).or(named("deleteTable")) + .or(named("createTable")).or(named("listTableNames")).or(named("modifyTable")) + .or(named("truncateTable")).or(named("enableTable")).or(named("listTables")) + .or(named("createNamespace")).or(named("modifyNamespace")).or(named("deleteNamespace")) + .or(named("addColumnFamily")).or(named("createColumnFamily")).or(named("modifyColumnFamily")) + .or(named("deleteColumnFamily")).or(named("compact")).or(named("majorCompact")) + .or(named("split")).or(named("getRegions")).or(named("snapshot")) + .or(named("restoreSnapshot")).or(named("cloneSnapshot")).or(named("listSnapshots")) + .or(named("deleteSnapshot")); + } + + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } + } + }; + } + + @Override + protected ClassMatch enhanceClass() { + return NameMatch.byName(ENHANCE_CLASS); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AsyncProcessInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AsyncProcessInstrumentation.java index 2d5eff21f99d..fd9e528eaefb 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AsyncProcessInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AsyncProcessInstrumentation.java @@ -35,7 +35,7 @@ public class AsyncProcessInstrumentation extends ClassInstanceMethodsEnhancePlug private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.AsyncProcess"; - private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.AsyncProcessInterceptor"; + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.v2.AsyncProcessInterceptor"; @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AsyncTableInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AsyncTableInstrumentation.java new file mode 100644 index 000000000000..9b87fa4f4e5b --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/AsyncTableInstrumentation.java @@ -0,0 +1,72 @@ +/* + * 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.hbase.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.match.ClassMatch; +import org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch; +import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; + +import static net.bytebuddy.matcher.ElementMatchers.named; + +/** + * @author zhangbin + */ +public class AsyncTableInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + private static final String[] ENHANCE_CLASS = new String[] {"org.apache.hadoop.hbase.client.AsyncTable"}; + + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.v2.AsyncTableInterceptor"; + + @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + return new ConstructorInterceptPoint[0]; + } + + @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override public ElementMatcher getMethodsMatcher() { + return named("append").or(named("increment")).or(named("exists")) + .or(named("existsAll")).or(named("get")) + .or(named("getAll")).or(named("scan")).or(named("scanAll")) + .or(named("batch")).or(named("batchAll")).or(named("put")) + .or(named("putAll")).or(named("delete")).or(named("deleteAll")) + .or(named("incrementColumnValue")).or(named("getScanner")).or(named("checkAndMutate")) + .or(named("mutateRow")); + } + + @Override public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override public boolean isOverrideArgs() { + return false; + } + } + }; + } + + @Override protected ClassMatch enhanceClass() { + return HierarchyMatch.byHierarchyMatch(ENHANCE_CLASS); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/ConnectionFactoryInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/ConnectionFactoryInstrumentation.java index 46052cdab292..3c47c6b2957e 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/ConnectionFactoryInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/ConnectionFactoryInstrumentation.java @@ -21,7 +21,7 @@ public class ConnectionFactoryInstrumentation extends ClassStaticMethodsEnhanceP private static final String ENHANCE_METHOD = "createConnection"; - private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.ConnectionFactoryInterceptor"; + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.v2.ConnectionFactoryInterceptor"; @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HBaseAdminInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HBaseAdminInstrumentation.java index 6f0c46a2c3ea..9f498e57ff93 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HBaseAdminInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HBaseAdminInstrumentation.java @@ -35,7 +35,7 @@ public class HBaseAdminInstrumentation extends ClassInstanceMethodsEnhancePlugin private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.HBaseAdmin"; - private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HBaseAdminInterceptor"; + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.v2.HBaseAdminInterceptor"; @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HBaseClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HBaseClientInstrumentation.java index 3559a1a5690f..3d2db6651fa5 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HBaseClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HBaseClientInstrumentation.java @@ -19,7 +19,7 @@ public class HBaseClientInstrumentation extends ClassInstanceMethodsEnhancePlugi private static final String ENHANCE_METHOD = "run"; - private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HBaseClientMethodInterceptor"; + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.v2.HBaseClientMethodInterceptor"; @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HTableInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HTableInstrumentation.java index f3f3a5942fe8..6ed2be465c15 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HTableInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hbase/v2/define/HTableInstrumentation.java @@ -35,10 +35,7 @@ public class HTableInstrumentation extends ClassInstanceMethodsEnhancePluginDefi private static final String ENHANCE_CLASS = "org.apache.hadoop.hbase.client.HTable"; - private static final ElementMatcher.Junction[] JUNCTIONS = new ElementMatcher.Junction[] { - }; - - private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.HTableInterceptor"; + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.hbase.v2.HTableInterceptor"; @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; diff --git a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/resources/skywalking-plugin.def index 5b36c2f3173d..aa6025da131c 100644 --- a/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-sdk-plugin/hbase-client-2.x-plugin/src/main/resources/skywalking-plugin.def @@ -19,4 +19,6 @@ hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.v2.define.HBaseAdminInst hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.v2.define.HTableInstrumentation hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.v2.define.AsyncProcessInstrumentation hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.v2.define.AbstractRpcClientInstrumentation -hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.v2.define.HBaseClientInstrumentation \ No newline at end of file +hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.v2.define.HBaseClientInstrumentation +hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.v2.define.AsyncAdminInstrumentation +hBase-client-2.x=org.apache.skywalking.apm.plugin.hbase.v2.define.AsyncTableInstrumentation \ No newline at end of file From 2cd73c5591c055088b310b5ac1ef153fabbb7499 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Tue, 30 Apr 2019 16:07:50 +0800 Subject: [PATCH 10/14] Introduce new profile in release --- docs/en/guides/How-to-release.md | 4 +- pom.xml | 65 ++++++++++++++++++++------------ 2 files changed, 43 insertions(+), 26 deletions(-) diff --git a/docs/en/guides/How-to-release.md b/docs/en/guides/How-to-release.md index aa99c5f81405..8a4753690f80 100644 --- a/docs/en/guides/How-to-release.md +++ b/docs/en/guides/How-to-release.md @@ -46,7 +46,7 @@ This step is only for test, if your env is set right, don't need to check every ## Prepare the release ``` ./mvnw release:clean -./mvnw release:prepare -DautoVersionSubmodules=true +./mvnw release:prepare -DautoVersionSubmodules=true -all ``` - Set version number as x.y.z, and tag as **v**x.y.z (version tag must start with **v**, you will find the purpose in next step.) @@ -56,7 +56,7 @@ but just failure. Run `gpg --sign xxx` to any file could remember the password f ## Stage the release ``` -./mvnw release:perform -DskipTests +./mvnw release:perform -DskipTests -all ``` - The release will automatically be inserted into a temporary staging repository for you. diff --git a/pom.xml b/pom.xml index 35096f25a99f..96bd7c7acbd3 100644 --- a/pom.xml +++ b/pom.xml @@ -113,6 +113,47 @@ apm-dist + + all + + false + + + apm-sniffer + apm-application-toolkit + oap-server + apm-webapp + apm-dist + + + + + org.codehaus.mojo + exec-maven-plugin + ${exec-maven-plugin.version} + + + git submodule update + initialize + false + + git + + submodule + update + --init + --recursive + + + + exec + + + + + + + @@ -251,30 +292,6 @@ - - org.codehaus.mojo - exec-maven-plugin - ${exec-maven-plugin.version} - - - git submodule update - initialize - false - - git - - submodule - update - --init - --recursive - - - - exec - - - - maven-enforcer-plugin ${maven-enforcer-plugin.version} From 0b9848fbe48143b1e11316d3cb72527e40108ab2 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Tue, 30 Apr 2019 16:09:57 +0800 Subject: [PATCH 11/14] Fix a missing change. --- docs/en/guides/How-to-release.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/guides/How-to-release.md b/docs/en/guides/How-to-release.md index 8a4753690f80..ff04e920ec97 100644 --- a/docs/en/guides/How-to-release.md +++ b/docs/en/guides/How-to-release.md @@ -40,7 +40,7 @@ Apache maven staging repository check list. ## Test your settings This step is only for test, if your env is set right, don't need to check every time. ``` -./mvnw clean install -Papache-release (this will build artifacts, sources and sign) +./mvnw clean install -Pauto (this will build artifacts, sources and sign) ``` ## Prepare the release From 5e10589530e7ac76b0e6e72d9bae43d2b6fc43d1 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Tue, 30 Apr 2019 16:12:37 +0800 Subject: [PATCH 12/14] Fix wrong profile name. --- docs/en/guides/How-to-release.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/en/guides/How-to-release.md b/docs/en/guides/How-to-release.md index ff04e920ec97..c8d0006d47f7 100644 --- a/docs/en/guides/How-to-release.md +++ b/docs/en/guides/How-to-release.md @@ -40,13 +40,13 @@ Apache maven staging repository check list. ## Test your settings This step is only for test, if your env is set right, don't need to check every time. ``` -./mvnw clean install -Pauto (this will build artifacts, sources and sign) +./mvnw clean install -Pall (this will build artifacts, sources and sign) ``` ## Prepare the release ``` ./mvnw release:clean -./mvnw release:prepare -DautoVersionSubmodules=true -all +./mvnw release:prepare -DautoVersionSubmodules=true -Pall ``` - Set version number as x.y.z, and tag as **v**x.y.z (version tag must start with **v**, you will find the purpose in next step.) @@ -56,7 +56,7 @@ but just failure. Run `gpg --sign xxx` to any file could remember the password f ## Stage the release ``` -./mvnw release:perform -DskipTests -all +./mvnw release:perform -DskipTests -Pall ``` - The release will automatically be inserted into a temporary staging repository for you. From ce0513307aba846e4568b6fc5e949cd9426ca10a Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Tue, 30 Apr 2019 08:47:09 +0000 Subject: [PATCH 13/14] [maven-release-plugin] prepare release v6.1.0 --- apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml | 2 +- apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml | 2 +- apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml | 2 +- apm-application-toolkit/apm-toolkit-opentracing/pom.xml | 2 +- apm-application-toolkit/apm-toolkit-trace/pom.xml | 2 +- apm-application-toolkit/pom.xml | 2 +- apm-checkstyle/pom.xml | 4 ++++ apm-commons/apm-datacarrier/pom.xml | 2 +- apm-commons/apm-util/pom.xml | 2 +- apm-commons/pom.xml | 2 +- apm-dist/pom.xml | 2 +- apm-protocol/apm-network/pom.xml | 2 +- apm-protocol/pom.xml | 2 +- apm-sniffer/apm-agent-core/pom.xml | 2 +- apm-sniffer/apm-agent/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 2 +- .../jetty-plugin/jetty-client-9.0-plugin/pom.xml | 2 +- .../jetty-plugin/jetty-client-9.x-plugin/pom.xml | 2 +- .../jetty-plugin/jetty-server-9.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml | 2 +- .../apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml | 2 +- .../nutz-plugins/mvc-annotation-1.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml | 2 +- .../servicecomb-java-chassis-0.x-plugin/pom.xml | 2 +- .../servicecomb-java-chassis-1.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml | 2 +- .../spring-plugins/concurrent-util-4.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml | 2 +- .../spring-plugins/mvc-annotation-3.x-plugin/pom.xml | 2 +- .../spring-plugins/mvc-annotation-4.x-plugin/pom.xml | 2 +- .../spring-plugins/mvc-annotation-5.x-plugin/pom.xml | 2 +- .../spring-plugins/mvc-annotation-commons/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 2 +- .../spring-plugins/resttemplate-4.x-plugin/pom.xml | 2 +- .../spring-plugins/spring-cloud/netflix-plugins/pom.xml | 2 +- .../netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml | 2 +- .../apm-sdk-plugin/spring-plugins/spring-commons/pom.xml | 2 +- .../apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml | 2 +- .../undertow-plugins/undertow-2.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml | 2 +- .../vertx-plugins/vertx-core-3.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/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 +- .../apm-toolkit-logback-1.x-activation/pom.xml | 2 +- .../apm-toolkit-opentracing-activation/pom.xml | 2 +- .../apm-toolkit-trace-activation/pom.xml | 2 +- apm-sniffer/apm-toolkit-activation/pom.xml | 2 +- apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml | 2 +- apm-sniffer/optional-plugins/gson-2.8.x-plugin/pom.xml | 2 +- apm-sniffer/optional-plugins/lettuce-5.x-plugin/pom.xml | 2 +- apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml | 2 +- .../optional-spring-plugins/spring-annotation-plugin/pom.xml | 2 +- apm-sniffer/optional-plugins/pom.xml | 2 +- apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml | 2 +- apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/pom.xml | 2 +- apm-sniffer/pom.xml | 2 +- apm-webapp/pom.xml | 2 +- oap-server/exporter/pom.xml | 2 +- oap-server/generate-tool-grammar/pom.xml | 2 +- oap-server/generate-tool/pom.xml | 2 +- oap-server/generated-analysis/pom.xml | 2 +- oap-server/pom.xml | 2 +- oap-server/server-alarm-plugin/pom.xml | 2 +- .../server-cluster-plugin/cluster-consul-plugin/pom.xml | 2 +- .../server-cluster-plugin/cluster-kubernetes-plugin/pom.xml | 2 +- .../server-cluster-plugin/cluster-standalone-plugin/pom.xml | 2 +- .../server-cluster-plugin/cluster-zookeeper-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/pom.xml | 2 +- oap-server/server-core/pom.xml | 2 +- oap-server/server-library/library-buffer/pom.xml | 2 +- oap-server/server-library/library-client/pom.xml | 2 +- oap-server/server-library/library-module/pom.xml | 2 +- oap-server/server-library/library-server/pom.xml | 2 +- oap-server/server-library/library-util/pom.xml | 2 +- oap-server/server-library/pom.xml | 2 +- oap-server/server-query-plugin/pom.xml | 2 +- oap-server/server-query-plugin/query-graphql-plugin/pom.xml | 2 +- .../envoy-metrics-receiver-plugin/pom.xml | 2 +- .../server-receiver-plugin/jaeger-receiver-plugin/pom.xml | 2 +- oap-server/server-receiver-plugin/pom.xml | 2 +- oap-server/server-receiver-plugin/receiver-proto/pom.xml | 2 +- .../skywalking-clr-receiver-plugin/pom.xml | 2 +- .../skywalking-istio-telemetry-receiver-plugin/pom.xml | 2 +- .../skywalking-jvm-receiver-plugin/pom.xml | 2 +- .../skywalking-mesh-receiver-plugin/pom.xml | 2 +- .../skywalking-register-receiver-plugin/pom.xml | 2 +- .../skywalking-sharing-server-plugin/pom.xml | 2 +- .../skywalking-trace-receiver-plugin/pom.xml | 2 +- .../server-receiver-plugin/zipkin-receiver-plugin/pom.xml | 2 +- oap-server/server-starter/pom.xml | 2 +- oap-server/server-storage-plugin/pom.xml | 2 +- .../storage-elasticsearch-plugin/pom.xml | 2 +- .../server-storage-plugin/storage-jaeger-plugin/pom.xml | 2 +- .../storage-jdbc-hikaricp-plugin/pom.xml | 2 +- .../server-storage-plugin/storage-zipkin-plugin/pom.xml | 2 +- oap-server/server-telemetry/pom.xml | 2 +- oap-server/server-telemetry/telemetry-api/pom.xml | 2 +- oap-server/server-telemetry/telemetry-prometheus/pom.xml | 2 +- oap-server/server-testing/pom.xml | 2 +- pom.xml | 4 ++-- 139 files changed, 143 insertions(+), 139 deletions(-) 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 507ee0dcb86a..2c8e15e0b5ad 100644 --- a/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml +++ b/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml @@ -21,7 +21,7 @@ apm-application-toolkit org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 0f2fc0112db5..bf4da9ace1ac 100644 --- a/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml +++ b/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml @@ -21,7 +21,7 @@ apm-application-toolkit org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 f68846419343..17f1ab135ec7 100644 --- a/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml +++ b/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml @@ -21,7 +21,7 @@ apm-application-toolkit org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-application-toolkit/apm-toolkit-opentracing/pom.xml b/apm-application-toolkit/apm-toolkit-opentracing/pom.xml index 21b29b75502d..a69cdfade548 100644 --- a/apm-application-toolkit/apm-toolkit-opentracing/pom.xml +++ b/apm-application-toolkit/apm-toolkit-opentracing/pom.xml @@ -21,7 +21,7 @@ apm-application-toolkit org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-application-toolkit/apm-toolkit-trace/pom.xml b/apm-application-toolkit/apm-toolkit-trace/pom.xml index 33c8b3ac9f57..2e0b55e6cd86 100644 --- a/apm-application-toolkit/apm-toolkit-trace/pom.xml +++ b/apm-application-toolkit/apm-toolkit-trace/pom.xml @@ -20,7 +20,7 @@ apm-application-toolkit org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-application-toolkit/pom.xml b/apm-application-toolkit/pom.xml index 8afdc06cf25d..78a77ae1b6fb 100644 --- a/apm-application-toolkit/pom.xml +++ b/apm-application-toolkit/pom.xml @@ -20,7 +20,7 @@ apm org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 apm-application-toolkit diff --git a/apm-checkstyle/pom.xml b/apm-checkstyle/pom.xml index 5466fa0546f9..8c4b9f8e7daa 100644 --- a/apm-checkstyle/pom.xml +++ b/apm-checkstyle/pom.xml @@ -30,4 +30,8 @@ apm-checkstyle 6.1.0 Module to hold Checkstyle for SkyWalking. + + + v6.1.0 + diff --git a/apm-commons/apm-datacarrier/pom.xml b/apm-commons/apm-datacarrier/pom.xml index fd829be815a7..8008326063d3 100644 --- a/apm-commons/apm-datacarrier/pom.xml +++ b/apm-commons/apm-datacarrier/pom.xml @@ -21,7 +21,7 @@ apm-commons org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-commons/apm-util/pom.xml b/apm-commons/apm-util/pom.xml index ac4c70c207fb..efebcac0bae1 100644 --- a/apm-commons/apm-util/pom.xml +++ b/apm-commons/apm-util/pom.xml @@ -20,7 +20,7 @@ apm-commons org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-commons/pom.xml b/apm-commons/pom.xml index 3fdbfbd5cac7..f253e1c5e06d 100644 --- a/apm-commons/pom.xml +++ b/apm-commons/pom.xml @@ -20,7 +20,7 @@ apm org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-dist/pom.xml b/apm-dist/pom.xml index 1a854bc01c7a..6ca1bc74416b 100644 --- a/apm-dist/pom.xml +++ b/apm-dist/pom.xml @@ -21,7 +21,7 @@ apm org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-protocol/apm-network/pom.xml b/apm-protocol/apm-network/pom.xml index ca2aca680095..6e2f3bad33a2 100644 --- a/apm-protocol/apm-network/pom.xml +++ b/apm-protocol/apm-network/pom.xml @@ -21,7 +21,7 @@ apm-protocol org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-protocol/pom.xml b/apm-protocol/pom.xml index 3df5765391e4..104c636e63ca 100644 --- a/apm-protocol/pom.xml +++ b/apm-protocol/pom.xml @@ -21,7 +21,7 @@ apm org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml index 0a18a0c2411b..5ce52e3fec37 100644 --- a/apm-sniffer/apm-agent-core/pom.xml +++ b/apm-sniffer/apm-agent-core/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sniffer - 6.2.0-SNAPSHOT + 6.1.0 apm-agent-core diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml index c9dfe7ab849c..41cec58c899a 100644 --- a/apm-sniffer/apm-agent/pom.xml +++ b/apm-sniffer/apm-agent/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sniffer - 6.2.0-SNAPSHOT + 6.1.0 apm-agent diff --git a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml index 5c1716f3a555..9167adc6df29 100644 --- a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/pom.xml index 2cf6c3ad4846..bcae75734b4f 100644 --- a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/pom.xml index a0548941826c..38a63ac2b63c 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml index f698d6198503..c888ed00910e 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/pom.xml index 8ab4f71f4f47..dfd66a98c7c1 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml index b7f596420ba7..bf7c154451f6 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 ac905d98de61..e84bc21afa85 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 @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml index f98a5836090e..e2cfa3d47406 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 a38ff513856c..77254e05d47f 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 @@ -21,7 +21,7 @@ org.apache.skywalking apm-sdk-plugin - 6.2.0-SNAPSHOT + 6.1.0 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 86538f7c189e..eae2ec559fd6 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 @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.2.0-SNAPSHOT + 6.1.0 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 39745ba687f4..6d9403ccc233 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 @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 059ebc950862..2ca0c2696d63 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 @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.2.0-SNAPSHOT + 6.1.0 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 8fc22c91f24e..47fd247d399d 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 @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.2.0-SNAPSHOT + 6.1.0 apm-httpasyncclient-4.x-plugin 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 b21fb8753514..a163d69ae15d 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 @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml b/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml index 8fe09501f500..f63d5702cf77 100755 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 383d60330870..fd9f7f6ea2cb 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 @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.2.0-SNAPSHOT + 6.1.0 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 bcece37aab4b..3f9711b1080c 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 @@ -20,7 +20,7 @@ jetty-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 85cc7b2c684e..0899692dd49c 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 @@ -20,7 +20,7 @@ jetty-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 159bb94ad02a..556b0e6d1a6b 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 @@ -20,7 +20,7 @@ jetty-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 a3be40711986..7c3ab4ee1185 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 6.2.0-SNAPSHOT + 6.1.0 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 bdb71b47196f..fe07ee66c551 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 f2b8828375dd..bff6a256b0c8 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 @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 e857b6aedccb..7aa619617624 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 @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 4329f3e37d09..3dda4fa0e5db 100644 --- a/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 8152ac2db2b9..969b5eccfa9a 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 @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml index 4085da0bc904..32c393fa70e8 100755 --- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml index a8d020c5bbb5..1510527b0e0e 100755 --- a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml index b04310694fa6..3cbe177aa85f 100755 --- a/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 3890f84f1eee..b73393429656 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 @@ -20,7 +20,7 @@ nutz-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 ccb5c8f4cfba..5db02e02c366 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 @@ -20,7 +20,7 @@ nutz-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 f3d4f564c5e4..e09665d7de7d 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 6.2.0-SNAPSHOT + 6.1.0 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 884477fe1472..63f8dd1d1b7c 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 @@ -21,7 +21,7 @@ org.apache.skywalking apm-sdk-plugin - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml index ff5904e88c47..baf92bd75b97 100644 --- a/apm-sniffer/apm-sdk-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sniffer - 6.2.0-SNAPSHOT + 6.1.0 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 8b7a28169324..9ba2f700c57c 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 @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml index 65973eb04133..b3b065de5800 100644 --- a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml index 3dbd498d69d3..9e7fa17ac8cc 100644 --- a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.2.0-SNAPSHOT + 6.1.0 apm-redisson-3.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml index a74b390f1844..940e495da315 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 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 d1fbf90f4c96..7be3a982c811 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 @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 e5eee2822fdf..0859a14fde3a 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 91681c979e87..d458fd0d5ea2 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 @@ -21,7 +21,7 @@ servicecomb-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 cf296dd7e2f5..6e5047755ef2 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 @@ -21,7 +21,7 @@ servicecomb-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 ec75e1b273a7..848b7ac97ed7 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 @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml index b73a5e549d73..e479dd023b55 100644 --- a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 f031e3ca59a6..a8376e1f8f11 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 @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 f1116fb50c4d..89fc9d269741 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 @@ -21,7 +21,7 @@ spring-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 70332d196360..d40d52a46e70 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 @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 1cfa80144e3f..6aa3d7945b07 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 @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml index d04eecd78b50..4a46443bb262 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml @@ -19,7 +19,7 @@ spring-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 eae34d77b62f..482e74eb898d 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 @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 070a2fc8fc02..bee4cd8984bb 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 6.2.0-SNAPSHOT + 6.1.0 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 04df4ab60a00..e247165bb981 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 @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 55d6e9c316f6..c2aedc4d8855 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 @@ -23,7 +23,7 @@ org.apache.skywalking spring-cloud - 6.2.0-SNAPSHOT + 6.1.0 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 f3690485b1f8..d6cbe6bd1c3c 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 @@ -23,7 +23,7 @@ org.apache.skywalking netflix-plugins - 6.2.0-SNAPSHOT + 6.1.0 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 b6eb7a71884e..3efbb2a89b6b 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 @@ -23,7 +23,7 @@ org.apache.skywalking spring-plugins - 6.2.0-SNAPSHOT + 6.1.0 spring-cloud diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/pom.xml index 1b81157fce5a..86f206b6e618 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/pom.xml @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/pom.xml index c38a4a1e15c9..54294c6704d8 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/pom.xml @@ -19,7 +19,7 @@ spring-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 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 e2a4a5fb7ea6..747c972e8f0a 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 @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.2.0-SNAPSHOT + 6.1.0 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 22ede9d2f95c..75f00bf3f98b 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 @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 46311d5d2f45..81e1ff023457 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 @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml index c8435c3bb963..48f48a0a65b8 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 6.2.0-SNAPSHOT + 6.1.0 undertow-plugins diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml index 89798ca0b5ee..9ff3a3fd0097 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml @@ -20,7 +20,7 @@ undertow-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml index ab868b20c658..fa0e5d671cd0 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 6.2.0-SNAPSHOT + 6.1.0 vertx-plugins diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/pom.xml index d5984a1d5579..6045208e42d0 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/pom.xml @@ -20,7 +20,7 @@ vertx-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 97ae43c8d9a6..5e8672d7fda6 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 @@ -21,7 +21,7 @@ org.apache.skywalking apm-sdk-plugin - 6.2.0-SNAPSHOT + 6.1.0 apm-xmemcached-2.x-plugin diff --git a/apm-sniffer/apm-test-tools/pom.xml b/apm-sniffer/apm-test-tools/pom.xml index b36f40dfdcfb..8891ea258e9c 100644 --- a/apm-sniffer/apm-test-tools/pom.xml +++ b/apm-sniffer/apm-test-tools/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sniffer - 6.2.0-SNAPSHOT + 6.1.0 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 1466b6f998c3..acc738a89e10 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 @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 c20dd59f5891..55a8aa88d4b7 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 @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 7147c5f9e2f3..5b0b28562dd2 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 @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 fee587bdecc7..13d17186c2e5 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 @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 2a118ed32ec8..bb668fd7a26b 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 @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/apm-toolkit-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/pom.xml index 4360493bd3f1..1aa96ee3ce41 100644 --- a/apm-sniffer/apm-toolkit-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/pom.xml @@ -21,7 +21,7 @@ apm-sniffer org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 pom diff --git a/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml b/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml index ad3510132b17..8a9bfac2cf5b 100644 --- a/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.skywalking optional-plugins - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/pom.xml b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/pom.xml index e887be1d5b85..c1a79eb98b27 100644 --- a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking optional-plugins - 6.2.0-SNAPSHOT + 6.1.0 apm-gson-2.x-plugin diff --git a/apm-sniffer/optional-plugins/lettuce-5.x-plugin/pom.xml b/apm-sniffer/optional-plugins/lettuce-5.x-plugin/pom.xml index 8cb74634072a..23a75d8eb29c 100644 --- a/apm-sniffer/optional-plugins/lettuce-5.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/lettuce-5.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking optional-plugins - 6.2.0-SNAPSHOT + 6.1.0 apm-lettuce-5.x-plugin diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml index 49dc230ebb13..b43ec00f9a72 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml @@ -21,7 +21,7 @@ optional-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 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 8514769e7ab6..d5b10d2d3c4d 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 @@ -21,7 +21,7 @@ optional-spring-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 jar diff --git a/apm-sniffer/optional-plugins/pom.xml b/apm-sniffer/optional-plugins/pom.xml index 99b399d99462..78b699443cf6 100644 --- a/apm-sniffer/optional-plugins/pom.xml +++ b/apm-sniffer/optional-plugins/pom.xml @@ -21,7 +21,7 @@ apm-sniffer org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml b/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml index ba6a1f497152..7717cc5ca57a 100644 --- a/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml @@ -20,7 +20,7 @@ optional-plugins org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/pom.xml b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/pom.xml index 54e4e1810827..f799a9336cb3 100644 --- a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking optional-plugins - 6.2.0-SNAPSHOT + 6.1.0 apm-zookeeper-3.4.x-plugin diff --git a/apm-sniffer/pom.xml b/apm-sniffer/pom.xml index ee568dae9644..a27f0fa96346 100644 --- a/apm-sniffer/pom.xml +++ b/apm-sniffer/pom.xml @@ -21,7 +21,7 @@ apm org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/apm-webapp/pom.xml b/apm-webapp/pom.xml index f487c43e1e00..f9afe38d311f 100644 --- a/apm-webapp/pom.xml +++ b/apm-webapp/pom.xml @@ -21,7 +21,7 @@ apm org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/exporter/pom.xml b/oap-server/exporter/pom.xml index aa21e4b7efcb..ff36490e7dc2 100644 --- a/oap-server/exporter/pom.xml +++ b/oap-server/exporter/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/generate-tool-grammar/pom.xml b/oap-server/generate-tool-grammar/pom.xml index bec2beb66b0c..d2ca6db8aa9f 100644 --- a/oap-server/generate-tool-grammar/pom.xml +++ b/oap-server/generate-tool-grammar/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/generate-tool/pom.xml b/oap-server/generate-tool/pom.xml index 2fa53a92c25e..725be600b8f1 100644 --- a/oap-server/generate-tool/pom.xml +++ b/oap-server/generate-tool/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/generated-analysis/pom.xml b/oap-server/generated-analysis/pom.xml index 2f303c343d23..f3f2b62cd48a 100644 --- a/oap-server/generated-analysis/pom.xml +++ b/oap-server/generated-analysis/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/pom.xml b/oap-server/pom.xml index db5bbe1cbd7e..74eed23e4669 100644 --- a/oap-server/pom.xml +++ b/oap-server/pom.xml @@ -21,7 +21,7 @@ apm org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-alarm-plugin/pom.xml b/oap-server/server-alarm-plugin/pom.xml index abfff126adc0..5cb873232e48 100644 --- a/oap-server/server-alarm-plugin/pom.xml +++ b/oap-server/server-alarm-plugin/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml index d68da9ddf133..00770b6b9135 100644 --- a/oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml @@ -21,7 +21,7 @@ server-cluster-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml index e5e2a69fb84b..2bc50861e1e7 100644 --- a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml @@ -21,7 +21,7 @@ server-cluster-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml index d49d6cfd0651..f91c46a9b93c 100644 --- a/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml @@ -21,7 +21,7 @@ server-cluster-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml index 7dccd3669045..67f2e1640ea5 100644 --- a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.skywalking server-cluster-plugin - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-cluster-plugin/pom.xml b/oap-server/server-cluster-plugin/pom.xml index 153015a1709c..28c54170445e 100644 --- a/oap-server/server-cluster-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-core/pom.xml b/oap-server/server-core/pom.xml index a66eba2d82a9..2475bc679da7 100644 --- a/oap-server/server-core/pom.xml +++ b/oap-server/server-core/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-library/library-buffer/pom.xml b/oap-server/server-library/library-buffer/pom.xml index d3a2583d6450..87eac81981f0 100644 --- a/oap-server/server-library/library-buffer/pom.xml +++ b/oap-server/server-library/library-buffer/pom.xml @@ -21,7 +21,7 @@ server-library org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-library/library-client/pom.xml b/oap-server/server-library/library-client/pom.xml index ed426d87fd3e..7b4a218cdd34 100644 --- a/oap-server/server-library/library-client/pom.xml +++ b/oap-server/server-library/library-client/pom.xml @@ -21,7 +21,7 @@ server-library org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-library/library-module/pom.xml b/oap-server/server-library/library-module/pom.xml index 4b1b3ed0dcb0..ccb65b739dfd 100644 --- a/oap-server/server-library/library-module/pom.xml +++ b/oap-server/server-library/library-module/pom.xml @@ -21,7 +21,7 @@ server-library org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-library/library-server/pom.xml b/oap-server/server-library/library-server/pom.xml index 25c994384191..37fd629398a7 100644 --- a/oap-server/server-library/library-server/pom.xml +++ b/oap-server/server-library/library-server/pom.xml @@ -21,7 +21,7 @@ server-library org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-library/library-util/pom.xml b/oap-server/server-library/library-util/pom.xml index 922690e1c42b..0e5fbdec5afa 100644 --- a/oap-server/server-library/library-util/pom.xml +++ b/oap-server/server-library/library-util/pom.xml @@ -21,7 +21,7 @@ server-library org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-library/pom.xml b/oap-server/server-library/pom.xml index 15de336b9ff8..1ab9f4c2cba5 100644 --- a/oap-server/server-library/pom.xml +++ b/oap-server/server-library/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-query-plugin/pom.xml b/oap-server/server-query-plugin/pom.xml index b24ef1eeef65..a124af937fd2 100644 --- a/oap-server/server-query-plugin/pom.xml +++ b/oap-server/server-query-plugin/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-query-plugin/query-graphql-plugin/pom.xml b/oap-server/server-query-plugin/query-graphql-plugin/pom.xml index 85ead062d609..a759c3b8905f 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/pom.xml +++ b/oap-server/server-query-plugin/query-graphql-plugin/pom.xml @@ -21,7 +21,7 @@ server-query-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml index 0b665dbd34dc..3b9d5ed0ffd7 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml index 7782a8b84b19..8bc1d8135b5e 100644 --- a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/pom.xml index 48483ac93931..56f2dee5b2b0 100644 --- a/oap-server/server-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-receiver-plugin/receiver-proto/pom.xml b/oap-server/server-receiver-plugin/receiver-proto/pom.xml index da2bcb8d72b4..1a078d4efc08 100644 --- a/oap-server/server-receiver-plugin/receiver-proto/pom.xml +++ b/oap-server/server-receiver-plugin/receiver-proto/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/pom.xml index f17e9909021c..6c2c56ff3116 100644 --- a/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml index ff20d9b72156..d21918690cba 100644 --- a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml index 9ed2f307f209..5ee345fac9f8 100644 --- a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml index 6679e41897e6..9971a6304d75 100644 --- a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml index 76f8213006e2..5f79433655bc 100644 --- a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/pom.xml index 29304348a874..b4cd66182212 100644 --- a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml index d778df9b47bd..8156f3a845d8 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml index aae84568d72e..84c90c6ed4f4 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-starter/pom.xml b/oap-server/server-starter/pom.xml index e7d91a53c5aa..b323d91d62ec 100644 --- a/oap-server/server-starter/pom.xml +++ b/oap-server/server-starter/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-storage-plugin/pom.xml b/oap-server/server-storage-plugin/pom.xml index cab8e4947fad..82749c6ffabd 100644 --- a/oap-server/server-storage-plugin/pom.xml +++ b/oap-server/server-storage-plugin/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml index 8fae6ffa2a1a..1f0f9e95bfd1 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml @@ -21,7 +21,7 @@ server-storage-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml b/oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml index 7e53f3cd95c8..36851ac9e220 100644 --- a/oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml @@ -21,7 +21,7 @@ server-storage-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml index 32331ecddc48..3a8ac7e88ef5 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml @@ -21,7 +21,7 @@ server-storage-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml b/oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml index bb414e1319fc..b851a3d69659 100644 --- a/oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml @@ -21,7 +21,7 @@ server-storage-plugin org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-telemetry/pom.xml b/oap-server/server-telemetry/pom.xml index 3de21b51439a..21cace34b519 100644 --- a/oap-server/server-telemetry/pom.xml +++ b/oap-server/server-telemetry/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-telemetry/telemetry-api/pom.xml b/oap-server/server-telemetry/telemetry-api/pom.xml index bccec40d7e68..8a7384bea818 100644 --- a/oap-server/server-telemetry/telemetry-api/pom.xml +++ b/oap-server/server-telemetry/telemetry-api/pom.xml @@ -21,7 +21,7 @@ server-telemetry org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-telemetry/telemetry-prometheus/pom.xml b/oap-server/server-telemetry/telemetry-prometheus/pom.xml index 97aab80ad3d1..0a5ca66a920f 100644 --- a/oap-server/server-telemetry/telemetry-prometheus/pom.xml +++ b/oap-server/server-telemetry/telemetry-prometheus/pom.xml @@ -21,7 +21,7 @@ server-telemetry org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/oap-server/server-testing/pom.xml b/oap-server/server-testing/pom.xml index 5de9ef856450..c40899f17af8 100644 --- a/oap-server/server-testing/pom.xml +++ b/oap-server/server-testing/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.2.0-SNAPSHOT + 6.1.0 4.0.0 diff --git a/pom.xml b/pom.xml index 96bd7c7acbd3..c8cf32ec7be0 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm - 6.2.0-SNAPSHOT + 6.1.0 org.apache @@ -45,7 +45,7 @@ https://github.com/apache/skywalking scm:git:https://github.com/apache/skywalking.git scm:git:https://github.com/apache/skywalking.git - HEAD + v6.1.0 From b21ef367e39fc3e4b7b4fc22b76dd32cc69115cc Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Tue, 30 Apr 2019 08:47:41 +0000 Subject: [PATCH 14/14] [maven-release-plugin] prepare for next development iteration --- apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml | 2 +- apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml | 2 +- apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml | 2 +- apm-application-toolkit/apm-toolkit-opentracing/pom.xml | 2 +- apm-application-toolkit/apm-toolkit-trace/pom.xml | 2 +- apm-application-toolkit/pom.xml | 2 +- apm-checkstyle/pom.xml | 4 ---- apm-commons/apm-datacarrier/pom.xml | 2 +- apm-commons/apm-util/pom.xml | 2 +- apm-commons/pom.xml | 2 +- apm-dist/pom.xml | 2 +- apm-protocol/apm-network/pom.xml | 2 +- apm-protocol/pom.xml | 2 +- apm-sniffer/apm-agent-core/pom.xml | 2 +- apm-sniffer/apm-agent/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 2 +- .../jetty-plugin/jetty-client-9.0-plugin/pom.xml | 2 +- .../jetty-plugin/jetty-client-9.x-plugin/pom.xml | 2 +- .../jetty-plugin/jetty-server-9.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml | 2 +- .../apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml | 2 +- .../nutz-plugins/mvc-annotation-1.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml | 2 +- .../servicecomb-java-chassis-0.x-plugin/pom.xml | 2 +- .../servicecomb-java-chassis-1.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml | 2 +- .../spring-plugins/concurrent-util-4.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml | 2 +- .../spring-plugins/mvc-annotation-3.x-plugin/pom.xml | 2 +- .../spring-plugins/mvc-annotation-4.x-plugin/pom.xml | 2 +- .../spring-plugins/mvc-annotation-5.x-plugin/pom.xml | 2 +- .../spring-plugins/mvc-annotation-commons/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 2 +- .../spring-plugins/resttemplate-4.x-plugin/pom.xml | 2 +- .../spring-plugins/spring-cloud/netflix-plugins/pom.xml | 2 +- .../netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml | 2 +- .../apm-sdk-plugin/spring-plugins/spring-commons/pom.xml | 2 +- .../apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml | 2 +- .../undertow-plugins/undertow-2.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml | 2 +- .../vertx-plugins/vertx-core-3.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/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 +- .../apm-toolkit-logback-1.x-activation/pom.xml | 2 +- .../apm-toolkit-opentracing-activation/pom.xml | 2 +- .../apm-toolkit-trace-activation/pom.xml | 2 +- apm-sniffer/apm-toolkit-activation/pom.xml | 2 +- apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml | 2 +- apm-sniffer/optional-plugins/gson-2.8.x-plugin/pom.xml | 2 +- apm-sniffer/optional-plugins/lettuce-5.x-plugin/pom.xml | 2 +- apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml | 2 +- .../optional-spring-plugins/spring-annotation-plugin/pom.xml | 2 +- apm-sniffer/optional-plugins/pom.xml | 2 +- apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml | 2 +- apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/pom.xml | 2 +- apm-sniffer/pom.xml | 2 +- apm-webapp/pom.xml | 2 +- oap-server/exporter/pom.xml | 2 +- oap-server/generate-tool-grammar/pom.xml | 2 +- oap-server/generate-tool/pom.xml | 2 +- oap-server/generated-analysis/pom.xml | 2 +- oap-server/pom.xml | 2 +- oap-server/server-alarm-plugin/pom.xml | 2 +- .../server-cluster-plugin/cluster-consul-plugin/pom.xml | 2 +- .../server-cluster-plugin/cluster-kubernetes-plugin/pom.xml | 2 +- .../server-cluster-plugin/cluster-standalone-plugin/pom.xml | 2 +- .../server-cluster-plugin/cluster-zookeeper-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/pom.xml | 2 +- oap-server/server-core/pom.xml | 2 +- oap-server/server-library/library-buffer/pom.xml | 2 +- oap-server/server-library/library-client/pom.xml | 2 +- oap-server/server-library/library-module/pom.xml | 2 +- oap-server/server-library/library-server/pom.xml | 2 +- oap-server/server-library/library-util/pom.xml | 2 +- oap-server/server-library/pom.xml | 2 +- oap-server/server-query-plugin/pom.xml | 2 +- oap-server/server-query-plugin/query-graphql-plugin/pom.xml | 2 +- .../envoy-metrics-receiver-plugin/pom.xml | 2 +- .../server-receiver-plugin/jaeger-receiver-plugin/pom.xml | 2 +- oap-server/server-receiver-plugin/pom.xml | 2 +- oap-server/server-receiver-plugin/receiver-proto/pom.xml | 2 +- .../skywalking-clr-receiver-plugin/pom.xml | 2 +- .../skywalking-istio-telemetry-receiver-plugin/pom.xml | 2 +- .../skywalking-jvm-receiver-plugin/pom.xml | 2 +- .../skywalking-mesh-receiver-plugin/pom.xml | 2 +- .../skywalking-register-receiver-plugin/pom.xml | 2 +- .../skywalking-sharing-server-plugin/pom.xml | 2 +- .../skywalking-trace-receiver-plugin/pom.xml | 2 +- .../server-receiver-plugin/zipkin-receiver-plugin/pom.xml | 2 +- oap-server/server-starter/pom.xml | 2 +- oap-server/server-storage-plugin/pom.xml | 2 +- .../storage-elasticsearch-plugin/pom.xml | 2 +- .../server-storage-plugin/storage-jaeger-plugin/pom.xml | 2 +- .../storage-jdbc-hikaricp-plugin/pom.xml | 2 +- .../server-storage-plugin/storage-zipkin-plugin/pom.xml | 2 +- oap-server/server-telemetry/pom.xml | 2 +- oap-server/server-telemetry/telemetry-api/pom.xml | 2 +- oap-server/server-telemetry/telemetry-prometheus/pom.xml | 2 +- oap-server/server-testing/pom.xml | 2 +- pom.xml | 4 ++-- 139 files changed, 139 insertions(+), 143 deletions(-) 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 2c8e15e0b5ad..507ee0dcb86a 100644 --- a/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml +++ b/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml @@ -21,7 +21,7 @@ apm-application-toolkit org.apache.skywalking - 6.1.0 + 6.2.0-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 bf4da9ace1ac..0f2fc0112db5 100644 --- a/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml +++ b/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml @@ -21,7 +21,7 @@ apm-application-toolkit org.apache.skywalking - 6.1.0 + 6.2.0-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 17f1ab135ec7..f68846419343 100644 --- a/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml +++ b/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml @@ -21,7 +21,7 @@ apm-application-toolkit org.apache.skywalking - 6.1.0 + 6.2.0-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 a69cdfade548..21b29b75502d 100644 --- a/apm-application-toolkit/apm-toolkit-opentracing/pom.xml +++ b/apm-application-toolkit/apm-toolkit-opentracing/pom.xml @@ -21,7 +21,7 @@ apm-application-toolkit org.apache.skywalking - 6.1.0 + 6.2.0-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 2e0b55e6cd86..33c8b3ac9f57 100644 --- a/apm-application-toolkit/apm-toolkit-trace/pom.xml +++ b/apm-application-toolkit/apm-toolkit-trace/pom.xml @@ -20,7 +20,7 @@ apm-application-toolkit org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-application-toolkit/pom.xml b/apm-application-toolkit/pom.xml index 78a77ae1b6fb..8afdc06cf25d 100644 --- a/apm-application-toolkit/pom.xml +++ b/apm-application-toolkit/pom.xml @@ -20,7 +20,7 @@ apm org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 apm-application-toolkit diff --git a/apm-checkstyle/pom.xml b/apm-checkstyle/pom.xml index 8c4b9f8e7daa..5466fa0546f9 100644 --- a/apm-checkstyle/pom.xml +++ b/apm-checkstyle/pom.xml @@ -30,8 +30,4 @@ apm-checkstyle 6.1.0 Module to hold Checkstyle for SkyWalking. - - - v6.1.0 - diff --git a/apm-commons/apm-datacarrier/pom.xml b/apm-commons/apm-datacarrier/pom.xml index 8008326063d3..fd829be815a7 100644 --- a/apm-commons/apm-datacarrier/pom.xml +++ b/apm-commons/apm-datacarrier/pom.xml @@ -21,7 +21,7 @@ apm-commons org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-commons/apm-util/pom.xml b/apm-commons/apm-util/pom.xml index efebcac0bae1..ac4c70c207fb 100644 --- a/apm-commons/apm-util/pom.xml +++ b/apm-commons/apm-util/pom.xml @@ -20,7 +20,7 @@ apm-commons org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-commons/pom.xml b/apm-commons/pom.xml index f253e1c5e06d..3fdbfbd5cac7 100644 --- a/apm-commons/pom.xml +++ b/apm-commons/pom.xml @@ -20,7 +20,7 @@ apm org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-dist/pom.xml b/apm-dist/pom.xml index 6ca1bc74416b..1a854bc01c7a 100644 --- a/apm-dist/pom.xml +++ b/apm-dist/pom.xml @@ -21,7 +21,7 @@ apm org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-protocol/apm-network/pom.xml b/apm-protocol/apm-network/pom.xml index 6e2f3bad33a2..ca2aca680095 100644 --- a/apm-protocol/apm-network/pom.xml +++ b/apm-protocol/apm-network/pom.xml @@ -21,7 +21,7 @@ apm-protocol org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-protocol/pom.xml b/apm-protocol/pom.xml index 104c636e63ca..3df5765391e4 100644 --- a/apm-protocol/pom.xml +++ b/apm-protocol/pom.xml @@ -21,7 +21,7 @@ apm org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml index 5ce52e3fec37..0a18a0c2411b 100644 --- a/apm-sniffer/apm-agent-core/pom.xml +++ b/apm-sniffer/apm-agent-core/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sniffer - 6.1.0 + 6.2.0-SNAPSHOT apm-agent-core diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml index 41cec58c899a..c9dfe7ab849c 100644 --- a/apm-sniffer/apm-agent/pom.xml +++ b/apm-sniffer/apm-agent/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sniffer - 6.1.0 + 6.2.0-SNAPSHOT apm-agent diff --git a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml index 9167adc6df29..5c1716f3a555 100644 --- a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/pom.xml index bcae75734b4f..2cf6c3ad4846 100644 --- a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/pom.xml index 38a63ac2b63c..a0548941826c 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml index c888ed00910e..f698d6198503 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/pom.xml index dfd66a98c7c1..8ab4f71f4f47 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml index bf7c154451f6..b7f596420ba7 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-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 e84bc21afa85..ac905d98de61 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 @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml index e2cfa3d47406..f98a5836090e 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-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 77254e05d47f..a38ff513856c 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 @@ -21,7 +21,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0 + 6.2.0-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 eae2ec559fd6..86538f7c189e 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 @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0 + 6.2.0-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 6d9403ccc233..39745ba687f4 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 @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-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 2ca0c2696d63..059ebc950862 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 @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0 + 6.2.0-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 47fd247d399d..8fc22c91f24e 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 @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0 + 6.2.0-SNAPSHOT apm-httpasyncclient-4.x-plugin 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 a163d69ae15d..b21fb8753514 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 @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml b/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml index f63d5702cf77..8fe09501f500 100755 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-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 fd9f7f6ea2cb..383d60330870 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 @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0 + 6.2.0-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 3f9711b1080c..bcece37aab4b 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 @@ -20,7 +20,7 @@ jetty-plugins org.apache.skywalking - 6.1.0 + 6.2.0-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 0899692dd49c..85cc7b2c684e 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 @@ -20,7 +20,7 @@ jetty-plugins org.apache.skywalking - 6.1.0 + 6.2.0-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 556b0e6d1a6b..159bb94ad02a 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 @@ -20,7 +20,7 @@ jetty-plugins org.apache.skywalking - 6.1.0 + 6.2.0-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 7c3ab4ee1185..a3be40711986 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0 + 6.2.0-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 fe07ee66c551..bdb71b47196f 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-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 bff6a256b0c8..f2b8828375dd 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 @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-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 7aa619617624..e857b6aedccb 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 @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-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 3dda4fa0e5db..4329f3e37d09 100644 --- a/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-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 969b5eccfa9a..8152ac2db2b9 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 @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml index 32c393fa70e8..4085da0bc904 100755 --- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml index 1510527b0e0e..a8d020c5bbb5 100755 --- a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml index 3cbe177aa85f..b04310694fa6 100755 --- a/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-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 b73393429656..3890f84f1eee 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 @@ -20,7 +20,7 @@ nutz-plugins org.apache.skywalking - 6.1.0 + 6.2.0-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 5db02e02c366..ccb5c8f4cfba 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 @@ -20,7 +20,7 @@ nutz-plugins org.apache.skywalking - 6.1.0 + 6.2.0-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 e09665d7de7d..f3d4f564c5e4 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0 + 6.2.0-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 63f8dd1d1b7c..884477fe1472 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 @@ -21,7 +21,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml index baf92bd75b97..ff5904e88c47 100644 --- a/apm-sniffer/apm-sdk-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sniffer - 6.1.0 + 6.2.0-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 9ba2f700c57c..8b7a28169324 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 @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml index b3b065de5800..65973eb04133 100644 --- a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml index 9e7fa17ac8cc..3dbd498d69d3 100644 --- a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0 + 6.2.0-SNAPSHOT apm-redisson-3.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml index 940e495da315..a74b390f1844 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 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 7be3a982c811..d1fbf90f4c96 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 @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-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 0859a14fde3a..e5eee2822fdf 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-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 d458fd0d5ea2..91681c979e87 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 @@ -21,7 +21,7 @@ servicecomb-plugin org.apache.skywalking - 6.1.0 + 6.2.0-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 6e5047755ef2..cf296dd7e2f5 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 @@ -21,7 +21,7 @@ servicecomb-plugin org.apache.skywalking - 6.1.0 + 6.2.0-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 848b7ac97ed7..ec75e1b273a7 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 @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml index e479dd023b55..b73a5e549d73 100644 --- a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-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 a8376e1f8f11..f031e3ca59a6 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 @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.1.0 + 6.2.0-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 89fc9d269741..f1116fb50c4d 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 @@ -21,7 +21,7 @@ spring-plugins org.apache.skywalking - 6.1.0 + 6.2.0-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 d40d52a46e70..70332d196360 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 @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.1.0 + 6.2.0-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 6aa3d7945b07..1cfa80144e3f 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 @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml index 4a46443bb262..d04eecd78b50 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml @@ -19,7 +19,7 @@ spring-plugins org.apache.skywalking - 6.1.0 + 6.2.0-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 482e74eb898d..eae34d77b62f 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 @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.1.0 + 6.2.0-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 bee4cd8984bb..070a2fc8fc02 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0 + 6.2.0-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 e247165bb981..04df4ab60a00 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 @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.1.0 + 6.2.0-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 c2aedc4d8855..55d6e9c316f6 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 @@ -23,7 +23,7 @@ org.apache.skywalking spring-cloud - 6.1.0 + 6.2.0-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 d6cbe6bd1c3c..f3690485b1f8 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 @@ -23,7 +23,7 @@ org.apache.skywalking netflix-plugins - 6.1.0 + 6.2.0-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 3efbb2a89b6b..b6eb7a71884e 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 @@ -23,7 +23,7 @@ org.apache.skywalking spring-plugins - 6.1.0 + 6.2.0-SNAPSHOT spring-cloud diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/pom.xml index 86f206b6e618..1b81157fce5a 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/pom.xml @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/pom.xml index 54294c6704d8..c38a4a1e15c9 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/pom.xml @@ -19,7 +19,7 @@ spring-plugins org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 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 747c972e8f0a..e2a4a5fb7ea6 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 @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0 + 6.2.0-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 75f00bf3f98b..22ede9d2f95c 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 @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-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 81e1ff023457..46311d5d2f45 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 @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml index 48f48a0a65b8..c8435c3bb963 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0 + 6.2.0-SNAPSHOT undertow-plugins diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml index 9ff3a3fd0097..89798ca0b5ee 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml @@ -20,7 +20,7 @@ undertow-plugins org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml index fa0e5d671cd0..ab868b20c658 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0 + 6.2.0-SNAPSHOT vertx-plugins diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/pom.xml index 6045208e42d0..d5984a1d5579 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/pom.xml @@ -20,7 +20,7 @@ vertx-plugins org.apache.skywalking - 6.1.0 + 6.2.0-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 5e8672d7fda6..97ae43c8d9a6 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 @@ -21,7 +21,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0 + 6.2.0-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 8891ea258e9c..b36f40dfdcfb 100644 --- a/apm-sniffer/apm-test-tools/pom.xml +++ b/apm-sniffer/apm-test-tools/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sniffer - 6.1.0 + 6.2.0-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 acc738a89e10..1466b6f998c3 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 @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.1.0 + 6.2.0-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 55a8aa88d4b7..c20dd59f5891 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 @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.1.0 + 6.2.0-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 5b0b28562dd2..7147c5f9e2f3 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 @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.1.0 + 6.2.0-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 13d17186c2e5..fee587bdecc7 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 @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.1.0 + 6.2.0-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 bb668fd7a26b..2a118ed32ec8 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 @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-toolkit-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/pom.xml index 1aa96ee3ce41..4360493bd3f1 100644 --- a/apm-sniffer/apm-toolkit-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/pom.xml @@ -21,7 +21,7 @@ apm-sniffer org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 pom diff --git a/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml b/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml index 8a9bfac2cf5b..ad3510132b17 100644 --- a/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.skywalking optional-plugins - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/pom.xml b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/pom.xml index c1a79eb98b27..e887be1d5b85 100644 --- a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking optional-plugins - 6.1.0 + 6.2.0-SNAPSHOT apm-gson-2.x-plugin diff --git a/apm-sniffer/optional-plugins/lettuce-5.x-plugin/pom.xml b/apm-sniffer/optional-plugins/lettuce-5.x-plugin/pom.xml index 23a75d8eb29c..8cb74634072a 100644 --- a/apm-sniffer/optional-plugins/lettuce-5.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/lettuce-5.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking optional-plugins - 6.1.0 + 6.2.0-SNAPSHOT apm-lettuce-5.x-plugin diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml index b43ec00f9a72..49dc230ebb13 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml @@ -21,7 +21,7 @@ optional-plugins org.apache.skywalking - 6.1.0 + 6.2.0-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 d5b10d2d3c4d..8514769e7ab6 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 @@ -21,7 +21,7 @@ optional-spring-plugins org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 jar diff --git a/apm-sniffer/optional-plugins/pom.xml b/apm-sniffer/optional-plugins/pom.xml index 78b699443cf6..99b399d99462 100644 --- a/apm-sniffer/optional-plugins/pom.xml +++ b/apm-sniffer/optional-plugins/pom.xml @@ -21,7 +21,7 @@ apm-sniffer org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml b/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml index 7717cc5ca57a..ba6a1f497152 100644 --- a/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml @@ -20,7 +20,7 @@ optional-plugins org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/pom.xml b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/pom.xml index f799a9336cb3..54e4e1810827 100644 --- a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking optional-plugins - 6.1.0 + 6.2.0-SNAPSHOT apm-zookeeper-3.4.x-plugin diff --git a/apm-sniffer/pom.xml b/apm-sniffer/pom.xml index a27f0fa96346..ee568dae9644 100644 --- a/apm-sniffer/pom.xml +++ b/apm-sniffer/pom.xml @@ -21,7 +21,7 @@ apm org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-webapp/pom.xml b/apm-webapp/pom.xml index f9afe38d311f..f487c43e1e00 100644 --- a/apm-webapp/pom.xml +++ b/apm-webapp/pom.xml @@ -21,7 +21,7 @@ apm org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/exporter/pom.xml b/oap-server/exporter/pom.xml index ff36490e7dc2..aa21e4b7efcb 100644 --- a/oap-server/exporter/pom.xml +++ b/oap-server/exporter/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/generate-tool-grammar/pom.xml b/oap-server/generate-tool-grammar/pom.xml index d2ca6db8aa9f..bec2beb66b0c 100644 --- a/oap-server/generate-tool-grammar/pom.xml +++ b/oap-server/generate-tool-grammar/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/generate-tool/pom.xml b/oap-server/generate-tool/pom.xml index 725be600b8f1..2fa53a92c25e 100644 --- a/oap-server/generate-tool/pom.xml +++ b/oap-server/generate-tool/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/generated-analysis/pom.xml b/oap-server/generated-analysis/pom.xml index f3f2b62cd48a..2f303c343d23 100644 --- a/oap-server/generated-analysis/pom.xml +++ b/oap-server/generated-analysis/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/pom.xml b/oap-server/pom.xml index 74eed23e4669..db5bbe1cbd7e 100644 --- a/oap-server/pom.xml +++ b/oap-server/pom.xml @@ -21,7 +21,7 @@ apm org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-alarm-plugin/pom.xml b/oap-server/server-alarm-plugin/pom.xml index 5cb873232e48..abfff126adc0 100644 --- a/oap-server/server-alarm-plugin/pom.xml +++ b/oap-server/server-alarm-plugin/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml index 00770b6b9135..d68da9ddf133 100644 --- a/oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml @@ -21,7 +21,7 @@ server-cluster-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml index 2bc50861e1e7..e5e2a69fb84b 100644 --- a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml @@ -21,7 +21,7 @@ server-cluster-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml index f91c46a9b93c..d49d6cfd0651 100644 --- a/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml @@ -21,7 +21,7 @@ server-cluster-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml index 67f2e1640ea5..7dccd3669045 100644 --- a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.skywalking server-cluster-plugin - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-cluster-plugin/pom.xml b/oap-server/server-cluster-plugin/pom.xml index 28c54170445e..153015a1709c 100644 --- a/oap-server/server-cluster-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-core/pom.xml b/oap-server/server-core/pom.xml index 2475bc679da7..a66eba2d82a9 100644 --- a/oap-server/server-core/pom.xml +++ b/oap-server/server-core/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-library/library-buffer/pom.xml b/oap-server/server-library/library-buffer/pom.xml index 87eac81981f0..d3a2583d6450 100644 --- a/oap-server/server-library/library-buffer/pom.xml +++ b/oap-server/server-library/library-buffer/pom.xml @@ -21,7 +21,7 @@ server-library org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-library/library-client/pom.xml b/oap-server/server-library/library-client/pom.xml index 7b4a218cdd34..ed426d87fd3e 100644 --- a/oap-server/server-library/library-client/pom.xml +++ b/oap-server/server-library/library-client/pom.xml @@ -21,7 +21,7 @@ server-library org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-library/library-module/pom.xml b/oap-server/server-library/library-module/pom.xml index ccb65b739dfd..4b1b3ed0dcb0 100644 --- a/oap-server/server-library/library-module/pom.xml +++ b/oap-server/server-library/library-module/pom.xml @@ -21,7 +21,7 @@ server-library org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-library/library-server/pom.xml b/oap-server/server-library/library-server/pom.xml index 37fd629398a7..25c994384191 100644 --- a/oap-server/server-library/library-server/pom.xml +++ b/oap-server/server-library/library-server/pom.xml @@ -21,7 +21,7 @@ server-library org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-library/library-util/pom.xml b/oap-server/server-library/library-util/pom.xml index 0e5fbdec5afa..922690e1c42b 100644 --- a/oap-server/server-library/library-util/pom.xml +++ b/oap-server/server-library/library-util/pom.xml @@ -21,7 +21,7 @@ server-library org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-library/pom.xml b/oap-server/server-library/pom.xml index 1ab9f4c2cba5..15de336b9ff8 100644 --- a/oap-server/server-library/pom.xml +++ b/oap-server/server-library/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-query-plugin/pom.xml b/oap-server/server-query-plugin/pom.xml index a124af937fd2..b24ef1eeef65 100644 --- a/oap-server/server-query-plugin/pom.xml +++ b/oap-server/server-query-plugin/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-query-plugin/query-graphql-plugin/pom.xml b/oap-server/server-query-plugin/query-graphql-plugin/pom.xml index a759c3b8905f..85ead062d609 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/pom.xml +++ b/oap-server/server-query-plugin/query-graphql-plugin/pom.xml @@ -21,7 +21,7 @@ server-query-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml index 3b9d5ed0ffd7..0b665dbd34dc 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml index 8bc1d8135b5e..7782a8b84b19 100644 --- a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/pom.xml index 56f2dee5b2b0..48483ac93931 100644 --- a/oap-server/server-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/receiver-proto/pom.xml b/oap-server/server-receiver-plugin/receiver-proto/pom.xml index 1a078d4efc08..da2bcb8d72b4 100644 --- a/oap-server/server-receiver-plugin/receiver-proto/pom.xml +++ b/oap-server/server-receiver-plugin/receiver-proto/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/pom.xml index 6c2c56ff3116..f17e9909021c 100644 --- a/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml index d21918690cba..ff20d9b72156 100644 --- a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml index 5ee345fac9f8..9ed2f307f209 100644 --- a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml index 9971a6304d75..6679e41897e6 100644 --- a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml index 5f79433655bc..76f8213006e2 100644 --- a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/pom.xml index b4cd66182212..29304348a874 100644 --- a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml index 8156f3a845d8..d778df9b47bd 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml index 84c90c6ed4f4..aae84568d72e 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-starter/pom.xml b/oap-server/server-starter/pom.xml index b323d91d62ec..e7d91a53c5aa 100644 --- a/oap-server/server-starter/pom.xml +++ b/oap-server/server-starter/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-storage-plugin/pom.xml b/oap-server/server-storage-plugin/pom.xml index 82749c6ffabd..cab8e4947fad 100644 --- a/oap-server/server-storage-plugin/pom.xml +++ b/oap-server/server-storage-plugin/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml index 1f0f9e95bfd1..8fae6ffa2a1a 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml @@ -21,7 +21,7 @@ server-storage-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml b/oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml index 36851ac9e220..7e53f3cd95c8 100644 --- a/oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml @@ -21,7 +21,7 @@ server-storage-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml index 3a8ac7e88ef5..32331ecddc48 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml @@ -21,7 +21,7 @@ server-storage-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml b/oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml index b851a3d69659..bb414e1319fc 100644 --- a/oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml @@ -21,7 +21,7 @@ server-storage-plugin org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-telemetry/pom.xml b/oap-server/server-telemetry/pom.xml index 21cace34b519..3de21b51439a 100644 --- a/oap-server/server-telemetry/pom.xml +++ b/oap-server/server-telemetry/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-telemetry/telemetry-api/pom.xml b/oap-server/server-telemetry/telemetry-api/pom.xml index 8a7384bea818..bccec40d7e68 100644 --- a/oap-server/server-telemetry/telemetry-api/pom.xml +++ b/oap-server/server-telemetry/telemetry-api/pom.xml @@ -21,7 +21,7 @@ server-telemetry org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-telemetry/telemetry-prometheus/pom.xml b/oap-server/server-telemetry/telemetry-prometheus/pom.xml index 0a5ca66a920f..97aab80ad3d1 100644 --- a/oap-server/server-telemetry/telemetry-prometheus/pom.xml +++ b/oap-server/server-telemetry/telemetry-prometheus/pom.xml @@ -21,7 +21,7 @@ server-telemetry org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-testing/pom.xml b/oap-server/server-testing/pom.xml index c40899f17af8..5de9ef856450 100644 --- a/oap-server/server-testing/pom.xml +++ b/oap-server/server-testing/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0 + 6.2.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index c8cf32ec7be0..96bd7c7acbd3 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm - 6.1.0 + 6.2.0-SNAPSHOT org.apache @@ -45,7 +45,7 @@ https://github.com/apache/skywalking scm:git:https://github.com/apache/skywalking.git scm:git:https://github.com/apache/skywalking.git - v6.1.0 + HEAD