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 2015/02/05 04:36:18 UTC
svn commit: r1657465 - in /incubator/sirona/trunk:
agent/javaagent/src/main/java/org/apache/sirona/javaagent/
agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/
agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/ agent/...
Author: olamy
Date: Thu Feb 5 03:36:17 2015
New Revision: 1657465
URL: http://svn.apache.org/r1657465
Log:
fix unit test
Added:
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/AgentContextTest.java (with props)
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/AutoSetPathTrackingListenerTest.java (contents, props changed)
- copied, changed from r1657464, incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/AutoSetPathTrackingListenerTest.java
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/MockPathTrackingInvocationListener.java (contents, props changed)
- copied, changed from r1657464, incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/MockPathTrackingInvocationListener.java
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationRecursiveTest.java (contents, props changed)
- copied, changed from r1657464, incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationRecursiveTest.java
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/PathTrackingListenerTest.java (contents, props changed)
- copied, changed from r1657464, incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingListenerTest.java
Removed:
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/AgentContextTest.java
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/AutoSetPathTrackingListenerTest.java
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/MockPathTrackingInvocationListener.java
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationRecursiveTest.java
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingListenerTest.java
Modified:
incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/AgentContext.java
incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingListener.java
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/App.java
incubator/sirona/trunk/agent/javaagent/src/test/resources/META-INF/services/org.apache.sirona.pathtracking.PathTrackingInvocationListener
incubator/sirona/trunk/agent/javaagent/src/test/resources/pathtracking/sirona.properties
incubator/sirona/trunk/api/src/main/java/org/apache/sirona/pathtracking/PathTrackingEntry.java
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java
Modified: incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/AgentContext.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/AgentContext.java?rev=1657465&r1=1657464&r2=1657465&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/AgentContext.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/AgentContext.java Thu Feb 5 03:36:17 2015
@@ -154,7 +154,6 @@ public class AgentContext {
private final InvocationListener[] listeners;
/**
- *
* @since 0.3
*/
private final Object[] methodParameters;
Modified: incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingListener.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingListener.java?rev=1657465&r1=1657464&r2=1657465&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingListener.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingListener.java Thu Feb 5 03:36:17 2015
@@ -28,8 +28,7 @@ import org.apache.sirona.tracking.PathTr
@AutoSet
/**
* This listener is responsible to track/record class#method path using {@link org.apache.sirona.tracking.PathTracker}
- */
-public class PathTrackingListener
+ */ public class PathTrackingListener
extends ConfigurableListener
{
@@ -47,8 +46,8 @@ public class PathTrackingListener
return false;
}
- SironaAgentLogging.debug(
- "PathTrackingListener#accept, TRACKING_ACTIVATED: {0}, key: {1}", TRACKING_ACTIVATED, key );
+ SironaAgentLogging.debug( "PathTrackingListener#accept, TRACKING_ACTIVATED: {0}, key: {1}", TRACKING_ACTIVATED,
+ key );
return TRACKING_ACTIVATED;
}
@@ -67,19 +66,66 @@ public class PathTrackingListener
String key = context.getKey();
SironaAgentLogging.debug( "PathTrackingListener#before: {0}", key );
- int lastDot = key.lastIndexOf( "." );
+ String className = extractClassName( key );
+ String methodName = extractMethodName( key );
- String className = key.substring( 0, lastDot );
- String methodName = key.substring( lastDot + 1, key.length() );
-
- final PathTrackingInformation pathTrackingInformation =
- new PathTrackingInformation( className, methodName );
+ final PathTrackingInformation pathTrackingInformation = new PathTrackingInformation( className, methodName );
SironaAgentLogging.debug( "call PathTracker#start with {0}", pathTrackingInformation );
context.put( PATH_TRACKER_KEY, PathTracker.start( pathTrackingInformation ) );
}
+ //----------------------------------------------------------------
+ // key format: org.apache.test.sirona.javaagent.App.foo()
+ // or org.apache.test.sirona.javaagent.App.pub(java.lang.String)
+ //----------------------------------------------------------------
+
+ static String extractClassName( String key )
+ {
+ if ( key == null )
+ {
+ return null;
+ }
+
+ int firstParenthesis = key.indexOf( '(' );
+
+ while ( firstParenthesis > 0 )
+ {
+ if ( key.charAt( firstParenthesis ) == '.' )
+ {
+ return key.substring( 0, firstParenthesis );
+ }
+ firstParenthesis--;
+ }
+
+ return key;
+ }
+
+
+ static String extractMethodName( String key )
+ {
+ if ( key == null )
+ {
+ return null;
+ }
+
+ int firstParenthesis = key.indexOf( '(' );
+
+ int j = firstParenthesis;
+
+ while ( j > 0 )
+ {
+ if ( key.charAt( j ) == '.' )
+ {
+ return key.substring( j + 1, firstParenthesis );
+ }
+ j--;
+ }
+
+ return key;
+ }
+
/**
* will call {@link org.apache.sirona.tracking.PathTracker#stop()}
*
Added: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/AgentContextTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/AgentContextTest.java?rev=1657465&view=auto
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/AgentContextTest.java (added)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/AgentContextTest.java Thu Feb 5 03:36:17 2015
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.sirona.javaagent.listener;
+
+import org.apache.sirona.javaagent.AgentContext;
+import org.apache.sirona.javaagent.spi.InvocationListener;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.lang.reflect.Method;
+
+import static org.junit.Assert.assertEquals;
+
+public class AgentContextTest
+{
+ @Test
+ public void keyClass()
+ {
+ final Class<?> clazz = new AgentContext( "org.apache.sirona.javaagent.listener.AgentContextTest.keyClass()", //
+ this, //
+ new InvocationListener[0], //
+ null ) //
+ .keyAsClass();
+ assertEquals( AgentContextTest.class, clazz );
+ }
+
+ @Test
+ public void keyMethod()
+ throws NoSuchMethodException
+ {
+ final Method mtd = new AgentContext( "org.apache.sirona.javaagent.listener.AgentContextTest.keyMethod()", //
+ this, //
+ new InvocationListener[0], //
+ null ) //
+ .keyAsMethod();
+ assertEquals( AgentContextTest.class.getMethod( "keyMethod" ), mtd );
+ }
+
+ @Test
+ public void extract_class_method_names()
+ {
+ //org.apache.test.sirona.javaagent.App.foo()
+ Assert.assertEquals( "org.apache.test.sirona.javaagent.App", //
+ PathTrackingListener.extractClassName( "org.apache.test.sirona.javaagent.App.foo()" ) );
+
+ Assert.assertEquals( "org.apache.test.sirona.javaagent.App", //
+ PathTrackingListener.extractClassName(
+ "org.apache.test.sirona.javaagent.App.pub(java.lang.String)" ) );
+
+ Assert.assertEquals( "App", //
+ PathTrackingListener.extractClassName( "App.foo()" ) );
+
+ Assert.assertEquals( "org.App", //
+ PathTrackingListener.extractClassName( "org.App.foo()" ) );
+
+ //org.apache.test.sirona.javaagent.App.pub(java.lang.String)
+ Assert.assertEquals( "pub", //
+ PathTrackingListener.extractMethodName(
+ "org.apache.test.sirona.javaagent.App.pub(java.lang.String)" ) );
+
+ Assert.assertEquals( "foo", //
+ PathTrackingListener.extractMethodName( "org.apache.test.sirona.javaagent.App.foo()" ) );
+
+ Assert.assertEquals( "foo", //
+ PathTrackingListener.extractMethodName( "App.foo()" ) );
+
+ Assert.assertEquals( "foo", //
+ PathTrackingListener.extractMethodName( "org.App.foo()" ) );
+ }
+}
Propchange: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/AgentContextTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/AgentContextTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/AutoSetPathTrackingListenerTest.java (from r1657464, incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/AutoSetPathTrackingListenerTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/AutoSetPathTrackingListenerTest.java?p2=incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/AutoSetPathTrackingListenerTest.java&p1=incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/AutoSetPathTrackingListenerTest.java&r1=1657464&r2=1657465&rev=1657465&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/AutoSetPathTrackingListenerTest.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/AutoSetPathTrackingListenerTest.java Thu Feb 5 03:36:17 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.test.sirona.javaagent;
+package org.apache.sirona.javaagent.listener;
import org.apache.sirona.configuration.ioc.IoCs;
import org.apache.sirona.javaagent.listener.PathTrackingListener;
Propchange: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/AutoSetPathTrackingListenerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/AutoSetPathTrackingListenerTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/MockPathTrackingInvocationListener.java (from r1657464, incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/MockPathTrackingInvocationListener.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/MockPathTrackingInvocationListener.java?p2=incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/MockPathTrackingInvocationListener.java&p1=incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/MockPathTrackingInvocationListener.java&r1=1657464&r2=1657465&rev=1657465&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/MockPathTrackingInvocationListener.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/MockPathTrackingInvocationListener.java Thu Feb 5 03:36:17 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.test.sirona.javaagent;
+package org.apache.sirona.javaagent.listener;
import org.apache.sirona.pathtracking.Context;
Propchange: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/MockPathTrackingInvocationListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/MockPathTrackingInvocationListener.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationRecursiveTest.java (from r1657464, incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationRecursiveTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationRecursiveTest.java?p2=incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationRecursiveTest.java&p1=incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationRecursiveTest.java&r1=1657464&r2=1657465&rev=1657465&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationRecursiveTest.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationRecursiveTest.java Thu Feb 5 03:36:17 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.test.sirona.javaagent;
+package org.apache.sirona.javaagent.listener;
import org.apache.sirona.configuration.ioc.IoCs;
import org.apache.sirona.javaagent.AgentArgs;
@@ -22,6 +22,7 @@ import org.apache.sirona.javaagent.JavaA
import org.apache.sirona.pathtracking.PathTrackingEntry;
import org.apache.sirona.pathtracking.test.ExtendedInMemoryPathTrackingDataStore;
import org.apache.sirona.store.DataStoreFactory;
+import org.apache.test.sirona.javaagent.App;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
Propchange: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationRecursiveTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationRecursiveTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/PathTrackingListenerTest.java (from r1657464, incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingListenerTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/PathTrackingListenerTest.java?p2=incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/PathTrackingListenerTest.java&p1=incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingListenerTest.java&r1=1657464&r2=1657465&rev=1657465&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingListenerTest.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/PathTrackingListenerTest.java Thu Feb 5 03:36:17 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.test.sirona.javaagent;
+package org.apache.sirona.javaagent.listener;
import org.apache.sirona.configuration.ioc.IoCs;
import org.apache.sirona.javaagent.AgentArgs;
@@ -24,6 +24,7 @@ import org.apache.sirona.pathtracking.Pa
import org.apache.sirona.pathtracking.test.ExtendedInMemoryPathTrackingDataStore;
import org.apache.sirona.store.DataStoreFactory;
import org.apache.sirona.tracking.PathTracker;
+import org.apache.test.sirona.javaagent.App;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -41,8 +42,9 @@ public class PathTrackingListenerTest
{
@Test
- @AgentArgs(value = "",
- sysProps = "project.build.directory=${project.build.directory}|sirona.agent.debug=${sirona.agent.debug}|org.apache.sirona.configuration.sirona.properties=${project.build.directory}/test-classes/pathtracking/sirona.properties|java.io.tmpdir=${java.io.tmpdir}")
+ @AgentArgs(value = "debug=true|sirona.agent.debug=${sirona.agent.debug}",
+ sysProps = "project.build.directory=${project.build.directory}|sirona.agent.debug=${sirona.agent.debug}|org.apache.sirona.configuration.sirona.properties=${project.build.directory}/test-classes/pathtracking/sirona.properties|java.io.tmpdir=${java.io.tmpdir}"
+ )
public void simpleTest()
throws Exception
{
@@ -131,4 +133,5 @@ public class PathTrackingListenerTest
}
+
}
Propchange: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/PathTrackingListenerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/listener/PathTrackingListenerTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/App.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/App.java?rev=1657465&r1=1657464&r2=1657465&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/App.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/App.java Thu Feb 5 03:36:17 2015
@@ -21,6 +21,8 @@ package org.apache.test.sirona.javaagent
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
+import java.util.Arrays;
+import java.util.List;
public class App
{
@@ -35,10 +37,10 @@ public class App
throws Exception
{
this.foo();
- this.pub( "blabla" );
+ this.pub( "blabla", Arrays.asList( "Mountain Goat", "Fatyak" ) );
}
- public void pub( String foo )
+ public void pub( String foo, List<String> beers )
throws Exception
{
Thread.sleep( 100 );
Modified: incubator/sirona/trunk/agent/javaagent/src/test/resources/META-INF/services/org.apache.sirona.pathtracking.PathTrackingInvocationListener
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/resources/META-INF/services/org.apache.sirona.pathtracking.PathTrackingInvocationListener?rev=1657465&r1=1657464&r2=1657465&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/resources/META-INF/services/org.apache.sirona.pathtracking.PathTrackingInvocationListener (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/resources/META-INF/services/org.apache.sirona.pathtracking.PathTrackingInvocationListener Thu Feb 5 03:36:17 2015
@@ -1 +1 @@
-org.apache.test.sirona.javaagent.MockPathTrackingInvocationListener
\ No newline at end of file
+org.apache.sirona.javaagent.listener.MockPathTrackingInvocationListener
\ No newline at end of file
Modified: incubator/sirona/trunk/agent/javaagent/src/test/resources/pathtracking/sirona.properties
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/resources/pathtracking/sirona.properties?rev=1657465&r1=1657464&r2=1657465&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/resources/pathtracking/sirona.properties (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/resources/pathtracking/sirona.properties Thu Feb 5 03:36:17 2015
@@ -23,7 +23,7 @@ excludes = \
prefix:junit, \
prefix:org.junit, \
prefix:com.apple, \
- prefix:org.apache.test.sirona.javaagent.MockPathTrackingInvocationListener
+ prefix:org.apache.sirona.javaagent.listener.MockPathTrackingInvocationListener
org.apache.sirona.javaagent.listener.PathTrackingListener.excludes = ${excludes}
org.apache.sirona.javaagent.listener.CounterListener.excludes = ${excludes}
Modified: incubator/sirona/trunk/api/src/main/java/org/apache/sirona/pathtracking/PathTrackingEntry.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/api/src/main/java/org/apache/sirona/pathtracking/PathTrackingEntry.java?rev=1657465&r1=1657464&r2=1657465&view=diff
==============================================================================
--- incubator/sirona/trunk/api/src/main/java/org/apache/sirona/pathtracking/PathTrackingEntry.java (original)
+++ incubator/sirona/trunk/api/src/main/java/org/apache/sirona/pathtracking/PathTrackingEntry.java Thu Feb 5 03:36:17 2015
@@ -68,8 +68,8 @@ public class PathTrackingEntry
// no op
}
- public PathTrackingEntry( String trackingId, String nodeId, String className, String methodName, long startTime,
- long executionTime, int level )
+ public PathTrackingEntry( String trackingId, String nodeId, String className, String methodName, //
+ long startTime, long executionTime, int level )
{
this.trackingId = trackingId;
this.nodeId = nodeId;
@@ -153,12 +153,8 @@ public class PathTrackingEntry
@Override
public String toString()
{
- return "PathTrackingEntry{" + "trackingId='" + trackingId
- + '\'' + ", nodeId='" + nodeId
- + '\'' + ", className='" + className + '\''
- + ", methodName='" + methodName
- + '\'' + ", startTime=" + startTime
- + ", executionTime=" + executionTime
- + ", level=" + level + '}';
+ return "PathTrackingEntry{" + "trackingId='" + trackingId + '\'' + ", nodeId='" + nodeId + '\''
+ + ", className='" + className + '\'' + ", methodName='" + methodName + '\'' + ", startTime=" + startTime
+ + ", executionTime=" + executionTime + ", level=" + level + '}';
}
}
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=1657465&r1=1657464&r2=1657465&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 5 03:36:17 2015
@@ -91,7 +91,7 @@ public class PathTracker
classLoader = Thread.currentThread().getContextClassLoader();
}
- List<PathTrackingInvocationListener> listeners = new ArrayList<PathTrackingInvocationListener>( );
+ List<PathTrackingInvocationListener> listeners = new ArrayList<PathTrackingInvocationListener>();
Iterator<PathTrackingInvocationListener> iterator =
SPI.INSTANCE.find( PathTrackingInvocationListener.class, classLoader ).iterator();
@@ -191,7 +191,7 @@ public class PathTracker
context.setPathTrackingInformation( pathTrackingInformation.getParent() );
}
- if (context.getPathTrackingInformation() != null)
+ if ( context.getPathTrackingInformation() != null )
{
for ( PathTrackingInvocationListener listener : LISTENERS )
{
@@ -201,8 +201,10 @@ public class PathTracker
}
final PathTrackingEntry pathTrackingEntry =
- new PathTrackingEntry( uuid, NODE, pathTrackingInformation.getClassName(),
- pathTrackingInformation.getMethodName(), start, ( end - start ),
+ new PathTrackingEntry( uuid, NODE, pathTrackingInformation.getClassName(), //
+ pathTrackingInformation.getMethodName(), //
+ start, //
+ ( end - start ), //
pathTrackingInformation.getLevel() );
if ( USE_SINGLE_STORE )
{