Drop LoggingLevel (#2254)

heyams · web-flow · commit a105c16252a9 · 2022-05-03T12:25:58.000-07:00
* Drop LoggingLevel

* Fix errorProne

* Make disableLoggingLevel opt-in feature

* Track via statsbeat

* Rename

* Fix compiling error

* Rename
diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java
@@ -234,6 +234,14 @@ public static class PreviewConfiguration {
     // https://portal.microsofticm.com/imp/v3/incidents/details/266992200/home
     public boolean disablePropagation;
     public boolean captureHttpServer4xxAsError = true;
+
+    // LoggingLevel is no longer sent by default since 3.3.0, since the data is already available
+    // under SeverityLevel. This configuration is provided as a temporary measure for customers
+    // who are unable to update their alerts/dashboards at the same time that they are updating
+    // their Javaagent version
+    // Note: this configuration option will be removed in 4.0.0
+    public boolean captureLoggingLevelAsCustomDimension;
+
     // this is to support interoperability with other systems
     // intentionally not allowing the removal of w3c propagator since that is key to many Azure
     // integrated experiences
diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/LoggerExporter.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/LoggerExporter.java
@@ -57,9 +57,12 @@ public class LoggerExporter implements LogExporter {
       new OperationLogger(Exporter.class, "Exporting log");
 
   private final TelemetryClient telemetryClient;
+  private final boolean captureLoggingLevelAsCustomDimension;
 
-  public LoggerExporter(TelemetryClient telemetryClient) {
+  public LoggerExporter(
+      TelemetryClient telemetryClient, boolean captureLoggingLevelAsCustomDimension) {
     this.telemetryClient = telemetryClient;
+    this.captureLoggingLevelAsCustomDimension = captureLoggingLevelAsCustomDimension;
   }
 
   @Override
@@ -239,18 +242,21 @@ static void setExtraAttributes(AbstractTelemetryBuilder telemetryBuilder, Attrib
         });
   }
 
-  private static void setLoggerProperties(
+  private void setLoggerProperties(
       AbstractTelemetryBuilder telemetryBuilder,
       String loggerName,
       String threadName,
       Severity severity) {
 
     telemetryBuilder.addProperty("SourceType", "Logger");
 
-    String loggingLevel = mapSeverityToLoggingLevel(severity);
-    if (loggingLevel != null) {
-      telemetryBuilder.addProperty("LoggingLevel", loggingLevel);
+    if (captureLoggingLevelAsCustomDimension) {
+      String loggingLevel = mapSeverityToLoggingLevel(severity);
+      if (loggingLevel != null) {
+        telemetryBuilder.addProperty("LoggingLevel", loggingLevel);
+      }
     }
+
     if (loggerName != null) {
       telemetryBuilder.addProperty("LoggerName", loggerName);
     }
diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/OpenTelemetryConfigurer.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/OpenTelemetryConfigurer.java
@@ -225,7 +225,10 @@ private static SdkLogEmitterProviderBuilder configureLogging(
   }
 
   private static LogExporter createLogExporter(Configuration configuration) {
-    LogExporter logExporter = new LoggerExporter(TelemetryClient.getActive());
+    LogExporter logExporter =
+        new LoggerExporter(
+            TelemetryClient.getActive(),
+            configuration.preview.captureLoggingLevelAsCustomDimension);
     List<ProcessorConfig> processorConfigs = getLogProcessorConfigs(configuration);
     if (!processorConfigs.isEmpty()) {
       // Reversing the order of processors before passing it Log processor
diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java
@@ -60,7 +60,8 @@ enum Feature {
   VERTX_DISABLED(29), // preview instrumentation, vertx is ON by default in OTEL
   CUSTOM_DIMENSIONS_ENABLED(30), // enable customDimensions
   JAXRS_ANNOTATIONS_DISABLED(
-      31); // can cause startup slowness, jaxrs-annotations is ON by default in OTEL
+      31), // can cause startup slowness, jaxrs-annotations is ON by default in OTEL
+  LOGGING_LEVEL_CUSTOM_PROPERTY_ENABLED(32); // preview opt-in to include LoggingLevel.
 
   private static final Map<String, Feature> javaVendorFeatureMap;
 
diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/FeatureStatsbeat.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/FeatureStatsbeat.java
@@ -174,5 +174,9 @@ void trackConfigurationOptions(Configuration config) {
     if (!config.customDimensions.isEmpty()) {
       featureList.add(Feature.CUSTOM_DIMENSIONS_ENABLED);
     }
+
+    if (config.preview.captureLoggingLevelAsCustomDimension) {
+      featureList.add(Feature.LOGGING_LEVEL_CUSTOM_PROPERTY_ENABLED);
+    }
   }
 }
diff --git a/agent/agent-tooling/src/test/java/com/azure/monitor/opentelemetry/exporter/implementation/localstorage/LocalFileLoaderTests.java b/agent/agent-tooling/src/test/java/com/azure/monitor/opentelemetry/exporter/implementation/localstorage/LocalFileLoaderTests.java
@@ -478,7 +478,6 @@ private static void verifyProperties(int index, JsonNode properties) {
       case 7: // Message
         assertThat(properties.get("LoggerName").asText())
             .isEqualTo("org.springframework.boot.web.embedded.tomcat.TomcatWebServer");
-        assertThat(properties.get("LoggingLevel").asText()).isEqualTo("INFO");
         assertThat(properties.get("SourceType").asText()).isEqualTo("Logger");
         return;
       case 2:
diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/processors/MockLoggerExporter.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/processors/MockLoggerExporter.java
@@ -34,7 +34,7 @@ public class MockLoggerExporter extends LoggerExporter {
   private final List<LogData> logs = new ArrayList<>();
 
   public MockLoggerExporter(TelemetryClient telemetryClient) {
-    super(telemetryClient);
+    super(telemetryClient, false);
   }
 
   public List<LogData> getLogs() {
diff --git a/agent/agent-tooling/src/test/resources/read-transmission.txt b/agent/agent-tooling/src/test/resources/read-transmission.txt
@@ -5,6 +5,6 @@
 {"ver":1,"name":"Metric","time":"2021-06-14T17:24:28.983-0700","sampleRate":100,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"MetricData","baseData":{"ver":2,"metrics":[{"name":"jvm_threads_live","kind":0,"value":150}],"properties":{"state":"runnable"}}}}
 {"ver":1,"name":"Metric","time":"2021-06-14T17:24:28.983-0700","sampleRate":100,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"MetricData","baseData":{"ver":2,"metrics":[{"name":"jdbc_connections_min","kind":0,"value":110}],"properties":{"name":"dataSource"}}}}
 {"ver":1,"name":"Statsbeat","time":"2021-06-15T12:01:02.852-0700","sampleRate":100.0,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"MetricData","baseData":{"ver":2,"metrics":[{"name":"Request Success Count","kind":0,"value":2.0}],"properties":{"runtimeVersion":"11.0.7","os":"Windows","language":"java","attach":"codeless","instrumentation":"0","cikey":"00000000-0000-0000-0000-0FEEDDADBEEF","version":"3.1.1","rp":"unknown"}}}}
-{"ver":1,"name":"Message","time":"2021-06-15T08:36:09.569-0700","sampleRate":100.0,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"MessageData","baseData":{"ver":2,"message":"Tomcat initialized with port(s): 8080 (http)","severityLevel":"Information","properties":{"LoggerName":"org.springframework.boot.web.embedded.tomcat.TomcatWebServer","LoggingLevel":"INFO","SourceType":"Logger"}}}}
+{"ver":1,"name":"Message","time":"2021-06-15T08:36:09.569-0700","sampleRate":100.0,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"MessageData","baseData":{"ver":2,"message":"Tomcat initialized with port(s): 8080 (http)","severityLevel":"Information","properties":{"LoggerName":"org.springframework.boot.web.embedded.tomcat.TomcatWebServer","SourceType":"Logger"}}}}
 {"ver":1,"name":"RemoteDependency","time":"2021-06-15T08:36:15.229-0700","sampleRate":100.0,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.operation.id":"891b332db33c65cc6497c014f02db26d","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"RemoteDependencyData","baseData":{"ver":2,"name":"DROP TABLE vet_specialties IF EXISTS","id":"d54e451407c13ad2","duration":"00:00:00.0130000","success":true,"data":"DROP TABLE vet_specialties IF EXISTS","type":"SQL","target":"b8f14b49-a2ad-4fa9-967e-c00b1d6addc4"}}}
 {"ver":1,"name":"Request","time":"2021-06-16T12:15:50.433-0700","sampleRate":100.0,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.operation.id":"0cb22c0f071802f7f314569b007c9a1e","ai.operation.name":"GET /webjars/**","ai.cloud.roleInstance":"test-role-instance","ai.user.userAgent":"Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36"},"data":{"baseType":"RequestData","baseData":{"ver":2,"id":"c0bfdc8f7963802c","duration":"00:00:00.0210000","responseCode":"304","success":true,"name":"GET /webjars/**","url":"http://localhost:8080/webjars/jquery/2.2.4/jquery.min.js"}}}
diff --git a/agent/agent-tooling/src/test/resources/write-transmission.txt b/agent/agent-tooling/src/test/resources/write-transmission.txt
@@ -5,6 +5,6 @@
 {"ver":1,"name":"Metric","time":"2021-06-14T17:24:28.983-0700","sampleRate":100,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"MetricData","baseData":{"ver":2,"metrics":[{"name":"jvm_threads_live","kind":0,"value":150}],"properties":{"state":"runnable"}}}}
 {"ver":1,"name":"Metric","time":"2021-06-14T17:24:28.983-0700","sampleRate":100,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"MetricData","baseData":{"ver":2,"metrics":[{"name":"jdbc_connections_min","kind":0,"value":110}],"properties":{"name":"dataSource"}}}}
 {"ver":1,"name":"Statsbeat","time":"2021-06-15T12:01:02.852-0700","sampleRate":100.0,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"MetricData","baseData":{"ver":2,"metrics":[{"name":"Request Success Count","kind":0,"value":2.0}],"properties":{"runtimeVersion":"11.0.7","os":"Windows","language":"java","attach":"codeless","instrumentation":"0","cikey":"00000000-0000-0000-0000-0FEEDDADBEEF","version":"3.1.1","rp":"unknown"}}}}
-{"ver":1,"name":"Message","time":"2021-06-15T08:36:09.569-0700","sampleRate":100.0,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"MessageData","baseData":{"ver":2,"message":"Tomcat initialized with port(s): 8080 (http)","severityLevel":"Information","properties":{"LoggerName":"org.springframework.boot.web.embedded.tomcat.TomcatWebServer","LoggingLevel":"INFO","SourceType":"Logger"}}}}
+{"ver":1,"name":"Message","time":"2021-06-15T08:36:09.569-0700","sampleRate":100.0,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"MessageData","baseData":{"ver":2,"message":"Tomcat initialized with port(s): 8080 (http)","severityLevel":"Information","properties":{"LoggerName":"org.springframework.boot.web.embedded.tomcat.TomcatWebServer","SourceType":"Logger"}}}}
 {"ver":1,"name":"RemoteDependency","time":"2021-06-15T08:36:15.229-0700","sampleRate":100.0,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.operation.id":"891b332db33c65cc6497c014f02db26d","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"RemoteDependencyData","baseData":{"ver":2,"name":"DROP TABLE vet_specialties IF EXISTS","id":"d54e451407c13ad2","duration":"00:00:00.0130000","success":true,"data":"DROP TABLE vet_specialties IF EXISTS","type":"SQL","target":"b8f14b49-a2ad-4fa9-967e-c00b1d6addc4"}}}
 {"ver":1,"name":"Request","time":"2021-06-16T12:15:50.433-0700","sampleRate":100.0,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.operation.id":"0cb22c0f071802f7f314569b007c9a1e","ai.operation.name":"GET /webjars/**","ai.cloud.roleInstance":"test-role-instance","ai.user.userAgent":"Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36"},"data":{"baseType":"RequestData","baseData":{"ver":2,"id":"c0bfdc8f7963802c","duration":"00:00:00.0210000","responseCode":"304","success":true,"name":"GET /webjars/**","url":"http://localhost:8080/webjars/jquery/2.2.4/jquery.min.js"}}}
diff --git a/test/smoke/testApps/InheritedAttributes/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootAutoTest.java b/test/smoke/testApps/InheritedAttributes/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootAutoTest.java
@@ -56,10 +56,9 @@ public void test() throws Exception {
     assertEquals("hello", md.getMessage());
     assertEquals(SeverityLevel.Information, md.getSeverityLevel());
     assertEquals("Logger", md.getProperties().get("SourceType"));
-    assertEquals("INFO", md.getProperties().get("LoggingLevel"));
     assertEquals("smoketestapp", md.getProperties().get("LoggerName"));
     assertNotNull(md.getProperties().get("ThreadName"));
     assertEquals("z", md.getProperties().get("tenant"));
-    assertEquals(5, md.getProperties().size());
+    assertEquals(4, md.getProperties().size());
   }
 }
diff --git a/test/smoke/testApps/NonDaemonThreads/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootAutoTest.java b/test/smoke/testApps/NonDaemonThreads/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootAutoTest.java
@@ -66,9 +66,8 @@ public void spawnAnotherJavaProcess() throws Exception {
     assertEquals("done", md.getMessage());
     assertEquals(SeverityLevel.Information, md.getSeverityLevel());
     assertEquals("Logger", md.getProperties().get("SourceType"));
-    assertEquals("INFO", md.getProperties().get("LoggingLevel"));
     assertEquals("smoketestapp", md.getProperties().get("LoggerName"));
     assertNotNull(md.getProperties().get("ThreadName"));
-    assertEquals(4, md.getProperties().size());
+    assertEquals(3, md.getProperties().size());
   }
 }
diff --git a/test/smoke/testApps/TraceJavaUtilLoggingUsingAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceJavaUtilLoggingTest.java b/test/smoke/testApps/TraceJavaUtilLoggingUsingAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceJavaUtilLoggingTest.java
@@ -58,18 +58,16 @@ public void testTraceJavaUtilLogging() throws Exception {
     assertEquals("This is jul warning.", md1.getMessage());
     assertEquals(SeverityLevel.Warning, md1.getSeverityLevel());
     assertEquals("Logger", md1.getProperties().get("SourceType"));
-    assertEquals("WARN", md1.getProperties().get("LoggingLevel"));
     assertEquals("smoketestapp", md1.getProperties().get("LoggerName"));
     assertNotNull(md1.getProperties().get("ThreadName"));
-    assertEquals(4, md1.getProperties().size());
+    assertEquals(3, md1.getProperties().size());
 
     assertEquals("This is jul severe.", 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"));
     assertNotNull(md2.getProperties().get("ThreadName"));
-    assertEquals(4, md2.getProperties().size());
+    assertEquals(3, md2.getProperties().size());
 
     assertParentChild(
         rd, rdEnvelope, mdEnvelope1, "GET /TraceJavaUtilLoggingUsingAgent/traceJavaUtilLogging");
@@ -98,10 +96,9 @@ public void testTraceJavaUtilLoggingWithExeption() throws Exception {
     assertEquals(SeverityLevel.Error, ed.getSeverityLevel());
     assertEquals("This is an exception!", ed.getProperties().get("Logger Message"));
     assertEquals("Logger", ed.getProperties().get("SourceType"));
-    assertEquals("ERROR", ed.getProperties().get("LoggingLevel"));
     assertEquals("smoketestapp", ed.getProperties().get("LoggerName"));
     assertNotNull(ed.getProperties().get("ThreadName"));
-    assertEquals(5, ed.getProperties().size());
+    assertEquals(4, ed.getProperties().size());
 
     assertParentChild(
         rd,
diff --git a/test/smoke/testApps/TraceLog4j1_2/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLog4j12Test.java b/test/smoke/testApps/TraceLog4j1_2/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLog4j12Test.java
@@ -61,27 +61,24 @@ public void testTraceLog4j12() throws Exception {
     assertEquals("This is log4j1.2 warn.", md1.getMessage());
     assertEquals(SeverityLevel.Warning, md1.getSeverityLevel());
     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(5, 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"));
     assertNotNull(md2.getProperties().get("ThreadName"));
-    assertEquals(4, md2.getProperties().size());
+    assertEquals(3, 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"));
     assertNotNull(md3.getProperties().get("ThreadName"));
-    assertEquals(4, md3.getProperties().size());
+    assertEquals(3, md3.getProperties().size());
 
     assertParentChild(rd, rdEnvelope, mdEnvelope1, "GET /TraceLog4j1_2/traceLog4j12");
     assertParentChild(rd, rdEnvelope, mdEnvelope2, "GET /TraceLog4j1_2/traceLog4j12");
@@ -111,11 +108,10 @@ public void testTraceLog4j1_2WithExeption() throws Exception {
     assertEquals(SeverityLevel.Error, ed.getSeverityLevel());
     assertEquals("This is an exception!", ed.getProperties().get("Logger Message"));
     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());
+    assertEquals(5, ed.getProperties().size());
 
     assertParentChild(rd, rdEnvelope, edEnvelope, "GET /TraceLog4j1_2/traceLog4j1_2WithException");
   }
diff --git a/test/smoke/testApps/TraceLog4j1_2UsingAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLog4j12Test.java b/test/smoke/testApps/TraceLog4j1_2UsingAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLog4j12Test.java
diff --git a/test/smoke/testApps/TraceLog4j2/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLog4j2Test.java b/test/smoke/testApps/TraceLog4j2/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLog4j2Test.java
diff --git a/test/smoke/testApps/TraceLog4j2UsingAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLog4j2Test.java b/test/smoke/testApps/TraceLog4j2UsingAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLog4j2Test.java
diff --git a/test/smoke/testApps/TraceLogBack/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLogBackTest.java b/test/smoke/testApps/TraceLogBack/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLogBackTest.java
diff --git a/test/smoke/testApps/TraceLogBackUsingAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLogBackTest.java b/test/smoke/testApps/TraceLogBackUsingAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLogBackTest.java

Original file line number	Diff line number	Diff line change
`@@ -174,5 +174,9 @@ void trackConfigurationOptions(Configuration config) {`
`174`	`174`	`if (!config.customDimensions.isEmpty()) {`
`175`	`175`	`featureList.add(Feature.CUSTOM_DIMENSIONS_ENABLED);`
`176`	`176`	`}`
	`177`	`+`
	`178`	`+ if (config.preview.captureLoggingLevelAsCustomDimension) {`
	`179`	`+ featureList.add(Feature.LOGGING_LEVEL_CUSTOM_PROPERTY_ENABLED);`
	`180`	`+ }`
`177`	`181`	`}`
`178`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public class MockLoggerExporter extends LoggerExporter {`
`34`	`34`	`private final List<LogData> logs = new ArrayList<>();`
`35`	`35`
`36`	`36`	`public MockLoggerExporter(TelemetryClient telemetryClient) {`
`37`		`- super(telemetryClient);`
	`37`	`+ super(telemetryClient, false);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public List<LogData> getLogs() {`
Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,9 @@ public void test() throws Exception {`
`56`	`56`	`assertEquals("hello", md.getMessage());`
`57`	`57`	`assertEquals(SeverityLevel.Information, md.getSeverityLevel());`
`58`	`58`	`assertEquals("Logger", md.getProperties().get("SourceType"));`
`59`		`- assertEquals("INFO", md.getProperties().get("LoggingLevel"));`
`60`	`59`	`assertEquals("smoketestapp", md.getProperties().get("LoggerName"));`
`61`	`60`	`assertNotNull(md.getProperties().get("ThreadName"));`
`62`	`61`	`assertEquals("z", md.getProperties().get("tenant"));`
`63`		`- assertEquals(5, md.getProperties().size());`
	`62`	`+ assertEquals(4, md.getProperties().size());`
`64`	`63`	`}`
`65`	`64`	`}`