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/03 07:05:20 UTC
svn commit: r1573453 - in /incubator/sirona/trunk: .gitignore
agent/store/cube/src/main/java/org/apache/sirona/cube/Cube.java
server/reporting/pom.xml
Author: olamy
Date: Mon Mar 3 06:05:19 2014
New Revision: 1573453
URL: http://svn.apache.org/r1573453
Log:
add method to send unit update, ignore some test files, add possibility to use a test file
Modified:
incubator/sirona/trunk/.gitignore
incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/Cube.java
incubator/sirona/trunk/server/reporting/pom.xml
Modified: incubator/sirona/trunk/.gitignore
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/.gitignore?rev=1573453&r1=1573452&r2=1573453&view=diff
==============================================================================
--- incubator/sirona/trunk/.gitignore (original)
+++ incubator/sirona/trunk/.gitignore Mon Mar 3 06:05:19 2014
@@ -5,3 +5,8 @@ target
out/
agent/javaagent/dependency-reduced-pom.xml
.java-version
+
+## local testing files
+agentToTomcat.sh
+server/reporting/src/test/sirona.properties
+startCollector.sh
Modified: incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/Cube.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/Cube.java?rev=1573453&r1=1573452&r2=1573453&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/Cube.java (original)
+++ incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/Cube.java Mon Mar 3 06:05:19 2014
@@ -303,11 +303,26 @@ public class Cube {
);
}
+ return events;
+ }
+ public StringBuilder pathTrackingSnapshot( PathTrackingEntry pathTrackingEntry ) {
+ final StringBuilder event = newEventStream();
+ final long ts = System.currentTimeMillis();
+
+ buildEvent( event, PATHTRACKING_TYPE, ts, new MapBuilder()
+ .add( TRACKING_D, pathTrackingEntry.getTrackingId() )
+ .add( NODE_ID, pathTrackingEntry.getNodeId() )
+ .add( CLASSNAME, pathTrackingEntry.getClassName() )
+ .add( METHOD_NAME, pathTrackingEntry.getMethodName() )
+ .add( START_TIME, pathTrackingEntry.getStartTime() )
+ .add( EXEC_TIME, pathTrackingEntry.getExecutionTime() )
+ .add( LEVEL, pathTrackingEntry.getLevel() )
+ .map()
+ );
-
- return events;
+ return event;
}
public StringBuilder gaugeSnapshot(final StringBuilder base, final long time, final Role role, final double value) {
Modified: incubator/sirona/trunk/server/reporting/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/pom.xml?rev=1573453&r1=1573452&r2=1573453&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/pom.xml (original)
+++ incubator/sirona/trunk/server/reporting/pom.xml Mon Mar 3 06:05:19 2014
@@ -130,6 +130,9 @@
<port>${tomcatRunPort}</port>
<path>${tomcatRunPath}</path>
<skip>${sirona.reporting.tomcat.skip}</skip>
+ <systemProperties>
+ <org.apache.sirona.configuration.sirona.properties>${basedir}/src/test/sirona.properties</org.apache.sirona.configuration.sirona.properties>
+ </systemProperties>
</configuration>
<dependencies>
<dependency>