[#2862] Remove @IgnoreMethod

pinpoint-apm · May 12, 2017 · 9187d91 · 9187d91
1 parent 65f01c0
commit 9187d91
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/...main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/SetCacheManagerInterceptor.java b/...main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/SetCacheManagerInterceptor.java
@@ -43,7 +43,9 @@ public void before(Object target, Object[] args) {
         }
     }
 
-    @IgnoreMethod
+// #1375 Workaround java level Deadlock
+// https://oss.navercorp.com/pinpoint/pinpoint-naver/issues/1375
+//    @IgnoreMethod
     @Override
     public void after(Object target, Object[] args, Object result, Throwable throwable) {
 

diff --git a/.../navercorp/pinpoint/plugin/cassandra/interceptor/CassandraConnectionCloseInterceptor.java b/.../navercorp/pinpoint/plugin/cassandra/interceptor/CassandraConnectionCloseInterceptor.java
@@ -41,7 +41,9 @@ public void before(Object target, Object[] args) {
         }
     }
 
-    @IgnoreMethod
+// #1375 Workaround java level Deadlock
+// https://oss.navercorp.com/pinpoint/pinpoint-naver/issues/1375
+//    @IgnoreMethod
     @Override
     public void after(Object target, Object[] args, Object result, Throwable throwable) {
 

diff --git a/.../java/com/navercorp/pinpoint/plugin/log4j/interceptor/LoggingEventOfLog4jInterceptor.java b/.../java/com/navercorp/pinpoint/plugin/log4j/interceptor/LoggingEventOfLog4jInterceptor.java
@@ -49,7 +49,9 @@ public void before(Object target) {
         }
     }
 
-    @IgnoreMethod
+// #1375 Workaround java level Deadlock
+// https://oss.navercorp.com/pinpoint/pinpoint-naver/issues/1375
+//    @IgnoreMethod
     @Override
     public void after(Object target, Object result, Throwable throwable) {
 

diff --git a/...a/com/navercorp/pinpoint/plugin/logback/interceptor/LoggingEventOfLogbackInterceptor.java b/...a/com/navercorp/pinpoint/plugin/logback/interceptor/LoggingEventOfLogbackInterceptor.java
@@ -49,7 +49,9 @@ public void before(Object target) {
         }
     }
 
-    @IgnoreMethod
+// #1375 Workaround java level Deadlock
+// https://oss.navercorp.com/pinpoint/pinpoint-naver/issues/1375
+//    @IgnoreMethod
     @Override
     public void after(Object target, Object result, Throwable throwable) {
 

diff --git a/...com/navercorp/pinpoint/plugin/spring/beans/interceptor/CreateBeanInstanceInterceptor.java b/...com/navercorp/pinpoint/plugin/spring/beans/interceptor/CreateBeanInstanceInterceptor.java
@@ -38,7 +38,9 @@ public CreateBeanInstanceInterceptor(Instrumentor instrumentor, TransformCallbac
         super(instrumentor, transformer, filter);
     }
 
-    @IgnoreMethod
+// #1375 Workaround java level Deadlock
+// https://oss.navercorp.com/pinpoint/pinpoint-naver/issues/1375
+//    @IgnoreMethod
     @Override
     public void before(Object target, Object arg0) {
     }

diff --git a/...java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/PostProcessorInterceptor.java b/...java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/PostProcessorInterceptor.java
@@ -33,8 +33,9 @@ public PostProcessorInterceptor(Instrumentor instrumentor, TransformCallback tra
         super(instrumentor, transformer, filter);
     }
 
-    //
-    @IgnoreMethod
+// #1375 Workaround java level Deadlock
+// https://oss.navercorp.com/pinpoint/pinpoint-naver/issues/1375
+//    @IgnoreMethod
     @Override
     public void before(Object target, Object arg0, Object arg1) {
     }