Skip to content

Commit 380f60f

Browse files
committed
Simplify Java agent instrumentation
1 parent 27d9902 commit 380f60f

File tree

2 files changed

+4
-16
lines changed
  • instrumentation
    • java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul
    • jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1

2 files changed

+4
-16
lines changed

instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,8 @@ private static void mapLogRecord(LogRecordBuilder builder, LogRecord logRecord)
8585
// throwable
8686
Throwable throwable = logRecord.getThrown();
8787
if (throwable != null) {
88-
// TODO (trask) extract method for recording exception into
89-
// io.opentelemetry:opentelemetry-api
90-
attributes.put(ExceptionAttributes.EXCEPTION_TYPE, throwable.getClass().getName());
91-
attributes.put(ExceptionAttributes.EXCEPTION_MESSAGE, throwable.getMessage());
92-
StringWriter writer = new StringWriter();
93-
throwable.printStackTrace(new PrintWriter(writer));
94-
attributes.put(ExceptionAttributes.EXCEPTION_STACKTRACE, writer.toString());
88+
// this is safe withinthis is java agent instrumentation
89+
((ExtendedLogRecordBuilder) builder).setException(throwable);
9590
}
9691

9792
if (captureExperimentalAttributes) {

instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,8 @@ public void capture(Logger logger, ExtLogRecord record) {
8282

8383
Throwable throwable = record.getThrown();
8484
if (throwable != null) {
85-
if (builder instanceof ExtendedLogRecordBuilder) {
86-
((ExtendedLogRecordBuilder) builder).setException(throwable);
87-
} else {
88-
attributes.put(ExceptionAttributes.EXCEPTION_TYPE, throwable.getClass().getName());
89-
attributes.put(ExceptionAttributes.EXCEPTION_MESSAGE, throwable.getMessage());
90-
StringWriter writer = new StringWriter();
91-
throwable.printStackTrace(new PrintWriter(writer));
92-
attributes.put(ExceptionAttributes.EXCEPTION_STACKTRACE, writer.toString());
93-
}
85+
// this is safe withinthis is java agent instrumentation
86+
((ExtendedLogRecordBuilder) builder).setException(throwable);
9487
}
9588
captureMdcAttributes(attributes);
9689

0 commit comments

Comments
 (0)