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/03/11 13:02:54 UTC
svn commit: r1576299 - 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/main/java/org/apache/sirona/javaagent/spi/ agent/javaa...
Author: olamy
Date: Tue Mar 11 12:02:54 2014
New Revision: 1576299
URL: http://svn.apache.org/r1576299
Log:
implement a PathTrackingInvocationListener for users being able to do their own
Added:
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/MockPathTrackingInvocationListener.java (with props)
incubator/sirona/trunk/agent/javaagent/src/test/resources/META-INF/services/org.apache.sirona.tracking.PathTrackingInvocationListener
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/spi/Order.java (contents, props changed)
- copied, changed from r1576298, incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/spi/Order.java
Removed:
incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/spi/Order.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/CounterListener.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/PathTrackingListenerTest.java
incubator/sirona/trunk/agent/javaagent/src/test/resources/pathtracking/sirona.properties
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/Context.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=1576299&r1=1576298&r2=1576299&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 Tue Mar 11 12:02:54 2014
@@ -21,7 +21,7 @@ import org.apache.sirona.configuration.i
import org.apache.sirona.counters.Counter;
import org.apache.sirona.javaagent.spi.InvocationListener;
import org.apache.sirona.javaagent.spi.InvocationListenerFactory;
-import org.apache.sirona.javaagent.spi.Order;
+import org.apache.sirona.spi.Order;
import org.apache.sirona.spi.SPI;
import java.lang.reflect.Method;
Modified: incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/CounterListener.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/CounterListener.java?rev=1576299&r1=1576298&r2=1576299&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/CounterListener.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/CounterListener.java Tue Mar 11 12:02:54 2014
@@ -22,7 +22,7 @@ import org.apache.sirona.configuration.p
import org.apache.sirona.counters.Counter;
import org.apache.sirona.javaagent.AgentContext;
import org.apache.sirona.javaagent.spi.InvocationListener;
-import org.apache.sirona.javaagent.spi.Order;
+import org.apache.sirona.spi.Order;
@Order(0)
@AutoSet
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=1576299&r1=1576298&r2=1576299&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 Tue Mar 11 12:02:54 2014
@@ -20,7 +20,7 @@ import org.apache.sirona.configuration.C
import org.apache.sirona.configuration.ioc.AutoSet;
import org.apache.sirona.javaagent.AgentContext;
import org.apache.sirona.javaagent.logging.SironaAgentLogging;
-import org.apache.sirona.javaagent.spi.Order;
+import org.apache.sirona.spi.Order;
import org.apache.sirona.tracking.PathTracker;
import org.apache.sirona.tracking.PathTrackingInformation;
Added: 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/test/sirona/javaagent/MockPathTrackingInvocationListener.java?rev=1576299&view=auto
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/MockPathTrackingInvocationListener.java (added)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/MockPathTrackingInvocationListener.java Tue Mar 11 12:02:54 2014
@@ -0,0 +1,69 @@
+/*
+ * 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.test.sirona.javaagent;
+
+import org.apache.sirona.tracking.Context;
+import org.apache.sirona.tracking.PathTrackingInformation;
+import org.apache.sirona.tracking.PathTrackingInvocationListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Olivier Lamy
+ */
+public class MockPathTrackingInvocationListener implements PathTrackingInvocationListener
+{
+
+ int startPathCallCount = 0;
+
+ int enterMethodCallCount = 0;
+
+ List<PathTrackingInformation> entered = new ArrayList<PathTrackingInformation>( );
+
+ int exitMethodCallCount = 0;
+
+ List<PathTrackingInformation> exit = new ArrayList<PathTrackingInformation>( );
+
+ int endPathCallCount = 0;
+
+ @Override
+ public void startPath( Context context )
+ {
+ startPathCallCount++;
+ }
+
+ @Override
+ public void enterMethod( Context context )
+ {
+ entered.add( context.getPathTrackingInformation() );
+ enterMethodCallCount++;
+ }
+
+ @Override
+ public void exitMethod( Context context )
+ {
+ exit.add( context.getPathTrackingInformation() );
+ exitMethodCallCount++;
+ }
+
+ @Override
+ public void endPath( Context context )
+ {
+ endPathCallCount++;
+ }
+}
Propchange: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/MockPathTrackingInvocationListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/MockPathTrackingInvocationListener.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: 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/test/sirona/javaagent/PathTrackingListenerTest.java?rev=1576299&r1=1576298&r2=1576299&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/test/sirona/javaagent/PathTrackingListenerTest.java Tue Mar 11 12:02:54 2014
@@ -23,6 +23,7 @@ import org.apache.sirona.pathtracking.te
import org.apache.sirona.store.DataStoreFactory;
import org.apache.sirona.tracking.PathTracker;
import org.apache.sirona.tracking.PathTrackingEntry;
+import org.apache.sirona.tracking.PathTrackingInvocationListener;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -112,6 +113,22 @@ public class PathTrackingListenerTest
Assert.assertTrue( entry.getExecutionTime() >= 300 * 1000000 );
+ // we have only one here
+ PathTrackingInvocationListener listener = PathTracker.getPathTrackingInvocationListeners()[0];
+
+ MockPathTrackingInvocationListener mock = MockPathTrackingInvocationListener.class.cast( listener );
+
+ System.out.println( "mock.startPathCallCount: " + mock.startPathCallCount );
+
+ Assert.assertEquals( 1, mock.startPathCallCount );
+
+ Assert.assertEquals( 1, mock.endPathCallCount );
+
+ Assert.assertEquals( 3, mock.enterMethodCallCount );
+
+ Assert.assertEquals( 3, mock.exitMethodCallCount );
+
+
}
}
Added: incubator/sirona/trunk/agent/javaagent/src/test/resources/META-INF/services/org.apache.sirona.tracking.PathTrackingInvocationListener
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/resources/META-INF/services/org.apache.sirona.tracking.PathTrackingInvocationListener?rev=1576299&view=auto
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/resources/META-INF/services/org.apache.sirona.tracking.PathTrackingInvocationListener (added)
+++ incubator/sirona/trunk/agent/javaagent/src/test/resources/META-INF/services/org.apache.sirona.tracking.PathTrackingInvocationListener Tue Mar 11 12:02:54 2014
@@ -0,0 +1 @@
+org.apache.test.sirona.javaagent.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=1576299&r1=1576298&r2=1576299&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 Tue Mar 11 12:02:54 2014
@@ -22,7 +22,8 @@ excludes = \
prefix:org.junit,\
prefix:junit, \
prefix:org.junit, \
- prefix:com.apple
+ prefix:com.apple, \
+ prefix:org.apache.test.sirona.javaagent.MockPathTrackingInvocationListener
org.apache.sirona.javaagent.listener.PathTrackingListener.excludes = ${excludes}
org.apache.sirona.javaagent.listener.CounterListener.excludes = ${excludes}
Copied: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/spi/Order.java (from r1576298, incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/spi/Order.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/spi/Order.java?p2=incubator/sirona/trunk/core/src/main/java/org/apache/sirona/spi/Order.java&p1=incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/spi/Order.java&r1=1576298&r2=1576299&rev=1576299&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/spi/Order.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/spi/Order.java Tue Mar 11 12:02:54 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sirona.javaagent.spi;
+package org.apache.sirona.spi;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Propchange: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/spi/Order.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/spi/Order.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/Context.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/Context.java?rev=1576299&r1=1576298&r2=1576299&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/Context.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/Context.java Tue Mar 11 12:02:54 2014
@@ -32,7 +32,7 @@ public class Context
private List<PathTrackingEntry> entries;
- private PathTrackingInformation trackingInformation;
+ private PathTrackingInformation pathTrackingInformation;
protected Context()
{
@@ -56,9 +56,9 @@ public class Context
return entries;
}
- public PathTrackingInformation getTrackingInformation()
+ public PathTrackingInformation getPathTrackingInformation()
{
- return trackingInformation;
+ return pathTrackingInformation;
}
public void setUuid( String uuid )
@@ -76,8 +76,8 @@ public class Context
this.entries = entries;
}
- public void setTrackingInformation( PathTrackingInformation trackingInformation )
+ public void setPathTrackingInformation( PathTrackingInformation pathTrackingInformation )
{
- this.trackingInformation = trackingInformation;
+ this.pathTrackingInformation = pathTrackingInformation;
}
}
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=1576299&r1=1576298&r2=1576299&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 Tue Mar 11 12:02:54 2014
@@ -20,15 +20,18 @@ package org.apache.sirona.tracking;
import org.apache.sirona.configuration.Configuration;
import org.apache.sirona.configuration.ioc.Destroying;
import org.apache.sirona.configuration.ioc.IoCs;
+import org.apache.sirona.spi.Order;
+import org.apache.sirona.spi.SPI;
import org.apache.sirona.store.DataStoreFactory;
import org.apache.sirona.store.tracking.PathTrackingDataStore;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
import java.util.List;
-import java.util.UUID;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* Contains logic to track class#method invocation path
@@ -42,6 +45,7 @@ public class PathTracker
private static final PathTrackingDataStore PATH_TRACKING_DATA_STORE =
IoCs.findOrCreateInstance( DataStoreFactory.class ).getPathTrackingDataStore();
+
private static final ThreadLocal<Context> THREAD_LOCAL = new ThreadLocal<Context>()
{
@Override
@@ -72,6 +76,44 @@ public class PathTracker
}
}
+ private static PathTrackingInvocationListener[] LISTENERS;
+
+ static
+ {
+ ClassLoader classLoader = PathTracker.class.getClassLoader();
+
+ if ( classLoader == null )
+ {
+ classLoader = Thread.currentThread().getContextClassLoader();
+ }
+
+ List<PathTrackingInvocationListener> listeners = new ArrayList<PathTrackingInvocationListener>( );
+
+ Iterator<PathTrackingInvocationListener> iterator =
+ SPI.INSTANCE.find( PathTrackingInvocationListener.class, classLoader ).iterator();
+
+ while ( iterator.hasNext() )
+ {
+ try
+ {
+ listeners.add( IoCs.autoSet( iterator.next() ) );
+ }
+ catch ( Exception e )
+ {
+ throw new RuntimeException( e.getMessage(), e );
+ }
+ }
+
+ Collections.sort( listeners, ListenerComparator.INSTANCE );
+ LISTENERS = listeners.toArray( new PathTrackingInvocationListener[listeners.size()] );
+ }
+
+
+ public static PathTrackingInvocationListener[] getPathTrackingInvocationListeners()
+ {
+ return LISTENERS;
+ }
+
private PathTracker( final PathTrackingInformation pathTrackingInformation )
{
this.pathTrackingInformation = pathTrackingInformation;
@@ -83,7 +125,6 @@ public class PathTracker
THREAD_LOCAL.remove();
}
-
// An other solution could be using Thread.currentThread().getStackTrace() <- very slow
public static PathTracker start( PathTrackingInformation pathTrackingInformation )
@@ -91,8 +132,8 @@ public class PathTracker
final Context context = THREAD_LOCAL.get();
- final int level;
- final PathTrackingInformation current = context.getTrackingInformation();
+ int level = 0;
+ final PathTrackingInformation current = context.getPathTrackingInformation();
if ( current == null )
{
level = context.getLevel().incrementAndGet();
@@ -112,7 +153,19 @@ public class PathTracker
}
pathTrackingInformation.setStart( System.nanoTime() );
- context.setTrackingInformation( pathTrackingInformation );
+ context.setPathTrackingInformation( pathTrackingInformation );
+
+ for ( PathTrackingInvocationListener listener : LISTENERS )
+ {
+ if ( level == 1 )
+ {
+ listener.startPath( context );
+ }
+ else
+ {
+ listener.enterMethod( context );
+ }
+ }
return new PathTracker( pathTrackingInformation );
}
@@ -126,12 +179,21 @@ public class PathTracker
final String uuid = context.getUuid();
- final PathTrackingInformation current = context.getTrackingInformation();
+ final PathTrackingInformation current = context.getPathTrackingInformation();
// same invocation so no inc, class can do recursion so don't use classname/methodname
if ( pathTrackingInformation != current )
{
context.getLevel().decrementAndGet();
- context.setTrackingInformation( pathTrackingInformation.getParent() );
+ context.setPathTrackingInformation( pathTrackingInformation.getParent() );
+ }
+
+ if (context.getPathTrackingInformation() != null)
+ {
+ for ( PathTrackingInvocationListener listener : LISTENERS )
+ {
+ listener.exitMethod( context );
+
+ }
}
final PathTrackingEntry pathTrackingEntry =
@@ -149,7 +211,7 @@ public class PathTracker
if ( pathTrackingInformation.getLevel() == 1 && pathTrackingInformation.getParent() == null )
{ // 0 is never reached so 1 is first
- if (!USE_SINGLE_STORE)
+ if ( !USE_SINGLE_STORE )
{
Runnable runnable = new Runnable()
{
@@ -169,6 +231,12 @@ public class PathTracker
runnable.run();
}
}
+
+ for ( PathTrackingInvocationListener listener : LISTENERS )
+ {
+ listener.endPath( context );
+ }
+
}
}
@@ -184,4 +252,31 @@ public class PathTracker
}
+ private static class ListenerComparator
+ implements Comparator<PathTrackingInvocationListener>
+ {
+ private static final ListenerComparator INSTANCE = new ListenerComparator();
+
+ private ListenerComparator()
+ {
+ // no-op
+ }
+
+ @Override
+ public int compare( final PathTrackingInvocationListener o1, final PathTrackingInvocationListener o2 )
+ {
+ final Order order1 = o1.getClass().getAnnotation( Order.class );
+ final Order order2 = o2.getClass().getAnnotation( Order.class );
+ if ( order2 == null )
+ {
+ return -1;
+ }
+ if ( order1 == null )
+ {
+ return 1;
+ }
+ return order1.value() - order2.value();
+ }
+ }
+
}