[pinpoint-apm#2862] Remove code using annotation logic in jetty, tomc…

…at plugin
minwoo-jung · Apr 27, 2017 · 0693201 · 0693201
1 parent e265fa5
commit 0693201
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 4 deletions.
diff --git a/...n/java/com/navercorp/pinpoint/plugin/jetty/interceptor/Jetty8ServerHandleInterceptor.java b/...n/java/com/navercorp/pinpoint/plugin/jetty/interceptor/Jetty8ServerHandleInterceptor.java
@@ -11,7 +11,6 @@
 /**
  * @author Taejin Koo
  */
-@TargetMethod(name = "handle", paramTypes = { "org.eclipse.jetty.server.AbstractHttpConnection" })
 public class Jetty8ServerHandleInterceptor extends AbstractServerHandleInterceptor {
 
     private volatile Method getRequestMethod;

diff --git a/...rc/main/java/com/navercorp/pinpoint/plugin/jetty/interceptor/ServerHandleInterceptor.java b/...rc/main/java/com/navercorp/pinpoint/plugin/jetty/interceptor/ServerHandleInterceptor.java
@@ -10,7 +10,6 @@
 /**
  * @author Taejin Koo
  */
-@TargetMethod(name = "handle", paramTypes = { "org.eclipse.jetty.server.HttpChannel" })
 public class ServerHandleInterceptor extends AbstractServerHandleInterceptor {
 
     public ServerHandleInterceptor(TraceContext traceContext, MethodDescriptor descriptor, Filter<String> excludeFilter) {

diff --git a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/TomcatPlugin.java b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/TomcatPlugin.java
@@ -195,7 +195,7 @@ public byte[] doInTransform(Instrumentor instrumentor, ClassLoader classLoader,
                 // Tomcat 7
                 InstrumentMethod initInternalEditor = target.getDeclaredMethod("initInternal");
                 if (initInternalEditor != null) {
-                    initInternalEditor.addInterceptor("com.navercorp.pinpoint.plugin.tomcat.interceptor.ConnectorInitializeInterceptor");
+                    initInternalEditor.addScopedInterceptor("com.navercorp.pinpoint.plugin.tomcat.interceptor.ConnectorInitializeInterceptor", TomcatConstants.TOMCAT_SERVLET_ASYNC_SCOPE);
                 }
 
                 return target.toBytecode();

diff --git a/...vercorp/pinpoint/plugin/tomcat/interceptor/AsyncContextImplDispatchMethodInterceptor.java b/...vercorp/pinpoint/plugin/tomcat/interceptor/AsyncContextImplDispatchMethodInterceptor.java
@@ -27,7 +27,6 @@
  * @author jaehong.kim
  *
  */
-@Scope(TomcatConstants.TOMCAT_SERVLET_ASYNC_SCOPE)
 public class AsyncContextImplDispatchMethodInterceptor extends SpanAsyncEventSimpleAroundInterceptor {
 
     public AsyncContextImplDispatchMethodInterceptor(TraceContext traceContext, MethodDescriptor methodDescriptor) {