You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by ol...@apache.org on 2014/02/21 05:26:52 UTC
svn commit: r1570442 - in /incubator/sirona/trunk/agent/javaagent: ./
src/main/java/org/apache/sirona/javaagent/
src/main/java/org/apache/sirona/javaagent/listener/
Author: olamy
Date: Fri Feb 21 04:26:52 2014
New Revision: 1570442
URL: http://svn.apache.org/r1570442
Log:
move logging debug in only place
Modified:
incubator/sirona/trunk/agent/javaagent/pom.xml
incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/SironaAgent.java
incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/SironaTransformer.java
incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java
Modified: incubator/sirona/trunk/agent/javaagent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/pom.xml?rev=1570442&r1=1570441&r2=1570442&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/pom.xml (original)
+++ incubator/sirona/trunk/agent/javaagent/pom.xml Fri Feb 21 04:26:52 2014
@@ -119,6 +119,12 @@
<pattern>org.objectweb.asm</pattern>
<shadedPattern>org.apache.sirona.asm4</shadedPattern>
</relocation>
+ <!--
+ <relocation>
+ <pattern>org.apache.sirona</pattern>
+ <shadedPattern>org.apache.sirona.sirona</shadedPattern>
+ </relocation>
+ -->
</relocations>
</configuration>
</execution>
Modified: incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/SironaAgent.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/SironaAgent.java?rev=1570442&r1=1570441&r2=1570442&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/SironaAgent.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/SironaAgent.java Fri Feb 21 04:26:52 2014
@@ -16,6 +16,8 @@
*/
package org.apache.sirona.javaagent;
+import org.apache.sirona.javaagent.logging.SironaAgentLogging;
+
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
@@ -30,8 +32,6 @@ import java.util.jar.JarFile;
public class SironaAgent {
- public static boolean AGENT_DEBUG = Boolean.getBoolean( "sirona.agent.debug" );
-
private static final boolean FORCE_RELOAD = Boolean.getBoolean("sirona.javaagent.force.reload");
public static void premain(final String agentArgs, final Instrumentation instrumentation) {
@@ -110,21 +110,25 @@ public class SironaAgent {
&& clazz.getAnnotation(instrumentedMarker) == null
&& instrumentation.isModifiableClass(clazz)) {
try {
- if (AGENT_DEBUG) {
- System.out.println( "reload clazz:" + clazz.getName() );
- }
+
+ SironaAgentLogging.debug( "reload clazz:" + clazz.getName() );
+
instrumentation.retransformClasses(clazz);
} catch (final Exception e) {
System.err.println("Can't instrument: " + clazz.getName() + "[" + e.getMessage() + "]");
- if (AGENT_DEBUG) {
+ if (SironaAgentLogging.AGENT_DEBUG) {
e.printStackTrace();
}
}
}
}
+ } else {
+ if (SironaAgentLogging.AGENT_DEBUG){
+ System.out.println("do not reload classes");
+ }
}
} catch (final Exception e) {
- if (AGENT_DEBUG) {
+ if (SironaAgentLogging.AGENT_DEBUG) {
System.out.println( "finished instrumentation setup with exception:" + e.getMessage() );
}
e.printStackTrace();
Modified: incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/SironaTransformer.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/SironaTransformer.java?rev=1570442&r1=1570441&r2=1570442&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/SironaTransformer.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/SironaTransformer.java Fri Feb 21 04:26:52 2014
@@ -16,6 +16,7 @@
*/
package org.apache.sirona.javaagent;
+import org.apache.sirona.javaagent.logging.SironaAgentLogging;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassWriter;
@@ -47,11 +48,12 @@ public class SironaTransformer implement
return writer.toByteArray();
}
return classfileBuffer;
- } catch (final RuntimeException re) {
- if (SironaAgent.AGENT_DEBUG) {
- re.printStackTrace();
+ } catch (final Exception e) {
+ if ( SironaAgentLogging.AGENT_DEBUG) {
+ SironaAgentLogging.debug( "fail transforming class " + className + ": " + e.getMessage() );
+ e.printStackTrace();
}
- throw re;
+ throw new RuntimeException( e.getMessage(), e );
}
}
Modified: incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java?rev=1570442&r1=1570441&r2=1570442&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java Fri Feb 21 04:26:52 2014
@@ -19,16 +19,18 @@ package org.apache.sirona.javaagent.list
import org.apache.sirona.configuration.Configuration;
import org.apache.sirona.configuration.ioc.AutoSet;
import org.apache.sirona.javaagent.AgentContext;
-import org.apache.sirona.javaagent.SironaAgent;
+import org.apache.sirona.javaagent.logging.SironaAgentLogging;
import org.apache.sirona.javaagent.spi.Order;
import org.apache.sirona.tracking.PathTracker;
-@Order(1)
+@Order( 1 )
@AutoSet
/**
* This listener is responsible to track/record class#method path using {@link org.apache.sirona.tracking.PathTracker}
*/
-public class PathTrackingInvocationListener extends ConfigurableListener {
+public class PathTrackingInvocationListener
+ extends ConfigurableListener
+{
private static final Integer PATH_TRACKER_KEY = "Sirona-path-tracker-key".hashCode();
@@ -45,11 +47,8 @@ public class PathTrackingInvocationListe
return false;
}
- if ( SironaAgent.AGENT_DEBUG )
- {
- System.out.println(
- "PathTrackingInvocationListener#accept, TRACKING_ACTIVATED:" + TRACKING_ACTIVATED + ", key: " + key );
- }
+ SironaAgentLogging.debug(
+ "PathTrackingInvocationListener#accept, TRACKING_ACTIVATED:" + TRACKING_ACTIVATED + ", key: " + key );
return TRACKING_ACTIVATED;
@@ -59,30 +58,30 @@ public class PathTrackingInvocationListe
* executed before method called to configure the start {@link org.apache.sirona.tracking.PathTracker.PathTrackingInformation}
* and set various thread local variable as invocation level
* will call {@link org.apache.sirona.tracking.PathTracker#start(org.apache.sirona.tracking.PathTracker.PathTrackingInformation)}
+ *
* @param context
*/
@Override
public void before( AgentContext context )
{
- if ( SironaAgent.AGENT_DEBUG )
- {
- System.out.println( "PathTrackingInvocationListener#before:" + context.getKey() );
- }
+
+ SironaAgentLogging.debug( "PathTrackingInvocationListener#before:" + context.getKey() );
String key = context.getKey();
int lastDot = key.lastIndexOf( "." );
String className = key.substring( 0, lastDot );
- String methodName = key.substring(lastDot + 1, key.length());
+ String methodName = key.substring( lastDot + 1, key.length() );
- final PathTracker.PathTrackingInformation pathTrackingInformation = new PathTracker.PathTrackingInformation(className, methodName);
- context.put(PATH_TRACKER_KEY, PathTracker.start(pathTrackingInformation));
+ final PathTracker.PathTrackingInformation pathTrackingInformation =
+ new PathTracker.PathTrackingInformation( className, methodName );
+ context.put( PATH_TRACKER_KEY, PathTracker.start( pathTrackingInformation ) );
}
/**
- *
* will call {@link org.apache.sirona.tracking.PathTracker#stop()}
+ *
* @param context
* @param result
* @param error
@@ -91,11 +90,8 @@ public class PathTrackingInvocationListe
public void after( AgentContext context, Object result, Throwable error )
{
- if ( SironaAgent.AGENT_DEBUG )
- {
- System.out.println( "PathTrackingInvocationListener#after: " + context.getKey() );
- }
+ SironaAgentLogging.debug( "PathTrackingInvocationListener#after: " + context.getKey() );
- context.get(PATH_TRACKER_KEY, PathTracker.class).stop();
+ context.get( PATH_TRACKER_KEY, PathTracker.class ).stop();
}
}