From 47076332b4c1442a9af6e9753ee65bd9e1b0162d Mon Sep 17 00:00:00 2001
From: Jean Bisutti <jean.bisutti@gmail.com>
Date: Mon, 17 Oct 2022 13:05:05 +0200
Subject: [PATCH] Renaming: captureLogbackMarkerAttribute =>
 captureLogbackMarker, captureLog4jMarkerAttribute => captureLog4jMarker

---
 .../agent/internal/configuration/Configuration.java           | 4 ++--
 .../agent/internal/init/AiConfigCustomizer.java               | 4 ++--
 .../src/smokeTest/resources/applicationinsights.json          | 2 +-
 .../src/smokeTest/resources/applicationinsights.json          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

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
index 5ed26dd81f1..1f436b2a698 100644
--- 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
@@ -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/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java
index 63d9da63efa..935bdbec57e 100644
--- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java
+++ b/agent/agent-tooling/src/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
index 2d31cc5a40a..760102c3f30 100644
--- 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
index 939c48d50be..4fa01c4c3ea 100644
--- 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
   }
 }