implemented traceID concept

src/kieker/monitoring/gwt/client/monitoring/AspectWeaver.java

@@ -14,11 +14,15 @@ public class AspectWeaver {
 		}
 
 		$wnd.moduleCacheJSLines = null
-		$wnd.moduleCacheJSLineLength = 0
+		$wnd.moduleCacheJSLineLength = -1
 		$wnd.functionLineMap = {}
 		$wnd.filenameMap = {}
 		$wnd.monitoringCache = []
 		
+		$wnd.currentStackDepth = 0
+		$wnd.traceID = 0
+		$wnd.orderID = 0
+
 		$wnd.lastWrite = 0
 
 		$wnd.jQuery.get('http://localhost:9876/gwtmonitoring/' + $strongName
@@ -32,14 +36,16 @@ public class AspectWeaver {
 						+ '_sourcemap.json');
 
 		function aspectInvoc(invocation) {
-			var toSeekName = 'function ' + invocation.method;
+			// JS source not yet fetched therefore only proceed
+			if ($wnd.moduleCacheJSLineLength == -1)
+				return invocation.proceed();
 				
 			var linenumber = -1;
-			if (toSeekName in $wnd.functionLineMap) {
-				linenumber = $wnd.functionLineMap[toSeekName]
+			if (invocation.method in $wnd.functionLineMap) {
+				linenumber = $wnd.functionLineMap[invocation.method]
 			} else {
 //				var firstL1 = $wnd.performance.now()
-
+				var toSeekName = 'function ' + invocation.method;
 				var toSeekNameLength = toSeekName.length
 
 				var lines = $wnd.moduleCacheJSLines
@@ -51,7 +57,7 @@ public class AspectWeaver {
 							&& line[9] == firstMethodChar
 							&& line.startsWith(toSeekName)) {
 						linenumber = i + 1;
-						$wnd.functionLineMap[toSeekName] = linenumber;
+						$wnd.functionLineMap[invocation.method] = linenumber;
 //						console.log("lookup of " + toSeekName + " took "
 //									+ ($wnd.performance.now() - firstL1))
 						break;
@@ -59,44 +65,55 @@ public class AspectWeaver {
 				}
 			}
 
-			if (linenumber == -1)
-				return invocation.proceed();
-
 			var filename = null;
 			if (linenumber in $wnd.filenameMap) {
 				filename = $wnd.filenameMap[linenumber]
 			} else {
-//				var look1 = $wnd.performance.now()
 				var filename = $wnd.jQuery().lookupFilename(linenumber)
 				$wnd.filenameMap[linenumber] = filename
-
-//				console.log("filename lookup of " + filename + " took "
-//					+ ($wnd.performance.now() - look1))
 			}
 
-			if (!filename.indexOf("kieker/monitoring/gwt/client") == 0)
+			if (!filename.startsWith("kieker/monitoring/gwt/client"))
 				return invocation.proceed()
 				
 			// dont monitor self...
-			if (filename.indexOf("kieker/monitoring/gwt/client/monitoring") == 0)
+			if (filename.startsWith("kieker/monitoring/gwt/client/monitoring"))
 				return invocation.proceed()
 
-			$wnd.monitoringCache.push(filename + ";" + invocation.method + ";" + $wnd.performance.now());
+			// BEFORE; should be an record ID
+			$wnd.monitoringCache.push("BEFORE;" + $wnd.performance.now() + ";" + $wnd.traceID + ";" + $wnd.orderID + ";" + filename + ";" + invocation.method);
+			$wnd.orderID++;
+			
+			$wnd.currentStackDepth++;
+			
 			var result = invocation.proceed();
 			
-			var afterT = $wnd.performance.now();
-			$wnd.monitoringCache.push(afterT);
+			$wnd.currentStackDepth--;
 
-			if ($wnd.monitoringCache.length >= 1) { // TODO increase for normal use
+			// AFTER; should be an record ID
+			$wnd.monitoringCache.push("AFTER;" + $wnd.performance.now() + ";" + $wnd.traceID + ";" + $wnd.orderID + ";" + filename + ";" + invocation.method);
+			$wnd.orderID++;
+
+			if ($wnd.monitoringCache.length >= 1) { // TODO increase for normal usage
 				@kieker.monitoring.gwt.client.monitoring.MetaMonitoringManager::sendRecordBundle(Ljava/lang/String;)($wnd.monitoringCache.toString())
 				$wnd.monitoringCache = [];
 			}
+			
 			// time triggered:
 //			if (afterT - $wnd.lastWrite > 1000) {
 //				$wnd.lastWrite = afterT
 //				@kieker.monitoring.gwt.client.monitoring.MetaMonitoringManager::sendRecordBundle(Ljava/lang/String;)($wnd.monitoringCache.toString())
 //				$wnd.monitoringCache = [];
 //			}
+
+			// LESS is if we started in the middle of the trace...
+			if ($wnd.currentStackDepth <= 0) {
+				// we finished the trace
+				$wnd.traceID++;
+				$wnd.orderID = 0;
+				$wnd.currentStackDepth = 0;
+			};
+
 			return result;
 		}
 

src/kieker/monitoring/gwt/server/monitoring/MetaMonitoringServiceImpl.java

@@ -17,9 +17,6 @@ public class MetaMonitoringServiceImpl extends RemoteServiceServlet implements
 			if (record.contains(";")) {
 				// BEFORE record
 				final String[] beforeRecordSplit = record.split(";");
-				String clazzName = beforeRecordSplit[0].substring(0,
-						beforeRecordSplit[0].lastIndexOf(".") - 1);
-				clazzName = clazzName.replace("/", ".");
 			} else {
 				// AFTER record
 			}