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:58:16 UTC
svn commit: r1569193 - in /incubator/sirona/trunk/agent/javaagent/src:
main/java/org/apache/sirona/pathtracking/PathTrackingInvocationListener.java
test/java/org/apache/sirona/pathtracking/PathTrackingInvocationListenerTest.java
Author: olamy
Date: Tue Feb 18 05:58:15 2014
New Revision: 1569193
URL: http://svn.apache.org/r1569193
Log:
fix some issues storing data
Modified:
incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/pathtracking/PathTrackingInvocationListener.java
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/pathtracking/PathTrackingInvocationListenerTest.java
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=1569193&r1=1569192&r2=1569193&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:58:15 2014
@@ -21,6 +21,7 @@ import org.apache.sirona.configuration.i
import org.apache.sirona.javaagent.AgentContext;
import org.apache.sirona.javaagent.listener.ConfigurableListener;
import org.apache.sirona.javaagent.spi.InvocationListener;
+import org.apache.sirona.store.DataStoreFactory;
import org.apache.sirona.store.tracking.PathTrackingDataStore;
import org.apache.sirona.tracking.PathTrackingEntry;
@@ -39,6 +40,9 @@ public class PathTrackingInvocationListe
private static final boolean DEBUG = Boolean.getBoolean( "sirona.agent.debug" );
+
+
+
/**
* fqcn.methodName
*/
@@ -47,7 +51,11 @@ public class PathTrackingInvocationListe
@Override
public boolean accept( String key )
{
-
+ boolean include = super.accept( key );
+ if ( !include )
+ {
+ return false;
+ }
if ( DEBUG )
{
System.out.println(
@@ -55,6 +63,14 @@ public class PathTrackingInvocationListe
//+ "super accept:" + accept );
}
+ // FIXME here really for testing purpose!!!
+ if ( key.startsWith( "java." )
+ || key.startsWith( "sun." )
+ || key.startsWith( "com.sun." ))
+ {
+ return false;
+ }
+
if ( !TRACKING_ACTIVATED )
{
return false;
@@ -92,16 +108,21 @@ public class PathTrackingInvocationListe
String methodName = this.key.substring( lastDot + 1, this.key.length() );
// FIXME get node from configuration
- // PathTrackingThreadLocal.get()
+ //
PathTrackingEntry pathTrackingEntry =
- new PathTrackingEntry( "1", "node", className, methodName, start, ( end - start ) );
+ new PathTrackingEntry( PathTrackingThreadLocal.get(), "node", className, methodName, start, ( end - start ) );
+
+ DataStoreFactory dataStoreFactory = IoCs.findOrCreateInstance( DataStoreFactory.class );
+
+ PathTrackingDataStore pathTrackingDataStore = dataStoreFactory.getPathTrackingDataStore();
if ( DEBUG )
{
- System.out.println( "PathTrackingInvocationListener: after: " + pathTrackingEntry.toString() );
+ System.out.println( "PathTrackingInvocationListener: after: " + pathTrackingEntry.toString()
+ + ", pathTrackingDataStore type:" + pathTrackingDataStore.getClass().getName() );
}
- IoCs.getInstance( PathTrackingDataStore.class ).store( pathTrackingEntry );
+ pathTrackingDataStore.store( pathTrackingEntry );
}
}
Modified: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/pathtracking/PathTrackingInvocationListenerTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/pathtracking/PathTrackingInvocationListenerTest.java?rev=1569193&r1=1569192&r2=1569193&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/pathtracking/PathTrackingInvocationListenerTest.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/pathtracking/PathTrackingInvocationListenerTest.java Tue Feb 18 05:58:15 2014
@@ -19,6 +19,7 @@ package org.apache.sirona.pathtracking;
import org.apache.sirona.configuration.ioc.IoCs;
import org.apache.sirona.javaagent.AgentArgs;
import org.apache.sirona.javaagent.JavaAgentRunner;
+import org.apache.sirona.store.DataStoreFactory;
import org.apache.sirona.store.tracking.InMemoryPathTrackingDataStore;
import org.apache.sirona.store.tracking.PathTrackingDataStore;
import org.apache.sirona.tracking.PathTrackingEntry;
@@ -45,8 +46,10 @@ public class PathTrackingInvocationListe
App app = new App();
app.beer();
+ DataStoreFactory dataStoreFactory = IoCs.findOrCreateInstance( DataStoreFactory.class );
+
InMemoryPathTrackingDataStore ptds =
- InMemoryPathTrackingDataStore.class.cast( IoCs.getInstance( PathTrackingDataStore.class ) );
+ InMemoryPathTrackingDataStore.class.cast( dataStoreFactory.getPathTrackingDataStore() );
Map<String, List<PathTrackingEntry>> all = ptds.retrieveAll();