Commit a13afd8a authored by Florian Fittkau's avatar Florian Fittkau

fixed monitoring

parent 40146210
......@@ -56,7 +56,7 @@ public abstract class AbstractAspect {
AfterFailedOperationEventRecord.CLAZZ_ID,
AfterOperationEventRecord.COMPRESSED_BYTE_LENGTH_WITH_CLAZZ_ID,
AfterOperationEventRecord.CLAZZ_ID, System.identityHashCode(thisObject), thisObject
.getClass().getName(), getInterface(thisJoinPoint));
.getClass().getName(), getInterface(thisJoinPoint));
}
@Around("monitoredOperation() && !this(java.lang.Object) && notWithinExplorViz()")
......@@ -73,7 +73,7 @@ public abstract class AbstractAspect {
AfterFailedStaticOperationEventRecord.CLAZZ_ID,
AfterStaticOperationEventRecord.COMPRESSED_BYTE_LENGTH_WITH_CLAZZ_ID,
AfterStaticOperationEventRecord.CLAZZ_ID, 0, thisJoinPoint.getSignature()
.getDeclaringTypeName(), getInterface(thisJoinPoint));
.getDeclaringTypeName(), getInterface(thisJoinPoint));
}
@Around("monitoredConstructor() && this(thisObject) && notWithinExplorViz()")
......@@ -118,14 +118,14 @@ public abstract class AbstractAspect {
final int beforeLength, final byte beforeId, final int afterFailedLength,
final byte afterFailedId, final int afterLength, final byte afterId,
final int objectId, final String clazz, final String implementedInterface)
throws Throwable {
throws Throwable {
final ByteBuffer buffer = bufferStore.get();
final ProbeTraceMetaData trace = TraceRegistry.getTrace();
trace.incrementStackDepth();
if (beforeLength > buffer.remaining()) {
updateLastSendingTimeToCurrent();
// updateLastSendingTimeToCurrent();
MonitoringController.sendOutBuffer(buffer);
}
......@@ -146,7 +146,7 @@ public abstract class AbstractAspect {
retval = thisJoinPoint.proceed();
} catch (final Throwable th) {
if (afterFailedLength > buffer.remaining()) {
updateLastSendingTimeToCurrent();
// updateLastSendingTimeToCurrent();
MonitoringController.sendOutBuffer(buffer);
}
......@@ -158,7 +158,12 @@ public abstract class AbstractAspect {
// final StringWriter errors = new StringWriter();
// th.printStackTrace(new PrintWriter(errors));
buffer.putInt(MonitoringStringRegistry.getIdForString(th.getLocalizedMessage()));
String message = th.getMessage();
if (message == null) {
message = "<unknown>";
}
buffer.putInt(MonitoringStringRegistry.getIdForString(message));
trace.decreaseStackDepthAndEndTraceIfNeccessary();
......@@ -166,7 +171,7 @@ public abstract class AbstractAspect {
}
if (afterLength > buffer.remaining()) {
updateLastSendingTimeToCurrent();
// updateLastSendingTimeToCurrent();
MonitoringController.sendOutBuffer(buffer);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment