Skip to content

Commit e3cb3dc

Browse files
trasktrask
authored
Merge pull request #1416 from microsoft/trask/fix-logging-configuration
Fix logging configuration
2 parents 9b39206 + 779aa18 commit e3cb3dc

File tree

9 files changed

+93
-147
lines changed

9 files changed

+93
-147
lines changed

‎agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/BeforeAgentInstaller.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -256,15 +256,15 @@ private static String getLoggingFrameworksThreshold(Configuration config, String
256256
if (logging == null) {
257257
return defaultValue;
258258
}
259-
Object thresholdObj = logging.get("threshold");
260-
if (thresholdObj == null) {
259+
Object levelObj = logging.get("level");
260+
if (levelObj == null) {
261261
return defaultValue;
262262
}
263-
if (!(thresholdObj instanceof String)) {
264-
startupLogger.warn("logging threshold must be a string, but found: {}", thresholdObj.getClass());
263+
if (!(levelObj instanceof String)) {
264+
startupLogger.warn("logging level must be a string, but found: {}", levelObj.getClass());
265265
return defaultValue;
266266
}
267-
String threshold = (String) thresholdObj;
267+
String threshold = (String) levelObj;
268268
if (threshold.isEmpty()) {
269269
return defaultValue;
270270
}

‎test/smoke/appServers/global-resources/logging_applicationinsights.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"connectionString": "InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=http://fakeingestion:60606/",
3+
"instrumentation": {
4+
"logging": {
5+
"level": "warn"
6+
}
7+
}
8+
}

‎test/smoke/testApps/TraceJavaUtilLoggingUsingAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceJavaUtilLoggingTest.java‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,18 @@
88

99
import static org.junit.Assert.*;
1010

11-
@UseAgent
11+
@UseAgent("logging")
1212
public class TraceJavaUtilLoggingTest extends AiSmokeTest {
1313

1414
@Test
1515
@TargetUri("/traceJavaUtilLogging")
1616
public void testTraceJavaUtilLogging() throws Exception {
1717
List<Envelope> rdList = mockedIngestion.waitForItems("RequestData", 1);
18-
List<Envelope> mdList = mockedIngestion.waitForMessageItemsInRequest(3);
18+
List<Envelope> mdList = mockedIngestion.waitForMessageItemsInRequest(2);
1919

2020
Envelope rdEnvelope = rdList.get(0);
2121
Envelope mdEnvelope1 = mdList.get(0);
2222
Envelope mdEnvelope2 = mdList.get(1);
23-
Envelope mdEnvelope3 = mdList.get(2);
2423

2524
RequestData rd = (RequestData) ((Data) rdEnvelope.getData()).getBaseData();
2625

@@ -34,25 +33,18 @@ public int compare(MessageData o1, MessageData o2) {
3433

3534
MessageData md1 = logs.get(0);
3635
MessageData md2 = logs.get(1);
37-
MessageData md3 = logs.get(2);
3836

39-
assertEquals("This is jul info.", md1.getMessage());
40-
assertEquals(SeverityLevel.Information, md1.getSeverityLevel());
37+
assertEquals("This is jul warning.", md1.getMessage());
38+
assertEquals(SeverityLevel.Warning, md1.getSeverityLevel());
4139
assertEquals("Logger", md1.getProperties().get("SourceType"));
42-
assertEquals("INFO", md1.getProperties().get("LoggingLevel"));
40+
assertEquals("WARNING", md1.getProperties().get("LoggingLevel"));
4341
assertParentChild(rd, rdEnvelope, mdEnvelope1);
4442

45-
assertEquals("This is jul warning.", md2.getMessage());
46-
assertEquals(SeverityLevel.Warning, md2.getSeverityLevel());
43+
assertEquals("This is jul severe.", md2.getMessage());
44+
assertEquals(SeverityLevel.Error, md2.getSeverityLevel());
4745
assertEquals("Logger", md2.getProperties().get("SourceType"));
48-
assertEquals("WARNING", md2.getProperties().get("LoggingLevel"));
46+
assertEquals("SEVERE", md2.getProperties().get("LoggingLevel"));
4947
assertParentChild(rd, rdEnvelope, mdEnvelope2);
50-
51-
assertEquals("This is jul severe.", md3.getMessage());
52-
assertEquals(SeverityLevel.Error, md3.getSeverityLevel());
53-
assertEquals("Logger", md3.getProperties().get("SourceType"));
54-
assertEquals("SEVERE", md3.getProperties().get("LoggingLevel"));
55-
assertParentChild(rd, rdEnvelope, mdEnvelope3);
5648
}
5749

5850
@Test

‎test/smoke/testApps/TraceLog4j1_2/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLog4j1_2Test.java‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,19 @@
88

99
import static org.junit.Assert.*;
1010

11-
@UseAgent
11+
@UseAgent("logging")
1212
public class TraceLog4j1_2Test extends AiSmokeTest {
1313

1414
@Test
1515
@TargetUri("/traceLog4j1_2")
1616
public void testTraceLog4j1_2() throws Exception {
1717
List<Envelope> rdList = mockedIngestion.waitForItems("RequestData", 1);
18-
List<Envelope> mdList = mockedIngestion.waitForMessageItemsInRequest(4);
18+
List<Envelope> mdList = mockedIngestion.waitForMessageItemsInRequest(3);
1919

2020
Envelope rdEnvelope = rdList.get(0);
2121
Envelope mdEnvelope1 = mdList.get(0);
2222
Envelope mdEnvelope2 = mdList.get(1);
2323
Envelope mdEnvelope3 = mdList.get(2);
24-
Envelope mdEnvelope4 = mdList.get(3);
2524

2625
RequestData rd = (RequestData) ((Data) rdEnvelope.getData()).getBaseData();
2726

@@ -36,35 +35,27 @@ public int compare(MessageData o1, MessageData o2) {
3635
MessageData md1 = logs.get(0);
3736
MessageData md2 = logs.get(1);
3837
MessageData md3 = logs.get(2);
39-
MessageData md4 = logs.get(3);
4038

41-
assertEquals("This is log4j1.2 info.", md1.getMessage());
42-
assertEquals(SeverityLevel.Information, md1.getSeverityLevel());
39+
assertEquals("This is log4j1.2 warn.", md1.getMessage());
40+
assertEquals(SeverityLevel.Warning, md1.getSeverityLevel());
4341
assertEquals("Logger", md1.getProperties().get("SourceType"));
44-
assertEquals("INFO", md1.getProperties().get("LoggingLevel"));
45-
assertFalse(md1.getProperties().containsKey("MDC key"));
42+
assertEquals("WARN", md1.getProperties().get("LoggingLevel"));
43+
assertEquals("MDC value", md1.getProperties().get("MDC key"));
4644
assertParentChild(rd, rdEnvelope, mdEnvelope1);
4745

48-
assertEquals("This is log4j1.2 warn.", md2.getMessage());
49-
assertEquals(SeverityLevel.Warning, md2.getSeverityLevel());
46+
assertEquals("This is log4j1.2 error.", md2.getMessage());
47+
assertEquals(SeverityLevel.Error, md2.getSeverityLevel());
5048
assertEquals("Logger", md2.getProperties().get("SourceType"));
51-
assertEquals("WARN", md2.getProperties().get("LoggingLevel"));
52-
assertEquals("MDC value", md2.getProperties().get("MDC key"));
49+
assertEquals("ERROR", md2.getProperties().get("LoggingLevel"));
50+
assertFalse(md2.getProperties().containsKey("MDC key"));
5351
assertParentChild(rd, rdEnvelope, mdEnvelope2);
5452

55-
assertEquals("This is log4j1.2 error.", md3.getMessage());
56-
assertEquals(SeverityLevel.Error, md3.getSeverityLevel());
53+
assertEquals("This is log4j1.2 fatal.", md3.getMessage());
54+
assertEquals(SeverityLevel.Critical, md3.getSeverityLevel());
5755
assertEquals("Logger", md3.getProperties().get("SourceType"));
58-
assertEquals("ERROR", md3.getProperties().get("LoggingLevel"));
56+
assertEquals("FATAL", md3.getProperties().get("LoggingLevel"));
5957
assertFalse(md3.getProperties().containsKey("MDC key"));
6058
assertParentChild(rd, rdEnvelope, mdEnvelope3);
61-
62-
assertEquals("This is log4j1.2 fatal.", md4.getMessage());
63-
assertEquals(SeverityLevel.Critical, md4.getSeverityLevel());
64-
assertEquals("Logger", md4.getProperties().get("SourceType"));
65-
assertEquals("FATAL", md4.getProperties().get("LoggingLevel"));
66-
assertFalse(md4.getProperties().containsKey("MDC key"));
67-
assertParentChild(rd, rdEnvelope, mdEnvelope4);
6859
}
6960

7061
@Test

‎test/smoke/testApps/TraceLog4j1_2UsingAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLog4j1_2Test.java‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,19 @@
1414

1515
import static org.junit.Assert.*;
1616

17-
@UseAgent
17+
@UseAgent("logging")
1818
public class TraceLog4j1_2Test extends AiSmokeTest {
1919

2020
@Test
2121
@TargetUri("/traceLog4j1_2")
2222
public void testTraceLog4j1_2() throws Exception {
2323
List<Envelope> rdList = mockedIngestion.waitForItems("RequestData", 1);
24-
List<Envelope> mdList = mockedIngestion.waitForMessageItemsInRequest(4);
24+
List<Envelope> mdList = mockedIngestion.waitForMessageItemsInRequest(3);
2525

2626
Envelope rdEnvelope = rdList.get(0);
2727
Envelope mdEnvelope1 = mdList.get(0);
2828
Envelope mdEnvelope2 = mdList.get(1);
2929
Envelope mdEnvelope3 = mdList.get(2);
30-
Envelope mdEnvelope4 = mdList.get(3);
3130

3231
RequestData rd = (RequestData) ((Data) rdEnvelope.getData()).getBaseData();
3332

@@ -42,35 +41,27 @@ public int compare(MessageData o1, MessageData o2) {
4241
MessageData md1 = logs.get(0);
4342
MessageData md2 = logs.get(1);
4443
MessageData md3 = logs.get(2);
45-
MessageData md4 = logs.get(3);
4644

47-
assertEquals("This is log4j1.2 info.", md1.getMessage());
48-
assertEquals(SeverityLevel.Information, md1.getSeverityLevel());
45+
assertEquals("This is log4j1.2 warn.", md1.getMessage());
46+
assertEquals(SeverityLevel.Warning, md1.getSeverityLevel());
4947
assertEquals("Logger", md1.getProperties().get("SourceType"));
50-
assertEquals("INFO", md1.getProperties().get("LoggingLevel"));
51-
assertFalse(md1.getProperties().containsKey("MDC key"));
48+
assertEquals("WARN", md1.getProperties().get("LoggingLevel"));
49+
assertEquals("MDC value", md1.getProperties().get("MDC key"));
5250
assertParentChild(rd, rdEnvelope, mdEnvelope1);
5351

54-
assertEquals("This is log4j1.2 warn.", md2.getMessage());
55-
assertEquals(SeverityLevel.Warning, md2.getSeverityLevel());
52+
assertEquals("This is log4j1.2 error.", md2.getMessage());
53+
assertEquals(SeverityLevel.Error, md2.getSeverityLevel());
5654
assertEquals("Logger", md2.getProperties().get("SourceType"));
57-
assertEquals("WARN", md2.getProperties().get("LoggingLevel"));
58-
assertEquals("MDC value", md2.getProperties().get("MDC key"));
55+
assertEquals("ERROR", md2.getProperties().get("LoggingLevel"));
56+
assertFalse(md2.getProperties().containsKey("MDC key"));
5957
assertParentChild(rd, rdEnvelope, mdEnvelope2);
6058

61-
assertEquals("This is log4j1.2 error.", md3.getMessage());
62-
assertEquals(SeverityLevel.Error, md3.getSeverityLevel());
59+
assertEquals("This is log4j1.2 fatal.", md3.getMessage());
60+
assertEquals(SeverityLevel.Critical, md3.getSeverityLevel());
6361
assertEquals("Logger", md3.getProperties().get("SourceType"));
64-
assertEquals("ERROR", md3.getProperties().get("LoggingLevel"));
62+
assertEquals("FATAL", md3.getProperties().get("LoggingLevel"));
6563
assertFalse(md3.getProperties().containsKey("MDC key"));
6664
assertParentChild(rd, rdEnvelope, mdEnvelope3);
67-
68-
assertEquals("This is log4j1.2 fatal.", md4.getMessage());
69-
assertEquals(SeverityLevel.Critical, md4.getSeverityLevel());
70-
assertEquals("Logger", md4.getProperties().get("SourceType"));
71-
assertEquals("FATAL", md4.getProperties().get("LoggingLevel"));
72-
assertFalse(md4.getProperties().containsKey("MDC key"));
73-
assertParentChild(rd, rdEnvelope, mdEnvelope4);
7465
}
7566

7667
@Test

‎test/smoke/testApps/TraceLog4j2/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLog4j2Test.java‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,19 @@
99

1010
import static org.junit.Assert.*;
1111

12-
@UseAgent
12+
@UseAgent("logging")
1313
public class TraceLog4j2Test extends AiSmokeTest {
1414

1515
@Test
1616
@TargetUri("/traceLog4j2")
1717
public void testTraceLog4j2() throws Exception {
1818
List<Envelope> rdList = mockedIngestion.waitForItems("RequestData", 1);
19-
List<Envelope> mdList = mockedIngestion.waitForMessageItemsInRequest(4);
19+
List<Envelope> mdList = mockedIngestion.waitForMessageItemsInRequest(3);
2020

2121
Envelope rdEnvelope = rdList.get(0);
2222
Envelope mdEnvelope1 = mdList.get(0);
2323
Envelope mdEnvelope2 = mdList.get(1);
2424
Envelope mdEnvelope3 = mdList.get(2);
25-
Envelope mdEnvelope4 = mdList.get(3);
2625

2726
RequestData rd = (RequestData) ((Data) rdEnvelope.getData()).getBaseData();
2827

@@ -37,35 +36,27 @@ public int compare(MessageData o1, MessageData o2) {
3736
MessageData md1 = logs.get(0);
3837
MessageData md2 = logs.get(1);
3938
MessageData md3 = logs.get(2);
40-
MessageData md4 = logs.get(3);
4139

42-
assertEquals("This is log4j2 info.", md1.getMessage());
43-
assertEquals(SeverityLevel.Information, md1.getSeverityLevel());
40+
assertEquals("This is log4j2 warn.", md1.getMessage());
41+
assertEquals(SeverityLevel.Warning, md1.getSeverityLevel());
4442
assertEquals("Logger", md1.getProperties().get("SourceType"));
45-
assertEquals("INFO", md1.getProperties().get("LoggingLevel"));
46-
assertFalse(md1.getProperties().containsKey("MDC key"));
43+
assertEquals("WARN", md1.getProperties().get("LoggingLevel"));
44+
assertEquals("MDC value", md1.getProperties().get("MDC key"));
4745
assertParentChild(rd, rdEnvelope, mdEnvelope1);
4846

49-
assertEquals("This is log4j2 warn.", md2.getMessage());
50-
assertEquals(SeverityLevel.Warning, md2.getSeverityLevel());
47+
assertEquals("This is log4j2 error.", md2.getMessage());
48+
assertEquals(SeverityLevel.Error, md2.getSeverityLevel());
5149
assertEquals("Logger", md2.getProperties().get("SourceType"));
52-
assertEquals("WARN", md2.getProperties().get("LoggingLevel"));
53-
assertEquals("MDC value", md2.getProperties().get("MDC key"));
50+
assertEquals("ERROR", md2.getProperties().get("LoggingLevel"));
51+
assertFalse(md2.getProperties().containsKey("MDC key"));
5452
assertParentChild(rd, rdEnvelope, mdEnvelope2);
5553

56-
assertEquals("This is log4j2 error.", md3.getMessage());
57-
assertEquals(SeverityLevel.Error, md3.getSeverityLevel());
54+
assertEquals("This is log4j2 fatal.", md3.getMessage());
55+
assertEquals(SeverityLevel.Critical, md3.getSeverityLevel());
5856
assertEquals("Logger", md3.getProperties().get("SourceType"));
59-
assertEquals("ERROR", md3.getProperties().get("LoggingLevel"));
57+
assertEquals("FATAL", md3.getProperties().get("LoggingLevel"));
6058
assertFalse(md3.getProperties().containsKey("MDC key"));
6159
assertParentChild(rd, rdEnvelope, mdEnvelope3);
62-
63-
assertEquals("This is log4j2 fatal.", md4.getMessage());
64-
assertEquals(SeverityLevel.Critical, md4.getSeverityLevel());
65-
assertEquals("Logger", md4.getProperties().get("SourceType"));
66-
assertEquals("FATAL", md4.getProperties().get("LoggingLevel"));
67-
assertFalse(md4.getProperties().containsKey("MDC key"));
68-
assertParentChild(rd, rdEnvelope, mdEnvelope4);
6960
}
7061

7162
@Test

‎test/smoke/testApps/TraceLog4j2UsingAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLog4j2Test.java‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,19 @@
1515

1616
import static org.junit.Assert.*;
1717

18-
@UseAgent
18+
@UseAgent("logging")
1919
public class TraceLog4j2Test extends AiSmokeTest {
2020

2121
@Test
2222
@TargetUri("/traceLog4j2")
2323
public void testTraceLog4j2() throws Exception {
2424
List<Envelope> rdList = mockedIngestion.waitForItems("RequestData", 1);
25-
List<Envelope> mdList = mockedIngestion.waitForMessageItemsInRequest(4);
25+
List<Envelope> mdList = mockedIngestion.waitForMessageItemsInRequest(3);
2626

2727
Envelope rdEnvelope = rdList.get(0);
2828
Envelope mdEnvelope1 = mdList.get(0);
2929
Envelope mdEnvelope2 = mdList.get(1);
3030
Envelope mdEnvelope3 = mdList.get(2);
31-
Envelope mdEnvelope4 = mdList.get(3);
3231

3332
RequestData rd = (RequestData) ((Data) rdEnvelope.getData()).getBaseData();
3433

@@ -43,35 +42,27 @@ public int compare(MessageData o1, MessageData o2) {
4342
MessageData md1 = logs.get(0);
4443
MessageData md2 = logs.get(1);
4544
MessageData md3 = logs.get(2);
46-
MessageData md4 = logs.get(3);
4745

48-
assertEquals("This is log4j2 info.", md1.getMessage());
49-
assertEquals(SeverityLevel.Information, md1.getSeverityLevel());
46+
assertEquals("This is log4j2 warn.", md1.getMessage());
47+
assertEquals(SeverityLevel.Warning, md1.getSeverityLevel());
5048
assertEquals("Logger", md1.getProperties().get("SourceType"));
51-
assertEquals("INFO", md1.getProperties().get("LoggingLevel"));
52-
assertFalse(md1.getProperties().containsKey("MDC key"));
49+
assertEquals("WARN", md1.getProperties().get("LoggingLevel"));
50+
assertEquals("MDC value", md1.getProperties().get("MDC key"));
5351
assertParentChild(rd, rdEnvelope, mdEnvelope1);
5452

55-
assertEquals("This is log4j2 warn.", md2.getMessage());
56-
assertEquals(SeverityLevel.Warning, md2.getSeverityLevel());
53+
assertEquals("This is log4j2 error.", md2.getMessage());
54+
assertEquals(SeverityLevel.Error, md2.getSeverityLevel());
5755
assertEquals("Logger", md2.getProperties().get("SourceType"));
58-
assertEquals("WARN", md2.getProperties().get("LoggingLevel"));
59-
assertEquals("MDC value", md2.getProperties().get("MDC key"));
56+
assertEquals("ERROR", md2.getProperties().get("LoggingLevel"));
57+
assertFalse(md2.getProperties().containsKey("MDC key"));
6058
assertParentChild(rd, rdEnvelope, mdEnvelope2);
6159

62-
assertEquals("This is log4j2 error.", md3.getMessage());
63-
assertEquals(SeverityLevel.Error, md3.getSeverityLevel());
60+
assertEquals("This is log4j2 fatal.", md3.getMessage());
61+
assertEquals(SeverityLevel.Critical, md3.getSeverityLevel());
6462
assertEquals("Logger", md3.getProperties().get("SourceType"));
65-
assertEquals("ERROR", md3.getProperties().get("LoggingLevel"));
63+
assertEquals("FATAL", md3.getProperties().get("LoggingLevel"));
6664
assertFalse(md3.getProperties().containsKey("MDC key"));
6765
assertParentChild(rd, rdEnvelope, mdEnvelope3);
68-
69-
assertEquals("This is log4j2 fatal.", md4.getMessage());
70-
assertEquals(SeverityLevel.Critical, md4.getSeverityLevel());
71-
assertEquals("Logger", md4.getProperties().get("SourceType"));
72-
assertEquals("FATAL", md4.getProperties().get("LoggingLevel"));
73-
assertFalse(md4.getProperties().containsKey("MDC key"));
74-
assertParentChild(rd, rdEnvelope, mdEnvelope4);
7566
}
7667

7768
@Test

0 commit comments

Comments
 (0)