From 9187d91f312665263d062e51e5c5ecdb414e4354 Mon Sep 17 00:00:00 2001 From: emeroad Date: Thu, 11 May 2017 19:14:01 +0900 Subject: [PATCH] [#2862] Remove @IgnoreMethod --- .../plugin/arcus/interceptor/SetCacheManagerInterceptor.java | 4 +++- .../interceptor/CassandraConnectionCloseInterceptor.java | 4 +++- .../log4j/interceptor/LoggingEventOfLog4jInterceptor.java | 4 +++- .../interceptor/LoggingEventOfLogbackInterceptor.java | 4 +++- .../beans/interceptor/CreateBeanInstanceInterceptor.java | 4 +++- .../spring/beans/interceptor/PostProcessorInterceptor.java | 5 +++-- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/SetCacheManagerInterceptor.java b/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/SetCacheManagerInterceptor.java index 50c858864e9b..1473354d46b6 100644 --- a/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/SetCacheManagerInterceptor.java +++ b/plugins/arcus/src/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/plugins/cassandra/src/main/java/com/navercorp/pinpoint/plugin/cassandra/interceptor/CassandraConnectionCloseInterceptor.java b/plugins/cassandra/src/main/java/com/navercorp/pinpoint/plugin/cassandra/interceptor/CassandraConnectionCloseInterceptor.java index 0dc93d25ebea..ab72f39e6084 100644 --- a/plugins/cassandra/src/main/java/com/navercorp/pinpoint/plugin/cassandra/interceptor/CassandraConnectionCloseInterceptor.java +++ b/plugins/cassandra/src/main/java/com/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/plugins/log4j/src/main/java/com/navercorp/pinpoint/plugin/log4j/interceptor/LoggingEventOfLog4jInterceptor.java b/plugins/log4j/src/main/java/com/navercorp/pinpoint/plugin/log4j/interceptor/LoggingEventOfLog4jInterceptor.java index 1214ba348d5c..07c7541667bd 100644 --- a/plugins/log4j/src/main/java/com/navercorp/pinpoint/plugin/log4j/interceptor/LoggingEventOfLog4jInterceptor.java +++ b/plugins/log4j/src/main/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/plugins/logback/src/main/java/com/navercorp/pinpoint/plugin/logback/interceptor/LoggingEventOfLogbackInterceptor.java b/plugins/logback/src/main/java/com/navercorp/pinpoint/plugin/logback/interceptor/LoggingEventOfLogbackInterceptor.java index f8a31d765d7e..15eb4afa3337 100644 --- a/plugins/logback/src/main/java/com/navercorp/pinpoint/plugin/logback/interceptor/LoggingEventOfLogbackInterceptor.java +++ b/plugins/logback/src/main/java/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/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/CreateBeanInstanceInterceptor.java b/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/CreateBeanInstanceInterceptor.java index 6857cb10bce2..67d4465864c9 100644 --- a/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/CreateBeanInstanceInterceptor.java +++ b/plugins/spring/src/main/java/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/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/PostProcessorInterceptor.java b/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/PostProcessorInterceptor.java index 832ac50210d2..6f0dc51b6452 100644 --- a/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/PostProcessorInterceptor.java +++ b/plugins/spring/src/main/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) { }