refactoring

- Instrumentor.addClassFileTransformer() -> transform()
- modify classFilter

agent/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/AbstractAutowireCapableBeanFactoryModifierIT.java → agent/src/test/java/com/navercorp/test/pinpoint/plugin/spring/beans/AbstractAutowireCapableBeanFactoryModifierIT.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.plugin.spring.beans;
+package com.navercorp.test.pinpoint.plugin.spring.beans;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

agent/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/Excluded.java → agent/src/test/java/com/navercorp/test/pinpoint/plugin/spring/beans/Excluded.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.plugin.spring.beans;
+package com.navercorp.test.pinpoint.plugin.spring.beans;
 
 public class Excluded {
 

agent/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/Inner.java → agent/src/test/java/com/navercorp/test/pinpoint/plugin/spring/beans/Inner.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.plugin.spring.beans;
+package com.navercorp.test.pinpoint.plugin.spring.beans;
 
 import org.springframework.stereotype.Component;
 

agent/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/Maru.java → agent/src/test/java/com/navercorp/test/pinpoint/plugin/spring/beans/Maru.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.plugin.spring.beans;
+package com.navercorp.test.pinpoint.plugin.spring.beans;
 
 
 public class Maru implements Comparable<Maru> {

agent/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/Morae.java → agent/src/test/java/com/navercorp/test/pinpoint/plugin/spring/beans/Morae.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.plugin.spring.beans;
+package com.navercorp.test.pinpoint.plugin.spring.beans;
 
 public class Morae {
 

agent/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/Mozzi.java → agent/src/test/java/com/navercorp/test/pinpoint/plugin/spring/beans/Mozzi.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.plugin.spring.beans;
+package com.navercorp.test.pinpoint.plugin.spring.beans;
 
 import org.springframework.stereotype.Controller;
 

agent/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/Outer.java → agent/src/test/java/com/navercorp/test/pinpoint/plugin/spring/beans/Outer.java

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.plugin.spring.beans;
-
+package com.navercorp.test.pinpoint.plugin.spring.beans;
 
 public class Outer {
     private Inner inner;

agent/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/ProxyTarget.java → agent/src/test/java/com/navercorp/test/pinpoint/plugin/spring/beans/ProxyTarget.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.plugin.spring.beans;
+package com.navercorp.test.pinpoint.plugin.spring.beans;
 
 import org.springframework.stereotype.Component;
 

agent/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/TestAdvisor.java → agent/src/test/java/com/navercorp/test/pinpoint/plugin/spring/beans/TestAdvisor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.plugin.spring.beans;
+package com.navercorp.test.pinpoint.plugin.spring.beans;
 
 import java.lang.reflect.Method;
 

agent/src/test/resources/spring-beans-test.xml

@@ -4,24 +4,24 @@
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <!-- retransformed by bean name -->
-    <bean id="maru" class="com.navercorp.pinpoint.plugin.spring.beans.Maru"/>
+    <bean id="maru" class="com.navercorp.test.pinpoint.plugin.spring.beans.Maru"/>
 
     <!-- retransformed by class -->
-    <bean id="morae" class="com.navercorp.pinpoint.plugin.spring.beans.Morae"/>
+    <bean id="morae" class="com.navercorp.test.pinpoint.plugin.spring.beans.Morae"/>
 
     <!-- retransformed by class. duplicated class -->
-    <bean id="duplicatedMorae" class="com.navercorp.pinpoint.plugin.spring.beans.Morae"/>
+    <bean id="duplicatedMorae" class="com.navercorp.test.pinpoint.plugin.spring.beans.Morae"/>
 
     <!-- retransformed by annotation -->
-    <bean id="mozzi" class="com.navercorp.pinpoint.plugin.spring.beans.Mozzi" scope="prototype"/>
+    <bean id="mozzi" class="com.navercorp.test.pinpoint.plugin.spring.beans.Mozzi" scope="prototype"/>
 
     <!-- excluded -->
-    <bean id="excluded" class="com.navercorp.pinpoint.plugin.spring.beans.Excluded"/>
+    <bean id="excluded" class="com.navercorp.test.pinpoint.plugin.spring.beans.Excluded"/>
 
     <!-- inner bean -->
-    <bean id="outer" class="com.navercorp.pinpoint.plugin.spring.beans.Outer">
+    <bean id="outer" class="com.navercorp.test.pinpoint.plugin.spring.beans.Outer">
         <property name="inner">
-            <bean class="com.navercorp.pinpoint.plugin.spring.beans.Inner"/>
+            <bean class="com.navercorp.test.pinpoint.plugin.spring.beans.Inner"/>
         </property>
     </bean>
 
@@ -31,7 +31,7 @@
         <property name="proxyTargetClass" value="true"></property>
     </bean>
 
-    <bean id="testAdvisor" class="com.navercorp.pinpoint.plugin.spring.beans.TestAdvisor"/>
+    <bean id="testAdvisor" class="com.navercorp.test.pinpoint.plugin.spring.beans.TestAdvisor"/>
 
-    <bean id="proxyTarget" class="com.navercorp.pinpoint.plugin.spring.beans.ProxyTarget"/>
+    <bean id="proxyTarget" class="com.navercorp.test.pinpoint.plugin.spring.beans.ProxyTarget"/>
 </beans>

bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/GuardInstrumentor.java

@@ -65,7 +65,7 @@ public <T> Class<? extends T> injectClass(ClassLoader targetClassLoader, String
     }
 
     @Override
-    public void addClassFileTransformer(ClassLoader classLoader, String targetClassName, TransformCallback transformCallback) {
+    public void transform(ClassLoader classLoader, String targetClassName, TransformCallback transformCallback) {
         checkOpen();
         instrumentContext.addClassFileTransformer(classLoader, targetClassName, transformCallback);
     }

bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/Instrumentor.java

@@ -34,7 +34,7 @@ public interface Instrumentor {
 
     <T> Class<? extends T> injectClass(ClassLoader targetClassLoader, String className);
 
-    void addClassFileTransformer(ClassLoader classLoader, String targetClassName, TransformCallback transformCallback);
+    void transform(ClassLoader classLoader, String targetClassName, TransformCallback transformCallback);
 
     void retransform(Class<?> target, TransformCallback transformCallback);
 }

bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/InstrumentorDelegate.java

@@ -60,7 +60,7 @@ public <T> Class<? extends T> injectClass(ClassLoader targetClassLoader, String
     }
 
     @Override
-    public void addClassFileTransformer(ClassLoader classLoader, String targetClassName, TransformCallback transformCallback) {
+    public void transform(ClassLoader classLoader, String targetClassName, TransformCallback transformCallback) {
         instrumentContext.addClassFileTransformer(classLoader, targetClassName, transformCallback);
     }
 

java8-test/src/test/java/com/navercorp/pinpoint/jdk8/lambda/LambdaIT.java → java8-test/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/LambdaIT.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.jdk8.lambda;
+package com.navercorp.test.pinpoint.jdk8.lambda;
 
 import java.util.function.Predicate;
 

java8-test/src/test/java/com/navercorp/pinpoint/jdk8/lambda/Maru.java → java8-test/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Maru.java

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.navercorp.pinpoint.jdk8.lambda;
+package com.navercorp.test.pinpoint.jdk8.lambda;
 
 /**
  * @author Jongho Moon

java8-test/src/test/java/com/navercorp/pinpoint/jdk8/lambda/Morae.java → java8-test/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Morae.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.jdk8.lambda;
+package com.navercorp.test.pinpoint.jdk8.lambda;
 
 import java.util.function.Predicate;
 

java8-test/src/test/java/com/navercorp/pinpoint/jdk8/lambda/Mozzi.java → java8-test/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Mozzi.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.jdk8.lambda;
+package com.navercorp.test.pinpoint.jdk8.lambda;
 
 import org.springframework.stereotype.Controller;
 

java8-test/src/test/resources/lambda-test.xml

@@ -3,13 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean id="maru" class="com.navercorp.pinpoint.jdk8.lambda.Maru"/>
+    <bean id="maru" class="com.navercorp.test.pinpoint.jdk8.lambda.Maru"/>
 
-    <bean id="morae" class="com.navercorp.pinpoint.jdk8.lambda.Morae">
+    <bean id="morae" class="com.navercorp.test.pinpoint.jdk8.lambda.Morae">
         <constructor-arg ref="mozzi"/>
     </bean>
 
-    <bean id="mozzi" class="com.navercorp.pinpoint.jdk8.lambda.Mozzi" scope="prototype">
+    <bean id="mozzi" class="com.navercorp.test.pinpoint.jdk8.lambda.Mozzi" scope="prototype">
         <constructor-arg value="4"/>
     </bean>
 

plugins/google-httpclient/src/main/java/com/navercorp/pinpoint/plugin/google/httpclient/HttpClientPlugin.java

@@ -68,7 +68,7 @@ public byte[] doInTransform(Instrumentor instrumentor, ClassLoader loader, Strin
 
                     for (InstrumentClass nestedClass : target.getNestedClasses(ClassFilters.chain(ClassFilters.enclosingMethod("executeAsync", "java.util.concurrent.Executor"), ClassFilters.interfaze("java.util.concurrent.Callable")))) {
                         logger.debug("Find nested class {}", target.getName());
-                        instrumentor.addClassFileTransformer(loader, nestedClass.getName(), new TransformCallback() {
+                        instrumentor.transform(loader, nestedClass.getName(), new TransformCallback() {
                             @Override
                             public byte[] doInTransform(Instrumentor instrumentor, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
                                 InstrumentClass target = instrumentor.getInstrumentClass(loader, className, classfileBuffer);

profiler/src/main/java/com/navercorp/pinpoint/profiler/ClassFileTransformerDispatcher.java

@@ -47,10 +47,11 @@ public class ClassFileTransformerDispatcher implements ClassFileTransformer, Dyn
     private final TransformerRegistry transformerRegistry;
     private final DynamicTransformerRegistry dynamicTransformerRegistry;
 
-    private final DefaultProfilerPluginContext globalContext;    
+    private final DefaultProfilerPluginContext globalContext;
     private final Filter<String> debugTargetFilter;
     private final DebugTransformer debugTransformer;
 
+    private final ClassFileFilter pinpointClassFilter;
     private final ClassFileFilter unmodifiableFilter;
 
     public ClassFileTransformerDispatcher(DefaultAgent agent, List<DefaultProfilerPluginContext> pluginContexts) {
@@ -62,26 +63,29 @@ public ClassFileTransformerDispatcher(DefaultAgent agent, List<DefaultProfilerPl
         this.debugTargetFilter = agent.getProfilerConfig().getProfilableClassFilter();
         this.debugTransformer = new DebugTransformer(globalContext);
 
-        this.unmodifiableFilter = new UnmodifiableClassFilter(agentClassLoader);
-
+        this.pinpointClassFilter = new PinpointClassFilter(agentClassLoader);
+        this.unmodifiableFilter = new UnmodifiableClassFilter();
+
         this.transformerRegistry = createTransformerRegistry(pluginContexts);
         this.dynamicTransformerRegistry = new DefaultDynamicTransformerRegistry();
     }
 
     @Override
     public byte[] transform(ClassLoader classLoader, String jvmClassName, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classFileBuffer) throws IllegalClassFormatException {
-        ClassFileTransformer transformer = dynamicTransformerRegistry.getTransformer(classLoader, jvmClassName);
-
-        if (transformer != null) {
-            return transform0(classLoader, jvmClassName, classBeingRedefined, protectionDomain, classFileBuffer, transformer);
+        if (!pinpointClassFilter.accept(classLoader, jvmClassName, classBeingRedefined, protectionDomain, classFileBuffer)) {
+            return null;
+        }
+
+        final ClassFileTransformer dynamicTransformer = dynamicTransformerRegistry.getTransformer(classLoader, jvmClassName);
+        if (dynamicTransformer != null) {
+            return transform0(classLoader, jvmClassName, classBeingRedefined, protectionDomain, classFileBuffer, dynamicTransformer);
         }
 
         if (!unmodifiableFilter.accept(classLoader, jvmClassName, classBeingRedefined, protectionDomain, classFileBuffer)) {
             return null;
         }
 
-        transformer = this.transformerRegistry.findTransformer(jvmClassName);
-
+        ClassFileTransformer transformer = this.transformerRegistry.findTransformer(jvmClassName);
         if (transformer == null) {
             // For debug
             // TODO What if a modifier is duplicated?
@@ -101,9 +105,9 @@ private byte[] transform0(ClassLoader classLoader, String jvmClassName, Class<?>
 
         if (isDebug) {
             if (classBeingRedefined == null) {
-                logger.debug("[transform] classLoader:{} className:{} trnasformer:{}", classLoader, javaClassName, transformer.getClass().getName());
+                logger.debug("[transform] classLoader:{} className:{} transformer:{}", classLoader, javaClassName, transformer.getClass().getName());
             } else {
-                logger.debug("[retransform] classLoader:{} className:{} trnasformer:{}", classLoader, javaClassName, transformer.getClass().getName());
+                logger.debug("[retransform] classLoader:{} className:{} transformer:{}", classLoader, javaClassName, transformer.getClass().getName());
             }
         }
 

profiler/src/main/java/com/navercorp/pinpoint/profiler/PinpointClassFilter.java

@@ -0,0 +1,54 @@
+/*
+ * *
+ *  * 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.profiler;
+
+import java.security.ProtectionDomain;
+
+/**
+ * @author emeroad
+ */
+public class PinpointClassFilter implements ClassFileFilter {
+
+    private final ClassLoader agentLoader;
+
+    public PinpointClassFilter(ClassLoader agentLoader) {
+        if (agentLoader == null) {
+            throw new NullPointerException("agentLoader must not be null");
+        }
+        this.agentLoader = agentLoader;
+    }
+
+    @Override
+    public boolean accept(ClassLoader classLoader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classFileBuffer) {
+        // bootstrap classLoader
+        if (classLoader == null) {
+            return CONTINUE;
+        }
+        if (classLoader == agentLoader) {
+            // skip classes loaded by agent class loader.
+            return SKIP;
+        }
+
+        // Skip pinpoint packages too.
+        if (className.startsWith("com/navercorp/pinpoint/")) {
+            return SKIP;
+        }
+
+        return CONTINUE;
+    }
+}

profiler/src/main/java/com/navercorp/pinpoint/profiler/UnmodifiableClassFilter.java

@@ -23,13 +23,8 @@
  */
 public class UnmodifiableClassFilter implements ClassFileFilter {
 
-    private final ClassLoader agentLoader;
 
-    public UnmodifiableClassFilter(ClassLoader agentLoader) {
-        if (agentLoader == null) {
-            throw new NullPointerException("agentLoader must not be null");
-        }
-        this.agentLoader = agentLoader;
+    public UnmodifiableClassFilter() {
     }
 
     @Override
@@ -41,16 +36,6 @@ public boolean accept(ClassLoader classLoader, String className, Class<?> classB
             }
         }
 
-        if (classLoader == agentLoader) {
-            // skip classes loaded by agent class loader.
-            return SKIP;
-        }
-
-        // Skip pinpoint packages too.
-        if (className.startsWith("com/navercorp/pinpoint/")) {
-            return SKIP;
-        }
-
         return CONTINUE;
     }
 }