Renaming net.tascalate.javaflow.utils -> net.tascalate.javaflow.tools.runtime; force JavaAgents to re-transform classes in agentmain

Author: vsilaev

net.tascalate.javaflow.extras/src/main/java/org/apache/commons/javaflow/extras/CoIterator.java

@@ -125,7 +125,9 @@ public void remove() {
 
     public void close() {
         try {
-            cc.terminate();
+            if (null != cc) {
+                cc.terminate();
+            }
         } finally {
             cc = null;
             advance = false;

net.tascalate.javaflow.tools.cdi-javaagent/src/main/java/org/apache/commons/javaflow/instrumentation/cdi/CdiProxyClassTransformer.java

@@ -45,6 +45,13 @@ public byte[] transform(
             final Class<?> classBeingRedefined,
             final ProtectionDomain protectionDomain, 
             final byte[] classfileBuffer) throws IllegalClassFormatException {
+        
+        if (skipClassByName(className)) {
+            if (log.isInfoEnabled()) {
+                log.info("Ignoring class by name (looks like Java std. class): " + className);
+            }
+            return null;
+        }
 
         classLoader = getSafeClassLoader(classLoader);
         final ContinuableClassInfoResolver resolver = getCachedResolver(classLoader);
@@ -94,6 +101,19 @@ protected ContinuableClassInfoResolver getCachedResolver(ClassLoader classLoader
             }
         }
     }
+    
+    static boolean skipClassByName(String className) {
+        return null != className && (
+               className.startsWith("java.") ||
+               className.startsWith("javax.") ||
+               className.startsWith("sun.") ||
+               className.startsWith("com.sun.") ||
+               className.startsWith("oracle.") ||
+               className.startsWith("com.oracle.") ||
+               className.startsWith("ibm.") ||
+               className.startsWith("com.ibm")
+               );
+    }
 
     private static final Map<ClassLoader, ContinuableClassInfoResolver> classLoader2resolver = new WeakHashMap<ClassLoader, ContinuableClassInfoResolver>();
 }

net.tascalate.javaflow.tools.cdi-javaagent/src/main/java/org/apache/commons/javaflow/instrumentation/cdi/CdiProxyInstrumentationAgent.java

@@ -31,6 +31,7 @@ public class CdiProxyInstrumentationAgent {
      */
     public static void premain(String args, Instrumentation instrumentation) throws Exception {
         setupInstrumentation(instrumentation);
+        System.setProperty(CdiProxyInstrumentationAgent.class.getName(), "true");        
     }
 
     /**
@@ -45,6 +46,17 @@ public static void premain(String args, Instrumentation instrumentation) throws
      */
     public static void agentmain(String args, Instrumentation instrumentation) throws Exception {
         setupInstrumentation(instrumentation);
+        for (Class<?> clazz : instrumentation.getAllLoadedClasses()) {
+            if (instrumentation.isModifiableClass(clazz) && 
+                !CdiProxyClassTransformer.skipClassByName(clazz.getName())) {
+                try {
+                    instrumentation.retransformClasses(clazz);
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        System.setProperty(CdiProxyInstrumentationAgent.class.getName(), "true");        
     }
 
     private static void setupInstrumentation(Instrumentation instrumentation) {

net.tascalate.javaflow.tools.javaagent/src/main/java/org/apache/commons/javaflow/instrumentation/JavaFlowClassTransformer.java

@@ -47,6 +47,13 @@ public byte[] transform(ClassLoader classLoader, final String className,
 			final ProtectionDomain protectionDomain,
 			final byte[] classfileBuffer) throws IllegalClassFormatException {
 
+	    if (skipClassByName(className)) {
+	        if (log.isInfoEnabled()) {
+	            log.info("Ignoring class by name (looks like Java std. class): " + className);
+	        }
+	        return null;
+	    }
+	    
 		classLoader = getSafeClassLoader(classLoader);
 		final ContinuableClassInfoResolver resolver = getCachedResolver(classLoader);
 
@@ -69,7 +76,9 @@ public byte[] call() {
 				log.error(ex);
 				return null;
 			} catch (ClassCircularityError ex) {
-			    log.warn("Ignoring class circularity error: " + ex.getMessage());
+			    if (log.isWarnEnabled()) {
+			        log.warn("Ignoring class circularity error: " + ex.getMessage());
+			    }
 			    return null;
 			} catch (final Error ex) {
 				log.error(ex);
@@ -95,6 +104,19 @@ protected ContinuableClassInfoResolver getCachedResolver(final ClassLoader class
 			}
 		}
 	}
+	
+	static boolean skipClassByName(String className) {
+	    return null != className && (
+	           className.startsWith("java.") ||
+	           className.startsWith("javax.") ||
+	           className.startsWith("sun.") ||
+	           className.startsWith("com.sun.") ||
+	           className.startsWith("oracle.") ||
+	           className.startsWith("com.oracle.") ||
+	           className.startsWith("ibm.") ||
+	           className.startsWith("com.ibm")
+	           );
+	}
 
 	final private static Map<ClassLoader, ContinuableClassInfoResolver> classLoader2resolver = new WeakHashMap<ClassLoader, ContinuableClassInfoResolver>();
 }

net.tascalate.javaflow.tools.javaagent/src/main/java/org/apache/commons/javaflow/instrumentation/JavaFlowInstrumentationAgent.java

@@ -29,9 +29,9 @@ public class JavaFlowInstrumentationAgent {
      * @param instrumentation
      * @throws Exception
      */
-    public static void premain(final String args,
-            final Instrumentation instrumentation) throws Exception {
+    public static void premain(String args, Instrumentation instrumentation) throws Exception {
         setupInstrumentation(instrumentation);
+        System.setProperty(JavaFlowInstrumentationAgent.class.getName(), "true");
     }
 
     /**
@@ -44,13 +44,22 @@ public static void premain(final String args,
      * @param instrumentation
      * @throws Exception
      */
-    public static void agentmain(final String args,
-            final Instrumentation instrumentation) throws Exception {
+    public static void agentmain(String args, Instrumentation instrumentation) throws Exception {
         setupInstrumentation(instrumentation);
+        for (Class<?> clazz : instrumentation.getAllLoadedClasses()) {
+            if (instrumentation.isModifiableClass(clazz) && 
+                !JavaFlowClassTransformer.skipClassByName(clazz.getName())) {
+                try {
+                    instrumentation.retransformClasses(clazz);
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        System.setProperty(JavaFlowInstrumentationAgent.class.getName(), "true");        
     }
 
-    private static void setupInstrumentation(
-            final Instrumentation instrumentation) {
+    private static void setupInstrumentation(Instrumentation instrumentation) {
         instrumentation.addTransformer(new JavaFlowClassTransformer(), true);
     }
 

net.tascalate.javaflow.utils/.classpath renamed to net.tascalate.javaflow.tools.runtime/.classpath

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>net.tascalate.javaflow.tools.runtime</name>
+	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>