Skip to content

Commit c6e48f3

Browse files
trasktrask
committed
fixup! Fix logging configuration
1 parent b26d3f6 commit c6e48f3

File tree

4 files changed

+28
-46
lines changed

4 files changed

+28
-46
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@ public int compare(MessageData o1, MessageData o2) {
3131
}
3232
});
3333

34+
MessageData md1 = logs.get(0);
3435
MessageData md2 = logs.get(1);
35-
MessageData md3 = logs.get(2);
3636

37-
assertEquals("This is jul warning.", md2.getMessage());
38-
assertEquals(SeverityLevel.Warning, md2.getSeverityLevel());
39-
assertEquals("Logger", md2.getProperties().get("SourceType"));
40-
assertEquals("WARNING", md2.getProperties().get("LoggingLevel"));
37+
assertEquals("This is jul warning.", md1.getMessage());
38+
assertEquals(SeverityLevel.Warning, md1.getSeverityLevel());
39+
assertEquals("Logger", md1.getProperties().get("SourceType"));
40+
assertEquals("WARNING", md1.getProperties().get("LoggingLevel"));
4141
assertParentChild(rd, rdEnvelope, mdEnvelope1);
4242

43-
assertEquals("This is jul severe.", md3.getMessage());
44-
assertEquals(SeverityLevel.Error, md3.getSeverityLevel());
45-
assertEquals("Logger", md3.getProperties().get("SourceType"));
46-
assertEquals("SEVERE", md3.getProperties().get("LoggingLevel"));
43+
assertEquals("This is jul severe.", md2.getMessage());
44+
assertEquals(SeverityLevel.Error, md2.getSeverityLevel());
45+
assertEquals("Logger", md2.getProperties().get("SourceType"));
46+
assertEquals("SEVERE", md2.getProperties().get("LoggingLevel"));
4747
assertParentChild(rd, rdEnvelope, mdEnvelope2);
4848
}
4949

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public int compare(MessageData o1, MessageData o2) {
3434

3535
MessageData md1 = logs.get(0);
3636
MessageData md2 = logs.get(1);
37-
MessageData md3 = logs.get(3);
37+
MessageData md3 = logs.get(2);
3838

3939
assertEquals("This is log4j1.2 warn.", md1.getMessage());
4040
assertEquals(SeverityLevel.Warning, md1.getSeverityLevel());

‎test/smoke/testApps/TraceLogBack/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLogBackTest.java‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@ public void skipJbosseap7Image() {
2323
@TargetUri("/traceLogBack")
2424
public void testTraceLogBack() throws Exception {
2525
List<Envelope> rdList = mockedIngestion.waitForItems("RequestData", 1);
26-
List<Envelope> mdList = mockedIngestion.waitForMessageItemsInRequest(3);
26+
List<Envelope> mdList = mockedIngestion.waitForMessageItemsInRequest(2);
2727

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

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

@@ -42,28 +41,20 @@ public int compare(MessageData o1, MessageData o2) {
4241

4342
MessageData md1 = logs.get(0);
4443
MessageData md2 = logs.get(1);
45-
MessageData md3 = logs.get(2);
4644

47-
assertEquals("This is logback info.", md1.getMessage());
48-
assertEquals(SeverityLevel.Information, md1.getSeverityLevel());
45+
assertEquals("This is logback 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 logback warn.", md2.getMessage());
55-
assertEquals(SeverityLevel.Warning, md2.getSeverityLevel());
52+
assertEquals("This is logback 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);
60-
61-
assertEquals("This is logback error.", md3.getMessage());
62-
assertEquals(SeverityLevel.Error, md3.getSeverityLevel());
63-
assertEquals("Logger", md3.getProperties().get("SourceType"));
64-
assertEquals("ERROR", md3.getProperties().get("LoggingLevel"));
65-
assertFalse(md3.getProperties().containsKey("MDC key"));
66-
assertParentChild(rd, rdEnvelope, mdEnvelope3);
6758
}
6859

6960
@Test

‎test/smoke/testApps/TraceLogBackUsingAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLogBackTest.java‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,11 @@ public void skipJbosseap7Image() {
2929
@TargetUri("/traceLogBack")
3030
public void testTraceLogBack() throws Exception {
3131
List<Envelope> rdList = mockedIngestion.waitForItems("RequestData", 1);
32-
List<Envelope> mdList = mockedIngestion.waitForMessageItemsInRequest(3);
32+
List<Envelope> mdList = mockedIngestion.waitForMessageItemsInRequest(2);
3333

3434
Envelope rdEnvelope = rdList.get(0);
3535
Envelope mdEnvelope1 = mdList.get(0);
3636
Envelope mdEnvelope2 = mdList.get(1);
37-
Envelope mdEnvelope3 = mdList.get(2);
3837

3938
RequestData rd = (RequestData) ((Data) rdEnvelope.getData()).getBaseData();
4039

@@ -48,28 +47,20 @@ public int compare(MessageData o1, MessageData o2) {
4847

4948
MessageData md1 = logs.get(0);
5049
MessageData md2 = logs.get(1);
51-
MessageData md3 = logs.get(2);
5250

53-
assertEquals("This is logback info.", md1.getMessage());
54-
assertEquals(SeverityLevel.Information, md1.getSeverityLevel());
51+
assertEquals("This is logback warn.", md1.getMessage());
52+
assertEquals(SeverityLevel.Warning, md1.getSeverityLevel());
5553
assertEquals("Logger", md1.getProperties().get("SourceType"));
56-
assertEquals("INFO", md1.getProperties().get("LoggingLevel"));
57-
assertFalse(md1.getProperties().containsKey("MDC key"));
54+
assertEquals("WARN", md1.getProperties().get("LoggingLevel"));
55+
assertEquals("MDC value", md1.getProperties().get("MDC key"));
5856
assertParentChild(rd, rdEnvelope, mdEnvelope1);
5957

60-
assertEquals("This is logback warn.", md2.getMessage());
61-
assertEquals(SeverityLevel.Warning, md2.getSeverityLevel());
58+
assertEquals("This is logback error.", md2.getMessage());
59+
assertEquals(SeverityLevel.Error, md2.getSeverityLevel());
6260
assertEquals("Logger", md2.getProperties().get("SourceType"));
63-
assertEquals("WARN", md2.getProperties().get("LoggingLevel"));
64-
assertEquals("MDC value", md2.getProperties().get("MDC key"));
61+
assertEquals("ERROR", md2.getProperties().get("LoggingLevel"));
62+
assertFalse(md2.getProperties().containsKey("MDC key"));
6563
assertParentChild(rd, rdEnvelope, mdEnvelope2);
66-
67-
assertEquals("This is logback error.", md3.getMessage());
68-
assertEquals(SeverityLevel.Error, md3.getSeverityLevel());
69-
assertEquals("Logger", md3.getProperties().get("SourceType"));
70-
assertEquals("ERROR", md3.getProperties().get("LoggingLevel"));
71-
assertFalse(md3.getProperties().containsKey("MDC key"));
72-
assertParentChild(rd, rdEnvelope, mdEnvelope3);
7364
}
7465

7566
@Test

0 commit comments

Comments
 (0)