Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add thread name to log capture #1790

Merged
merged 3 commits into from
Jul 7, 2021
Merged

Add thread name to log capture #1790

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a24945
Add thread name to log capture
trask Jul 1, 2021
b5de007
Update smoke tests
trask Jul 1, 2021
5dacf04
FIX
trask Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions ...ing/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/Exporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,12 +348,13 @@ private void trackMessage(SpanData span) {
// set message-specific properties
String level = attributes.get(AI_LOG_LEVEL_KEY);
String loggerName = attributes.get(AI_LOGGER_NAME_KEY);
String threadName = attributes.get(SemanticAttributes.THREAD_NAME);

data.setVersion(2);
data.setSeverityLevel(toSeverityLevel(level));
data.setMessage(span.getName());

setLoggerProperties(data, level, loggerName);
setLoggerProperties(data, level, loggerName, threadName);

// export
telemetryClient.trackAsync(telemetry);
Expand All @@ -374,11 +375,12 @@ private void trackTraceAsException(SpanData span, String errorStack) {
// set exception-specific properties
String level = attributes.get(AI_LOG_LEVEL_KEY);
String loggerName = attributes.get(AI_LOGGER_NAME_KEY);
String threadName = attributes.get(SemanticAttributes.THREAD_NAME);

data.setExceptions(Exceptions.minimalParse(errorStack));
data.setSeverityLevel(toSeverityLevel(level));
TelemetryUtil.getProperties(data).put("Logger Message", span.getName());
setLoggerProperties(data, level, loggerName);
setLoggerProperties(data, level, loggerName, threadName);

// export
telemetryClient.trackAsync(telemetry);
Expand All @@ -396,7 +398,8 @@ private static void setOperationTags(
}
}

private static void setLoggerProperties(MonitorDomain data, String level, String loggerName) {
private static void setLoggerProperties(
MonitorDomain data, String level, String loggerName, String threadName) {
if (level != null) {
// TODO are these needed? level is already reported as severityLevel, sourceType maybe needed
// for exception telemetry only?
Expand All @@ -407,6 +410,9 @@ private static void setLoggerProperties(MonitorDomain data, String level, String
if (loggerName != null) {
TelemetryUtil.getProperties(data).put("LoggerName", loggerName);
}
if (threadName != null) {
TelemetryUtil.getProperties(data).put("ThreadName", loggerName);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be threadName

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😱 👍

}
}

private static void applyHttpClientSpan(Attributes attributes, RemoteDependencyData telemetry) {
Expand Down
9 changes: 6 additions & 3 deletions .../smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceJavaUtilLoggingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,16 @@ public void testTraceJavaUtilLogging() throws Exception {
assertEquals("Logger", md1.getProperties().get("SourceType"));
assertEquals("WARNING", md1.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", md1.getProperties().get("LoggerName"));
assertEquals(3, md1.getProperties().size());
assertNotNull(md1.getProperties().get("ThreadName"));
assertEquals(4, md1.getProperties().size());

assertEquals("This is jul severe.", md2.getMessage());
assertEquals(SeverityLevel.Error, md2.getSeverityLevel());
assertEquals("Logger", md2.getProperties().get("SourceType"));
assertEquals("SEVERE", md2.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", md1.getProperties().get("LoggerName"));
assertEquals(3, md2.getProperties().size());
assertNotNull(md2.getProperties().get("ThreadName"));
assertEquals(4, md2.getProperties().size());

assertParentChild(
rd, rdEnvelope, mdEnvelope1, "GET /TraceJavaUtilLoggingUsingAgent/traceJavaUtilLogging");
Expand Down Expand Up @@ -99,7 +101,8 @@ public void testTraceJavaUtilLoggingWithExeption() throws Exception {
assertEquals("Logger", ed.getProperties().get("SourceType"));
assertEquals("SEVERE", ed.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", ed.getProperties().get("LoggerName"));
assertEquals(4, ed.getProperties().size());
assertNotNull(ed.getProperties().get("ThreadName"));
assertEquals(5, ed.getProperties().size());

assertParentChild(
rd,
Expand Down
16 changes: 10 additions & 6 deletions ...j1_2/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLog4j12Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,28 +64,31 @@ public void testTraceLog4j12() throws Exception {
assertEquals("Logger", md1.getProperties().get("SourceType"));
assertEquals("WARN", md1.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", md1.getProperties().get("LoggerName"));
assertNotNull(md1.getProperties().get("ThreadName"));
// TODO (trask) revisit after Java 17 release
// MDC.getContext() always returns null on Java 17-ea
if (!currentImageName.contains("_openjdk_17")) {
assertEquals("MDC value", md1.getProperties().get("MDC key"));
assertEquals(4, md1.getProperties().size());
assertEquals(5, md1.getProperties().size());
} else {
assertEquals(3, md1.getProperties().size());
assertEquals(4, md1.getProperties().size());
}

assertEquals("This is log4j1.2 error.", md2.getMessage());
assertEquals(SeverityLevel.Error, md2.getSeverityLevel());
assertEquals("Logger", md2.getProperties().get("SourceType"));
assertEquals("ERROR", md2.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", md2.getProperties().get("LoggerName"));
assertEquals(3, md2.getProperties().size());
assertNotNull(md2.getProperties().get("ThreadName"));
assertEquals(4, md2.getProperties().size());

assertEquals("This is log4j1.2 fatal.", md3.getMessage());
assertEquals(SeverityLevel.Critical, md3.getSeverityLevel());
assertEquals("Logger", md3.getProperties().get("SourceType"));
assertEquals("FATAL", md3.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", md3.getProperties().get("LoggerName"));
assertEquals(3, md3.getProperties().size());
assertNotNull(md3.getProperties().get("ThreadName"));
assertEquals(4, md3.getProperties().size());

assertParentChild(rd, rdEnvelope, mdEnvelope1, "GET /TraceLog4j1_2/traceLog4j12");
assertParentChild(rd, rdEnvelope, mdEnvelope2, "GET /TraceLog4j1_2/traceLog4j12");
Expand Down Expand Up @@ -117,13 +120,14 @@ public void testTraceLog4j1_2WithExeption() throws Exception {
assertEquals("Logger", ed.getProperties().get("SourceType"));
assertEquals("ERROR", ed.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", ed.getProperties().get("LoggerName"));
assertNotNull(ed.getProperties().get("ThreadName"));
// TODO (trask) revisit after Java 17 release
// MDC.getContext() always returns null on Java 17-ea
if (!currentImageName.contains("_openjdk_17")) {
assertEquals("MDC value", ed.getProperties().get("MDC key"));
assertEquals(5, ed.getProperties().size());
assertEquals(6, ed.getProperties().size());
} else {
assertEquals(4, ed.getProperties().size());
assertEquals(5, ed.getProperties().size());
}

assertParentChild(rd, rdEnvelope, edEnvelope, "GET /TraceLog4j1_2/traceLog4j1_2WithException");
Expand Down
16 changes: 10 additions & 6 deletions ...gent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLog4j12Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,28 +64,31 @@ public void testTraceLog4j12() throws Exception {
assertEquals("Logger", md1.getProperties().get("SourceType"));
assertEquals("WARN", md1.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", md1.getProperties().get("LoggerName"));
assertNotNull(md1.getProperties().get("ThreadName"));
// TODO (trask) revisit after Java 17 release
// MDC.getContext() always returns null on Java 17-ea
if (!currentImageName.contains("_openjdk_17")) {
assertEquals("MDC value", md1.getProperties().get("MDC key"));
assertEquals(4, md1.getProperties().size());
assertEquals(5, md1.getProperties().size());
} else {
assertEquals(3, md1.getProperties().size());
assertEquals(4, md1.getProperties().size());
}

assertEquals("This is log4j1.2 error.", md2.getMessage());
assertEquals(SeverityLevel.Error, md2.getSeverityLevel());
assertEquals("Logger", md2.getProperties().get("SourceType"));
assertEquals("ERROR", md2.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", md2.getProperties().get("LoggerName"));
assertEquals(3, md2.getProperties().size());
assertNotNull(md2.getProperties().get("ThreadName"));
assertEquals(4, md2.getProperties().size());

assertEquals("This is log4j1.2 fatal.", md3.getMessage());
assertEquals(SeverityLevel.Critical, md3.getSeverityLevel());
assertEquals("Logger", md3.getProperties().get("SourceType"));
assertEquals("FATAL", md3.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", md3.getProperties().get("LoggerName"));
assertEquals(3, md3.getProperties().size());
assertNotNull(md3.getProperties().get("ThreadName"));
assertEquals(4, md3.getProperties().size());

assertParentChild(rd, rdEnvelope, mdEnvelope1, "GET /TraceLog4j1_2UsingAgent/traceLog4j12");
assertParentChild(rd, rdEnvelope, mdEnvelope2, "GET /TraceLog4j1_2UsingAgent/traceLog4j12");
Expand Down Expand Up @@ -117,13 +120,14 @@ public void testTraceLog4j1_2WithExeption() throws Exception {
assertEquals("Logger", ed.getProperties().get("SourceType"));
assertEquals("ERROR", ed.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", ed.getProperties().get("LoggerName"));
assertNotNull(ed.getProperties().get("ThreadName"));
// TODO (trask) revisit after Java 17 release
// MDC.getContext() always returns null on Java 17-ea
if (!currentImageName.contains("_openjdk_17")) {
assertEquals("MDC value", ed.getProperties().get("MDC key"));
assertEquals(5, ed.getProperties().size());
assertEquals(6, ed.getProperties().size());
} else {
assertEquals(4, ed.getProperties().size());
assertEquals(5, ed.getProperties().size());
}

assertParentChild(
Expand Down
12 changes: 9 additions & 3 deletions ...og4j2/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLog4j2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,25 @@ public void testTraceLog4j2() throws Exception {
assertEquals("Logger", md1.getProperties().get("SourceType"));
assertEquals("WARN", md1.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", md1.getProperties().get("LoggerName"));
assertNotNull(md1.getProperties().get("ThreadName"));
assertEquals("MDC value", md1.getProperties().get("MDC key"));
assertEquals(4, md1.getProperties().size());
assertEquals(5, md1.getProperties().size());

assertEquals("This is log4j2 error.", md2.getMessage());
assertEquals(SeverityLevel.Error, md2.getSeverityLevel());
assertEquals("Logger", md2.getProperties().get("SourceType"));
assertEquals("ERROR", md2.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", md2.getProperties().get("LoggerName"));
assertEquals(3, md2.getProperties().size());
assertNotNull(md2.getProperties().get("ThreadName"));
assertEquals(4, md2.getProperties().size());

assertEquals("This is log4j2 fatal.", md3.getMessage());
assertEquals(SeverityLevel.Critical, md3.getSeverityLevel());
assertEquals("Logger", md3.getProperties().get("SourceType"));
assertEquals("FATAL", md3.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", md3.getProperties().get("LoggerName"));
assertEquals(3, md3.getProperties().size());
assertNotNull(md3.getProperties().get("ThreadName"));
assertEquals(4, md3.getProperties().size());

assertParentChild(rd, rdEnvelope, mdEnvelope1, "GET /TraceLog4j2/traceLog4j2");
assertParentChild(rd, rdEnvelope, mdEnvelope2, "GET /TraceLog4j2/traceLog4j2");
Expand Down Expand Up @@ -111,7 +114,10 @@ public void testTraceLog4j2WithException() throws Exception {
assertEquals("Logger", ed.getProperties().get("SourceType"));
assertEquals("ERROR", ed.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", ed.getProperties().get("LoggerName"));
assertNotNull(ed.getProperties().get("ThreadName"));
assertEquals("MDC value", ed.getProperties().get("MDC key"));
assertEquals(6, ed.getProperties().size());

assertParentChild(rd, rdEnvelope, edEnvelope, "GET /TraceLog4j2/traceLog4j2WithException");
}

Expand Down
12 changes: 8 additions & 4 deletions ...Agent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLog4j2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,25 @@ public void testTraceLog4j2() throws Exception {
assertEquals("Logger", md1.getProperties().get("SourceType"));
assertEquals("WARN", md1.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", md1.getProperties().get("LoggerName"));
assertNotNull(md1.getProperties().get("ThreadName"));
assertEquals("MDC value", md1.getProperties().get("MDC key"));
assertEquals(4, md1.getProperties().size());
assertEquals(5, md1.getProperties().size());

assertEquals("This is log4j2 error.", md2.getMessage());
assertEquals(SeverityLevel.Error, md2.getSeverityLevel());
assertEquals("Logger", md2.getProperties().get("SourceType"));
assertEquals("ERROR", md2.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", md1.getProperties().get("LoggerName"));
assertEquals(3, md2.getProperties().size());
assertNotNull(md1.getProperties().get("ThreadName"));
assertEquals(4, md2.getProperties().size());

assertEquals("This is log4j2 fatal.", md3.getMessage());
assertEquals(SeverityLevel.Critical, md3.getSeverityLevel());
assertEquals("Logger", md3.getProperties().get("SourceType"));
assertEquals("FATAL", md3.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", md3.getProperties().get("LoggerName"));
assertEquals(3, md3.getProperties().size());
assertNotNull(md3.getProperties().get("ThreadName"));
assertEquals(4, md3.getProperties().size());

assertParentChild(rd, rdEnvelope, mdEnvelope1, "GET /TraceLog4j2UsingAgent/traceLog4j2");
assertParentChild(rd, rdEnvelope, mdEnvelope2, "GET /TraceLog4j2UsingAgent/traceLog4j2");
Expand Down Expand Up @@ -111,8 +114,9 @@ public void testTraceLog4j2WithException() throws Exception {
assertEquals("Logger", ed.getProperties().get("SourceType"));
assertEquals("ERROR", ed.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", ed.getProperties().get("LoggerName"));
assertNotNull(ed.getProperties().get("ThreadName"));
assertEquals("MDC value", ed.getProperties().get("MDC key"));
assertEquals(5, ed.getProperties().size());
assertEquals(6, ed.getProperties().size());

assertParentChild(
rd, rdEnvelope, edEnvelope, "GET /TraceLog4j2UsingAgent/traceLog4j2WithException");
Expand Down
17 changes: 10 additions & 7 deletions ...Back/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLogBackTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,12 @@ public void testTraceLogBack() throws Exception {
assertEquals("Logger", md1.getProperties().get("SourceType"));
assertEquals("WARN", md1.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", md1.getProperties().get("LoggerName"));
assertNotNull(md1.getProperties().get("ThreadName"));
// TODO add MDC instrumentation for jboss logging
if (currentImageName.contains("wildfly")) {
assertEquals(3, md1.getProperties().size());
} else {
if (!currentImageName.contains("wildfly")) {
assertEquals("MDC value", md1.getProperties().get("MDC key"));
assertEquals(5, md1.getProperties().size());
} else {
assertEquals(4, md1.getProperties().size());
}

Expand All @@ -74,7 +75,8 @@ public void testTraceLogBack() throws Exception {
assertEquals("Logger", md2.getProperties().get("SourceType"));
assertEquals("ERROR", md2.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", md2.getProperties().get("LoggerName"));
assertEquals(3, md2.getProperties().size());
assertNotNull(md2.getProperties().get("ThreadName"));
assertEquals(4, md2.getProperties().size());

assertParentChild(rd, rdEnvelope, mdEnvelope1, "GET /TraceLogBack/traceLogBack");
assertParentChild(rd, rdEnvelope, mdEnvelope2, "GET /TraceLogBack/traceLogBack");
Expand Down Expand Up @@ -102,11 +104,12 @@ public void testTraceLogBackWithExeption() throws Exception {
assertEquals("Logger", ed.getProperties().get("SourceType"));
assertEquals("ERROR", ed.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", ed.getProperties().get("LoggerName"));
assertNotNull(ed.getProperties().get("ThreadName"));
// TODO add MDC instrumentation for jboss logging
if (currentImageName.contains("wildfly")) {
assertEquals(4, ed.getProperties().size());
} else {
if (!currentImageName.contains("wildfly")) {
assertEquals("MDC value", ed.getProperties().get("MDC key"));
assertEquals(6, ed.getProperties().size());
} else {
assertEquals(5, ed.getProperties().size());
}

Expand Down
17 changes: 10 additions & 7 deletions ...gent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLogBackTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,12 @@ public void testTraceLogBack() throws Exception {
assertEquals("Logger", md1.getProperties().get("SourceType"));
assertEquals("WARN", md1.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", md1.getProperties().get("LoggerName"));
assertNotNull(md1.getProperties().get("ThreadName"));
// TODO add MDC instrumentation for jboss logging
if (currentImageName.contains("wildfly")) {
assertEquals(3, md1.getProperties().size());
} else {
if (!currentImageName.contains("wildfly")) {
assertEquals("MDC value", md1.getProperties().get("MDC key"));
assertEquals(5, md1.getProperties().size());
} else {
assertEquals(4, md1.getProperties().size());
}

Expand All @@ -74,7 +75,8 @@ public void testTraceLogBack() throws Exception {
assertEquals("Logger", md2.getProperties().get("SourceType"));
assertEquals("ERROR", md2.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", md2.getProperties().get("LoggerName"));
assertEquals(3, md2.getProperties().size());
assertNotNull(md2.getProperties().get("ThreadName"));
assertEquals(4, md2.getProperties().size());

assertParentChild(rd, rdEnvelope, mdEnvelope1, "GET /TraceLogBackUsingAgent/traceLogBack");
assertParentChild(rd, rdEnvelope, mdEnvelope2, "GET /TraceLogBackUsingAgent/traceLogBack");
Expand Down Expand Up @@ -102,11 +104,12 @@ public void testTraceLogBackWithExeption() throws Exception {
assertEquals("Logger", ed.getProperties().get("SourceType"));
assertEquals("ERROR", ed.getProperties().get("LoggingLevel"));
assertEquals("smoketestapp", ed.getProperties().get("LoggerName"));
assertNotNull(ed.getProperties().get("ThreadName"));
// TODO add MDC instrumentation for jboss logging
if (currentImageName.contains("wildfly")) {
assertEquals(4, ed.getProperties().size());
} else {
if (!currentImageName.contains("wildfly")) {
assertEquals("MDC value", ed.getProperties().get("MDC key"));
assertEquals(6, ed.getProperties().size());
} else {
assertEquals(5, ed.getProperties().size());
}

Expand Down