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/20 01:32:32 UTC
svn commit: r1570012 - in /incubator/sirona/trunk:
agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java
core/src/main/java/org/apache/sirona/tracking/PathTracker.java
Author: olamy
Date: Thu Feb 20 00:32:31 2014
New Revision: 1570012
URL: http://svn.apache.org/r1570012
Log:
fix level support add unit tests related to level
Modified:
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java
Modified: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java?rev=1570012&r1=1570011&r2=1570012&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java Thu Feb 20 00:32:31 2014
@@ -71,10 +71,42 @@ public class PathTrackingInvocationListe
System.out.println( "entry:" + entry );
}
+ PathTrackingEntry entry = entries.get( 0 );
+
+ Assert.assertEquals( "beer", entry.getMethodName() );
+
+ Assert.assertEquals( "org.apache.test.sirona.javaagent.App", entry.getClassName() );
+
+ Assert.assertEquals( 1, entry.getLevel() );
+
+ entry = entries.get( 1 );
+
+ Assert.assertEquals( "foo", entry.getMethodName() );
+
+ Assert.assertEquals( "org.apache.test.sirona.javaagent.App", entry.getClassName() );
+
+ Assert.assertEquals( 2, entry.getLevel() );
+
+
+ entry = entries.get( 2 );
+
+ Assert.assertEquals( "pub", entry.getMethodName() );
+
+ Assert.assertEquals( "org.apache.test.sirona.javaagent.App", entry.getClassName() );
+
+ Assert.assertEquals( 3, entry.getLevel() );
+
+
+ entry = entries.get( 3 );
+
+ Assert.assertEquals( "bar", entry.getMethodName() );
+
+ Assert.assertEquals( "org.apache.test.sirona.javaagent.App", entry.getClassName() );
+
+ Assert.assertEquals( 4, entry.getLevel() );
+
- PathTrackingEntry first = entries.get( 0 );
- Assert.assertEquals( "beer", first.getMethodName() );
}
}
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java?rev=1570012&r1=1570011&r2=1570012&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java Thu Feb 20 00:32:31 2014
@@ -220,12 +220,6 @@ public class PathTracker
final String uuid = PathTracker.get();
- // FIXME get node from configuration!
- // FIXME correctly configure the level!
- final PathTrackingEntry pathTrackingEntry =
- new PathTrackingEntry( uuid, "node", pathTrackingInformation.getClassName(), pathTrackingInformation.getMethodName(),
- start, ( end - start ), THREAD_LOCAL_LEVEL.get().get());
-
final PathTrackingInformation current = THREAD_LOCAL_LEVEL_INFO.get();
// same invocation so no inc, class can do recursion so don't use classname/methodname
if ( pathTrackingInformation != current )
@@ -234,7 +228,11 @@ public class PathTracker
THREAD_LOCAL_LEVEL_INFO.set( pathTrackingInformation.getParent() );
}
- //THREAD_LOCAL_LEVEL_INFO.set( pathTrackingInformation );
+ // FIXME get node from configuration!
+ // FIXME correctly configure the level!
+ final PathTrackingEntry pathTrackingEntry =
+ new PathTrackingEntry( uuid, "node", pathTrackingInformation.getClassName(), pathTrackingInformation.getMethodName(),
+ start, ( end - start ), pathTrackingInformation.getLevel());
THREAD_LOCAL_ENTRIES.get().add( pathTrackingEntry );