From 8822ee13859bb5dba33cdf030e2f0c210af300ee Mon Sep 17 00:00:00 2001 From: Jongho Moon Date: Fri, 18 Sep 2015 15:51:09 +0900 Subject: [PATCH] Refactor interceptor types --- .../instrument/InstrumentClassPool.java | 2 +- .../bootstrap/instrument/Instrumentor.java | 2 +- .../PinpointClassFileTransformer.java | 4 +-- .../PinpointClassFileTransformers.java | 6 ++-- .../interceptor/AfterInterceptor.java | 23 +++++++++++++++ .../interceptor/AroundInterceptor.java | 5 +--- .../interceptor/BasicMethodInterceptor.java | 4 +-- .../interceptor/BeforeInterceptor.java | 23 +++++++++++++++ .../interceptor/LoggingInterceptor.java | 6 ++-- ...SpanAsyncEventSimpleAroundInterceptor.java | 4 +-- ...EventSimpleAroundInterceptorForPlugin.java | 4 +-- .../SpanSimpleAroundInterceptor.java | 4 +-- .../interceptor/StaticAroundInterceptor.java | 2 +- .../interceptor/group/GroupedInterceptor.java | 28 ++++++++++++------- .../group/GroupedStaticAroundInterceptor.java | 4 +-- .../ConnectionCloseInterceptor.java | 8 ++---- ...paredStatementBindVariableInterceptor.java | 2 +- ...paredStatementExecuteQueryInterceptor.java | 6 ++-- .../StatementCreateInterceptor.java | 7 ++--- ...DefaultInterceptorRegistryAdaptorTest.java | 2 +- .../interceptor/InterceptorRegistryTest.java | 2 +- .../pinpoint/plugin/arcus/ArcusPlugin.java | 18 ++++++------ .../arcus/interceptor/AddOpInterceptor.java | 6 ++-- .../arcus/interceptor/ApiInterceptor.java | 6 ++-- .../CacheManagerConstructInterceptor.java | 6 ++-- ...ontCacheGetFutureConstructInterceptor.java | 6 ++-- .../FrontCacheGetFutureGetInterceptor.java | 6 ++-- .../FutureSetOperationInterceptor.java | 6 ++-- .../SetCacheManagerInterceptor.java | 9 ++---- .../plugin/jdbc/cubrid/CubridPlugin.java | 10 +++---- .../commons/dbcp/CommonsDbcpPlugin.java | 6 ++-- .../google/httpclient/HttpClientPlugin.java | 6 ++-- ...ethodInnerClassConstructorInterceptor.java | 6 ++-- ...pRequestExecuteAsyncMethodInterceptor.java | 6 ++-- .../pinpoint/plugin/gson/GsonPlugin.java | 4 +-- .../plugin/httpclient3/HttpClient3Plugin.java | 10 +++---- .../interceptor/ExecuteInterceptor.java | 6 ++-- ...ttpMethodBaseExecuteMethodInterceptor.java | 6 ++-- ...seRequestAndResponseMethodInterceptor.java | 6 ++-- .../interceptor/RetryMethodInterceptor.java | 6 ++-- .../plugin/httpclient4/HttpClient4Plugin.java | 24 ++++++++-------- ...actHttpClientExecuteMethodInterceptor.java | 6 ++-- ...angeHandlerImplStartMethodInterceptor.java | 6 ++-- ...yHandlerRetryRequestMethodInterceptor.java | 6 ++-- ...tpAsyncClientExecuteMethodInterceptor.java | 6 ++-- ...lientExecuteMethodInternalInterceptor.java | 6 ++-- ...AndDoReceiveResponseMethodInterceptor.java | 6 ++-- ...questExecutorExecuteMethodInterceptor.java | 8 +++--- .../pinpoint/plugin/ibatis/IBatisPlugin.java | 4 +-- .../plugin/jackson/JacksonPlugin.java | 10 +++---- .../interceptor/ReadValueInterceptor.java | 6 ++-- .../WriteValueAsBytesInterceptor.java | 6 ++-- .../WriteValueAsStringInterceptor.java | 6 ++-- .../plugin/jdk/http/JdkHttpPlugin.java | 4 +-- .../HttpURLConnectionInterceptor.java | 8 +++--- .../interceptor/ServerHandleInterceptor.java | 6 ++-- .../plugin/json_lib/JsonLibPlugin.java | 8 +++--- .../interceptor/ParsingInterceptor.java | 6 ++-- .../interceptor/ToStringInterceptor.java | 6 ++-- .../pinpoint/plugin/jdbc/jtds/JtdsPlugin.java | 10 +++---- .../pinpoint/plugin/log4j/Log4jPlugin.java | 4 +-- .../plugin/logback/LogbackPlugin.java | 4 +-- .../plugin/mybatis/MyBatisPlugin.java | 4 +-- .../plugin/jdbc/mysql/MySqlPlugin.java | 12 ++++---- .../MySQLConnectionCreateInterceptor.java | 6 ++-- .../NingAsyncHttpClientPlugin.java | 4 +-- .../ExecuteRequestInterceptor.java | 6 ++-- .../pinpoint/plugin/okhttp/OkHttpPlugin.java | 10 +++---- .../DispatcherEnqueueMethodInterceptor.java | 6 ++-- ...tpEngineReadResponseMethodInterceptor.java | 6 ++-- ...ttpEngineSendRequestMethodInterceptor.java | 6 ++-- .../RequestBuilderBuildMethodInterceptor.java | 6 ++-- .../plugin/jdbc/oracle/OraclePlugin.java | 10 +++---- .../pinpoint/plugin/redis/RedisPlugin.java | 10 +++---- .../JedisClientConstructorInterceptor.java | 6 ++-- .../JedisClientMetadataAttchInterceptor.java | 6 ++-- .../JedisConstructorInterceptor.java | 6 ++-- ...olSendCommandAndReadMethodInterceptor.java | 6 ++-- .../spring/beans/BeanMethodTransformer.java | 4 +-- .../spring/beans/SpringBeansPlugin.java | 4 +-- ...AbstractSpringBeanCreationInterceptor.java | 6 ++-- .../CreateBeanInstanceInterceptor.java | 4 +-- .../interceptor/PostProcessorInterceptor.java | 4 +-- .../plugin/spring/web/SpringWebMvcPlugin.java | 4 +-- .../pinpoint/plugin/thrift/ThriftPlugin.java | 24 ++++++++-------- .../TServiceClientSendBaseInterceptor.java | 6 ++-- .../TAsyncClientManagerCallInterceptor.java | 6 ++-- ...CallCleanUpAndFireCallbackInterceptor.java | 4 +-- .../TAsyncMethodCallConstructInterceptor.java | 6 ++-- ...dCallDoReadingResponseBodyInterceptor.java | 4 +-- ...odCallDoWritingRequestBodyInterceptor.java | 4 +-- ...ncMethodCallInternalMethodInterceptor.java | 6 ++-- .../TAsyncMethodCallOnErrorInterceptor.java | 4 +-- .../ProcessFunctionProcessInterceptor.java | 6 ++-- .../TBaseProcessorProcessInterceptor.java | 6 ++-- ...TBaseAsyncProcessorProcessInterceptor.java | 6 ++-- ...FrameBufferTransportInjectInterceptor.java | 6 ++-- .../TProtocolWriteFieldStopInterceptor.java | 6 ++-- .../TProtocolReadFieldBeginInterceptor.java | 6 ++-- .../TProtocolReadMessageBeginInterceptor.java | 6 ++-- .../TProtocolReadMessageEndInterceptor.java | 6 ++-- .../server/TProtocolReadTTypeInterceptor.java | 6 ++-- ...NonblockingSocketConstructInterceptor.java | 6 ++-- .../TSocketConstructInterceptor.java | 6 ++-- ...WrappedTTransportConstructInterceptor.java | 6 ++-- .../pinpoint/plugin/tomcat/TomcatPlugin.java | 16 +++++------ .../ConnectorInitializeInterceptor.java | 6 ++-- .../RequestRecycleInterceptor.java | 6 ++-- .../RequestStartAsyncInterceptor.java | 6 ++-- .../StandardHostValveInvokeInterceptor.java | 8 +++--- .../StandardServiceStartInterceptor.java | 6 ++-- .../WebappLoaderStartInterceptor.java | 6 ++-- .../tomcat/InvokeMethodInterceptorTest.java | 12 ++++---- .../pinpoint/plugin/user/UserPlugin.java | 4 +-- .../UserIncludeMethodInterceptor.java | 6 ++-- .../profiler/instrument/JavassistClass.java | 6 ++-- .../instrument/JavassistClassPool.java | 4 +-- .../profiler/instrument/JavassistMethod.java | 6 ++-- .../interceptor/InvokeAfterCodeGenerator.java | 6 ++-- .../InvokeBeforeCodeGenerator.java | 2 +- .../interceptor/InvokeCodeGenerator.java | 20 ++++--------- .../factory/AnnotatedInterceptorFactory.java | 20 ++++++++----- .../AutoBindingObjectFactory.java | 6 ++-- .../ProfilerPluginArgumentProvider.java | 8 +++--- .../plugin/DefaultProfilerPluginContext.java | 4 +-- .../xml/transformer/ClassCondition.java | 4 +-- .../xml/transformer/ClassConditions.java | 14 +++++----- .../transformer/ConditionalClassRecipe.java | 6 ++-- .../ConditionalMethodTransformer.java | 6 ++-- .../DedicatedClassFileTransformer.java | 6 ++-- .../profiler/interceptor/InterceptorTest.java | 8 +++--- .../interceptor/TestAfterInterceptor.java | 2 +- .../interceptor/TestAroundInterceptor.java | 4 +-- .../interceptor/TestBeforeInterceptor.java | 2 +- .../interceptor/bci/JavassistClassTest.java | 14 +++++----- .../profiler/plugin/TestInterceptor.java | 6 ++-- .../profiler/plugin/TestInterceptors.java | 6 ++-- 137 files changed, 493 insertions(+), 454 deletions(-) create mode 100644 bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/AfterInterceptor.java create mode 100644 bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/BeforeInterceptor.java diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/InstrumentClassPool.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/InstrumentClassPool.java index d65b01b0a..79883c02d 100644 --- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/InstrumentClassPool.java +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/InstrumentClassPool.java @@ -20,7 +20,7 @@ package com.navercorp.pinpoint.bootstrap.instrument; * */ public interface InstrumentClassPool { - InstrumentClass getClass(PinpointInstrument pluginContext, ClassLoader classLoader, String classInternalName, byte[] classFileBuffer) throws NotFoundInstrumentException; + InstrumentClass getClass(Instrumentor pluginContext, ClassLoader classLoader, String classInternalName, byte[] classFileBuffer) throws NotFoundInstrumentException; boolean hasClass(ClassLoader classLoader, String classBinaryName); void appendToBootstrapClassPath(String jar); } diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/Instrumentor.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/Instrumentor.java index 3520d4802..481e9156d 100644 --- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/Instrumentor.java +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/Instrumentor.java @@ -22,7 +22,7 @@ import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; * @author Jongho Moon * */ -public interface PinpointInstrument { +public interface Instrumentor { public TraceContext getTraceContext(); public InstrumentClass getInstrumentClass(ClassLoader classLoader, String className, byte[] classfileBuffer); diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/transformer/PinpointClassFileTransformer.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/transformer/PinpointClassFileTransformer.java index 8e5e53a8e..531f5f3ac 100644 --- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/transformer/PinpointClassFileTransformer.java +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/transformer/PinpointClassFileTransformer.java @@ -19,9 +19,9 @@ package com.navercorp.pinpoint.bootstrap.instrument.transformer; import java.security.ProtectionDomain; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; public interface PinpointClassFileTransformer { - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException; + public byte[] transform(Instrumentor instrumentor, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException; } diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/transformer/PinpointClassFileTransformers.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/transformer/PinpointClassFileTransformers.java index d628ca47b..360ea3fb3 100644 --- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/transformer/PinpointClassFileTransformers.java +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/transformer/PinpointClassFileTransformers.java @@ -18,7 +18,7 @@ import java.security.ProtectionDomain; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; /** * @author Jongho Moon @@ -30,7 +30,7 @@ public class PinpointClassFileTransformers { return new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addInterceptor(interceptorClassName, constructorArgs); return target.toBytecode(); @@ -42,7 +42,7 @@ public class PinpointClassFileTransformers { return new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addField(fieldAccessorClassName); return target.toBytecode(); diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/AfterInterceptor.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/AfterInterceptor.java new file mode 100644 index 000000000..7ab6dd646 --- /dev/null +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/AfterInterceptor.java @@ -0,0 +1,23 @@ +/** + * Copyright 2014 NAVER Corp. + * Licensed 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 com.navercorp.pinpoint.bootstrap.interceptor; + +/** + * @author Jongho Moon + * + */ +public interface AfterInterceptor extends Interceptor { + void after(Object target, Object result, Throwable throwable, Object[] args); +} diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/AroundInterceptor.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/AroundInterceptor.java index 0111bba6f..9bfcc16a6 100644 --- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/AroundInterceptor.java +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/AroundInterceptor.java @@ -19,9 +19,6 @@ package com.navercorp.pinpoint.bootstrap.interceptor; /** * @author emeroad */ -public interface SimpleAroundInterceptor extends Interceptor { +public interface AroundInterceptor extends BeforeInterceptor, AfterInterceptor { - void before(Object target, Object[] args); - - void after(Object target, Object[] args, Object result, Throwable throwable); } diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/BasicMethodInterceptor.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/BasicMethodInterceptor.java index bd7d66bd2..2f210bfef 100644 --- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/BasicMethodInterceptor.java +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/BasicMethodInterceptor.java @@ -29,7 +29,7 @@ import com.navercorp.pinpoint.common.trace.ServiceType; * @author netspider * @author emeroad */ -public class BasicMethodInterceptor implements SimpleAroundInterceptor { +public class BasicMethodInterceptor implements AroundInterceptor { private final PLogger logger = PLoggerFactory.getLogger(BasicMethodInterceptor.class); private final boolean isDebug = logger.isDebugEnabled(); @@ -64,7 +64,7 @@ public class BasicMethodInterceptor implements SimpleAroundInterceptor { } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/BeforeInterceptor.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/BeforeInterceptor.java new file mode 100644 index 000000000..a0d0f2d69 --- /dev/null +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/BeforeInterceptor.java @@ -0,0 +1,23 @@ +/** + * Copyright 2014 NAVER Corp. + * Licensed 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 com.navercorp.pinpoint.bootstrap.interceptor; + +/** + * @author Jongho Moon + * + */ +public interface BeforeInterceptor extends Interceptor { + void before(Object target, Object[] args); +} diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/LoggingInterceptor.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/LoggingInterceptor.java index 9ad6777ea..e41a6b4ba 100644 --- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/LoggingInterceptor.java +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/LoggingInterceptor.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; /** * @author emeroad */ -public class LoggingInterceptor implements StaticAroundInterceptor, SimpleAroundInterceptor, Interceptor { +public class LoggingInterceptor implements StaticAroundInterceptor, AroundInterceptor { private final Logger logger; @@ -39,7 +39,7 @@ public class LoggingInterceptor implements StaticAroundInterceptor, SimpleAround } @Override - public void after(Object target, String className, String methodName, String parameterDescription, Object[] args, Object result, Throwable throwable) { + public void after(Object target, String className, String methodName, String parameterDescription, Object result, Throwable throwable, Object[] args) { if (logger.isLoggable(Level.FINE)) { logger.fine("after " + defaultString(target) + " " + className + "." + methodName + parameterDescription + " args:" + Arrays.toString(args) + " result:" + result + " Throwable:" + throwable); } @@ -53,7 +53,7 @@ public class LoggingInterceptor implements StaticAroundInterceptor, SimpleAround } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (logger.isLoggable(Level.FINE)) { logger.fine("after " + defaultString(target) + " args:" + Arrays.toString(args) + " result:" + result + " Throwable:" + throwable); } diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanAsyncEventSimpleAroundInterceptor.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanAsyncEventSimpleAroundInterceptor.java index b0c6a16d6..a52cec183 100644 --- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanAsyncEventSimpleAroundInterceptor.java +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanAsyncEventSimpleAroundInterceptor.java @@ -10,7 +10,7 @@ import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.common.trace.ServiceType; -public abstract class SpanAsyncEventSimpleAroundInterceptor implements SimpleAroundInterceptor { +public abstract class SpanAsyncEventSimpleAroundInterceptor implements AroundInterceptor { protected final PLogger logger = PLoggerFactory.getLogger(getClass()); protected final boolean isDebug = logger.isDebugEnabled(); @@ -77,7 +77,7 @@ public abstract class SpanAsyncEventSimpleAroundInterceptor implements SimpleAro protected abstract void doInBeforeTrace(SpanEventRecorder recorder, AsyncTraceId asyncTraceId, Object target, Object[] args); @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, methodDescriptor.getClassName(), methodDescriptor.getMethodName(), "", args, result, throwable); } diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanEventSimpleAroundInterceptorForPlugin.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanEventSimpleAroundInterceptorForPlugin.java index 2a7e51a37..bb836fc68 100644 --- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanEventSimpleAroundInterceptorForPlugin.java +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanEventSimpleAroundInterceptorForPlugin.java @@ -27,7 +27,7 @@ import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; * @author emeroad * @author jaehong.kim */ -public abstract class SpanEventSimpleAroundInterceptorForPlugin implements SimpleAroundInterceptor { +public abstract class SpanEventSimpleAroundInterceptorForPlugin implements AroundInterceptor { protected final PLogger logger = PLoggerFactory.getLogger(getClass()); protected final boolean isDebug = logger.isDebugEnabled(); @@ -73,7 +73,7 @@ public abstract class SpanEventSimpleAroundInterceptorForPlugin implements Simpl protected abstract void doInBeforeTrace(final SpanEventRecorder recorder, final Object target, final Object[] args); @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logAfterInterceptor(target, args, result, throwable); } diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanSimpleAroundInterceptor.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanSimpleAroundInterceptor.java index 9826e00e9..4fa867995 100644 --- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanSimpleAroundInterceptor.java +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanSimpleAroundInterceptor.java @@ -27,7 +27,7 @@ import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; * @author emeroad * @author jaehong.kim */ -public abstract class SpanSimpleAroundInterceptor implements SimpleAroundInterceptor { +public abstract class SpanSimpleAroundInterceptor implements AroundInterceptor { protected final PLogger logger; protected final boolean isDebug; @@ -71,7 +71,7 @@ public abstract class SpanSimpleAroundInterceptor implements SimpleAroundInterce protected abstract Trace createTrace(final Object target, final Object[] args); @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/StaticAroundInterceptor.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/StaticAroundInterceptor.java index 8a7da2df6..35dc01a8e 100644 --- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/StaticAroundInterceptor.java +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/StaticAroundInterceptor.java @@ -23,6 +23,6 @@ public interface StaticAroundInterceptor extends Interceptor { void before(Object target, String className, String methodName, String parameterDescription, Object[] args); - void after(Object target, String className, String methodName, String parameterDescription, Object[] args, Object result, Throwable throwable); + void after(Object target, String className, String methodName, String parameterDescription, Object result, Throwable throwable, Object[] args); } diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/group/GroupedInterceptor.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/group/GroupedInterceptor.java index 8969c758a..68ed570b8 100644 --- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/group/GroupedInterceptor.java +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/group/GroupedInterceptor.java @@ -16,23 +16,27 @@ package com.navercorp.pinpoint.bootstrap.interceptor.group; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AfterInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.BeforeInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; /** * @author emeroad */ -public class GroupedSimpleAroundInterceptor implements SimpleAroundInterceptor { +public class GroupedInterceptor implements AroundInterceptor { private final PLogger logger = PLoggerFactory.getLogger(getClass()); private final boolean debugEnabled = logger.isDebugEnabled(); - private final SimpleAroundInterceptor delegate; + private final BeforeInterceptor before; + private final AfterInterceptor after; private final InterceptorGroup group; private final ExecutionPolicy policy; - public GroupedSimpleAroundInterceptor(SimpleAroundInterceptor delegate, InterceptorGroup group, ExecutionPolicy policy) { - this.delegate = delegate; + public GroupedInterceptor(BeforeInterceptor before, AfterInterceptor after, InterceptorGroup group, ExecutionPolicy policy) { + this.before = before; + this.after = after; this.group = group; this.policy = policy; } @@ -42,24 +46,28 @@ public class GroupedSimpleAroundInterceptor implements SimpleAroundInterceptor { InterceptorGroupInvocation transaction = group.getCurrentInvocation(); if (transaction.tryEnter(policy)) { - delegate.before(target, args); + if (before != null) { + before.before(target, args); + } } else { if (debugEnabled) { - logger.debug("tryBefore() returns false: interceptorGroupTransaction: {}, executionPoint: {}. Skip interceptor {}", new Object[] {transaction, policy, delegate.getClass()} ); + logger.debug("tryBefore() returns false: interceptorGroupTransaction: {}, executionPoint: {}. Skip interceptor {}", new Object[] {transaction, policy, before == null ? null : before.getClass()} ); } } } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { InterceptorGroupInvocation transaction = group.getCurrentInvocation(); if (transaction.canLeave(policy)) { - delegate.after(target, args, result, throwable); + if (after != null) { + after.after(target, result, throwable, args); + } transaction.leave(policy); } else { if (debugEnabled) { - logger.debug("tryAfter() returns false: interceptorGroupTransaction: {}, executionPoint: {}. Skip interceptor {}", new Object[] {transaction, policy, delegate.getClass()} ); + logger.debug("tryAfter() returns false: interceptorGroupTransaction: {}, executionPoint: {}. Skip interceptor {}", new Object[] {transaction, policy, after == null ? null : after.getClass()} ); } } } diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/group/GroupedStaticAroundInterceptor.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/group/GroupedStaticAroundInterceptor.java index 19ef0cc73..10bf92410 100644 --- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/group/GroupedStaticAroundInterceptor.java +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/group/GroupedStaticAroundInterceptor.java @@ -51,11 +51,11 @@ public class GroupedStaticAroundInterceptor implements StaticAroundInterceptor { } @Override - public void after(Object target, String className, String methodName, String parameterDescription, Object[] args, Object result, Throwable throwable) { + public void after(Object target, String className, String methodName, String parameterDescription, Object result, Throwable throwable, Object[] args) { InterceptorGroupInvocation transaction = group.getCurrentInvocation(); if (transaction.canLeave(policy)) { - this.delegate.after(target, className, methodName, parameterDescription, args, result, throwable); + this.delegate.after(target, className, methodName, parameterDescription, result, throwable, args); transaction.leave(policy); } else { if (debugEnabled) { diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/ConnectionCloseInterceptor.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/ConnectionCloseInterceptor.java index 7d322578f..aaa36d35f 100644 --- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/ConnectionCloseInterceptor.java +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/ConnectionCloseInterceptor.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.bootstrap.plugin.jdbc.interceptor; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.BeforeInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.TargetMethod; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -26,7 +26,7 @@ import com.navercorp.pinpoint.bootstrap.plugin.jdbc.DatabaseInfoAccessor; * @author emeroad */ @TargetMethod(name="close") -public class ConnectionCloseInterceptor implements SimpleAroundInterceptor { +public class ConnectionCloseInterceptor implements BeforeInterceptor { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -39,8 +39,4 @@ public class ConnectionCloseInterceptor implements SimpleAroundInterceptor { // In case of close, we have to delete data even if the invocation failed. ((DatabaseInfoAccessor)target)._$PINPOINT$_setDatabaseInfo(null); } - - @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { - } } diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/PreparedStatementBindVariableInterceptor.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/PreparedStatementBindVariableInterceptor.java index b824300d9..743734a82 100644 --- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/PreparedStatementBindVariableInterceptor.java +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/PreparedStatementBindVariableInterceptor.java @@ -48,7 +48,7 @@ public class PreparedStatementBindVariableInterceptor implements StaticAroundInt } @Override - public void after(Object target, String className, String methodName, String parameterDescription, Object[] args, Object result, Throwable throwable) { + public void after(Object target, String className, String methodName, String parameterDescription, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, className, methodName, parameterDescription, args, result, throwable); diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/PreparedStatementExecuteQueryInterceptor.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/PreparedStatementExecuteQueryInterceptor.java index 82df3c521..134735270 100644 --- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/PreparedStatementExecuteQueryInterceptor.java +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/PreparedStatementExecuteQueryInterceptor.java @@ -25,7 +25,7 @@ import com.navercorp.pinpoint.bootstrap.context.ParsingResult; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.TargetMethod; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Targets; import com.navercorp.pinpoint.bootstrap.logging.PLogger; @@ -44,7 +44,7 @@ import com.navercorp.pinpoint.bootstrap.plugin.jdbc.bindvalue.BindValueUtils; @TargetMethod(name="executeQuery"), @TargetMethod(name="executeUpdate") }) -public class PreparedStatementExecuteQueryInterceptor implements SimpleAroundInterceptor { +public class PreparedStatementExecuteQueryInterceptor implements AroundInterceptor { private static final int DEFAULT_BIND_VALUE_LENGTH = 1024; @@ -132,7 +132,7 @@ public class PreparedStatementExecuteQueryInterceptor implements SimpleAroundInt } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/StatementCreateInterceptor.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/StatementCreateInterceptor.java index cb21e15ee..decd6db3b 100644 --- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/StatementCreateInterceptor.java +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/StatementCreateInterceptor.java @@ -21,7 +21,7 @@ import java.sql.Connection; import com.navercorp.pinpoint.bootstrap.context.DatabaseInfo; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.TargetMethod; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Targets; import com.navercorp.pinpoint.bootstrap.logging.PLogger; @@ -38,7 +38,7 @@ import com.navercorp.pinpoint.bootstrap.util.InterceptorUtils; @TargetMethod(name="createStatement", paramTypes={"int", "int"}), @TargetMethod(name="createStatement", paramTypes={"int", "int", "int"}) }) -public class StatementCreateInterceptor implements SimpleAroundInterceptor { +public class StatementCreateInterceptor implements AroundInterceptor { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -54,11 +54,10 @@ public class StatementCreateInterceptor implements SimpleAroundInterceptor { if (isDebug) { logger.beforeInterceptor(target, args); } - } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/DefaultInterceptorRegistryAdaptorTest.java b/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/DefaultInterceptorRegistryAdaptorTest.java index 94ccbf3c1..047563507 100644 --- a/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/DefaultInterceptorRegistryAdaptorTest.java +++ b/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/DefaultInterceptorRegistryAdaptorTest.java @@ -56,7 +56,7 @@ public class DefaultInterceptorRegistryAdaptorTest { @Test public void addSimpleInterceptor() { - SimpleAroundInterceptor mock = mock(SimpleAroundInterceptor.class); + AroundInterceptor mock = mock(AroundInterceptor.class); InterceptorRegistryAdaptor registry = new DefaultInterceptorRegistryAdaptor(); int key = registry.addInterceptor(mock); diff --git a/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/InterceptorRegistryTest.java b/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/InterceptorRegistryTest.java index 03161e9b3..d691f990b 100644 --- a/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/InterceptorRegistryTest.java +++ b/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/InterceptorRegistryTest.java @@ -45,7 +45,7 @@ public class InterceptorRegistryTest { @Test public void testSimpleInterceptor() throws Exception { - SimpleAroundInterceptor simpleAroundInterceptor = mock(SimpleAroundInterceptor.class); + AroundInterceptor simpleAroundInterceptor = mock(AroundInterceptor.class); when(registryAdaptor.getInterceptor(0)).thenReturn(simpleAroundInterceptor); diff --git a/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/ArcusPlugin.java b/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/ArcusPlugin.java index 74fee4615..dfb4856b3 100644 --- a/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/ArcusPlugin.java +++ b/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/ArcusPlugin.java @@ -20,7 +20,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; import com.navercorp.pinpoint.bootstrap.instrument.MethodFilters; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -79,7 +79,7 @@ public class ArcusPlugin implements ProfilerPlugin, ArcusConstants { context.addClassFileTransformer("net.spy.memcached.ArcusClient", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument context, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor context, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = context.getInstrumentClass(loader, className, classfileBuffer); if (target.hasMethod("addOp", "java.lang.String", "net.spy.memcached.ops.Operation")) { @@ -109,7 +109,7 @@ public class ArcusPlugin implements ProfilerPlugin, ArcusConstants { context.addClassFileTransformer("net.spy.memcached.CacheManager", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument context, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor context, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = context.getInstrumentClass(loader, className, classfileBuffer); target.addField(SERVICE_CODE_ACCESSOR); target.addInterceptor("com.navercorp.pinpoint.plugin.arcus.interceptor.CacheManagerConstructInterceptor"); @@ -123,7 +123,7 @@ public class ArcusPlugin implements ProfilerPlugin, ArcusConstants { context.addClassFileTransformer("net.spy.memcached.protocol.BaseOperationImpl", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument context, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor context, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = context.getInstrumentClass(loader, className, classfileBuffer); target.addField(SERVICE_CODE_ACCESSOR); return target.toBytecode(); @@ -136,7 +136,7 @@ public class ArcusPlugin implements ProfilerPlugin, ArcusConstants { context.addClassFileTransformer("net.spy.memcached.plugin.FrontCacheGetFuture", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument context, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor context, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = context.getInstrumentClass(loader, className, classfileBuffer); target.addField(CACHE_NAME_ACCESSOR); @@ -159,7 +159,7 @@ public class ArcusPlugin implements ProfilerPlugin, ArcusConstants { context.addClassFileTransformer("net.spy.memcached.plugin.FrontCacheMemcachedClient", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument context, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor context, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = context.getInstrumentClass(loader, className, classfileBuffer); boolean traceKey = config.isMemcachedKeyTrace(); @@ -183,7 +183,7 @@ public class ArcusPlugin implements ProfilerPlugin, ArcusConstants { context.addClassFileTransformer("net.spy.memcached.MemcachedClient", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument context, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor context, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = context.getInstrumentClass(loader, className, classfileBuffer); if (target.hasDeclaredMethod("addOp", new String[] { "java.lang.String", "net.spy.memcached.ops.Operation" })) { @@ -212,7 +212,7 @@ public class ArcusPlugin implements ProfilerPlugin, ArcusConstants { private static final PinpointClassFileTransformer FUTURE_TRANSFORMER = new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument context, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor context, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = context.getInstrumentClass(loader, className, classfileBuffer); target.addField(OPERATION_ACCESSOR); @@ -236,7 +236,7 @@ public class ArcusPlugin implements ProfilerPlugin, ArcusConstants { private static final PinpointClassFileTransformer INTERNAL_FUTURE_TRANSFORMER = new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument context, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor context, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = context.getInstrumentClass(loader, className, classfileBuffer); target.addField(ASYNC_TRACE_ID_ACCESSOR); diff --git a/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/AddOpInterceptor.java b/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/AddOpInterceptor.java index f58973bfc..c749ebadc 100644 --- a/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/AddOpInterceptor.java +++ b/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/AddOpInterceptor.java @@ -15,7 +15,7 @@ package com.navercorp.pinpoint.plugin.arcus.interceptor; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.TargetMethod; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -27,7 +27,7 @@ import com.navercorp.pinpoint.plugin.arcus.ServiceCodeAccessor; * @author emeroad */ @TargetMethod(name="addOp", paramTypes={"java.lang.String", "net.spy.memcached.ops.Operation"}) -public class AddOpInterceptor implements SimpleAroundInterceptor { +public class AddOpInterceptor implements AroundInterceptor { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -43,7 +43,7 @@ public class AddOpInterceptor implements SimpleAroundInterceptor { } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/ApiInterceptor.java b/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/ApiInterceptor.java index e331316ee..fdd2ea715 100644 --- a/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/ApiInterceptor.java +++ b/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/ApiInterceptor.java @@ -27,7 +27,7 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -41,7 +41,7 @@ import com.navercorp.pinpoint.plugin.arcus.ServiceCodeAccessor; * @author jaehong.kim */ @Group(ArcusConstants.ARCUS_SCOPE) -public class ApiInterceptor implements SimpleAroundInterceptor, ArcusConstants { +public class ApiInterceptor implements AroundInterceptor, ArcusConstants { protected final PLogger logger = PLoggerFactory.getLogger(getClass()); protected final boolean isDebug = logger.isDebugEnabled(); @@ -106,7 +106,7 @@ public class ApiInterceptor implements SimpleAroundInterceptor, ArcusConstants { } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/CacheManagerConstructInterceptor.java b/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/CacheManagerConstructInterceptor.java index 1a0b0d575..acb56a0cb 100644 --- a/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/CacheManagerConstructInterceptor.java +++ b/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/CacheManagerConstructInterceptor.java @@ -14,7 +14,7 @@ */ package com.navercorp.pinpoint.plugin.arcus.interceptor; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.TargetConstructor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -27,7 +27,7 @@ import com.navercorp.pinpoint.plugin.arcus.ServiceCodeAccessor; * @author emeroad */ @TargetConstructor({"java.lang.String", "java.lang.String", "net.spy.memcached.ConnectionFactoryBuilder", "java.util.concurrent.CountDownLatch", "int", "int"}) -public class CacheManagerConstructInterceptor implements SimpleAroundInterceptor, ArcusConstants { +public class CacheManagerConstructInterceptor implements AroundInterceptor, ArcusConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -38,7 +38,7 @@ public class CacheManagerConstructInterceptor implements SimpleAroundInterceptor } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/FrontCacheGetFutureConstructInterceptor.java b/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/FrontCacheGetFutureConstructInterceptor.java index d16d033c6..080c2b958 100644 --- a/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/FrontCacheGetFutureConstructInterceptor.java +++ b/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/FrontCacheGetFutureConstructInterceptor.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.plugin.arcus.interceptor; import net.sf.ehcache.Element; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.TargetConstructor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -28,7 +28,7 @@ import com.navercorp.pinpoint.plugin.arcus.CacheNameAccessor; * @author harebox */ @TargetConstructor("net.sf.ehcache.Element") -public class FrontCacheGetFutureConstructInterceptor implements SimpleAroundInterceptor, ArcusConstants { +public class FrontCacheGetFutureConstructInterceptor implements AroundInterceptor, ArcusConstants { // TODO This should be extracted from FrontCacheMemcachedClient. private static final String DEFAULT_FRONTCACHE_NAME = "front"; @@ -42,7 +42,7 @@ public class FrontCacheGetFutureConstructInterceptor implements SimpleAroundInte } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/FrontCacheGetFutureGetInterceptor.java b/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/FrontCacheGetFutureGetInterceptor.java index ebd62c687..ee6f600f1 100644 --- a/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/FrontCacheGetFutureGetInterceptor.java +++ b/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/FrontCacheGetFutureGetInterceptor.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -29,7 +29,7 @@ import com.navercorp.pinpoint.plugin.arcus.CacheNameAccessor; * @author harebox */ @Group(ArcusConstants.ARCUS_SCOPE) -public class FrontCacheGetFutureGetInterceptor implements SimpleAroundInterceptor, ArcusConstants { +public class FrontCacheGetFutureGetInterceptor implements AroundInterceptor, ArcusConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -57,7 +57,7 @@ public class FrontCacheGetFutureGetInterceptor implements SimpleAroundIntercepto } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/FutureSetOperationInterceptor.java b/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/FutureSetOperationInterceptor.java index 7127cc929..8bab26d68 100644 --- a/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/FutureSetOperationInterceptor.java +++ b/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/FutureSetOperationInterceptor.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.plugin.arcus.interceptor; import net.spy.memcached.ops.Operation; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.plugin.arcus.ArcusConstants; @@ -27,7 +27,7 @@ import com.navercorp.pinpoint.plugin.arcus.OperationAccessor; * @author harebox * @author emeroad */ -public class FutureSetOperationInterceptor implements SimpleAroundInterceptor, ArcusConstants { +public class FutureSetOperationInterceptor implements AroundInterceptor, ArcusConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -42,7 +42,7 @@ public class FutureSetOperationInterceptor implements SimpleAroundInterceptor, A } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } 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 611ecd563..f66779ddd 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 @@ -14,7 +14,7 @@ */ package com.navercorp.pinpoint.plugin.arcus.interceptor; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.BeforeInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.TargetMethod; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -27,16 +27,11 @@ import com.navercorp.pinpoint.plugin.arcus.ServiceCodeAccessor; * @author emeroad */ @TargetMethod(name="setCacheManager", paramTypes="net.spy.memcached.CacheManager") -public class SetCacheManagerInterceptor implements SimpleAroundInterceptor, ArcusConstants { +public class SetCacheManagerInterceptor implements BeforeInterceptor, ArcusConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); - @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { - // do nothing - } - @Override public void before(Object target, Object[] args) { if (isDebug) { diff --git a/plugins/cubrid-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/cubrid/CubridPlugin.java b/plugins/cubrid-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/cubrid/CubridPlugin.java index 6b9acecbd..4ff6c62c7 100644 --- a/plugins/cubrid-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/cubrid/CubridPlugin.java +++ b/plugins/cubrid-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/cubrid/CubridPlugin.java @@ -18,7 +18,7 @@ import java.security.ProtectionDomain; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; @@ -46,7 +46,7 @@ public class CubridPlugin implements ProfilerPlugin, CubridConstants { setupContext.addClassFileTransformer("cubrid.jdbc.driver.CUBRIDConnection", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addField("com.navercorp.pinpoint.bootstrap.plugin.jdbc.DatabaseInfoAccessor"); @@ -77,7 +77,7 @@ public class CubridPlugin implements ProfilerPlugin, CubridConstants { setupContext.addClassFileTransformer("cubrid.jdbc.driver.CUBRIDDriver", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); InterceptorGroup group = instrumentContext.getInterceptorGroup(GROUP_CUBRID); @@ -92,7 +92,7 @@ public class CubridPlugin implements ProfilerPlugin, CubridConstants { setupContext.addClassFileTransformer("cubrid.jdbc.driver.CUBRIDPreparedStatement", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addField("com.navercorp.pinpoint.bootstrap.plugin.jdbc.DatabaseInfoAccessor"); @@ -114,7 +114,7 @@ public class CubridPlugin implements ProfilerPlugin, CubridConstants { setupContext.addClassFileTransformer("cubrid.jdbc.driver.CUBRIDStatement", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addField("com.navercorp.pinpoint.bootstrap.plugin.jdbc.DatabaseInfoAccessor"); diff --git a/plugins/dbcp/src/main/java/com/navercorp/pinpoint/plugin/commons/dbcp/CommonsDbcpPlugin.java b/plugins/dbcp/src/main/java/com/navercorp/pinpoint/plugin/commons/dbcp/CommonsDbcpPlugin.java index a21aa3928..4889cfbfa 100644 --- a/plugins/dbcp/src/main/java/com/navercorp/pinpoint/plugin/commons/dbcp/CommonsDbcpPlugin.java +++ b/plugins/dbcp/src/main/java/com/navercorp/pinpoint/plugin/commons/dbcp/CommonsDbcpPlugin.java @@ -21,7 +21,7 @@ import java.security.ProtectionDomain; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPlugin; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPluginSetupContext; @@ -49,7 +49,7 @@ public class CommonsDbcpPlugin implements ProfilerPlugin { context.addClassFileTransformer("org.apache.commons.dbcp.PoolingDataSource$PoolGuardConnectionWrapper", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument pluginContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor pluginContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = pluginContext.getInstrumentClass(loader, className, classfileBuffer); target.addInterceptor("com.navercorp.pinpoint.plugin.commons.dbcp.interceptor.DataSourceCloseInterceptor"); return target.toBytecode(); @@ -61,7 +61,7 @@ public class CommonsDbcpPlugin implements ProfilerPlugin { context.addClassFileTransformer("org.apache.commons.dbcp.BasicDataSource", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument pluginContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor pluginContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = pluginContext.getInstrumentClass(loader, className, classfileBuffer); target.addInterceptor("com.navercorp.pinpoint.plugin.commons.dbcp.interceptor.DataSourceGetConnectionInterceptor"); return target.toBytecode(); diff --git a/plugins/google-httpclient/src/main/java/com/navercorp/pinpoint/plugin/google/httpclient/HttpClientPlugin.java b/plugins/google-httpclient/src/main/java/com/navercorp/pinpoint/plugin/google/httpclient/HttpClientPlugin.java index 4a1801646..308d22f25 100644 --- a/plugins/google-httpclient/src/main/java/com/navercorp/pinpoint/plugin/google/httpclient/HttpClientPlugin.java +++ b/plugins/google-httpclient/src/main/java/com/navercorp/pinpoint/plugin/google/httpclient/HttpClientPlugin.java @@ -22,7 +22,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.ClassFilters; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -49,7 +49,7 @@ public class HttpClientPlugin implements ProfilerPlugin, HttpClientConstants { context.addClassFileTransformer("com.google.api.client.http.HttpRequest", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); InstrumentMethod execute = target.getDeclaredMethod("execute", new String[] {}); @@ -67,7 +67,7 @@ public class HttpClientPlugin implements ProfilerPlugin, HttpClientConstants { logger.debug("Find nested class {}", target.getName()); instrumentContext.addClassFileTransformer(loader, nestedClass.getName(), new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addField(AsyncTraceIdAccessor.class.getName()); diff --git a/plugins/google-httpclient/src/main/java/com/navercorp/pinpoint/plugin/google/httpclient/interceptor/HttpRequestExecuteAsyncMethodInnerClassConstructorInterceptor.java b/plugins/google-httpclient/src/main/java/com/navercorp/pinpoint/plugin/google/httpclient/interceptor/HttpRequestExecuteAsyncMethodInnerClassConstructorInterceptor.java index b636dfc20..b2df33782 100644 --- a/plugins/google-httpclient/src/main/java/com/navercorp/pinpoint/plugin/google/httpclient/interceptor/HttpRequestExecuteAsyncMethodInnerClassConstructorInterceptor.java +++ b/plugins/google-httpclient/src/main/java/com/navercorp/pinpoint/plugin/google/httpclient/interceptor/HttpRequestExecuteAsyncMethodInnerClassConstructorInterceptor.java @@ -19,7 +19,7 @@ import com.navercorp.pinpoint.bootstrap.async.AsyncTraceIdAccessor; import com.navercorp.pinpoint.bootstrap.context.AsyncTraceId; import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; @@ -34,7 +34,7 @@ import com.navercorp.pinpoint.plugin.google.httpclient.HttpClientConstants; * */ @Group(value = HttpClientConstants.EXECUTE_ASYNC_SCOPE, executionPolicy = ExecutionPolicy.ALWAYS) -public class HttpRequestExecuteAsyncMethodInnerClassConstructorInterceptor implements SimpleAroundInterceptor, HttpClientConstants { +public class HttpRequestExecuteAsyncMethodInnerClassConstructorInterceptor implements AroundInterceptor, HttpClientConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -77,7 +77,7 @@ public class HttpRequestExecuteAsyncMethodInnerClassConstructorInterceptor imple } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } diff --git a/plugins/google-httpclient/src/main/java/com/navercorp/pinpoint/plugin/google/httpclient/interceptor/HttpRequestExecuteAsyncMethodInterceptor.java b/plugins/google-httpclient/src/main/java/com/navercorp/pinpoint/plugin/google/httpclient/interceptor/HttpRequestExecuteAsyncMethodInterceptor.java index 8ce3654ab..c0db1cfb4 100644 --- a/plugins/google-httpclient/src/main/java/com/navercorp/pinpoint/plugin/google/httpclient/interceptor/HttpRequestExecuteAsyncMethodInterceptor.java +++ b/plugins/google-httpclient/src/main/java/com/navercorp/pinpoint/plugin/google/httpclient/interceptor/HttpRequestExecuteAsyncMethodInterceptor.java @@ -20,7 +20,7 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; @@ -35,7 +35,7 @@ import com.navercorp.pinpoint.plugin.google.httpclient.HttpClientConstants; * */ @Group(value = HttpClientConstants.EXECUTE_ASYNC_SCOPE, executionPolicy = ExecutionPolicy.ALWAYS) -public class HttpRequestExecuteAsyncMethodInterceptor implements SimpleAroundInterceptor { +public class HttpRequestExecuteAsyncMethodInterceptor implements AroundInterceptor { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -80,7 +80,7 @@ public class HttpRequestExecuteAsyncMethodInterceptor implements SimpleAroundInt } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } diff --git a/plugins/gson/src/main/java/com/navercorp/pinpoint/plugin/gson/GsonPlugin.java b/plugins/gson/src/main/java/com/navercorp/pinpoint/plugin/gson/GsonPlugin.java index d6a1575ef..fd511ac8a 100644 --- a/plugins/gson/src/main/java/com/navercorp/pinpoint/plugin/gson/GsonPlugin.java +++ b/plugins/gson/src/main/java/com/navercorp/pinpoint/plugin/gson/GsonPlugin.java @@ -23,7 +23,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; import com.navercorp.pinpoint.bootstrap.instrument.MethodFilters; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPlugin; @@ -45,7 +45,7 @@ public class GsonPlugin implements ProfilerPlugin { context.addClassFileTransformer("com.google.gson.Gson", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument pluginContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor pluginContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = pluginContext.getInstrumentClass(loader, className, classfileBuffer); InterceptorGroup group = pluginContext.getInterceptorGroup(GSON_GROUP); diff --git a/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/HttpClient3Plugin.java b/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/HttpClient3Plugin.java index 18ebdc2a3..d53f27a44 100644 --- a/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/HttpClient3Plugin.java +++ b/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/HttpClient3Plugin.java @@ -20,7 +20,7 @@ import java.security.ProtectionDomain; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPlugin; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPluginSetupContext; @@ -52,7 +52,7 @@ public class HttpClient3Plugin implements ProfilerPlugin, HttpClient3Constants { context.addClassFileTransformer("org.apache.commons.httpclient.HttpClient", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); injectHttpClientExecuteMethod(target, "org.apache.commons.httpclient.HttpMethod"); @@ -78,7 +78,7 @@ public class HttpClient3Plugin implements ProfilerPlugin, HttpClient3Constants { context.addClassFileTransformer("org.apache.commons.httpclient.DefaultHttpMethodRetryHandler", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); InstrumentMethod retryMethod = target.getDeclaredMethod("retryMethod", "org.apache.commons.httpclient.HttpMethod", "java.io.IOException", "int"); @@ -96,7 +96,7 @@ public class HttpClient3Plugin implements ProfilerPlugin, HttpClient3Constants { context.addClassFileTransformer("org.apache.commons.httpclient.HttpConnection", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addGetter(HostNameGetter.class.getName(), HttpClient3Constants.FIELD_HOST_NAME); @@ -119,7 +119,7 @@ public class HttpClient3Plugin implements ProfilerPlugin, HttpClient3Constants { context.addClassFileTransformer("org.apache.commons.httpclient.HttpMethodBase", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); InstrumentMethod execute = target.getDeclaredMethod("execute", "org.apache.commons.httpclient.HttpState", "org.apache.commons.httpclient.HttpConnection"); diff --git a/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/interceptor/ExecuteInterceptor.java b/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/interceptor/ExecuteInterceptor.java index ae84724eb..b285ec034 100644 --- a/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/interceptor/ExecuteInterceptor.java +++ b/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/interceptor/ExecuteInterceptor.java @@ -20,7 +20,7 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -31,7 +31,7 @@ import com.navercorp.pinpoint.plugin.httpclient3.HttpClient3Constants; * @author jaehong.kim */ @Group(HttpClient3Constants.HTTP_CLIENT3_SCOPE) -public class ExecuteInterceptor implements SimpleAroundInterceptor, HttpClient3Constants { +public class ExecuteInterceptor implements AroundInterceptor, HttpClient3Constants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -60,7 +60,7 @@ public class ExecuteInterceptor implements SimpleAroundInterceptor, HttpClient3C } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } diff --git a/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/interceptor/HttpMethodBaseExecuteMethodInterceptor.java b/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/interceptor/HttpMethodBaseExecuteMethodInterceptor.java index 5e784a71a..274da2a80 100644 --- a/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/interceptor/HttpMethodBaseExecuteMethodInterceptor.java +++ b/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/interceptor/HttpMethodBaseExecuteMethodInterceptor.java @@ -37,7 +37,7 @@ import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.context.TraceId; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.group.AttachmentFactory; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; @@ -58,7 +58,7 @@ import com.navercorp.pinpoint.plugin.httpclient3.HttpClient3Constants; * @author Minwoo Jung */ @Group(value = HttpClient3Constants.HTTP_CLIENT3_METHOD_BASE_SCOPE, executionPolicy = ExecutionPolicy.ALWAYS) -public class HttpMethodBaseExecuteMethodInterceptor implements SimpleAroundInterceptor, HttpClient3Constants { +public class HttpMethodBaseExecuteMethodInterceptor implements AroundInterceptor, HttpClient3Constants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -174,7 +174,7 @@ public class HttpMethodBaseExecuteMethodInterceptor implements SimpleAroundInter } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } diff --git a/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/interceptor/HttpMethodBaseRequestAndResponseMethodInterceptor.java b/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/interceptor/HttpMethodBaseRequestAndResponseMethodInterceptor.java index d04b90ba6..8decb9b6d 100644 --- a/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/interceptor/HttpMethodBaseRequestAndResponseMethodInterceptor.java +++ b/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/interceptor/HttpMethodBaseRequestAndResponseMethodInterceptor.java @@ -19,7 +19,7 @@ package com.navercorp.pinpoint.plugin.httpclient3.interceptor; import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; @@ -33,7 +33,7 @@ import com.navercorp.pinpoint.plugin.httpclient3.HttpClient3Constants; * @author jaehong.kim */ @Group(value=HttpClient3Constants.HTTP_CLIENT3_METHOD_BASE_SCOPE, executionPolicy=ExecutionPolicy.ALWAYS) -public class HttpMethodBaseRequestAndResponseMethodInterceptor implements SimpleAroundInterceptor, HttpClient3Constants { +public class HttpMethodBaseRequestAndResponseMethodInterceptor implements AroundInterceptor, HttpClient3Constants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -73,7 +73,7 @@ public class HttpMethodBaseRequestAndResponseMethodInterceptor implements Simple } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, methodDescriptor.getClassName(), methodDescriptor.getMethodName(), "", args, result, throwable); } diff --git a/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/interceptor/RetryMethodInterceptor.java b/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/interceptor/RetryMethodInterceptor.java index c90936aca..88581c17b 100644 --- a/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/interceptor/RetryMethodInterceptor.java +++ b/plugins/httpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/interceptor/RetryMethodInterceptor.java @@ -20,7 +20,7 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.common.trace.AnnotationKey; @@ -30,7 +30,7 @@ import com.navercorp.pinpoint.plugin.httpclient3.HttpClient3Constants; * @author Minwoo Jung * @author jaehong.kim */ -public class RetryMethodInterceptor implements SimpleAroundInterceptor, HttpClient3Constants { +public class RetryMethodInterceptor implements AroundInterceptor, HttpClient3Constants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -60,7 +60,7 @@ public class RetryMethodInterceptor implements SimpleAroundInterceptor, HttpClie } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } diff --git a/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClient4Plugin.java b/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClient4Plugin.java index c0ad521ca..a9f23dc19 100644 --- a/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClient4Plugin.java +++ b/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClient4Plugin.java @@ -21,7 +21,7 @@ import com.navercorp.pinpoint.bootstrap.async.AsyncTraceIdAccessor; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -70,7 +70,7 @@ public class HttpClient4Plugin implements ProfilerPlugin, HttpClient4Constants { context.addClassFileTransformer("org.apache.http.protocol.HttpRequestExecutor", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); InstrumentMethod execute = target.getDeclaredMethod("execute", "org.apache.http.HttpRequest", "org.apache.http.HttpClientConnection", "org.apache.http.protocol.HttpContext"); @@ -97,7 +97,7 @@ public class HttpClient4Plugin implements ProfilerPlugin, HttpClient4Constants { context.addClassFileTransformer("org.apache.http.impl.client.AbstractHttpClient", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); injectHttpClientExecuteMethodWithHttpRequestInterceptor(target, false, "org.apache.http.HttpHost", "org.apache.http.HttpRequest"); @@ -120,7 +120,7 @@ public class HttpClient4Plugin implements ProfilerPlugin, HttpClient4Constants { context.addClassFileTransformer("org.apache.http.impl.client.CloseableHttpClient", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); injectHttpClientExecuteMethodWithHttpRequestInterceptor(target, false, "org.apache.http.HttpHost", "org.apache.http.HttpRequest"); @@ -160,7 +160,7 @@ public class HttpClient4Plugin implements ProfilerPlugin, HttpClient4Constants { context.addClassFileTransformer("org.apache.http.impl.client.DefaultHttpRequestRetryHandler", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); InstrumentMethod retryRequest = target.getDeclaredMethod("retryRequest", "java.io.IOException", "int", "org.apache.http.protocol.HttpContext"); @@ -177,7 +177,7 @@ public class HttpClient4Plugin implements ProfilerPlugin, HttpClient4Constants { context.addClassFileTransformer("org.apache.http.impl.conn.AbstractPooledConnAdapter", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); InstrumentMethod open = target.getDeclaredMethod("open", "org.apache.http.conn.routing.HttpRoute", "org.apache.http.protocol.HttpContext", "org.apache.http.params.HttpParams"); @@ -195,7 +195,7 @@ public class HttpClient4Plugin implements ProfilerPlugin, HttpClient4Constants { context.addClassFileTransformer("org.apache.http.impl.conn.ManagedClientConnectionImpl", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); InstrumentMethod open = target.getDeclaredMethod("open", "org.apache.http.conn.routing.HttpRoute", "org.apache.http.protocol.HttpContext", "org.apache.http.params.HttpParams"); @@ -213,7 +213,7 @@ public class HttpClient4Plugin implements ProfilerPlugin, HttpClient4Constants { context.addClassFileTransformer("org.apache.http.impl.conn.BasicHttpClientConnectionManager", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); InstrumentMethod connect = target.getDeclaredMethod("connect", "org.apache.http.HttpClientConnection", "org.apache.http.conn.routing.HttpRoute", "int", "org.apache.http.protocol.HttpContext"); @@ -231,7 +231,7 @@ public class HttpClient4Plugin implements ProfilerPlugin, HttpClient4Constants { context.addClassFileTransformer("org.apache.http.impl.conn.PoolingHttpClientConnectionManager", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); InstrumentMethod connect = target.getDeclaredMethod("connect", "org.apache.http.HttpClientConnection", "org.apache.http.conn.routing.HttpRoute", "int", "org.apache.http.protocol.HttpContext"); @@ -249,7 +249,7 @@ public class HttpClient4Plugin implements ProfilerPlugin, HttpClient4Constants { context.addClassFileTransformer("org.apache.http.impl.nio.client.CloseableHttpAsyncClient", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); injectHttpAsyncClientExecuteMethodInterceptor(target, "org.apache.http.HttpHost", "org.apache.http.HttpRequest", "org.apache.http.protocol.HttpContext", "org.apache.http.concurrent.FutureCallback"); @@ -276,7 +276,7 @@ public class HttpClient4Plugin implements ProfilerPlugin, HttpClient4Constants { context.addClassFileTransformer("org.apache.http.impl.nio.client.DefaultClientExchangeHandlerImpl", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addGetter(RequestProducerGetter.class.getName(), FIELD_REQUEST_PRODUCER); @@ -298,7 +298,7 @@ public class HttpClient4Plugin implements ProfilerPlugin, HttpClient4Constants { context.addClassFileTransformer("org.apache.http.concurrent.BasicFuture", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addField(AsyncTraceIdAccessor.class.getName()); diff --git a/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/AbstractHttpClientExecuteMethodInterceptor.java b/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/AbstractHttpClientExecuteMethodInterceptor.java index 681d4c97c..cc5c0a072 100644 --- a/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/AbstractHttpClientExecuteMethodInterceptor.java +++ b/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/AbstractHttpClientExecuteMethodInterceptor.java @@ -38,7 +38,7 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.group.AttachmentFactory; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; @@ -58,7 +58,7 @@ import com.navercorp.pinpoint.plugin.httpclient4.HttpClient4Constants; * @author jaehong.kim */ @Group(HttpClient4Constants.HTTP_CLIENT4_SCOPE) -public abstract class AbstractHttpClientExecuteMethodInterceptor implements SimpleAroundInterceptor, HttpClient4Constants { +public abstract class AbstractHttpClientExecuteMethodInterceptor implements AroundInterceptor, HttpClient4Constants { protected final PLogger logger; protected final boolean isDebug; @@ -121,7 +121,7 @@ public abstract class AbstractHttpClientExecuteMethodInterceptor implements Simp } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } diff --git a/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/DefaultClientExchangeHandlerImplStartMethodInterceptor.java b/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/DefaultClientExchangeHandlerImplStartMethodInterceptor.java index 6ad0e980c..3548a0887 100644 --- a/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/DefaultClientExchangeHandlerImplStartMethodInterceptor.java +++ b/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/DefaultClientExchangeHandlerImplStartMethodInterceptor.java @@ -43,7 +43,7 @@ import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.context.TraceId; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.bootstrap.pair.NameIntValuePair; @@ -62,7 +62,7 @@ import com.navercorp.pinpoint.plugin.httpclient4.ResultFutureGetter; * @author jaehong.kim * */ -public class DefaultClientExchangeHandlerImplStartMethodInterceptor implements SimpleAroundInterceptor, HttpClient4Constants { +public class DefaultClientExchangeHandlerImplStartMethodInterceptor implements AroundInterceptor, HttpClient4Constants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -185,7 +185,7 @@ public class DefaultClientExchangeHandlerImplStartMethodInterceptor implements S } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } diff --git a/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/DefaultHttpRequestRetryHandlerRetryRequestMethodInterceptor.java b/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/DefaultHttpRequestRetryHandlerRetryRequestMethodInterceptor.java index a1b5c115c..a1be0ba6a 100644 --- a/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/DefaultHttpRequestRetryHandlerRetryRequestMethodInterceptor.java +++ b/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/DefaultHttpRequestRetryHandlerRetryRequestMethodInterceptor.java @@ -20,7 +20,7 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.common.trace.AnnotationKey; @@ -31,7 +31,7 @@ import com.navercorp.pinpoint.plugin.httpclient4.HttpClient4Constants; * @author Minwoo Jung * @author jaehong.kim */ -public class DefaultHttpRequestRetryHandlerRetryRequestMethodInterceptor implements SimpleAroundInterceptor, HttpClient4Constants { +public class DefaultHttpRequestRetryHandlerRetryRequestMethodInterceptor implements AroundInterceptor, HttpClient4Constants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -62,7 +62,7 @@ public class DefaultHttpRequestRetryHandlerRetryRequestMethodInterceptor impleme } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } diff --git a/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/HttpAsyncClientExecuteMethodInterceptor.java b/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/HttpAsyncClientExecuteMethodInterceptor.java index b299d2bf8..5734f9417 100644 --- a/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/HttpAsyncClientExecuteMethodInterceptor.java +++ b/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/HttpAsyncClientExecuteMethodInterceptor.java @@ -20,7 +20,7 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -31,7 +31,7 @@ import com.navercorp.pinpoint.plugin.httpclient4.HttpClient4Constants; * @author jaehong.kim */ @Group(HttpClient4Constants.HTTP_CLIENT4_SCOPE) -public class HttpAsyncClientExecuteMethodInterceptor implements SimpleAroundInterceptor, HttpClient4Constants { +public class HttpAsyncClientExecuteMethodInterceptor implements AroundInterceptor, HttpClient4Constants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -60,7 +60,7 @@ public class HttpAsyncClientExecuteMethodInterceptor implements SimpleAroundInte } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } diff --git a/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/HttpClientExecuteMethodInternalInterceptor.java b/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/HttpClientExecuteMethodInternalInterceptor.java index b8c3fa23b..1538c454a 100644 --- a/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/HttpClientExecuteMethodInternalInterceptor.java +++ b/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/HttpClientExecuteMethodInternalInterceptor.java @@ -18,7 +18,7 @@ package com.navercorp.pinpoint.plugin.httpclient4.interceptor; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; @@ -36,7 +36,7 @@ import org.apache.http.*; * @author jaehong.kim */ @Group(value = HttpClient4Constants.HTTP_CLIENT4_SCOPE, executionPolicy = ExecutionPolicy.INTERNAL) -public class HttpClientExecuteMethodInternalInterceptor implements SimpleAroundInterceptor, HttpClient4Constants { +public class HttpClientExecuteMethodInternalInterceptor implements AroundInterceptor, HttpClient4Constants { private boolean isHasCallbackParam; @@ -60,7 +60,7 @@ public class HttpClientExecuteMethodInternalInterceptor implements SimpleAroundI } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, target.getClass().getName(), "", "internal", args); } diff --git a/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/HttpRequestExecutorDoSendRequestAndDoReceiveResponseMethodInterceptor.java b/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/HttpRequestExecutorDoSendRequestAndDoReceiveResponseMethodInterceptor.java index c0bfc854d..d64514406 100644 --- a/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/HttpRequestExecutorDoSendRequestAndDoReceiveResponseMethodInterceptor.java +++ b/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/HttpRequestExecutorDoSendRequestAndDoReceiveResponseMethodInterceptor.java @@ -19,7 +19,7 @@ package com.navercorp.pinpoint.plugin.httpclient4.interceptor; import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; @@ -32,7 +32,7 @@ import com.navercorp.pinpoint.plugin.httpclient4.HttpClient4Constants; * @author jaehong.kim */ @Group(value=HttpClient4Constants.HTTP_CLIENT4_SCOPE, executionPolicy=ExecutionPolicy.ALWAYS) -public class HttpRequestExecutorDoSendRequestAndDoReceiveResponseMethodInterceptor implements SimpleAroundInterceptor, HttpClient4Constants { +public class HttpRequestExecutorDoSendRequestAndDoReceiveResponseMethodInterceptor implements AroundInterceptor, HttpClient4Constants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -72,7 +72,7 @@ public class HttpRequestExecutorDoSendRequestAndDoReceiveResponseMethodIntercept } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, methodDescriptor.getClassName(), methodDescriptor.getMethodName(), "", args, result, throwable); } diff --git a/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/HttpRequestExecutorExecuteMethodInterceptor.java b/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/HttpRequestExecutorExecuteMethodInterceptor.java index 036aeca16..97f6998df 100644 --- a/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/HttpRequestExecutorExecuteMethodInterceptor.java +++ b/plugins/httpclient4/src/main/java/com/navercorp/pinpoint/plugin/httpclient4/interceptor/HttpRequestExecutorExecuteMethodInterceptor.java @@ -40,7 +40,7 @@ import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.context.TraceId; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.group.AttachmentFactory; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; @@ -62,7 +62,7 @@ import com.navercorp.pinpoint.plugin.httpclient4.HttpClient4Constants; * @author jaehong.kim */ @Group(value = HttpClient4Constants.HTTP_CLIENT4_SCOPE, executionPolicy = ExecutionPolicy.ALWAYS) -public class HttpRequestExecutorExecuteMethodInterceptor implements SimpleAroundInterceptor, HttpClient4Constants { +public class HttpRequestExecutorExecuteMethodInterceptor implements AroundInterceptor, HttpClient4Constants { private static final int HTTP_REQUEST_INDEX = 1; private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); @@ -189,7 +189,7 @@ public class HttpRequestExecutorExecuteMethodInterceptor implements SimpleAround } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } @@ -413,4 +413,4 @@ public class HttpRequestExecutorExecuteMethodInterceptor implements SimpleAround } return charset; } -} \ No newline at end of file +} diff --git a/plugins/ibatis/src/main/java/com/navercorp/pinpoint/plugin/ibatis/IBatisPlugin.java b/plugins/ibatis/src/main/java/com/navercorp/pinpoint/plugin/ibatis/IBatisPlugin.java index 07652f1c2..8fbc6a9d5 100644 --- a/plugins/ibatis/src/main/java/com/navercorp/pinpoint/plugin/ibatis/IBatisPlugin.java +++ b/plugins/ibatis/src/main/java/com/navercorp/pinpoint/plugin/ibatis/IBatisPlugin.java @@ -27,7 +27,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; import com.navercorp.pinpoint.bootstrap.instrument.MethodFilter; import com.navercorp.pinpoint.bootstrap.instrument.MethodFilters; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; @@ -84,7 +84,7 @@ public class IBatisPlugin implements ProfilerPlugin { context.addClassFileTransformer(targetClassName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { diff --git a/plugins/jackson/src/main/java/com/navercorp/pinpoint/plugin/jackson/JacksonPlugin.java b/plugins/jackson/src/main/java/com/navercorp/pinpoint/plugin/jackson/JacksonPlugin.java index bd922fd70..1bb87f9b4 100644 --- a/plugins/jackson/src/main/java/com/navercorp/pinpoint/plugin/jackson/JacksonPlugin.java +++ b/plugins/jackson/src/main/java/com/navercorp/pinpoint/plugin/jackson/JacksonPlugin.java @@ -20,7 +20,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; import com.navercorp.pinpoint.bootstrap.instrument.MethodFilters; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; import com.navercorp.pinpoint.bootstrap.logging.PLogger; @@ -57,7 +57,7 @@ public class JacksonPlugin implements ProfilerPlugin, JacksonConstants { context.addClassFileTransformer(clazzName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); InterceptorGroup group = instrumentContext.getInterceptorGroup(GROUP); @@ -96,7 +96,7 @@ public class JacksonPlugin implements ProfilerPlugin, JacksonConstants { context.addClassFileTransformer(clazzName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); InterceptorGroup group = instrumentContext.getInterceptorGroup(GROUP); @@ -143,7 +143,7 @@ public class JacksonPlugin implements ProfilerPlugin, JacksonConstants { context.addClassFileTransformer(clazzName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); InterceptorGroup group = instrumentContext.getInterceptorGroup(GROUP); @@ -161,7 +161,7 @@ public class JacksonPlugin implements ProfilerPlugin, JacksonConstants { context.addClassFileTransformer(clazzName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); InterceptorGroup group = instrumentContext.getInterceptorGroup(GROUP); diff --git a/plugins/jackson/src/main/java/com/navercorp/pinpoint/plugin/jackson/interceptor/ReadValueInterceptor.java b/plugins/jackson/src/main/java/com/navercorp/pinpoint/plugin/jackson/interceptor/ReadValueInterceptor.java index 737811811..8f2cc1dcd 100644 --- a/plugins/jackson/src/main/java/com/navercorp/pinpoint/plugin/jackson/interceptor/ReadValueInterceptor.java +++ b/plugins/jackson/src/main/java/com/navercorp/pinpoint/plugin/jackson/interceptor/ReadValueInterceptor.java @@ -20,7 +20,7 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.plugin.jackson.JacksonConstants; @@ -29,7 +29,7 @@ import com.navercorp.pinpoint.plugin.jackson.JacksonConstants; * @see JacksonPlugin#intercept_ObjectMapper(com.navercorp.pinpoint.bootstrap.plugin.ProfilerPluginSetupContext) * @author Sungkook Kim */ -public class ReadValueInterceptor implements SimpleAroundInterceptor, JacksonConstants { +public class ReadValueInterceptor implements AroundInterceptor, JacksonConstants { private final PLogger logger = PLoggerFactory.getLogger(getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -57,7 +57,7 @@ public class ReadValueInterceptor implements SimpleAroundInterceptor, JacksonCon } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } diff --git a/plugins/jackson/src/main/java/com/navercorp/pinpoint/plugin/jackson/interceptor/WriteValueAsBytesInterceptor.java b/plugins/jackson/src/main/java/com/navercorp/pinpoint/plugin/jackson/interceptor/WriteValueAsBytesInterceptor.java index c4b7ec80e..d79aa21cc 100644 --- a/plugins/jackson/src/main/java/com/navercorp/pinpoint/plugin/jackson/interceptor/WriteValueAsBytesInterceptor.java +++ b/plugins/jackson/src/main/java/com/navercorp/pinpoint/plugin/jackson/interceptor/WriteValueAsBytesInterceptor.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.plugin.jackson.JacksonConstants; @@ -28,7 +28,7 @@ import com.navercorp.pinpoint.plugin.jackson.JacksonPlugin; * @see JacksonPlugin#intercept_ObjectMapper(com.navercorp.pinpoint.bootstrap.plugin.ProfilerPluginSetupContext) * @author Sungkook Kim */ -public class WriteValueAsBytesInterceptor implements SimpleAroundInterceptor, JacksonConstants { +public class WriteValueAsBytesInterceptor implements AroundInterceptor, JacksonConstants { private final PLogger logger = PLoggerFactory.getLogger(getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -55,7 +55,7 @@ public class WriteValueAsBytesInterceptor implements SimpleAroundInterceptor, Ja } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } diff --git a/plugins/jackson/src/main/java/com/navercorp/pinpoint/plugin/jackson/interceptor/WriteValueAsStringInterceptor.java b/plugins/jackson/src/main/java/com/navercorp/pinpoint/plugin/jackson/interceptor/WriteValueAsStringInterceptor.java index 0d9109f04..7eb37bbd1 100644 --- a/plugins/jackson/src/main/java/com/navercorp/pinpoint/plugin/jackson/interceptor/WriteValueAsStringInterceptor.java +++ b/plugins/jackson/src/main/java/com/navercorp/pinpoint/plugin/jackson/interceptor/WriteValueAsStringInterceptor.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.plugin.jackson.JacksonConstants; @@ -28,7 +28,7 @@ import com.navercorp.pinpoint.plugin.jackson.JacksonPlugin; * @see JacksonPlugin#intercept_ObjectMapper(com.navercorp.pinpoint.bootstrap.plugin.ProfilerPluginSetupContext) * @author Sungkook Kim */ -public class WriteValueAsStringInterceptor implements SimpleAroundInterceptor, JacksonConstants { +public class WriteValueAsStringInterceptor implements AroundInterceptor, JacksonConstants { private final PLogger logger = PLoggerFactory.getLogger(getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -55,7 +55,7 @@ public class WriteValueAsStringInterceptor implements SimpleAroundInterceptor, J } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } diff --git a/plugins/jdk-http/src/main/java/com/navercorp/pinpoint/plugin/jdk/http/JdkHttpPlugin.java b/plugins/jdk-http/src/main/java/com/navercorp/pinpoint/plugin/jdk/http/JdkHttpPlugin.java index 8f307dce3..079cdc3d2 100644 --- a/plugins/jdk-http/src/main/java/com/navercorp/pinpoint/plugin/jdk/http/JdkHttpPlugin.java +++ b/plugins/jdk-http/src/main/java/com/navercorp/pinpoint/plugin/jdk/http/JdkHttpPlugin.java @@ -19,7 +19,7 @@ import java.security.ProtectionDomain; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPlugin; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPluginSetupContext; @@ -36,7 +36,7 @@ public class JdkHttpPlugin implements ProfilerPlugin { context.addClassFileTransformer("sun.net.www.protocol.http.HttpURLConnection", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addGetter(ConnectedGetter.class.getName(), "connected"); diff --git a/plugins/jdk-http/src/main/java/com/navercorp/pinpoint/plugin/jdk/http/interceptor/HttpURLConnectionInterceptor.java b/plugins/jdk-http/src/main/java/com/navercorp/pinpoint/plugin/jdk/http/interceptor/HttpURLConnectionInterceptor.java index 4ac887085..cdebd911c 100644 --- a/plugins/jdk-http/src/main/java/com/navercorp/pinpoint/plugin/jdk/http/interceptor/HttpURLConnectionInterceptor.java +++ b/plugins/jdk-http/src/main/java/com/navercorp/pinpoint/plugin/jdk/http/interceptor/HttpURLConnectionInterceptor.java @@ -25,7 +25,7 @@ import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.context.TraceId; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.TargetMethod; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Targets; @@ -48,7 +48,7 @@ import com.navercorp.pinpoint.plugin.jdk.http.JdkHttpConstants; @TargetMethod(name="getInputStream"), @TargetMethod(name="getOutputStream") }) -public class HttpURLConnectionInterceptor implements SimpleAroundInterceptor, JdkHttpConstants { +public class HttpURLConnectionInterceptor implements AroundInterceptor, JdkHttpConstants { private static final Object TRACE_BLOCK_BEGIN_MARKER = new Object(); private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -130,7 +130,7 @@ public class HttpURLConnectionInterceptor implements SimpleAroundInterceptor, Jd } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { // do not log result logger.afterInterceptor(target, args); @@ -155,4 +155,4 @@ public class HttpURLConnectionInterceptor implements SimpleAroundInterceptor, Jd trace.traceBlockEnd(); } } -} \ No newline at end of file +} diff --git a/plugins/jetty/src/main/java/com/navercorp/pinpoint/plugin/jetty/interceptor/ServerHandleInterceptor.java b/plugins/jetty/src/main/java/com/navercorp/pinpoint/plugin/jetty/interceptor/ServerHandleInterceptor.java index 0aa6601cd..76b7b943a 100644 --- a/plugins/jetty/src/main/java/com/navercorp/pinpoint/plugin/jetty/interceptor/ServerHandleInterceptor.java +++ b/plugins/jetty/src/main/java/com/navercorp/pinpoint/plugin/jetty/interceptor/ServerHandleInterceptor.java @@ -28,7 +28,7 @@ import com.navercorp.pinpoint.bootstrap.context.SpanRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.context.TraceId; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.TargetMethod; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -42,7 +42,7 @@ import com.navercorp.pinpoint.plugin.jetty.JettyConstants; import com.navercorp.pinpoint.plugin.jetty.JettySyncMethodDescriptor; @TargetMethod(name = "handle", paramTypes = { "org.eclipse.jetty.server.HttpChannel" }) -public class ServerHandleInterceptor implements SimpleAroundInterceptor, JettyConstants { +public class ServerHandleInterceptor implements AroundInterceptor, JettyConstants { public static final JettySyncMethodDescriptor JETTY_SYNC_API_TAG = new JettySyncMethodDescriptor(); @@ -147,7 +147,7 @@ public class ServerHandleInterceptor implements SimpleAroundInterceptor, JettyCo } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/json-lib/src/main/java/com/navercorp/pinpoint/plugin/json_lib/JsonLibPlugin.java b/plugins/json-lib/src/main/java/com/navercorp/pinpoint/plugin/json_lib/JsonLibPlugin.java index 66df2c1be..a0c22b082 100644 --- a/plugins/json-lib/src/main/java/com/navercorp/pinpoint/plugin/json_lib/JsonLibPlugin.java +++ b/plugins/json-lib/src/main/java/com/navercorp/pinpoint/plugin/json_lib/JsonLibPlugin.java @@ -21,7 +21,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; import com.navercorp.pinpoint.bootstrap.instrument.MethodFilters; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.interceptor.BasicMethodInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; @@ -54,7 +54,7 @@ public class JsonLibPlugin implements ProfilerPlugin, JsonLibConstants { context.addClassFileTransformer(clazzName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); InterceptorGroup group = instrumentContext.getInterceptorGroup(GROUP); @@ -77,7 +77,7 @@ public class JsonLibPlugin implements ProfilerPlugin, JsonLibConstants { context.addClassFileTransformer(clazzName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); InterceptorGroup group = instrumentContext.getInterceptorGroup(GROUP); @@ -103,7 +103,7 @@ public class JsonLibPlugin implements ProfilerPlugin, JsonLibConstants { context.addClassFileTransformer(clazzName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); InterceptorGroup group = instrumentContext.getInterceptorGroup(GROUP); diff --git a/plugins/json-lib/src/main/java/com/navercorp/pinpoint/plugin/json_lib/interceptor/ParsingInterceptor.java b/plugins/json-lib/src/main/java/com/navercorp/pinpoint/plugin/json_lib/interceptor/ParsingInterceptor.java index 481f24701..0a7b8ebee 100644 --- a/plugins/json-lib/src/main/java/com/navercorp/pinpoint/plugin/json_lib/interceptor/ParsingInterceptor.java +++ b/plugins/json-lib/src/main/java/com/navercorp/pinpoint/plugin/json_lib/interceptor/ParsingInterceptor.java @@ -19,7 +19,7 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.plugin.json_lib.JsonLibConstants; @@ -29,7 +29,7 @@ import com.navercorp.pinpoint.plugin.json_lib.JsonLibConstants; * * @author Sangyoon Lee */ -public class ParsingInterceptor implements SimpleAroundInterceptor { +public class ParsingInterceptor implements AroundInterceptor { private final TraceContext traceContext; private final MethodDescriptor descriptor; private final PLogger logger = PLoggerFactory.getLogger(getClass()); @@ -54,7 +54,7 @@ public class ParsingInterceptor implements SimpleAroundInterceptor { } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (logger.isDebugEnabled()) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/json-lib/src/main/java/com/navercorp/pinpoint/plugin/json_lib/interceptor/ToStringInterceptor.java b/plugins/json-lib/src/main/java/com/navercorp/pinpoint/plugin/json_lib/interceptor/ToStringInterceptor.java index 1c0f259d7..cf4510421 100644 --- a/plugins/json-lib/src/main/java/com/navercorp/pinpoint/plugin/json_lib/interceptor/ToStringInterceptor.java +++ b/plugins/json-lib/src/main/java/com/navercorp/pinpoint/plugin/json_lib/interceptor/ToStringInterceptor.java @@ -19,7 +19,7 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.plugin.json_lib.JsonLibConstants; @@ -29,7 +29,7 @@ import com.navercorp.pinpoint.plugin.json_lib.JsonLibConstants; * * @author Sangyoon Lee */ -public class ToStringInterceptor implements SimpleAroundInterceptor { +public class ToStringInterceptor implements AroundInterceptor { private final TraceContext traceContext; private final MethodDescriptor descriptor; private final PLogger logger = PLoggerFactory.getLogger(getClass()); @@ -54,7 +54,7 @@ public class ToStringInterceptor implements SimpleAroundInterceptor { } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (logger.isDebugEnabled()) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/jtds/src/main/java/com/navercorp/pinpoint/plugin/jdbc/jtds/JtdsPlugin.java b/plugins/jtds/src/main/java/com/navercorp/pinpoint/plugin/jdbc/jtds/JtdsPlugin.java index 4b2013afb..07935de33 100644 --- a/plugins/jtds/src/main/java/com/navercorp/pinpoint/plugin/jdbc/jtds/JtdsPlugin.java +++ b/plugins/jtds/src/main/java/com/navercorp/pinpoint/plugin/jdbc/jtds/JtdsPlugin.java @@ -18,7 +18,7 @@ import java.security.ProtectionDomain; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; @@ -46,7 +46,7 @@ public class JtdsPlugin implements ProfilerPlugin, JtdsConstants { PinpointClassFileTransformer transformer = new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addField("com.navercorp.pinpoint.bootstrap.plugin.jdbc.DatabaseInfoAccessor"); @@ -80,7 +80,7 @@ public class JtdsPlugin implements ProfilerPlugin, JtdsConstants { setupContext.addClassFileTransformer("net.sourceforge.jtds.jdbc.Driver", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); InterceptorGroup group = instrumentContext.getInterceptorGroup(GROUP_JTDS); @@ -95,7 +95,7 @@ public class JtdsPlugin implements ProfilerPlugin, JtdsConstants { setupContext.addClassFileTransformer("net.sourceforge.jtds.jdbc.JtdsPreparedStatement", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addField("com.navercorp.pinpoint.bootstrap.plugin.jdbc.DatabaseInfoAccessor"); @@ -117,7 +117,7 @@ public class JtdsPlugin implements ProfilerPlugin, JtdsConstants { setupContext.addClassFileTransformer("net.sourceforge.jtds.jdbc.JtdsStatement", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addField("com.navercorp.pinpoint.bootstrap.plugin.jdbc.DatabaseInfoAccessor"); diff --git a/plugins/log4j/src/main/java/com/navercorp/pinpoint/plugin/log4j/Log4jPlugin.java b/plugins/log4j/src/main/java/com/navercorp/pinpoint/plugin/log4j/Log4jPlugin.java index 37a2b5ecb..925d5a78d 100644 --- a/plugins/log4j/src/main/java/com/navercorp/pinpoint/plugin/log4j/Log4jPlugin.java +++ b/plugins/log4j/src/main/java/com/navercorp/pinpoint/plugin/log4j/Log4jPlugin.java @@ -19,7 +19,7 @@ import java.security.ProtectionDomain; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -34,7 +34,7 @@ public class Log4jPlugin implements ProfilerPlugin { context.addClassFileTransformer("org.apache.log4j.spi.LoggingEvent", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument pluginContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor pluginContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass mdcClass = pluginContext.getInstrumentClass(loader, "org.apache.log4j.MDC", null); if (mdcClass == null) { diff --git a/plugins/logback/src/main/java/com/navercorp/pinpoint/plugin/logback/LogbackPlugin.java b/plugins/logback/src/main/java/com/navercorp/pinpoint/plugin/logback/LogbackPlugin.java index 7ab327a68..925be630a 100644 --- a/plugins/logback/src/main/java/com/navercorp/pinpoint/plugin/logback/LogbackPlugin.java +++ b/plugins/logback/src/main/java/com/navercorp/pinpoint/plugin/logback/LogbackPlugin.java @@ -21,7 +21,7 @@ import java.security.ProtectionDomain; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -41,7 +41,7 @@ public class LogbackPlugin implements ProfilerPlugin { context.addClassFileTransformer("ch.qos.logback.classic.spi.LoggingEvent", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument pluginContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor pluginContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass mdcClass = pluginContext.getInstrumentClass(loader, "org.slf4j.MDC", null); if (mdcClass == null) { diff --git a/plugins/mybatis/src/main/java/com/navercorp/pinpoint/plugin/mybatis/MyBatisPlugin.java b/plugins/mybatis/src/main/java/com/navercorp/pinpoint/plugin/mybatis/MyBatisPlugin.java index d7ac86562..f8b1ebe56 100644 --- a/plugins/mybatis/src/main/java/com/navercorp/pinpoint/plugin/mybatis/MyBatisPlugin.java +++ b/plugins/mybatis/src/main/java/com/navercorp/pinpoint/plugin/mybatis/MyBatisPlugin.java @@ -27,7 +27,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; import com.navercorp.pinpoint.bootstrap.instrument.MethodFilter; import com.navercorp.pinpoint.bootstrap.instrument.MethodFilters; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; @@ -63,7 +63,7 @@ public class MyBatisPlugin implements ProfilerPlugin { context.addClassFileTransformer(sqlSession, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { diff --git a/plugins/mysql-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlPlugin.java b/plugins/mysql-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlPlugin.java index 0bdc3666f..40ff5e5d1 100644 --- a/plugins/mysql-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlPlugin.java +++ b/plugins/mysql-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlPlugin.java @@ -18,7 +18,7 @@ import java.security.ProtectionDomain; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; @@ -50,7 +50,7 @@ public class MySqlPlugin implements ProfilerPlugin, MySqlConstants { PinpointClassFileTransformer transformer = new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); if (!target.isInterceptable()) { @@ -90,7 +90,7 @@ public class MySqlPlugin implements ProfilerPlugin, MySqlConstants { setupContext.addClassFileTransformer("com.mysql.jdbc.NonRegisteringDriver", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); InterceptorGroup group = instrumentContext.getInterceptorGroup(GROUP_NAME); @@ -105,7 +105,7 @@ public class MySqlPlugin implements ProfilerPlugin, MySqlConstants { setupContext.addClassFileTransformer("com.mysql.jdbc.PreparedStatement", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addField("com.navercorp.pinpoint.bootstrap.plugin.jdbc.DatabaseInfoAccessor"); @@ -127,7 +127,7 @@ public class MySqlPlugin implements ProfilerPlugin, MySqlConstants { setupContext.addClassFileTransformer("com.mysql.jdbc.JDBC4PreparedStatement", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); InterceptorGroup group = instrumentContext.getInterceptorGroup(GROUP_NAME); @@ -143,7 +143,7 @@ public class MySqlPlugin implements ProfilerPlugin, MySqlConstants { PinpointClassFileTransformer transformer = new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); if (!target.isInterceptable()) { diff --git a/plugins/mysql-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/mysql/interceptor/MySQLConnectionCreateInterceptor.java b/plugins/mysql-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/mysql/interceptor/MySQLConnectionCreateInterceptor.java index c9feb1f3d..ffe45522b 100644 --- a/plugins/mysql-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/mysql/interceptor/MySQLConnectionCreateInterceptor.java +++ b/plugins/mysql-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/mysql/interceptor/MySQLConnectionCreateInterceptor.java @@ -22,7 +22,7 @@ import com.navercorp.pinpoint.bootstrap.context.DatabaseInfo; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.TargetConstructor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -35,7 +35,7 @@ import com.navercorp.pinpoint.plugin.jdbc.mysql.MySqlConstants; * @author emeroad */ @TargetConstructor({ "java.lang.String", "int", "java.util.Properties", "java.lang.String", "java.lang.String" }) -public class MySQLConnectionCreateInterceptor implements SimpleAroundInterceptor { +public class MySQLConnectionCreateInterceptor implements AroundInterceptor { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -47,7 +47,7 @@ public class MySQLConnectionCreateInterceptor implements SimpleAroundInterceptor } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/ning-asynchttpclient/src/main/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/NingAsyncHttpClientPlugin.java b/plugins/ning-asynchttpclient/src/main/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/NingAsyncHttpClientPlugin.java index 3aeaa6634..478f77b29 100644 --- a/plugins/ning-asynchttpclient/src/main/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/NingAsyncHttpClientPlugin.java +++ b/plugins/ning-asynchttpclient/src/main/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/NingAsyncHttpClientPlugin.java @@ -22,7 +22,7 @@ import java.security.ProtectionDomain; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPlugin; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPluginSetupContext; @@ -44,7 +44,7 @@ public class NingAsyncHttpClientPlugin implements ProfilerPlugin { context.addClassFileTransformer("com.ning.http.client.AsyncHttpClient", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addInterceptor("com.navercorp.pinpoint.plugin.ning.asynchttpclient.interceptor.ExecuteRequestInterceptor"); diff --git a/plugins/ning-asynchttpclient/src/main/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/interceptor/ExecuteRequestInterceptor.java b/plugins/ning-asynchttpclient/src/main/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/interceptor/ExecuteRequestInterceptor.java index 0b8911bf3..e46d6064f 100644 --- a/plugins/ning-asynchttpclient/src/main/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/interceptor/ExecuteRequestInterceptor.java +++ b/plugins/ning-asynchttpclient/src/main/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/interceptor/ExecuteRequestInterceptor.java @@ -29,7 +29,7 @@ import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.context.TraceId; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.TargetMethod; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -55,7 +55,7 @@ import com.ning.http.client.cookie.Cookie; * */ @TargetMethod(name="executeRequest", paramTypes= { "com.ning.http.client.Request", "com.ning.http.client.AsyncHandler" }) -public class ExecuteRequestInterceptor implements SimpleAroundInterceptor { +public class ExecuteRequestInterceptor implements AroundInterceptor { private final PLogger logger = PLoggerFactory.getLogger(ExecuteRequestInterceptor.class); private final boolean isDebug = logger.isDebugEnabled(); @@ -136,7 +136,7 @@ public class ExecuteRequestInterceptor implements SimpleAroundInterceptor { } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { // Do not log result logger.afterInterceptor(target, args); diff --git a/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/OkHttpPlugin.java b/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/OkHttpPlugin.java index b4f0edc57..5ba626be8 100644 --- a/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/OkHttpPlugin.java +++ b/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/OkHttpPlugin.java @@ -53,7 +53,7 @@ public class OkHttpPlugin implements ProfilerPlugin, OkHttpConstants { context.addClassFileTransformer("com.squareup.okhttp.Call", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); for (InstrumentMethod method : target.getDeclaredMethods(MethodFilters.name("execute", "enqueue", "cancel"))) { @@ -69,7 +69,7 @@ public class OkHttpPlugin implements ProfilerPlugin, OkHttpConstants { context.addClassFileTransformer("com.squareup.okhttp.Dispatcher", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); for(InstrumentMethod method : target.getDeclaredMethods(MethodFilters.name("execute", "cancel"))) { @@ -91,7 +91,7 @@ public class OkHttpPlugin implements ProfilerPlugin, OkHttpConstants { context.addClassFileTransformer("com.squareup.okhttp.Call$AsyncCall", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addField(AsyncTraceIdAccessor.class.getName()); @@ -110,7 +110,7 @@ public class OkHttpPlugin implements ProfilerPlugin, OkHttpConstants { context.addClassFileTransformer("com.squareup.okhttp.internal.http.HttpEngine", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addGetter(UserRequestGetter.class.getName(), FIELD_USER_REQUEST); target.addGetter(UserResponseGetter.class.getName(), FIELD_USER_RESPONSE); @@ -144,7 +144,7 @@ public class OkHttpPlugin implements ProfilerPlugin, OkHttpConstants { context.addClassFileTransformer("com.squareup.okhttp.Request$Builder", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addGetter(HttpUrlGetter.class.getName(), FIELD_HTTP_URL); diff --git a/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/interceptor/DispatcherEnqueueMethodInterceptor.java b/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/interceptor/DispatcherEnqueueMethodInterceptor.java index 9338cff79..7a590aa76 100644 --- a/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/interceptor/DispatcherEnqueueMethodInterceptor.java +++ b/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/interceptor/DispatcherEnqueueMethodInterceptor.java @@ -21,7 +21,7 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; @@ -35,7 +35,7 @@ import com.navercorp.pinpoint.plugin.okhttp.OkHttpConstants; * @author jaehong.kim * */ -public class DispatcherEnqueueMethodInterceptor implements SimpleAroundInterceptor, OkHttpConstants{ +public class DispatcherEnqueueMethodInterceptor implements AroundInterceptor, OkHttpConstants{ private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -89,7 +89,7 @@ public class DispatcherEnqueueMethodInterceptor implements SimpleAroundIntercept } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } diff --git a/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/interceptor/HttpEngineReadResponseMethodInterceptor.java b/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/interceptor/HttpEngineReadResponseMethodInterceptor.java index 60d527a6d..0a077d795 100644 --- a/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/interceptor/HttpEngineReadResponseMethodInterceptor.java +++ b/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/interceptor/HttpEngineReadResponseMethodInterceptor.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.plugin.okhttp.interceptor; import com.navercorp.pinpoint.bootstrap.context.*; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -33,7 +33,7 @@ import com.squareup.okhttp.Response; /** * @author jaehong.kim */ -public class HttpEngineReadResponseMethodInterceptor implements SimpleAroundInterceptor, OkHttpConstants { +public class HttpEngineReadResponseMethodInterceptor implements AroundInterceptor, OkHttpConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -87,7 +87,7 @@ public class HttpEngineReadResponseMethodInterceptor implements SimpleAroundInte } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } diff --git a/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/interceptor/HttpEngineSendRequestMethodInterceptor.java b/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/interceptor/HttpEngineSendRequestMethodInterceptor.java index 20eb827d6..dc730b90d 100644 --- a/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/interceptor/HttpEngineSendRequestMethodInterceptor.java +++ b/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/interceptor/HttpEngineSendRequestMethodInterceptor.java @@ -17,7 +17,7 @@ package com.navercorp.pinpoint.plugin.okhttp.interceptor; import com.navercorp.pinpoint.bootstrap.config.DumpType; import com.navercorp.pinpoint.bootstrap.context.*; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.group.AttachmentFactory; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; @@ -38,7 +38,7 @@ import com.squareup.okhttp.Request; * @author jaehong.kim */ @Group(OkHttpConstants.SEND_REQUEST_SCOPE) -public class HttpEngineSendRequestMethodInterceptor implements SimpleAroundInterceptor, OkHttpConstants { +public class HttpEngineSendRequestMethodInterceptor implements AroundInterceptor, OkHttpConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -126,7 +126,7 @@ public class HttpEngineSendRequestMethodInterceptor implements SimpleAroundInter } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } diff --git a/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/interceptor/RequestBuilderBuildMethodInterceptor.java b/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/interceptor/RequestBuilderBuildMethodInterceptor.java index 7a3797143..d502a3645 100644 --- a/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/interceptor/RequestBuilderBuildMethodInterceptor.java +++ b/plugins/okhttp/src/main/java/com/navercorp/pinpoint/plugin/okhttp/interceptor/RequestBuilderBuildMethodInterceptor.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.plugin.okhttp.interceptor; import com.navercorp.pinpoint.bootstrap.context.*; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; @@ -33,7 +33,7 @@ import com.squareup.okhttp.Request; * @author jaehong.kim */ @Group(value = OkHttpConstants.SEND_REQUEST_SCOPE, executionPolicy = ExecutionPolicy.INTERNAL) -public class RequestBuilderBuildMethodInterceptor implements SimpleAroundInterceptor, OkHttpConstants { +public class RequestBuilderBuildMethodInterceptor implements AroundInterceptor, OkHttpConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -96,7 +96,7 @@ public class RequestBuilderBuildMethodInterceptor implements SimpleAroundInterce } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } diff --git a/plugins/oracle-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/oracle/OraclePlugin.java b/plugins/oracle-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/oracle/OraclePlugin.java index 8ef04812d..751648dc8 100644 --- a/plugins/oracle-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/oracle/OraclePlugin.java +++ b/plugins/oracle-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/oracle/OraclePlugin.java @@ -18,7 +18,7 @@ import java.security.ProtectionDomain; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; @@ -51,7 +51,7 @@ public class OraclePlugin implements ProfilerPlugin, OracleConstants { setupContext.addClassFileTransformer("oracle.jdbc.driver.PhysicalConnection", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.addField("com.navercorp.pinpoint.bootstrap.plugin.jdbc.DatabaseInfoAccessor"); @@ -82,7 +82,7 @@ public class OraclePlugin implements ProfilerPlugin, OracleConstants { setupContext.addClassFileTransformer("oracle.jdbc.driver.OracleDriver", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); InterceptorGroup group = instrumentContext.getInterceptorGroup(GROUP_ORACLE); @@ -97,7 +97,7 @@ public class OraclePlugin implements ProfilerPlugin, OracleConstants { PinpointClassFileTransformer transformer = new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { if (className.equals(CLASS_PREPARED_STATEMENT)) { if (instrumentContext.exist(loader, CLASS_PREPARED_STATEMENT_WRAPPER)) { return null; @@ -128,7 +128,7 @@ public class OraclePlugin implements ProfilerPlugin, OracleConstants { PinpointClassFileTransformer transformer = new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { if (className.equals(CLASS_STATEMENT)) { if (instrumentContext.exist(loader, CLASS_STATEMENT_WRAPPER)) { return null; diff --git a/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/RedisPlugin.java b/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/RedisPlugin.java index ab990e9a2..1c1e61ea3 100644 --- a/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/RedisPlugin.java +++ b/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/RedisPlugin.java @@ -22,7 +22,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; import com.navercorp.pinpoint.bootstrap.instrument.MethodFilters; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -71,7 +71,7 @@ public class RedisPlugin implements ProfilerPlugin, RedisConstants { context.addClassFileTransformer(targetClassName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); if (handler != null) { handler.handle(target); @@ -122,7 +122,7 @@ public class RedisPlugin implements ProfilerPlugin, RedisConstants { context.addClassFileTransformer("redis.clients.jedis.Client", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); target.addField(METADATA_END_POINT); @@ -145,7 +145,7 @@ public class RedisPlugin implements ProfilerPlugin, RedisConstants { context.addClassFileTransformer("redis.clients.jedis.Protocol", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); for (InstrumentMethod method : target.getDeclaredMethods(MethodFilters.chain(MethodFilters.name("sendCommand", "read"), MethodFilters.modifierNot(Modifier.PRIVATE)))) { @@ -188,7 +188,7 @@ public class RedisPlugin implements ProfilerPlugin, RedisConstants { context.addClassFileTransformer(targetClassName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); if (handler != null) { handler.handle(target); diff --git a/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/interceptor/JedisClientConstructorInterceptor.java b/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/interceptor/JedisClientConstructorInterceptor.java index e6456b7aa..0081e800b 100644 --- a/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/interceptor/JedisClientConstructorInterceptor.java +++ b/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/interceptor/JedisClientConstructorInterceptor.java @@ -18,7 +18,7 @@ package com.navercorp.pinpoint.plugin.redis.interceptor; import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.plugin.redis.EndPointAccessor; @@ -30,7 +30,7 @@ import com.navercorp.pinpoint.plugin.redis.RedisConstants; * @author jaehong.kim * */ -public class JedisClientConstructorInterceptor implements SimpleAroundInterceptor, RedisConstants { +public class JedisClientConstructorInterceptor implements AroundInterceptor, RedisConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -86,6 +86,6 @@ public class JedisClientConstructorInterceptor implements SimpleAroundIntercepto } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { } } \ No newline at end of file diff --git a/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/interceptor/JedisClientMetadataAttchInterceptor.java b/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/interceptor/JedisClientMetadataAttchInterceptor.java index 386e955bf..33e4fa03b 100644 --- a/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/interceptor/JedisClientMetadataAttchInterceptor.java +++ b/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/interceptor/JedisClientMetadataAttchInterceptor.java @@ -19,7 +19,7 @@ import redis.clients.jedis.Client; import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.plugin.redis.EndPointAccessor; @@ -30,7 +30,7 @@ import com.navercorp.pinpoint.plugin.redis.RedisConstants; * @author jaehong.kim * */ -public abstract class JedisClientMetadataAttchInterceptor implements SimpleAroundInterceptor, RedisConstants { +public abstract class JedisClientMetadataAttchInterceptor implements AroundInterceptor, RedisConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -82,6 +82,6 @@ public abstract class JedisClientMetadataAttchInterceptor implements SimpleAroun } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { } } \ No newline at end of file diff --git a/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/interceptor/JedisConstructorInterceptor.java b/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/interceptor/JedisConstructorInterceptor.java index 77b031d12..80d0df3a4 100644 --- a/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/interceptor/JedisConstructorInterceptor.java +++ b/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/interceptor/JedisConstructorInterceptor.java @@ -22,7 +22,7 @@ import redis.clients.jedis.JedisShardInfo; import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.plugin.redis.EndPointAccessor; @@ -35,7 +35,7 @@ import com.navercorp.pinpoint.plugin.redis.RedisConstants; * @author jaehong.kim * */ -public class JedisConstructorInterceptor implements SimpleAroundInterceptor, RedisConstants { +public class JedisConstructorInterceptor implements AroundInterceptor, RedisConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -99,6 +99,6 @@ public class JedisConstructorInterceptor implements SimpleAroundInterceptor, Red } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { } } \ No newline at end of file diff --git a/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/interceptor/ProtocolSendCommandAndReadMethodInterceptor.java b/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/interceptor/ProtocolSendCommandAndReadMethodInterceptor.java index a2bacf357..3b284b2e9 100644 --- a/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/interceptor/ProtocolSendCommandAndReadMethodInterceptor.java +++ b/plugins/redis/src/main/java/com/navercorp/pinpoint/plugin/redis/interceptor/ProtocolSendCommandAndReadMethodInterceptor.java @@ -18,7 +18,7 @@ package com.navercorp.pinpoint.plugin.redis.interceptor; import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; @@ -35,7 +35,7 @@ import com.navercorp.pinpoint.plugin.redis.RedisConstants; * */ @Group(value = RedisConstants.REDIS_SCOPE, executionPolicy = ExecutionPolicy.INTERNAL) -public class ProtocolSendCommandAndReadMethodInterceptor implements SimpleAroundInterceptor, RedisConstants { +public class ProtocolSendCommandAndReadMethodInterceptor implements AroundInterceptor, RedisConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -78,7 +78,7 @@ public class ProtocolSendCommandAndReadMethodInterceptor implements SimpleAround } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, methodDescriptor.getClassName(), methodDescriptor.getMethodName(), "", args, result, throwable); } diff --git a/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/BeanMethodTransformer.java b/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/BeanMethodTransformer.java index 5e28710f5..745875240 100644 --- a/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/BeanMethodTransformer.java +++ b/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/BeanMethodTransformer.java @@ -24,7 +24,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; import com.navercorp.pinpoint.bootstrap.instrument.MethodFilter; import com.navercorp.pinpoint.bootstrap.instrument.MethodFilters; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.interceptor.BasicMethodInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; @@ -46,7 +46,7 @@ public class BeanMethodTransformer implements PinpointClassFileTransformer, Spri * @see com.navercorp.pinpoint.bootstrap.plugin.transformer.PinpointClassFileTransformer#transform(com.navercorp.pinpoint.bootstrap.plugin.PinpointInstrument, java.lang.ClassLoader, java.lang.String, java.lang.Class, java.security.ProtectionDomain, byte[]) */ @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { if (logger.isInfoEnabled()) { logger.info("Modify {}", className); } diff --git a/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansPlugin.java b/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansPlugin.java index 35fee7917..8f0d46d78 100644 --- a/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansPlugin.java +++ b/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansPlugin.java @@ -19,7 +19,7 @@ import java.security.ProtectionDomain; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.plugin.ObjectRecipe; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPlugin; @@ -40,7 +40,7 @@ public class SpringBeansPlugin implements ProfilerPlugin { context.addClassFileTransformer("org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); BeanMethodTransformer beanTransformer = new BeanMethodTransformer(); diff --git a/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/AbstractSpringBeanCreationInterceptor.java b/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/AbstractSpringBeanCreationInterceptor.java index 140b10ce7..cf65050fe 100644 --- a/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/AbstractSpringBeanCreationInterceptor.java +++ b/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/AbstractSpringBeanCreationInterceptor.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.plugin.spring.beans.interceptor; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.interceptor.Interceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; @@ -29,11 +29,11 @@ import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; public abstract class AbstractSpringBeanCreationInterceptor implements Interceptor { private final PLogger logger = PLoggerFactory.getLogger(getClass()); - private final PinpointInstrument instrumentContext; + private final Instrumentor instrumentContext; private final PinpointClassFileTransformer transformer; private final TargetBeanFilter filter; - protected AbstractSpringBeanCreationInterceptor(PinpointInstrument instrumentContext, PinpointClassFileTransformer transformer, TargetBeanFilter filter) { + protected AbstractSpringBeanCreationInterceptor(Instrumentor instrumentContext, PinpointClassFileTransformer transformer, TargetBeanFilter filter) { this.instrumentContext = instrumentContext; this.transformer = transformer; this.filter = filter; 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 102be941e..4eb7b509c 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 @@ -18,7 +18,7 @@ package com.navercorp.pinpoint.plugin.spring.beans.interceptor; import java.lang.reflect.Method; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -31,7 +31,7 @@ import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; public class CreateBeanInstanceInterceptor extends AbstractSpringBeanCreationInterceptor { private final PLogger logger = PLoggerFactory.getLogger(getClass()); - public CreateBeanInstanceInterceptor(PinpointInstrument instrumentContext, PinpointClassFileTransformer transformer, TargetBeanFilter filter) { + public CreateBeanInstanceInterceptor(Instrumentor instrumentContext, PinpointClassFileTransformer transformer, TargetBeanFilter filter) { super(instrumentContext, transformer, filter); } 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 7014a1c3a..de29c6118 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 @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.plugin.spring.beans.interceptor; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -29,7 +29,7 @@ import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; public class PostProcessorInterceptor extends AbstractSpringBeanCreationInterceptor { private final PLogger logger = PLoggerFactory.getLogger(getClass()); - public PostProcessorInterceptor(PinpointInstrument instrumentContext, PinpointClassFileTransformer transformer, TargetBeanFilter filter) { + public PostProcessorInterceptor(Instrumentor instrumentContext, PinpointClassFileTransformer transformer, TargetBeanFilter filter) { super(instrumentContext, transformer, filter); } diff --git a/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/web/SpringWebMvcPlugin.java b/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/web/SpringWebMvcPlugin.java index b771b0be4..96c02da41 100644 --- a/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/web/SpringWebMvcPlugin.java +++ b/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/web/SpringWebMvcPlugin.java @@ -20,7 +20,7 @@ import java.security.ProtectionDomain; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.interceptor.BasicMethodInterceptor; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPlugin; @@ -39,7 +39,7 @@ public class SpringWebMvcPlugin implements ProfilerPlugin { context.addClassFileTransformer("org.springframework.web.servlet.FrameworkServlet", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); target.getDeclaredMethod("doGet", "javax.servlet.http.HttpServletRequest", "javax.servlet.http.HttpServletResponse").addInterceptor(BasicMethodInterceptor.class.getName(), SPRING_MVC); diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/ThriftPlugin.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/ThriftPlugin.java index d37050247..576c67e36 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/ThriftPlugin.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/ThriftPlugin.java @@ -23,7 +23,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; import com.navercorp.pinpoint.bootstrap.instrument.MethodFilters; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPlugin; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPluginSetupContext; @@ -81,7 +81,7 @@ public class ThriftPlugin implements ProfilerPlugin, ThriftConstants { context.addClassFileTransformer(targetClassName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { final InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); @@ -117,7 +117,7 @@ public class ThriftPlugin implements ProfilerPlugin, ThriftConstants { context.addClassFileTransformer(targetClassName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { final InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); @@ -140,7 +140,7 @@ public class ThriftPlugin implements ProfilerPlugin, ThriftConstants { context.addClassFileTransformer(targetClassName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { final InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); @@ -235,7 +235,7 @@ public class ThriftPlugin implements ProfilerPlugin, ThriftConstants { context.addClassFileTransformer(targetClassName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { final InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); @@ -259,7 +259,7 @@ public class ThriftPlugin implements ProfilerPlugin, ThriftConstants { context.addClassFileTransformer(targetClassName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { final InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); @@ -290,7 +290,7 @@ public class ThriftPlugin implements ProfilerPlugin, ThriftConstants { context.addClassFileTransformer(targetClassName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { final InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); @@ -352,7 +352,7 @@ public class ThriftPlugin implements ProfilerPlugin, ThriftConstants { context.addClassFileTransformer(targetClassName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { final InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); @@ -369,7 +369,7 @@ public class ThriftPlugin implements ProfilerPlugin, ThriftConstants { context.addClassFileTransformer(targetClassName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { final InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); @@ -393,7 +393,7 @@ public class ThriftPlugin implements ProfilerPlugin, ThriftConstants { context.addClassFileTransformer(targetClassName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { final InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); @@ -418,7 +418,7 @@ public class ThriftPlugin implements ProfilerPlugin, ThriftConstants { context.addClassFileTransformer(targetClassName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { final InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); @@ -471,7 +471,7 @@ public class ThriftPlugin implements ProfilerPlugin, ThriftConstants { context.addClassFileTransformer(targetClassName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { final InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer); diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/TServiceClientSendBaseInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/TServiceClientSendBaseInterceptor.java index 6d4a49225..d44e80913 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/TServiceClientSendBaseInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/TServiceClientSendBaseInterceptor.java @@ -30,7 +30,7 @@ import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.context.TraceId; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Name; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; @@ -59,7 +59,7 @@ import com.navercorp.pinpoint.plugin.thrift.field.accessor.SocketFieldAccessor; * @see com.navercorp.pinpoint.plugin.thrift.interceptor.tprotocol.client.TProtocolWriteFieldStopInterceptor TProtocolWriteFieldStopInterceptor */ @Group(value = THRIFT_CLIENT_SCOPE, executionPolicy = ExecutionPolicy.BOUNDARY) -public class TServiceClientSendBaseInterceptor implements SimpleAroundInterceptor, ThriftConstants { +public class TServiceClientSendBaseInterceptor implements AroundInterceptor, ThriftConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -149,7 +149,7 @@ public class TServiceClientSendBaseInterceptor implements SimpleAroundIntercepto } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncClientManagerCallInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncClientManagerCallInterceptor.java index 450dab3b7..d036d6c1a 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncClientManagerCallInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncClientManagerCallInterceptor.java @@ -26,7 +26,7 @@ import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.context.TraceId; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Name; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; @@ -46,7 +46,7 @@ import com.navercorp.pinpoint.plugin.thrift.field.accessor.SocketAddressFieldAcc * @author HyunGil Jeong */ @Group(value = THRIFT_CLIENT_SCOPE, executionPolicy = ExecutionPolicy.BOUNDARY) -public class TAsyncClientManagerCallInterceptor implements SimpleAroundInterceptor, ThriftConstants { +public class TAsyncClientManagerCallInterceptor implements AroundInterceptor, ThriftConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -120,7 +120,7 @@ public class TAsyncClientManagerCallInterceptor implements SimpleAroundIntercept } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallCleanUpAndFireCallbackInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallCleanUpAndFireCallbackInterceptor.java index 4e02b6c62..748f54f68 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallCleanUpAndFireCallbackInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallCleanUpAndFireCallbackInterceptor.java @@ -32,8 +32,8 @@ public class TAsyncMethodCallCleanUpAndFireCallbackInterceptor extends TAsyncMet } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { - super.after(target, args, result, throwable); + public void after(Object target, Object result, Throwable throwable, Object[] args) { + super.after(target, result, throwable, args); // Set a flag to end async trace block if this method completed successfully if (throwable != null) { diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallConstructInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallConstructInterceptor.java index 7de81c2ac..453352528 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallConstructInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallConstructInterceptor.java @@ -20,7 +20,7 @@ import java.net.SocketAddress; import org.apache.thrift.transport.TNonblockingTransport; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.plugin.thrift.ThriftConstants; @@ -30,7 +30,7 @@ import com.navercorp.pinpoint.plugin.thrift.field.getter.TNonblockingTransportFi /** * @author HyunGil Jeong */ -public class TAsyncMethodCallConstructInterceptor implements SimpleAroundInterceptor, ThriftConstants { +public class TAsyncMethodCallConstructInterceptor implements AroundInterceptor, ThriftConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -41,7 +41,7 @@ public class TAsyncMethodCallConstructInterceptor implements SimpleAroundInterce } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallDoReadingResponseBodyInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallDoReadingResponseBodyInterceptor.java index db9a6810a..2738b6d54 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallDoReadingResponseBodyInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallDoReadingResponseBodyInterceptor.java @@ -31,8 +31,8 @@ public class TAsyncMethodCallDoReadingResponseBodyInterceptor extends TAsyncMeth } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { - super.after(target, args, result, throwable); + public void after(Object target, Object result, Throwable throwable, Object[] args) { + super.after(target, result, throwable, args); // End async trace block if TAsyncMethodCall.cleanUpAndFireCallback(...) call completed successfully // if there was an exception, TAsyncMethodCall.onError(...) will be called and the async trace block will be ended there diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallDoWritingRequestBodyInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallDoWritingRequestBodyInterceptor.java index 57b4cad98..e1d226a71 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallDoWritingRequestBodyInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallDoWritingRequestBodyInterceptor.java @@ -53,8 +53,8 @@ public class TAsyncMethodCallDoWritingRequestBodyInterceptor extends TAsyncMetho } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { - super.after(target, args, result, throwable); + public void after(Object target, Object result, Throwable throwable, Object[] args) { + super.after(target, result, throwable, args); // End async trace block if TAsyncMethodCall.cleanUpAndFireCallback(...) call completed successfully // if there was an exception, TAsyncMethodCall.onError(...) will be called and the async trace block will be ended there diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallInternalMethodInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallInternalMethodInterceptor.java index 185aae6eb..94ddd4b2f 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallInternalMethodInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallInternalMethodInterceptor.java @@ -22,7 +22,7 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.common.trace.ServiceType; @@ -32,7 +32,7 @@ import com.navercorp.pinpoint.plugin.thrift.field.accessor.AsyncMarkerFlagFieldA /** * @author HyunGil Jeong */ -public class TAsyncMethodCallInternalMethodInterceptor implements SimpleAroundInterceptor, ThriftConstants { +public class TAsyncMethodCallInternalMethodInterceptor implements AroundInterceptor, ThriftConstants { protected final PLogger logger = PLoggerFactory.getLogger(getClass()); protected final boolean isDebug = logger.isDebugEnabled(); @@ -74,7 +74,7 @@ public class TAsyncMethodCallInternalMethodInterceptor implements SimpleAroundIn } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallOnErrorInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallOnErrorInterceptor.java index 655dc72ff..a32304ddb 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallOnErrorInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/client/async/TAsyncMethodCallOnErrorInterceptor.java @@ -32,8 +32,8 @@ public class TAsyncMethodCallOnErrorInterceptor extends TAsyncMethodCallInternal } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { - super.after(target, args, result, throwable); + public void after(Object target, Object result, Throwable throwable, Object[] args) { + super.after(target, result, throwable, args); // End async trace block final Trace trace = super.traceContext.currentTraceObject(); diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/server/ProcessFunctionProcessInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/server/ProcessFunctionProcessInterceptor.java index 782e15ea0..914d4ce1c 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/server/ProcessFunctionProcessInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/server/ProcessFunctionProcessInterceptor.java @@ -21,7 +21,7 @@ import static com.navercorp.pinpoint.plugin.thrift.ThriftScope.THRIFT_SERVER_SCO import org.apache.thrift.ProcessFunction; import org.apache.thrift.protocol.TProtocol; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Name; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; @@ -50,7 +50,7 @@ import com.navercorp.pinpoint.plugin.thrift.field.accessor.ServerMarkerFlagField * @see com.navercorp.pinpoint.plugin.thrift.interceptor.tprotocol.server.TProtocolReadMessageEndInterceptor TProtocolReadMessageEndInterceptor */ @Group(value = THRIFT_SERVER_SCOPE, executionPolicy = ExecutionPolicy.INTERNAL) -public class ProcessFunctionProcessInterceptor implements SimpleAroundInterceptor, ThriftConstants { +public class ProcessFunctionProcessInterceptor implements AroundInterceptor, ThriftConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -88,7 +88,7 @@ public class ProcessFunctionProcessInterceptor implements SimpleAroundIntercepto } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/server/TBaseProcessorProcessInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/server/TBaseProcessorProcessInterceptor.java index ea5462c6c..833b3c464 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/server/TBaseProcessorProcessInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/server/TBaseProcessorProcessInterceptor.java @@ -29,7 +29,7 @@ import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.SpanRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Name; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; @@ -78,7 +78,7 @@ import com.navercorp.pinpoint.plugin.thrift.field.accessor.SocketFieldAccessor; * @see com.navercorp.pinpoint.plugin.thrift.interceptor.tprotocol.server.TProtocolReadMessageEndInterceptor TProtocolReadMessageEndInterceptor */ @Group(value = THRIFT_SERVER_SCOPE, executionPolicy = ExecutionPolicy.BOUNDARY) -public class TBaseProcessorProcessInterceptor implements SimpleAroundInterceptor, ThriftConstants { +public class TBaseProcessorProcessInterceptor implements AroundInterceptor, ThriftConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -99,7 +99,7 @@ public class TBaseProcessorProcessInterceptor implements SimpleAroundInterceptor } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { final Trace trace = this.traceContext.currentRawTraceObject(); if (trace == null) { return; diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/server/async/TBaseAsyncProcessorProcessInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/server/async/TBaseAsyncProcessorProcessInterceptor.java index 444e430f2..609ed7ddb 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/server/async/TBaseAsyncProcessorProcessInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/server/async/TBaseAsyncProcessorProcessInterceptor.java @@ -27,7 +27,7 @@ import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.SpanRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Name; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; @@ -78,7 +78,7 @@ import com.navercorp.pinpoint.plugin.thrift.field.accessor.ServerMarkerFlagField * @see com.navercorp.pinpoint.plugin.thrift.interceptor.tprotocol.server.TProtocolReadMessageEndInterceptor TProtocolReadMessageEndInterceptor */ @Group(value = THRIFT_SERVER_SCOPE, executionPolicy = ExecutionPolicy.BOUNDARY) -public class TBaseAsyncProcessorProcessInterceptor implements SimpleAroundInterceptor, ThriftConstants { +public class TBaseAsyncProcessorProcessInterceptor implements AroundInterceptor, ThriftConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -111,7 +111,7 @@ public class TBaseAsyncProcessorProcessInterceptor implements SimpleAroundInterc } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/server/nonblocking/FrameBufferTransportInjectInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/server/nonblocking/FrameBufferTransportInjectInterceptor.java index d0b4e3219..24c12e74d 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/server/nonblocking/FrameBufferTransportInjectInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/server/nonblocking/FrameBufferTransportInjectInterceptor.java @@ -21,7 +21,7 @@ import java.net.Socket; import org.apache.thrift.transport.TNonblockingTransport; import org.apache.thrift.transport.TTransport; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.plugin.thrift.ThriftConstants; @@ -33,7 +33,7 @@ import com.navercorp.pinpoint.plugin.thrift.field.getter.TNonblockingTransportFi * * @author HyunGil Jeong */ -public abstract class FrameBufferTransportInjectInterceptor implements SimpleAroundInterceptor, ThriftConstants { +public abstract class FrameBufferTransportInjectInterceptor implements AroundInterceptor, ThriftConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -44,7 +44,7 @@ public abstract class FrameBufferTransportInjectInterceptor implements SimpleAro } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (validate0(target, args, result)) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/client/TProtocolWriteFieldStopInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/client/TProtocolWriteFieldStopInterceptor.java index bd1cca019..94e21ae64 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/client/TProtocolWriteFieldStopInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/client/TProtocolWriteFieldStopInterceptor.java @@ -21,7 +21,7 @@ import static com.navercorp.pinpoint.plugin.thrift.ThriftScope.THRIFT_CLIENT_SCO import org.apache.thrift.TException; import org.apache.thrift.protocol.TProtocol; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Name; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; @@ -46,7 +46,7 @@ import com.navercorp.pinpoint.plugin.thrift.ThriftHeader; * @see com.navercorp.pinpoint.plugin.thrift.interceptor.client.TServiceClientSendBaseInterceptor TServiceClientSendBaseInterceptor */ @Group(value = THRIFT_CLIENT_SCOPE, executionPolicy = ExecutionPolicy.INTERNAL) -public class TProtocolWriteFieldStopInterceptor implements SimpleAroundInterceptor, ThriftConstants { +public class TProtocolWriteFieldStopInterceptor implements AroundInterceptor, ThriftConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -73,7 +73,7 @@ public class TProtocolWriteFieldStopInterceptor implements SimpleAroundIntercept } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { // Do nothing } diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/server/TProtocolReadFieldBeginInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/server/TProtocolReadFieldBeginInterceptor.java index 3e925437f..d097cc56a 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/server/TProtocolReadFieldBeginInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/server/TProtocolReadFieldBeginInterceptor.java @@ -21,7 +21,7 @@ import static com.navercorp.pinpoint.plugin.thrift.ThriftScope.THRIFT_SERVER_SCO import org.apache.thrift.protocol.TField; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Name; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; @@ -60,7 +60,7 @@ import com.navercorp.pinpoint.plugin.thrift.field.accessor.ServerMarkerFlagField * @see com.navercorp.pinpoint.plugin.thrift.interceptor.tprotocol.server.TProtocolReadMessageEndInterceptor TProtocolReadMessageEndInterceptor */ @Group(value = THRIFT_SERVER_SCOPE, executionPolicy = ExecutionPolicy.INTERNAL) -public class TProtocolReadFieldBeginInterceptor implements SimpleAroundInterceptor, ThriftConstants { +public class TProtocolReadFieldBeginInterceptor implements AroundInterceptor, ThriftConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -77,7 +77,7 @@ public class TProtocolReadFieldBeginInterceptor implements SimpleAroundIntercept } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/server/TProtocolReadMessageBeginInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/server/TProtocolReadMessageBeginInterceptor.java index 19118d15c..8db8f2504 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/server/TProtocolReadMessageBeginInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/server/TProtocolReadMessageBeginInterceptor.java @@ -20,7 +20,7 @@ import static com.navercorp.pinpoint.plugin.thrift.ThriftScope.THRIFT_SERVER_SCO import org.apache.thrift.protocol.TMessage; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Name; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; @@ -48,7 +48,7 @@ import com.navercorp.pinpoint.plugin.thrift.field.accessor.AsyncMarkerFlagFieldA * @see com.navercorp.pinpoint.plugin.thrift.interceptor.tprotocol.server.TProtocolReadMessageEndInterceptor TProtocolReadMessageEndInterceptor */ @Group(value = THRIFT_SERVER_SCOPE, executionPolicy = ExecutionPolicy.INTERNAL) -public class TProtocolReadMessageBeginInterceptor implements SimpleAroundInterceptor, ThriftConstants { +public class TProtocolReadMessageBeginInterceptor implements AroundInterceptor, ThriftConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -65,7 +65,7 @@ public class TProtocolReadMessageBeginInterceptor implements SimpleAroundInterce } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/server/TProtocolReadMessageEndInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/server/TProtocolReadMessageEndInterceptor.java index 4c249e484..612e6b74f 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/server/TProtocolReadMessageEndInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/server/TProtocolReadMessageEndInterceptor.java @@ -29,7 +29,7 @@ import com.navercorp.pinpoint.bootstrap.context.SpanRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.context.TraceId; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Name; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; @@ -71,7 +71,7 @@ import com.navercorp.pinpoint.plugin.thrift.field.accessor.SocketFieldAccessor; * @see com.navercorp.pinpoint.plugin.thrift.interceptor.tprotocol.server.TProtocolReadTTypeInterceptor TProtocolReadTTypeInterceptor */ @Group(value = THRIFT_SERVER_SCOPE, executionPolicy = ExecutionPolicy.INTERNAL) -public class TProtocolReadMessageEndInterceptor implements SimpleAroundInterceptor, ThriftConstants { +public class TProtocolReadMessageEndInterceptor implements AroundInterceptor, ThriftConstants { private final ThriftServerEntryMethodDescriptor thriftServerEntryMethodDescriptor = new ThriftServerEntryMethodDescriptor(); @@ -93,7 +93,7 @@ public class TProtocolReadMessageEndInterceptor implements SimpleAroundIntercept } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/server/TProtocolReadTTypeInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/server/TProtocolReadTTypeInterceptor.java index 134a3984d..92218c987 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/server/TProtocolReadTTypeInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/tprotocol/server/TProtocolReadTTypeInterceptor.java @@ -19,7 +19,7 @@ package com.navercorp.pinpoint.plugin.thrift.interceptor.tprotocol.server; import static com.navercorp.pinpoint.plugin.thrift.ThriftClientCallContext.NONE; import static com.navercorp.pinpoint.plugin.thrift.ThriftScope.THRIFT_SERVER_SCOPE; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Name; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; @@ -58,7 +58,7 @@ import com.navercorp.pinpoint.plugin.thrift.field.accessor.ServerMarkerFlagField * @see com.navercorp.pinpoint.plugin.thrift.interceptor.tprotocol.server.TProtocolReadMessageEndInterceptor TProtocolReadMessageEndInterceptor */ @Group(value = THRIFT_SERVER_SCOPE, executionPolicy = ExecutionPolicy.INTERNAL) -public class TProtocolReadTTypeInterceptor implements SimpleAroundInterceptor, ThriftConstants { +public class TProtocolReadTTypeInterceptor implements AroundInterceptor, ThriftConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -75,7 +75,7 @@ public class TProtocolReadTTypeInterceptor implements SimpleAroundInterceptor, T } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/transport/TNonblockingSocketConstructInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/transport/TNonblockingSocketConstructInterceptor.java index 957028aa0..2f1868c34 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/transport/TNonblockingSocketConstructInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/transport/TNonblockingSocketConstructInterceptor.java @@ -21,7 +21,7 @@ import java.net.SocketAddress; import org.apache.thrift.transport.TNonblockingSocket; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.plugin.thrift.ThriftConstants; @@ -31,7 +31,7 @@ import com.navercorp.pinpoint.plugin.thrift.field.accessor.SocketFieldAccessor; /** * @author HyunGil Jeong */ -public class TNonblockingSocketConstructInterceptor implements SimpleAroundInterceptor, ThriftConstants { +public class TNonblockingSocketConstructInterceptor implements AroundInterceptor, ThriftConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -42,7 +42,7 @@ public class TNonblockingSocketConstructInterceptor implements SimpleAroundInter } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/transport/TSocketConstructInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/transport/TSocketConstructInterceptor.java index e8e902b22..38e93edf2 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/transport/TSocketConstructInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/transport/TSocketConstructInterceptor.java @@ -20,7 +20,7 @@ import java.net.Socket; import org.apache.thrift.transport.TSocket; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.plugin.thrift.ThriftConstants; @@ -29,7 +29,7 @@ import com.navercorp.pinpoint.plugin.thrift.field.accessor.SocketFieldAccessor; /** * @author HyunGil Jeong */ -public class TSocketConstructInterceptor implements SimpleAroundInterceptor, ThriftConstants { +public class TSocketConstructInterceptor implements AroundInterceptor, ThriftConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -40,7 +40,7 @@ public class TSocketConstructInterceptor implements SimpleAroundInterceptor, Thr } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/transport/wrapper/WrappedTTransportConstructInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/transport/wrapper/WrappedTTransportConstructInterceptor.java index c7d454635..b65bae02c 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/transport/wrapper/WrappedTTransportConstructInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/transport/wrapper/WrappedTTransportConstructInterceptor.java @@ -20,7 +20,7 @@ import java.net.Socket; import org.apache.thrift.transport.TTransport; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.plugin.thrift.ThriftConstants; @@ -29,7 +29,7 @@ import com.navercorp.pinpoint.plugin.thrift.field.accessor.SocketFieldAccessor; /** * @author HyunGil Jeong */ -public abstract class WrappedTTransportConstructInterceptor implements SimpleAroundInterceptor, ThriftConstants { +public abstract class WrappedTTransportConstructInterceptor implements AroundInterceptor, ThriftConstants { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -40,7 +40,7 @@ public abstract class WrappedTTransportConstructInterceptor implements SimpleAro } @Override - public final void after(Object target, Object[] args, Object result, Throwable throwable) { + public final void after(Object target, Object result, Throwable throwable, Object[] args) { if (validateTransport(target)) { TTransport wrappedTransport = getWrappedTransport(args); if (validateTransport(wrappedTransport)) { 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 index dbe676171..08a16aebd 100644 --- 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 @@ -20,7 +20,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; import com.navercorp.pinpoint.bootstrap.instrument.MethodFilters; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPlugin; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPluginSetupContext; @@ -60,7 +60,7 @@ public class TomcatPlugin implements ProfilerPlugin, TomcatConstants { context.addClassFileTransformer("org.apache.catalina.connector.Request", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); target.addField(METADATA_TRACE); target.addField(METADATA_ASYNC); @@ -86,7 +86,7 @@ public class TomcatPlugin implements ProfilerPlugin, TomcatConstants { context.addClassFileTransformer("org.apache.catalina.connector.RequestFacade", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); if (target != null) { target.weave("com.navercorp.pinpoint.plugin.tomcat.aspect.RequestFacadeAspect"); @@ -101,7 +101,7 @@ public class TomcatPlugin implements ProfilerPlugin, TomcatConstants { context.addClassFileTransformer("org.apache.catalina.core.StandardHostValve", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); InstrumentMethod method = target.getDeclaredMethod("invoke", "org.apache.catalina.connector.Request", "org.apache.catalina.connector.Response"); @@ -118,7 +118,7 @@ public class TomcatPlugin implements ProfilerPlugin, TomcatConstants { context.addClassFileTransformer("org.apache.catalina.core.StandardService", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); // Tomcat 6 @@ -142,7 +142,7 @@ public class TomcatPlugin implements ProfilerPlugin, TomcatConstants { context.addClassFileTransformer("org.apache.catalina.connector.Connector", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); // Tomcat 6 @@ -166,7 +166,7 @@ public class TomcatPlugin implements ProfilerPlugin, TomcatConstants { context.addClassFileTransformer("org.apache.catalina.loader.WebappLoader", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); // Tomcat 6 - org.apache.catalina.loader.WebappLoader.start() @@ -190,7 +190,7 @@ public class TomcatPlugin implements ProfilerPlugin, TomcatConstants { context.addClassFileTransformer("org.apache.catalina.core.AsyncContextImpl", new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); target.addField(METADATA_ASYNC_TRACE_ID); diff --git a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/ConnectorInitializeInterceptor.java b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/ConnectorInitializeInterceptor.java index 523022273..02ad0dbe9 100644 --- a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/ConnectorInitializeInterceptor.java +++ b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/ConnectorInitializeInterceptor.java @@ -19,14 +19,14 @@ package com.navercorp.pinpoint.plugin.tomcat.interceptor; import org.apache.catalina.connector.Connector; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; /** * @author emeroad */ -public class ConnectorInitializeInterceptor implements SimpleAroundInterceptor { +public class ConnectorInitializeInterceptor implements AroundInterceptor { private PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -43,7 +43,7 @@ public class ConnectorInitializeInterceptor implements SimpleAroundInterceptor { } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/RequestRecycleInterceptor.java b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/RequestRecycleInterceptor.java index 53d487007..7b0d0e4d2 100644 --- a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/RequestRecycleInterceptor.java +++ b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/RequestRecycleInterceptor.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.plugin.tomcat.interceptor; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.plugin.tomcat.AsyncAccessor; @@ -28,7 +28,7 @@ import com.navercorp.pinpoint.plugin.tomcat.TraceAccessor; * @author jaehong.kim * */ -public class RequestRecycleInterceptor implements SimpleAroundInterceptor, TomcatConstants { +public class RequestRecycleInterceptor implements AroundInterceptor, TomcatConstants { private PLogger logger = PLoggerFactory.getLogger(this.getClass()); @@ -62,6 +62,6 @@ public class RequestRecycleInterceptor implements SimpleAroundInterceptor, Tomca } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { } } \ No newline at end of file diff --git a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/RequestStartAsyncInterceptor.java b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/RequestStartAsyncInterceptor.java index 56da97bc1..6ff592888 100644 --- a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/RequestStartAsyncInterceptor.java +++ b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/RequestStartAsyncInterceptor.java @@ -20,7 +20,7 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.plugin.tomcat.AsyncAccessor; @@ -31,7 +31,7 @@ import com.navercorp.pinpoint.plugin.tomcat.TomcatConstants; * @author jaehong.kim * */ -public class RequestStartAsyncInterceptor implements SimpleAroundInterceptor, TomcatConstants { +public class RequestStartAsyncInterceptor implements AroundInterceptor, TomcatConstants { private PLogger logger = PLoggerFactory.getLogger(this.getClass()); private boolean isDebug = logger.isDebugEnabled(); @@ -58,7 +58,7 @@ public class RequestStartAsyncInterceptor implements SimpleAroundInterceptor, To } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, "", descriptor.getMethodName(), "", args); } diff --git a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/StandardHostValveInvokeInterceptor.java b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/StandardHostValveInvokeInterceptor.java index 3deb64154..e802d52d8 100644 --- a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/StandardHostValveInvokeInterceptor.java +++ b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/StandardHostValveInvokeInterceptor.java @@ -31,7 +31,7 @@ import com.navercorp.pinpoint.bootstrap.context.SpanRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.context.TraceId; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.bootstrap.sampler.SamplingFlagUtils; @@ -50,7 +50,7 @@ import com.navercorp.pinpoint.plugin.tomcat.TraceAccessor; * @author emeroad * @author jaehong.kim */ -public class StandardHostValveInvokeInterceptor implements SimpleAroundInterceptor, TomcatConstants { +public class StandardHostValveInvokeInterceptor implements AroundInterceptor, TomcatConstants { public static final ServletSyncMethodDescriptor SERVLET_SYNCHRONOUS_API_TAG = new ServletSyncMethodDescriptor(); public static final ServletAsyncMethodDescriptor SERVLET_ASYNCHRONOUS_API_TAG = new ServletAsyncMethodDescriptor(); @@ -237,7 +237,7 @@ public class StandardHostValveInvokeInterceptor implements SimpleAroundIntercept } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } @@ -344,4 +344,4 @@ public class StandardHostValveInvokeInterceptor implements SimpleAroundIntercept setTraceMetadata(request, null); } } -} \ No newline at end of file +} diff --git a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/StandardServiceStartInterceptor.java b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/StandardServiceStartInterceptor.java index 0be81c2be..9fca25086 100644 --- a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/StandardServiceStartInterceptor.java +++ b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/StandardServiceStartInterceptor.java @@ -19,7 +19,7 @@ package com.navercorp.pinpoint.plugin.tomcat.interceptor; import org.apache.catalina.util.ServerInfo; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -27,7 +27,7 @@ import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; * @author emeroad * @author hyungil.jeong */ -public class StandardServiceStartInterceptor implements SimpleAroundInterceptor { +public class StandardServiceStartInterceptor implements AroundInterceptor { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -44,7 +44,7 @@ public class StandardServiceStartInterceptor implements SimpleAroundInterceptor } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args, result, throwable); } diff --git a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/WebappLoaderStartInterceptor.java b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/WebappLoaderStartInterceptor.java index 7c76f13de..030f2fdd0 100644 --- a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/WebappLoaderStartInterceptor.java +++ b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/interceptor/WebappLoaderStartInterceptor.java @@ -31,14 +31,14 @@ import org.apache.catalina.Host; import org.apache.catalina.loader.WebappLoader; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; /** * @author hyungil.jeong */ -public class WebappLoaderStartInterceptor implements SimpleAroundInterceptor { +public class WebappLoaderStartInterceptor implements AroundInterceptor { private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); @@ -54,7 +54,7 @@ public class WebappLoaderStartInterceptor implements SimpleAroundInterceptor { } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { // target should be an instance of WebappLoader. if (target instanceof WebappLoader) { WebappLoader webappLoader = (WebappLoader)target; diff --git a/plugins/tomcat/src/test/java/com/navercorp/pinpoint/plugin/tomcat/InvokeMethodInterceptorTest.java b/plugins/tomcat/src/test/java/com/navercorp/pinpoint/plugin/tomcat/InvokeMethodInterceptorTest.java index d77a28ece..592607ad6 100644 --- a/plugins/tomcat/src/test/java/com/navercorp/pinpoint/plugin/tomcat/InvokeMethodInterceptorTest.java +++ b/plugins/tomcat/src/test/java/com/navercorp/pinpoint/plugin/tomcat/InvokeMethodInterceptorTest.java @@ -81,10 +81,10 @@ public class InvokeMethodInterceptorTest { StandardHostValveInvokeInterceptor interceptor = new StandardHostValveInvokeInterceptor(traceContext, descriptor, new SkipFilter()); interceptor.before("target", new Object[]{request, response}); - interceptor.after("target", new Object[]{request, response}, new Object(), null); + interceptor.after("target", new Object(), null, new Object[]{request, response}); interceptor.before("target", new Object[]{request, response}); - interceptor.after("target", new Object[]{request, response}, new Object(), null); + interceptor.after("target", new Object(), null, new Object[]{request, response}); } @Test @@ -103,10 +103,10 @@ public class InvokeMethodInterceptorTest { TraceContext traceContext = new MockTraceContext(); StandardHostValveInvokeInterceptor interceptor = new StandardHostValveInvokeInterceptor(traceContext, descriptor, new SkipFilter()); interceptor.before("target", new Object[]{request, response}); - interceptor.after("target", new Object[]{request, response}, new Object(), null); + interceptor.after("target", new Object(), null, new Object[]{request, response}); interceptor.before("target", new Object[]{request, response}); - interceptor.after("target", new Object[]{request, response}, new Object(), null); + interceptor.after("target", new Object(), null, new Object[]{request, response}); } @Test @@ -126,9 +126,9 @@ public class InvokeMethodInterceptorTest { StandardHostValveInvokeInterceptor interceptor = new StandardHostValveInvokeInterceptor(traceContext, descriptor, new SkipFilter()); interceptor.before("target", new Object[]{request, response}); - interceptor.after("target", new Object[]{request, response}, new Object(), null); + interceptor.after("target", new Object(), null, new Object[]{request, response}); interceptor.before("target", new Object[]{request, response}); - interceptor.after("target", new Object[]{request, response}, new Object(), null); + interceptor.after("target", new Object(), null, new Object[]{request, response}); } } diff --git a/plugins/user/src/main/java/com/navercorp/pinpoint/plugin/user/UserPlugin.java b/plugins/user/src/main/java/com/navercorp/pinpoint/plugin/user/UserPlugin.java index c03b29100..04295e362 100644 --- a/plugins/user/src/main/java/com/navercorp/pinpoint/plugin/user/UserPlugin.java +++ b/plugins/user/src/main/java/com/navercorp/pinpoint/plugin/user/UserPlugin.java @@ -21,7 +21,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; import com.navercorp.pinpoint.bootstrap.instrument.MethodFilters; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -59,7 +59,7 @@ public class UserPlugin implements ProfilerPlugin, UserConstants { context.addClassFileTransformer(className, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { InstrumentClass target = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); for (InstrumentMethod method : target.getDeclaredMethods(MethodFilters.name(methodName))) { diff --git a/plugins/user/src/main/java/com/navercorp/pinpoint/plugin/user/interceptor/UserIncludeMethodInterceptor.java b/plugins/user/src/main/java/com/navercorp/pinpoint/plugin/user/interceptor/UserIncludeMethodInterceptor.java index f4ec6f900..c9154f65c 100644 --- a/plugins/user/src/main/java/com/navercorp/pinpoint/plugin/user/interceptor/UserIncludeMethodInterceptor.java +++ b/plugins/user/src/main/java/com/navercorp/pinpoint/plugin/user/interceptor/UserIncludeMethodInterceptor.java @@ -22,7 +22,7 @@ import com.navercorp.pinpoint.bootstrap.context.SpanRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.context.TraceType; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.common.trace.ServiceType; @@ -31,7 +31,7 @@ import com.navercorp.pinpoint.plugin.user.UserIncludeMethodDescriptor; /** * @author jaehong.kim */ -public class UserIncludeMethodInterceptor implements SimpleAroundInterceptor { +public class UserIncludeMethodInterceptor implements AroundInterceptor { private static final UserIncludeMethodDescriptor USER_INCLUDE_METHOD_DESCRIPTOR = new UserIncludeMethodDescriptor(); private final PLogger logger = PLoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); @@ -78,7 +78,7 @@ public class UserIncludeMethodInterceptor implements SimpleAroundInterceptor { } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { if (isDebug) { logger.afterInterceptor(target, args); } diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/JavassistClass.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/JavassistClass.java index 574b95c19..03ac46d57 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/JavassistClass.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/JavassistClass.java @@ -41,7 +41,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; import com.navercorp.pinpoint.bootstrap.instrument.MethodFilter; import com.navercorp.pinpoint.bootstrap.instrument.MethodFilters; import com.navercorp.pinpoint.bootstrap.instrument.NotFoundInstrumentException; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.TargetConstructor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.TargetFilter; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.TargetMethod; @@ -69,7 +69,7 @@ public class JavassistClass implements InstrumentClass { private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); - private final PinpointInstrument pluginContext; + private final Instrumentor pluginContext; // private final JavassistClassPool instrumentClassPool; private final InterceptorRegistryBinder interceptorRegistryBinder; private final ClassLoader classLoader; @@ -79,7 +79,7 @@ public class JavassistClass implements InstrumentClass { private static final String SETTER_PREFIX = "_$PINPOINT$_set"; private static final String GETTER_PREFIX = "_$PINPOINT$_get"; - public JavassistClass(PinpointInstrument pluginContext, InterceptorRegistryBinder interceptorRegistryBinder, ClassLoader classLoader, CtClass ctClass) { + public JavassistClass(Instrumentor pluginContext, InterceptorRegistryBinder interceptorRegistryBinder, ClassLoader classLoader, CtClass ctClass) { this.pluginContext = pluginContext; this.ctClass = ctClass; this.interceptorRegistryBinder = interceptorRegistryBinder; diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/JavassistClassPool.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/JavassistClassPool.java index 919d3f203..b64a65463 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/JavassistClassPool.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/JavassistClassPool.java @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClassPool; import com.navercorp.pinpoint.bootstrap.instrument.NotFoundInstrumentException; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.exception.PinpointException; import com.navercorp.pinpoint.profiler.instrument.classpool.IsolateMultipleClassPool; import com.navercorp.pinpoint.profiler.instrument.classpool.MultipleClassPool; @@ -104,7 +104,7 @@ public class JavassistClassPool implements InstrumentClassPool { } @Override - public InstrumentClass getClass(PinpointInstrument pluginContext, ClassLoader classLoader, String jvmInternalClassName, byte[] classFileBuffer) throws NotFoundInstrumentException { + public InstrumentClass getClass(Instrumentor pluginContext, ClassLoader classLoader, String jvmInternalClassName, byte[] classFileBuffer) throws NotFoundInstrumentException { CtClass cc = getClass(classLoader, jvmInternalClassName); return new JavassistClass(pluginContext, interceptorRegistryBinder, classLoader, cc); } diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/JavassistMethod.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/JavassistMethod.java index 649c50006..adf160b3d 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/JavassistMethod.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/JavassistMethod.java @@ -42,7 +42,7 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.interceptor.Interceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; @@ -60,14 +60,14 @@ public class JavassistMethod implements InstrumentMethod { private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); - private final PinpointInstrument pluginContext; + private final Instrumentor pluginContext; private final InterceptorRegistryBinder interceptorRegistryBinder; private final CtBehavior behavior; private final InstrumentClass declaringClass; private final MethodDescriptor descriptor; - public JavassistMethod(PinpointInstrument pluginContext, InterceptorRegistryBinder interceptorRegistryBinder, InstrumentClass declaringClass, CtBehavior behavior) { + public JavassistMethod(Instrumentor pluginContext, InterceptorRegistryBinder interceptorRegistryBinder, InstrumentClass declaringClass, CtBehavior behavior) { this.pluginContext = pluginContext; this.interceptorRegistryBinder = interceptorRegistryBinder; this.behavior = behavior; diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InvokeAfterCodeGenerator.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InvokeAfterCodeGenerator.java index 7fd09ac2f..0cf6f41b8 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InvokeAfterCodeGenerator.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InvokeAfterCodeGenerator.java @@ -101,7 +101,7 @@ public class InvokeAfterCodeGenerator extends InvokeCodeGenerator { private void appendArguments(CodeBuilder builder) { switch (type) { - case SIMPLE: + case ARRAY_ARGS: appendSimpleAfterArguments(builder); break; case STATIC: @@ -114,11 +114,11 @@ public class InvokeAfterCodeGenerator extends InvokeCodeGenerator { } private void appendSimpleAfterArguments(CodeBuilder builder) { - builder.format("%1$s, %2$s, %3$s, %4$s", getTarget(), getArguments(), getReturnValue(), getException()); + builder.format("%1$s, %2$s, %3$s, %4$s", getTarget(), getReturnValue(), getException(), getArguments()); } private void appendStaticAfterArguments(CodeBuilder builder) { - builder.format("%1$s, \"%2$s\", \"%3$s\", \"%4$s\", %5$s, %6$s, %7$s", getTarget(), targetClass.getName(), targetMethod.getName(), getParameterTypes(), getArguments(), getReturnValue(), getException()); + builder.format("%1$s, \"%2$s\", \"%3$s\", \"%4$s\", %5$s, %6$s, %7$s", getTarget(), targetClass.getName(), targetMethod.getName(), getParameterTypes(), getReturnValue(), getException(), getArguments()); } private void appendCustomAfterArguments(CodeBuilder builder) { diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InvokeBeforeCodeGenerator.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InvokeBeforeCodeGenerator.java index 4aa5d504f..e5a7a8ced 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InvokeBeforeCodeGenerator.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InvokeBeforeCodeGenerator.java @@ -66,7 +66,7 @@ public class InvokeBeforeCodeGenerator extends InvokeCodeGenerator { private void appendArguments(CodeBuilder builder) { switch (type) { - case SIMPLE: + case ARRAY_ARGS: appendSimpleBeforeArguments(builder); break; case STATIC: diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InvokeCodeGenerator.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InvokeCodeGenerator.java index 9774e0b5d..2995f0d6e 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InvokeCodeGenerator.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InvokeCodeGenerator.java @@ -17,8 +17,9 @@ package com.navercorp.pinpoint.profiler.instrument.interceptor; import java.lang.reflect.Modifier; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; +import com.navercorp.pinpoint.bootstrap.interceptor.AfterInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.BeforeInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.InterceptorInvokerHelper; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.StaticAroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.registry.InterceptorRegistry; import com.navercorp.pinpoint.profiler.util.JavaAssistUtils; @@ -38,8 +39,8 @@ public class InvokeCodeGenerator { this.targetMethod = targetMethod; this.interceptorId = interceptorId; - if (SimpleAroundInterceptor.class.isAssignableFrom(interceptorClass)) { - type = Type.SIMPLE; + if (BeforeInterceptor.class.isAssignableFrom(interceptorClass) || AfterInterceptor.class.isAssignableFrom(interceptorClass)) { + type = Type.ARRAY_ARGS; } else if (StaticAroundInterceptor.class.isAssignableFrom(interceptorClass)) { type = Type.STATIC; } else { @@ -48,20 +49,11 @@ public class InvokeCodeGenerator { } protected enum Type { - SIMPLE, STATIC, CUSTOM + ARRAY_ARGS, STATIC, CUSTOM } protected String getInterceptorType() { - switch (type) { - case SIMPLE: - return SimpleAroundInterceptor.class.getName(); - case STATIC: - return StaticAroundInterceptor.class.getName(); - case CUSTOM: - return interceptorClass.getName(); - } - - return null; + return interceptorClass.getName(); } protected String getParameterTypes() { diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/interceptor/factory/AnnotatedInterceptorFactory.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/interceptor/factory/AnnotatedInterceptorFactory.java index eb7a2d60a..517ca2da3 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/interceptor/factory/AnnotatedInterceptorFactory.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/interceptor/factory/AnnotatedInterceptorFactory.java @@ -18,19 +18,22 @@ package com.navercorp.pinpoint.profiler.interceptor.factory; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; +import com.navercorp.pinpoint.bootstrap.interceptor.AfterInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.AfterInterceptor0; import com.navercorp.pinpoint.bootstrap.interceptor.AfterInterceptor1; import com.navercorp.pinpoint.bootstrap.interceptor.AfterInterceptor2; import com.navercorp.pinpoint.bootstrap.interceptor.AfterInterceptor3; import com.navercorp.pinpoint.bootstrap.interceptor.AfterInterceptor4; import com.navercorp.pinpoint.bootstrap.interceptor.AfterInterceptor5; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor0; import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor1; import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor2; import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor3; import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor4; import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor5; +import com.navercorp.pinpoint.bootstrap.interceptor.BeforeInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.BeforeInterceptor0; import com.navercorp.pinpoint.bootstrap.interceptor.BeforeInterceptor1; import com.navercorp.pinpoint.bootstrap.interceptor.BeforeInterceptor2; @@ -38,17 +41,16 @@ import com.navercorp.pinpoint.bootstrap.interceptor.BeforeInterceptor3; import com.navercorp.pinpoint.bootstrap.interceptor.BeforeInterceptor4; import com.navercorp.pinpoint.bootstrap.interceptor.BeforeInterceptor5; import com.navercorp.pinpoint.bootstrap.interceptor.Interceptor; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.StaticAroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; import com.navercorp.pinpoint.bootstrap.interceptor.group.ExecutionPolicy; +import com.navercorp.pinpoint.bootstrap.interceptor.group.GroupedInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.group.GroupedInterceptor0; import com.navercorp.pinpoint.bootstrap.interceptor.group.GroupedInterceptor1; import com.navercorp.pinpoint.bootstrap.interceptor.group.GroupedInterceptor2; import com.navercorp.pinpoint.bootstrap.interceptor.group.GroupedInterceptor3; import com.navercorp.pinpoint.bootstrap.interceptor.group.GroupedInterceptor4; import com.navercorp.pinpoint.bootstrap.interceptor.group.GroupedInterceptor5; -import com.navercorp.pinpoint.bootstrap.interceptor.group.GroupedSimpleAroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.group.GroupedStaticAroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; import com.navercorp.pinpoint.bootstrap.plugin.ObjectRecipe; @@ -56,9 +58,9 @@ import com.navercorp.pinpoint.profiler.objectfactory.AutoBindingObjectFactory; import com.navercorp.pinpoint.profiler.objectfactory.InterceptorArgumentProvider; public class AnnotatedInterceptorFactory implements InterceptorFactory { - private final PinpointInstrument pluginContext; + private final Instrumentor pluginContext; - public AnnotatedInterceptorFactory(PinpointInstrument pluginContext) { + public AnnotatedInterceptorFactory(Instrumentor pluginContext) { this.pluginContext = pluginContext; } @@ -90,8 +92,8 @@ public class AnnotatedInterceptorFactory implements InterceptorFactory { } private Interceptor wrapByGroup(Interceptor interceptor, InterceptorGroup group, ExecutionPolicy policy) { - if (interceptor instanceof SimpleAroundInterceptor) { - return new GroupedSimpleAroundInterceptor((SimpleAroundInterceptor)interceptor, group, policy); + if (interceptor instanceof AroundInterceptor) { + return new GroupedInterceptor((AroundInterceptor)interceptor, (AroundInterceptor)interceptor, group, policy); } else if (interceptor instanceof StaticAroundInterceptor) { return new GroupedStaticAroundInterceptor((StaticAroundInterceptor)interceptor, group, policy); } else if (interceptor instanceof AroundInterceptor5) { @@ -130,6 +132,10 @@ public class AnnotatedInterceptorFactory implements InterceptorFactory { return new GroupedInterceptor0((BeforeInterceptor0)interceptor, null, group, policy); } else if (interceptor instanceof AfterInterceptor0) { return new GroupedInterceptor0(null, (AfterInterceptor0)interceptor, group, policy); + } else if (interceptor instanceof BeforeInterceptor) { + return new GroupedInterceptor((BeforeInterceptor)interceptor, null, group, policy); + } else if (interceptor instanceof AfterInterceptor) { + return new GroupedInterceptor(null, (AfterInterceptor)interceptor, group, policy); } throw new IllegalArgumentException("Unexpected interceptor type: " + interceptor.getClass()); diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/objectfactory/AutoBindingObjectFactory.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/objectfactory/AutoBindingObjectFactory.java index d2ebe0995..b61f16164 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/objectfactory/AutoBindingObjectFactory.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/objectfactory/AutoBindingObjectFactory.java @@ -23,7 +23,7 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.plugin.ObjectRecipe; import com.navercorp.pinpoint.bootstrap.plugin.ObjectRecipe.ByConstructor; import com.navercorp.pinpoint.bootstrap.plugin.ObjectRecipe.ByStaticFactoryMethod; @@ -37,11 +37,11 @@ public class AutoBindingObjectFactory { private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final boolean isDebug = logger.isDebugEnabled(); - private final PinpointInstrument pluginContext; + private final Instrumentor pluginContext; private final ClassLoader classLoader; private final List commonProviders; - public AutoBindingObjectFactory(PinpointInstrument pluginContext, ClassLoader classLoader, ArgumentProvider... argumentProviders) { + public AutoBindingObjectFactory(Instrumentor pluginContext, ClassLoader classLoader, ArgumentProvider... argumentProviders) { this.pluginContext = pluginContext; this.classLoader = classLoader; this.commonProviders = new ArrayList(Arrays.asList(argumentProviders)); diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/objectfactory/ProfilerPluginArgumentProvider.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/objectfactory/ProfilerPluginArgumentProvider.java index a89783e36..87b814499 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/objectfactory/ProfilerPluginArgumentProvider.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/objectfactory/ProfilerPluginArgumentProvider.java @@ -18,7 +18,7 @@ import java.lang.annotation.Annotation; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Name; import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroup; import com.navercorp.pinpoint.exception.PinpointException; @@ -29,9 +29,9 @@ import com.navercorp.pinpoint.profiler.util.TypeUtils; * */ public class ProfilerPluginArgumentProvider implements ArgumentProvider { - private final PinpointInstrument pluginContext; + private final Instrumentor pluginContext; - public ProfilerPluginArgumentProvider(PinpointInstrument pluginContext) { + public ProfilerPluginArgumentProvider(Instrumentor pluginContext) { this.pluginContext = pluginContext; } @@ -41,7 +41,7 @@ public class ProfilerPluginArgumentProvider implements ArgumentProvider { return Option.withValue(pluginContext.getTraceContext().currentTraceObject()); } else if (type == TraceContext.class) { return Option.withValue(pluginContext.getTraceContext()); - } else if (type == PinpointInstrument.class) { + } else if (type == Instrumentor.class) { return Option.withValue(pluginContext); } else if (type == InterceptorGroup.class) { Name annotation = TypeUtils.findAnnotation(annotations, Name.class); diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/DefaultProfilerPluginContext.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/DefaultProfilerPluginContext.java index 71a6e3e53..638794035 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/DefaultProfilerPluginContext.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/DefaultProfilerPluginContext.java @@ -27,7 +27,7 @@ import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; import com.navercorp.pinpoint.bootstrap.instrument.NotFoundInstrumentException; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.matcher.Matcher; import com.navercorp.pinpoint.bootstrap.instrument.matcher.Matchers; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; @@ -44,7 +44,7 @@ import com.navercorp.pinpoint.profiler.plugin.xml.transformer.MatchableClassFile import com.navercorp.pinpoint.profiler.util.JavaAssistUtils; import com.navercorp.pinpoint.profiler.util.NameValueList; -public class DefaultProfilerPluginContext implements ProfilerPluginSetupContext, PinpointInstrument { +public class DefaultProfilerPluginContext implements ProfilerPluginSetupContext, Instrumentor { private final DefaultAgent agent; private final ClassInjector classInjector; diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/ClassCondition.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/ClassCondition.java index 8e7f51158..6d4ab37a3 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/ClassCondition.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/ClassCondition.java @@ -17,8 +17,8 @@ package com.navercorp.pinpoint.profiler.plugin.xml.transformer; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; public interface ClassCondition { - boolean check(PinpointInstrument context, ClassLoader classLoader, InstrumentClass target); + boolean check(Instrumentor context, ClassLoader classLoader, InstrumentClass target); } diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/ClassConditions.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/ClassConditions.java index b2c3cbb72..332c458e0 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/ClassConditions.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/ClassConditions.java @@ -15,7 +15,7 @@ package com.navercorp.pinpoint.profiler.plugin.xml.transformer; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; /** * @author Jongho Moon @@ -65,7 +65,7 @@ public class ClassConditions { } @Override - public boolean check(PinpointInstrument context, ClassLoader classLoader, InstrumentClass target) { + public boolean check(Instrumentor context, ClassLoader classLoader, InstrumentClass target) { return target.hasField(name, type); } @@ -85,7 +85,7 @@ public class ClassConditions { } @Override - public boolean check(PinpointInstrument context, ClassLoader classLoader, InstrumentClass target) { + public boolean check(Instrumentor context, ClassLoader classLoader, InstrumentClass target) { return target.hasMethod(name, paramTypes); } @@ -116,7 +116,7 @@ public class ClassConditions { } @Override - public boolean check(PinpointInstrument context, ClassLoader classLoader, InstrumentClass target) { + public boolean check(Instrumentor context, ClassLoader classLoader, InstrumentClass target) { return target.hasDeclaredMethod(name, paramTypes); } @@ -144,7 +144,7 @@ public class ClassConditions { } @Override - public boolean check(PinpointInstrument context, ClassLoader classLoader, InstrumentClass target) { + public boolean check(Instrumentor context, ClassLoader classLoader, InstrumentClass target) { return !super.check(context, classLoader, target); } } @@ -157,7 +157,7 @@ public class ClassConditions { } @Override - public boolean check(PinpointInstrument context, ClassLoader classLoader, InstrumentClass target) { + public boolean check(Instrumentor context, ClassLoader classLoader, InstrumentClass target) { return target.hasConstructor(paramTypes); } @@ -184,7 +184,7 @@ public class ClassConditions { } @Override - public boolean check(PinpointInstrument context, ClassLoader classLoader, InstrumentClass target) { + public boolean check(Instrumentor context, ClassLoader classLoader, InstrumentClass target) { return context.exist(classLoader, name); } diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/ConditionalClassRecipe.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/ConditionalClassRecipe.java index e1c209262..3235827ae 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/ConditionalClassRecipe.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/ConditionalClassRecipe.java @@ -17,14 +17,14 @@ package com.navercorp.pinpoint.profiler.plugin.xml.transformer; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; public class ConditionalClassRecipe implements ClassRecipe { - private final PinpointInstrument context; + private final Instrumentor context; private final ClassCondition condition; private final ClassRecipe delegate; - public ConditionalClassRecipe(PinpointInstrument context, ClassCondition condition, ClassRecipe delegate) { + public ConditionalClassRecipe(Instrumentor context, ClassCondition condition, ClassRecipe delegate) { this.context = context; this.condition = condition; this.delegate = delegate; diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/ConditionalMethodTransformer.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/ConditionalMethodTransformer.java index 177e018df..fada57e9a 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/ConditionalMethodTransformer.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/ConditionalMethodTransformer.java @@ -17,14 +17,14 @@ package com.navercorp.pinpoint.profiler.plugin.xml.transformer; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; public class ConditionalMethodTransformer implements MethodTransformer { - private final PinpointInstrument context; + private final Instrumentor context; private final ClassCondition condition; private final MethodTransformer delegate; - public ConditionalMethodTransformer(PinpointInstrument context, ClassCondition condition, MethodTransformer delegate) { + public ConditionalMethodTransformer(Instrumentor context, ClassCondition condition, MethodTransformer delegate) { this.context = context; this.condition = condition; this.delegate = delegate; diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/DedicatedClassFileTransformer.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/DedicatedClassFileTransformer.java index 2faee3e5b..061e2c45c 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/DedicatedClassFileTransformer.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/xml/transformer/DedicatedClassFileTransformer.java @@ -20,20 +20,20 @@ import java.lang.instrument.IllegalClassFormatException; import java.security.ProtectionDomain; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.matcher.Matcher; import com.navercorp.pinpoint.bootstrap.instrument.matcher.Matchers; import com.navercorp.pinpoint.exception.PinpointException; import com.navercorp.pinpoint.profiler.util.JavaAssistUtils; public class DedicatedClassFileTransformer implements MatchableClassFileTransformer { - private final PinpointInstrument context; + private final Instrumentor context; private final String targetClassName; private final ClassRecipe recipe; - public DedicatedClassFileTransformer(PinpointInstrument context, String targetClassName, ClassRecipe recipe) { + public DedicatedClassFileTransformer(Instrumentor context, String targetClassName, ClassRecipe recipe) { this.context = context; this.targetClassName = targetClassName; this.recipe = recipe; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/InterceptorTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/InterceptorTest.java index de379eae3..e48e71336 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/InterceptorTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/InterceptorTest.java @@ -34,7 +34,7 @@ import org.junit.Before; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.registry.DefaultInterceptorRegistryAdaptor; import com.navercorp.pinpoint.bootstrap.interceptor.registry.InterceptorRegistry; import com.navercorp.pinpoint.test.util.LoaderUtils; @@ -81,7 +81,7 @@ public class InterceptorTest { // @Deprecated // @Test public void interceptor() throws NotFoundException, CannotCompileException, IllegalAccessException, InstantiationException, IOException, ClassNotFoundException, NoSuchMethodException { - SimpleAroundInterceptor aroundInterceptor = new SimpleAroundInterceptor() { + AroundInterceptor aroundInterceptor = new AroundInterceptor() { @Override public void before(Object target, Object[] args) { @@ -89,7 +89,7 @@ public class InterceptorTest { } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { logger.info("AFTER target: " + target + " args:" + Arrays.toString(args) + " result:" + result + " throwable:" + throwable); } }; @@ -105,7 +105,7 @@ public class InterceptorTest { logger.debug("longName:{}", hello.getLongName()); logger.debug("name:{}", hello.getName()); - String interceptorClassName = SimpleAroundInterceptor.class.getName(); + String interceptorClassName = AroundInterceptor.class.getName(); CtClass interceptor = classPool.get(interceptorClassName); hello.addLocalVariable("interceptor", interceptor); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/TestAfterInterceptor.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/TestAfterInterceptor.java index 73994f659..aad0af892 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/TestAfterInterceptor.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/TestAfterInterceptor.java @@ -43,7 +43,7 @@ public class TestAfterInterceptor implements StaticAroundInterceptor { } @Override - public void after(Object target, String className, String methodName, String parameterDescription, Object[] args, Object result, Throwable throwable) { + public void after(Object target, String className, String methodName, String parameterDescription, Object result, Throwable throwable, Object[] args) { logger.info("AFTER target:" + target + " " + className + "." + methodName + parameterDescription + " args:" + Arrays.toString(args)); this.target = target; this.className = className; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/TestAroundInterceptor.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/TestAroundInterceptor.java index 0ef9706ed..308e492d7 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/TestAroundInterceptor.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/TestAroundInterceptor.java @@ -32,8 +32,8 @@ public class TestAroundInterceptor implements StaticAroundInterceptor { } @Override - public void after(Object target, String className, String methodName, String parameterDescription, Object[] args, Object result, Throwable throwable) { - after.after(target, className, methodName, parameterDescription, args, result, throwable); + public void after(Object target, String className, String methodName, String parameterDescription, Object result, Throwable throwable, Object[] args) { + after.after(target, className, methodName, parameterDescription, result, throwable, args); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/TestBeforeInterceptor.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/TestBeforeInterceptor.java index 23195f832..1a17311f1 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/TestBeforeInterceptor.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/TestBeforeInterceptor.java @@ -53,7 +53,7 @@ public class TestBeforeInterceptor implements StaticAroundInterceptor { } @Override - public void after(Object target, String className, String methodName, String parameterDescription, Object[] args, Object result, Throwable throwable) { + public void after(Object target, String className, String methodName, String parameterDescription, Object result, Throwable throwable, Object[] args) { } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/bci/JavassistClassTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/bci/JavassistClassTest.java index a2e5ab3fa..360e6ce89 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/bci/JavassistClassTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/bci/JavassistClassTest.java @@ -37,7 +37,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.ClassFilters; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; -import com.navercorp.pinpoint.bootstrap.instrument.PinpointInstrument; +import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.PinpointClassFileTransformer; import com.navercorp.pinpoint.bootstrap.interceptor.Interceptor; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; @@ -53,8 +53,8 @@ import com.navercorp.pinpoint.test.TestClassLoader; /** * @author emeroad */ -public class JavaAssistClassTest { - private Logger logger = LoggerFactory.getLogger(JavaAssistClassTest.class.getName()); +public class JavassistClassTest { + private Logger logger = LoggerFactory.getLogger(JavassistClassTest.class.getName()); @Before public void clear() { @@ -136,7 +136,7 @@ public class JavaAssistClassTest { loader.addTransformer(javassistClassName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { try { logger.info("modify cl:{}", loader); @@ -195,7 +195,7 @@ public class JavaAssistClassTest { loader.addTransformer(javassistClassName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { try { logger.info("modify className:{} cl:{}", className, classLoader); @@ -266,7 +266,7 @@ public class JavaAssistClassTest { loader.addTransformer(testClassObject, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { try { logger.info("modify cl:{}", classLoader); InstrumentClass aClass = instrumentContext.getInstrumentClass(classLoader, testClassObject, classfileBuffer); @@ -331,7 +331,7 @@ public class JavaAssistClassTest { loader.addTransformer(targetClassName, new PinpointClassFileTransformer() { @Override - public byte[] transform(PinpointInstrument instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + public byte[] transform(Instrumentor instrumentContext, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { try { logger.info("modify cl:{}", classLoader); InstrumentClass aClass = instrumentContext.getInstrumentClass(classLoader, className, classfileBuffer); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/TestInterceptor.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/TestInterceptor.java index 37d9bb805..7aab9a5ff 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/TestInterceptor.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/TestInterceptor.java @@ -16,11 +16,11 @@ package com.navercorp.pinpoint.profiler.plugin; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Group; @Group(DefaultClassEditorBuilderTest.SCOPE_NAME) -public class TestInterceptor implements SimpleAroundInterceptor { +public class TestInterceptor implements AroundInterceptor { private final String field; public TestInterceptor(String field) { @@ -34,7 +34,7 @@ public class TestInterceptor implements SimpleAroundInterceptor { } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { // TODO Auto-generated method stub } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/TestInterceptors.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/TestInterceptors.java index d3650ea72..b5b825dbd 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/TestInterceptors.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/TestInterceptors.java @@ -20,11 +20,11 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; -import com.navercorp.pinpoint.bootstrap.interceptor.SimpleAroundInterceptor; +import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; public class TestInterceptors { - private static class AbstractInterceptor implements SimpleAroundInterceptor { + private static class AbstractInterceptor implements AroundInterceptor { @Override public void before(Object target, Object[] args) { @@ -33,7 +33,7 @@ public class TestInterceptors { } @Override - public void after(Object target, Object[] args, Object result, Throwable throwable) { + public void after(Object target, Object result, Throwable throwable, Object[] args) { // TODO Auto-generated method stub }