Renaming: captureLogbackMarkerAttribute => captureLogbackMarker, capt…

…ureLog4jMarkerAttribute => captureLog4jMarker
microsoft · Oct 17, 2022 · 15ba360 · 15ba360
1 parent 2773c88
commit 15ba360
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/...in/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java b/...in/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java
@@ -321,9 +321,9 @@ public static class PreviewConfiguration {
 
     public boolean captureLogbackCodeAttributes;
 
-    public boolean captureLogbackMarkerAttribute;
+    public boolean captureLogbackMarker;
 
-    public boolean captureLog4jMarkerAttribute;
+    public boolean captureLog4jMarker;
 
     // this is to support interoperability with other systems
     // intentionally not allowing the removal of w3c propagator since that is key to many Azure

diff --git a/...c/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java b/...c/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java
@@ -256,11 +256,11 @@ private static void enableInstrumentations(Configuration config, Map<String, Str
       properties.put(
           "otel.instrumentation.logback-appender.experimental.capture-code-attributes", "true");
     }
-    if (config.preview.captureLogbackMarkerAttribute) {
+    if (config.preview.captureLogbackMarker) {
       properties.put(
           "otel.instrumentation.logback-appender.experimental.capture-marker-attribute", "true");
     }
-    if (config.preview.captureLog4jMarkerAttribute) {
+    if (config.preview.captureLog4jMarker) {
       properties.put(
           "otel.instrumentation.log4j-appender.experimental.capture-marker-attribute", "true");
     }

diff --git a/smoke-tests/apps/TraceLog4j2UsingAgent/src/smokeTest/resources/applicationinsights.json b/smoke-tests/apps/TraceLog4j2UsingAgent/src/smokeTest/resources/applicationinsights.json
@@ -12,6 +12,6 @@
     }
   },
   "preview": {
-    "captureLog4jMarkerAttribute": true
+    "captureLog4jMarker": true
   }
 }
diff --git a/smoke-tests/apps/TraceLogBackUsingAgent/src/smokeTest/resources/applicationinsights.json b/smoke-tests/apps/TraceLogBackUsingAgent/src/smokeTest/resources/applicationinsights.json
@@ -13,6 +13,6 @@
   },
   "preview": {
     "captureLogbackCodeAttributes": true,
-    "captureLogbackMarkerAttribute": true
+    "captureLogbackMarker": true
   }
 }