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:06 UTC
svn commit: r1576295 - in /incubator/sirona/trunk/agent/javaagent/src:
main/java/org/apache/sirona/javaagent/listener/
main/resources/META-INF/services/
test/java/org/apache/test/sirona/javaagent/ test/resources/
test/resources/pathtracking/
Author: olamy
Date: Tue Mar 11 12:02:06 2014
New Revision: 1576295
URL: http://svn.apache.org/r1576295
Log:
rename to add later a listener for path tracking invocation
Added:
incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingListener.java
- copied, changed from r1576293, incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingListenerTest.java (contents, props changed)
- copied, changed from r1576293, incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java
Removed:
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java
Modified:
incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java
incubator/sirona/trunk/agent/javaagent/src/main/resources/META-INF/services/org.apache.sirona.javaagent.spi.InvocationListener
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/AutoSetPathTrackingListenerTest.java
incubator/sirona/trunk/agent/javaagent/src/test/resources/pathtracking/sirona.properties
incubator/sirona/trunk/agent/javaagent/src/test/resources/sirona.properties
Modified: incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java?rev=1576295&r1=1576294&r2=1576295&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java Tue Mar 11 12:02:06 2014
@@ -1,97 +1,24 @@
/*
- * 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.
- */
+* 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.configuration.Configuration;
-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.tracking.PathTracker;
-
-@Order( 1 )
-@AutoSet
/**
- * This listener is responsible to track/record class#method path using {@link org.apache.sirona.tracking.PathTracker}
+ * @author Olivier Lamy
*/
-public class PathTrackingInvocationListener
- extends ConfigurableListener
+public interface PathTrackingInvocationListener
{
-
- private static final Integer PATH_TRACKER_KEY = "Sirona-path-tracker-key".hashCode();
-
- private static final boolean TRACKING_ACTIVATED =
- Configuration.is( Configuration.CONFIG_PROPERTY_PREFIX + "javaagent.path.tracking.activate", false );
-
- @Override
- public boolean accept( String key )
- {
- boolean include = super.accept( key );
- if ( !include )
- {
- return false;
- }
-
- SironaAgentLogging.debug(
- "PathTrackingInvocationListener#accept, TRACKING_ACTIVATED: {0}, key: {1}", TRACKING_ACTIVATED, key );
-
- return TRACKING_ACTIVATED;
- }
-
- /**
- * executed before method called to configure the start {@link org.apache.sirona.tracking.PathTracker.PathTrackingInformation}
- * and set various thread local variable as invocation level
- * will call {@link org.apache.sirona.tracking.PathTracker#start(org.apache.sirona.tracking.PathTracker.PathTrackingInformation)}
- *
- * @param context
- */
- @Override
- public void before( AgentContext context )
- {
-
- String key = context.getKey();
- SironaAgentLogging.debug( "PathTrackingInvocationListener#before: {0}", key );
-
- int lastDot = key.lastIndexOf( "." );
-
- String className = key.substring( 0, lastDot );
- String methodName = key.substring( lastDot + 1, key.length() );
-
- final PathTracker.PathTrackingInformation pathTrackingInformation =
- new PathTracker.PathTrackingInformation( className, methodName );
-
- SironaAgentLogging.debug( "call PathTracker#start with {0}", pathTrackingInformation );
-
- context.put( PATH_TRACKER_KEY, PathTracker.start( pathTrackingInformation ) );
- }
-
- /**
- * will call {@link org.apache.sirona.tracking.PathTracker#stop()}
- *
- * @param context
- * @param result
- * @param error
- */
- @Override
- public void after( AgentContext context, Object result, Throwable error )
- {
-
- SironaAgentLogging.debug( "PathTrackingInvocationListener#after: {0}", context.getKey() );
-
- context.get( PATH_TRACKER_KEY, PathTracker.class ).stop();
- }
}
Copied: incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingListener.java (from r1576293, incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingListener.java?p2=incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingListener.java&p1=incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java&r1=1576293&r2=1576295&rev=1576295&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingListener.java Tue Mar 11 12:02:06 2014
@@ -28,7 +28,7 @@ import org.apache.sirona.tracking.PathTr
/**
* This listener is responsible to track/record class#method path using {@link org.apache.sirona.tracking.PathTracker}
*/
-public class PathTrackingInvocationListener
+public class PathTrackingListener
extends ConfigurableListener
{
@@ -47,7 +47,7 @@ public class PathTrackingInvocationListe
}
SironaAgentLogging.debug(
- "PathTrackingInvocationListener#accept, TRACKING_ACTIVATED: {0}, key: {1}", TRACKING_ACTIVATED, key );
+ "PathTrackingListener#accept, TRACKING_ACTIVATED: {0}, key: {1}", TRACKING_ACTIVATED, key );
return TRACKING_ACTIVATED;
}
@@ -64,7 +64,7 @@ public class PathTrackingInvocationListe
{
String key = context.getKey();
- SironaAgentLogging.debug( "PathTrackingInvocationListener#before: {0}", key );
+ SironaAgentLogging.debug( "PathTrackingListener#before: {0}", key );
int lastDot = key.lastIndexOf( "." );
@@ -90,7 +90,7 @@ public class PathTrackingInvocationListe
public void after( AgentContext context, Object result, Throwable error )
{
- SironaAgentLogging.debug( "PathTrackingInvocationListener#after: {0}", context.getKey() );
+ SironaAgentLogging.debug( "PathTrackingListener#after: {0}", context.getKey() );
context.get( PATH_TRACKER_KEY, PathTracker.class ).stop();
}
Modified: incubator/sirona/trunk/agent/javaagent/src/main/resources/META-INF/services/org.apache.sirona.javaagent.spi.InvocationListener
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/main/resources/META-INF/services/org.apache.sirona.javaagent.spi.InvocationListener?rev=1576295&r1=1576294&r2=1576295&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/main/resources/META-INF/services/org.apache.sirona.javaagent.spi.InvocationListener (original)
+++ incubator/sirona/trunk/agent/javaagent/src/main/resources/META-INF/services/org.apache.sirona.javaagent.spi.InvocationListener Tue Mar 11 12:02:06 2014
@@ -1,2 +1,2 @@
org.apache.sirona.javaagent.listener.CounterListener
-org.apache.sirona.javaagent.listener.PathTrackingInvocationListener
+org.apache.sirona.javaagent.listener.PathTrackingListener
Modified: 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/test/sirona/javaagent/AutoSetPathTrackingListenerTest.java?rev=1576295&r1=1576294&r2=1576295&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/test/sirona/javaagent/AutoSetPathTrackingListenerTest.java Tue Mar 11 12:02:06 2014
@@ -17,7 +17,7 @@
package org.apache.test.sirona.javaagent;
import org.apache.sirona.configuration.ioc.IoCs;
-import org.apache.sirona.javaagent.listener.PathTrackingInvocationListener;
+import org.apache.sirona.javaagent.listener.PathTrackingListener;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertFal
public class AutoSetPathTrackingListenerTest {
@Test
public void autoSet() throws Exception {
- final PathTrackingInvocationListener listener = IoCs.autoSet(null, new PathTrackingInvocationListener());
+ final PathTrackingListener listener = IoCs.autoSet(null, new PathTrackingListener());
assertFalse(listener.accept("org.junit"));
}
}
Copied: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingListenerTest.java (from r1576293, 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/PathTrackingListenerTest.java?p2=incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingListenerTest.java&p1=incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java&r1=1576293&r2=1576295&rev=1576295&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/PathTrackingListenerTest.java Tue Mar 11 12:02:06 2014
@@ -36,7 +36,7 @@ import java.util.Set;
*
*/
@RunWith(JavaAgentRunner.class)
-public class PathTrackingInvocationListenerTest
+public class PathTrackingListenerTest
{
@Test
Propchange: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingListenerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingListenerTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
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=1576295&r1=1576294&r2=1576295&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:06 2014
@@ -24,7 +24,7 @@ excludes = \
prefix:org.junit, \
prefix:com.apple
-org.apache.sirona.javaagent.listener.PathTrackingInvocationListener.excludes = ${excludes}
+org.apache.sirona.javaagent.listener.PathTrackingListener.excludes = ${excludes}
org.apache.sirona.javaagent.listener.CounterListener.excludes = ${excludes}
org.apache.sirona.store.DataStoreFactory = org.apache.sirona.pathtracking.test.ExtDataStoreFactory
Modified: incubator/sirona/trunk/agent/javaagent/src/test/resources/sirona.properties
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/resources/sirona.properties?rev=1576295&r1=1576294&r2=1576295&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/resources/sirona.properties (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/resources/sirona.properties Tue Mar 11 12:02:06 2014
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-org.apache.sirona.javaagent.listener.PathTrackingInvocationListener.excludes = \
+org.apache.sirona.javaagent.listener.PathTrackingListener.excludes = \
prefix:java,\
prefix:sun,\
prefix:com,\