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/18 06:59:29 UTC
svn commit: r1569200 - in
/incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona:
javaagent/SironaAgent.java javaagent/SironaTransformer.java
pathtracking/PathTrackingInvocationListener.java
Author: olamy
Date: Tue Feb 18 05:59:28 2014
New Revision: 1569200
URL: http://svn.apache.org/r1569200
Log:
read this agent debug sys property in only one place
Modified:
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/pathtracking/PathTrackingInvocationListener.java
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=1569200&r1=1569199&r2=1569200&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 Tue Feb 18 05:59:28 2014
@@ -29,6 +29,9 @@ import java.util.Map;
import java.util.jar.JarFile;
public class SironaAgent {
+
+ public static boolean AGENT_DEBUG = Boolean.getBoolean( "sirona.agent.debug" );
+
public static void premain(final String agentArgs, final Instrumentation instrumentation) {
agentmain(agentArgs, instrumentation);
}
@@ -105,13 +108,13 @@ public class SironaAgent {
&& clazz.getAnnotation(instrumentedMarker) == null
&& instrumentation.isModifiableClass(clazz)) {
try {
- if (Boolean.getBoolean("sirona.agent.debug")) {
+ if (AGENT_DEBUG) {
System.out.println( "reload clazz:" + clazz.getName() );
}
instrumentation.retransformClasses(clazz);
} catch (final Exception e) {
System.err.println("Can't instrument: " + clazz.getName() + "[" + e.getMessage() + "]");
- if (Boolean.getBoolean("sirona.agent.debug")) {
+ if (AGENT_DEBUG) {
e.printStackTrace();
}
}
@@ -119,7 +122,7 @@ public class SironaAgent {
}
}
} catch (final Exception e) {
- if (Boolean.getBoolean("sirona.agent.debug")) {
+ if (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=1569200&r1=1569199&r2=1569200&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 Tue Feb 18 05:59:28 2014
@@ -48,7 +48,7 @@ public class SironaTransformer implement
}
return classfileBuffer;
} catch (final RuntimeException re) {
- if (Boolean.getBoolean("sirona.agent.debug")) {
+ if (SironaAgent.AGENT_DEBUG) {
re.printStackTrace();
}
throw re;
Modified: incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/pathtracking/PathTrackingInvocationListener.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/pathtracking/PathTrackingInvocationListener.java?rev=1569200&r1=1569199&r2=1569200&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/pathtracking/PathTrackingInvocationListener.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/pathtracking/PathTrackingInvocationListener.java Tue Feb 18 05:59:28 2014
@@ -19,6 +19,7 @@ package org.apache.sirona.pathtracking;
import org.apache.sirona.configuration.Configuration;
import org.apache.sirona.configuration.ioc.IoCs;
import org.apache.sirona.javaagent.AgentContext;
+import org.apache.sirona.javaagent.SironaAgent;
import org.apache.sirona.javaagent.listener.ConfigurableListener;
import org.apache.sirona.javaagent.spi.InvocationListener;
import org.apache.sirona.store.DataStoreFactory;
@@ -39,8 +40,6 @@ public class PathTrackingInvocationListe
private static final boolean TRACKING_ACTIVATED =
Configuration.is( Configuration.CONFIG_PROPERTY_PREFIX + "javaagent.path.tracking.activate", false );
- private static final boolean DEBUG = Boolean.getBoolean( "sirona.agent.debug" );
-
PathTrackingDataStore pathTrackingDataStore = IoCs.findOrCreateInstance( DataStoreFactory.class )
.getPathTrackingDataStore();
@@ -59,7 +58,7 @@ public class PathTrackingInvocationListe
return false;
}
- if ( DEBUG )
+ if ( SironaAgent.AGENT_DEBUG )
{
System.out.println(
"PathTrackingInvocationListener#accept, TRACKING_ACTIVATED:" + TRACKING_ACTIVATED + ", key: " + key );
@@ -77,7 +76,7 @@ public class PathTrackingInvocationListe
@Override
public void before( AgentContext context )
{
- if ( DEBUG )
+ if ( SironaAgent.AGENT_DEBUG )
{
System.out.println( "PathTrackingInvocationListener#before:" + context.getKey() );
}
@@ -89,7 +88,7 @@ public class PathTrackingInvocationListe
public void after( AgentContext context, Object result, Throwable error )
{
- if ( DEBUG )
+ if ( SironaAgent.AGENT_DEBUG )
{
System.out.println( "PathTrackingInvocationListener#after: " + context.getKey() );
}
@@ -107,7 +106,7 @@ public class PathTrackingInvocationListe
new PathTrackingEntry( PathTrackingThreadLocal.get(), "node", className, methodName, start, ( end - start ), 0 );
- if ( DEBUG )
+ if ( SironaAgent.AGENT_DEBUG )
{
System.out.println( "PathTrackingInvocationListener: after: " + pathTrackingEntry.toString()
+ ", pathTrackingDataStore type:" + pathTrackingDataStore.getClass().getName() );