From 106dc93fe8ec1e8b7692067d9c5e3156d679f915 Mon Sep 17 00:00:00 2001 From: wusheng Date: Sat, 18 Feb 2017 23:33:43 +0800 Subject: [PATCH] fix api compile issue. remove rmi-oracle plugin. --- .../queue/TraceSegmentProcessQueue.java | 2 +- .../rmi-oracle-1.8-plugin/pom.xml | 15 ------- .../rmi/oracle18/RMIBuriedPointType.java | 25 ----------- .../rmi/oracle18/RMIClientInterceptor.java | 42 ------------------- .../rmi/oracle18/define/RMIClientDefine.java | 42 ------------------- .../src/main/resources/skywalking-plugin.def | 1 - 6 files changed, 1 insertion(+), 126 deletions(-) delete mode 100644 skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/pom.xml delete mode 100644 skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/src/main/java/com/a/eye/skywalking/plugin/rmi/oracle18/RMIBuriedPointType.java delete mode 100644 skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/src/main/java/com/a/eye/skywalking/plugin/rmi/oracle18/RMIClientInterceptor.java delete mode 100644 skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/src/main/java/com/a/eye/skywalking/plugin/rmi/oracle18/define/RMIClientDefine.java delete mode 100644 skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/src/main/resources/skywalking-plugin.def diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/queue/TraceSegmentProcessQueue.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/queue/TraceSegmentProcessQueue.java index edff9c6b0..1d3223909 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/queue/TraceSegmentProcessQueue.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/queue/TraceSegmentProcessQueue.java @@ -33,7 +33,7 @@ public enum TraceSegmentProcessQueue implements TracerContextListener { }; private Disruptor disruptor; - private RingBuffer buffer; + RingBuffer buffer; TraceSegmentProcessQueue() { disruptor = new Disruptor<>(TraceSegmentHolder.Factory.INSTANCE, Config.Disruptor.BUFFER_SIZE, DaemonThreadFactory.INSTANCE); diff --git a/skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/pom.xml deleted file mode 100644 index f83a32006..000000000 --- a/skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - skywalking-sdk-plugin - com.a.eye - 3.0-2017 - - 4.0.0 - - rmi-oracle-1.8-plugin - jar - - rmi-oracle-1.8-plugin - http://maven.apache.org - diff --git a/skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/src/main/java/com/a/eye/skywalking/plugin/rmi/oracle18/RMIBuriedPointType.java b/skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/src/main/java/com/a/eye/skywalking/plugin/rmi/oracle18/RMIBuriedPointType.java deleted file mode 100644 index 2fe454327..000000000 --- a/skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/src/main/java/com/a/eye/skywalking/plugin/rmi/oracle18/RMIBuriedPointType.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.a.eye.skywalking.plugin.rmi.oracle18; - -import com.a.eye.skywalking.api.IBuriedPointType; - -/** - * Created by xin on 2016/12/22. - */ -public class RMIBuriedPointType implements IBuriedPointType{ - - public static RMIBuriedPointType INSTANCE = new RMIBuriedPointType(); - - private RMIBuriedPointType(){ - - } - - @Override - public String getTypeName() { - return "R"; - } - - @Override - public CallType getCallType() { - return CallType.SYNC; - } -} diff --git a/skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/src/main/java/com/a/eye/skywalking/plugin/rmi/oracle18/RMIClientInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/src/main/java/com/a/eye/skywalking/plugin/rmi/oracle18/RMIClientInterceptor.java deleted file mode 100644 index 43e99f78d..000000000 --- a/skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/src/main/java/com/a/eye/skywalking/plugin/rmi/oracle18/RMIClientInterceptor.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.a.eye.skywalking.plugin.rmi.oracle18; - -import com.a.eye.skywalking.invoke.monitor.RPCClientInvokeMonitor; -import com.a.eye.skywalking.model.ContextData; -import com.a.eye.skywalking.model.Identification; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; - -import java.lang.reflect.Method; -import java.util.Arrays; - -/** - * Created by xin on 2016/12/22. - */ -public class RMIClientInterceptor implements InstanceMethodsAroundInterceptor { - @Override - public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, MethodInterceptResult result) { - Object[] arguments = (Object[]) interceptorContext.allArguments()[3]; - ContextData contextData = new RPCClientInvokeMonitor() - .beforeInvoke(Identification.newBuilder().viewPoint(((Method) interceptorContext. - allArguments()[2]).getName()).spanType(RMIBuriedPointType.INSTANCE).build()); - String contextDataStr = contextData.toString(); - - Object[] newArguments = Arrays.copyOf(arguments, arguments.length + 1); - newArguments[arguments.length] = contextDataStr; - - interceptorContext.allArguments()[3] = newArguments; - } - - @Override - public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, Object ret) { - new RPCClientInvokeMonitor().afterInvoke(); - return ret; - } - - @Override - public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext) { - new RPCClientInvokeMonitor().occurException(t); - } -} diff --git a/skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/src/main/java/com/a/eye/skywalking/plugin/rmi/oracle18/define/RMIClientDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/src/main/java/com/a/eye/skywalking/plugin/rmi/oracle18/define/RMIClientDefine.java deleted file mode 100644 index dfced2657..000000000 --- a/skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/src/main/java/com/a/eye/skywalking/plugin/rmi/oracle18/define/RMIClientDefine.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.a.eye.skywalking.plugin.rmi.oracle18.define; - -import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.MethodMatcher; -import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import com.a.eye.skywalking.plugin.interceptor.matcher.SimpleMethodMatcher; - -/** - * Created by xin on 2016/12/22. - */ -public class RMIClientDefine extends ClassInstanceMethodsEnhancePluginDefine { - - @Override - protected String enhanceClassName() { - return "java.rmi.serve.RemoteObjectInvocationHandler"; - } - - @Override - protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[0]; - } - - @Override - protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ - new InstanceMethodsInterceptPoint() { - @Override - public MethodMatcher[] getMethodsMatchers() { - return new MethodMatcher[]{ - new SimpleMethodMatcher("invokeRemoteMethod") - }; - } - - @Override - public String getMethodsInterceptor() { - return "com.a.eye.skywalking.plugin.rmi.oracle18.RMIClientInterceptor"; - } - } - }; - } -} diff --git a/skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/src/main/resources/skywalking-plugin.def b/skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/src/main/resources/skywalking-plugin.def deleted file mode 100644 index 0ffbef100..000000000 --- a/skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/src/main/resources/skywalking-plugin.def +++ /dev/null @@ -1 +0,0 @@ -com.a.eye.skywalking.plugin.rmi.oracle18.define.RMIClientDefine \ No newline at end of file