From 768b14543bbbe67d920631c59e0912b288bcd1a2 Mon Sep 17 00:00:00 2001
From: Stuart McCulloch <stuart.mcculloch@datadoghq.com>
Date: Tue, 27 Jun 2023 21:11:45 +0100
Subject: [PATCH] Latest dynamic-config schema changes (#5481)

---
 .../smoketest/DynamicServiceMappingSmokeTest.groovy       | 2 +-
 .../groovy/datadog/smoketest/LogInjectionSmokeTest.groovy | 2 +-
 .../main/java/datadog/trace/core/TracingConfigPoller.java | 8 ++++----
 .../test/groovy/datadog/trace/core/CoreTracerTest.groovy  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dd-smoke-tests/dynamic-config/src/test/groovy/datadog/smoketest/DynamicServiceMappingSmokeTest.groovy b/dd-smoke-tests/dynamic-config/src/test/groovy/datadog/smoketest/DynamicServiceMappingSmokeTest.groovy
index ae2d4389a27..b2898fe7e63 100644
--- a/dd-smoke-tests/dynamic-config/src/test/groovy/datadog/smoketest/DynamicServiceMappingSmokeTest.groovy
+++ b/dd-smoke-tests/dynamic-config/src/test/groovy/datadog/smoketest/DynamicServiceMappingSmokeTest.groovy
@@ -29,7 +29,7 @@ class DynamicServiceMappingSmokeTest extends AbstractSmokeTest {
         {
           "lib_config": {
             "tracing_service_mapping": [{
-              "from_name": "${ServiceMappingApplication.ORIGINAL_SERVICE_NAME}",
+              "from_key": "${ServiceMappingApplication.ORIGINAL_SERVICE_NAME}",
               "to_name": "${ServiceMappingApplication.MAPPED_SERVICE_NAME}"
             }]
           }
diff --git a/dd-smoke-tests/log-injection/src/test/groovy/datadog/smoketest/LogInjectionSmokeTest.groovy b/dd-smoke-tests/log-injection/src/test/groovy/datadog/smoketest/LogInjectionSmokeTest.groovy
index 5ddfdac546a..a094534cb04 100644
--- a/dd-smoke-tests/log-injection/src/test/groovy/datadog/smoketest/LogInjectionSmokeTest.groovy
+++ b/dd-smoke-tests/log-injection/src/test/groovy/datadog/smoketest/LogInjectionSmokeTest.groovy
@@ -221,7 +221,7 @@ abstract class LogInjectionSmokeTest extends AbstractSmokeTest {
 
     def newConfig = """
         {"lib_config":
-          {"logs_injection_enabled":false}
+          {"log_injection_enabled":false}
         }
      """.toString()
     setRemoteConfig("datadog/2/APM_TRACING/config_overrides/config", newConfig)
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/TracingConfigPoller.java b/dd-trace-core/src/main/java/datadog/trace/core/TracingConfigPoller.java
index 77f278240b2..5f39a2ad8bb 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/TracingConfigPoller.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/TracingConfigPoller.java
@@ -125,7 +125,7 @@ static final class LibConfig {
     @Json(name = "runtime_metrics_enabled")
     public Boolean runtimeMetricsEnabled;
 
-    @Json(name = "logs_injection_enabled")
+    @Json(name = "log_injection_enabled")
     public Boolean logsInjectionEnabled;
 
     @Json(name = "data_streams_enabled")
@@ -142,15 +142,15 @@ static final class LibConfig {
   }
 
   static final class ServiceMappingEntry implements Map.Entry<String, String> {
-    @Json(name = "from_name")
-    public String fromName;
+    @Json(name = "from_key")
+    public String fromKey;
 
     @Json(name = "to_name")
     public String toName;
 
     @Override
     public String getKey() {
-      return fromName;
+      return fromKey;
     }
 
     @Override
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/CoreTracerTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/CoreTracerTest.groovy
index 1fd6d43ff1c..7dee9fb63e0 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/CoreTracerTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/CoreTracerTest.groovy
@@ -438,10 +438,10 @@ class CoreTracerTest extends DDCoreSpecification {
         {
           "tracing_service_mapping":
           [{
-             "from_name": "foobar",
+             "from_key": "foobar",
              "to_name": "bar"
           }, {
-             "from_name": "snafu",
+             "from_key": "snafu",
              "to_name": "foo"
           }]
           ,