Use the correct setting name

Author: amarziali

dd-java-agent/instrumentation/spring-boot/src/test/groovy/SpringBootApplicationTest.groovy

@@ -3,17 +3,16 @@ import datadog.trace.api.ProcessTags
 import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
 
 import datadog.trace.agent.test.AgentTestRunner
-import datadog.trace.api.Config
 import org.springframework.beans.factory.InitializingBean
 import org.springframework.boot.SpringApplication
 
-import static datadog.trace.api.config.GeneralConfig.EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED
+import static datadog.trace.api.config.GeneralConfig.EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED
 
 class SpringBootApplicationTest extends AgentTestRunner {
   @Override
   protected void configurePreAgent() {
     super.configurePreAgent()
-    injectSysConfig(EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED, "true")
+    injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "true")
   }
 
   static class BeanWhoTraces implements InitializingBean {

dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java

@@ -29,8 +29,8 @@ public final class GeneralConfig {
   @Deprecated // Use dd.tags instead
   public static final String GLOBAL_TAGS = "trace.global.tags";
 
-  public static final String EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED =
-      "experimental.collect.tags.enabled";
+  public static final String EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED =
+      "experimental.propagate.process.tags.enabled";
 
   public static final String LOG_LEVEL = "log.level";
   public static final String TRACE_DEBUG = "trace.debug";

dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SerializingMetricWriterTest.groovy

@@ -11,7 +11,7 @@ import org.msgpack.core.MessageUnpacker
 import java.nio.ByteBuffer
 import java.util.concurrent.atomic.AtomicLongArray
 
-import static datadog.trace.api.config.GeneralConfig.EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED
+import static datadog.trace.api.config.GeneralConfig.EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED
 import static java.util.concurrent.TimeUnit.MILLISECONDS
 import static java.util.concurrent.TimeUnit.SECONDS
 
@@ -20,7 +20,7 @@ class SerializingMetricWriterTest extends DDSpecification {
   def "should produce correct message #iterationIndex with process tags enabled #withProcessTags" () {
     setup:
     if (withProcessTags) {
-      injectSysConfig(EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED, "true")
+      injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "true")
     }
     ProcessTags.reset()
     long startTime = MILLISECONDS.toNanos(System.currentTimeMillis())

dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.groovy

@@ -21,7 +21,7 @@ import org.msgpack.core.MessageUnpacker
 import java.nio.ByteBuffer
 import java.nio.channels.WritableByteChannel
 
-import static datadog.trace.api.config.GeneralConfig.EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED
+import static datadog.trace.api.config.GeneralConfig.EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED
 import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.DD_MEASURED
 import static datadog.trace.common.writer.TraceGenerator.generateRandomTraces
 import static org.junit.jupiter.api.Assertions.assertEquals
@@ -177,7 +177,7 @@ class TraceMapperV04PayloadTest extends DDSpecification {
 
   void 'test process tags serialization'() {
     setup:
-    injectSysConfig(EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED, "true")
+    injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "true")
     ProcessTags.reset()
     assertNotNull(ProcessTags.tagsForSerialization)
     def spans = (1..2).collect {

dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.groovy

@@ -23,7 +23,7 @@ import java.nio.ByteBuffer
 import java.nio.channels.WritableByteChannel
 import java.util.concurrent.atomic.AtomicInteger
 
-import static datadog.trace.api.config.GeneralConfig.EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED
+import static datadog.trace.api.config.GeneralConfig.EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED
 import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.DD_MEASURED
 import static datadog.trace.common.writer.TraceGenerator.generateRandomTraces
 import static org.junit.Assert.assertEquals
@@ -135,7 +135,7 @@ class TraceMapperV05PayloadTest extends DDSpecification {
 
   void 'test process tags serialization'() {
     setup:
-    injectSysConfig(EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED, "true")
+    injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "true")
     ProcessTags.reset()
     assertNotNull(ProcessTags.tagsForSerialization)
     def spans = (1..2).collect {

internal-api/src/main/java/datadog/trace/api/Config.java

@@ -848,7 +848,7 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
     removeIntegrationServiceNamesEnabled =
         configProvider.getBoolean(TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED, false);
     experimentalCollectProcessTagsEnabled =
-        configProvider.getBoolean(EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED, false);
+        configProvider.getBoolean(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, false);
 
     peerServiceMapping = configProvider.getMergedMap(TRACE_PEER_SERVICE_MAPPING);
 

internal-api/src/test/groovy/datadog/trace/api/ProcessTagsForkedTest.groovy

@@ -5,7 +5,7 @@ import datadog.trace.test.util.DDSpecification
 
 import java.nio.file.Paths
 
-import static datadog.trace.api.config.GeneralConfig.EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED
+import static datadog.trace.api.config.GeneralConfig.EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED
 
 class ProcessTagsForkedTest extends DDSpecification {
 
@@ -22,7 +22,7 @@ class ProcessTagsForkedTest extends DDSpecification {
 
   def 'should load default tags for jar #jar and main class #cls'() {
     given:
-    injectSysConfig(EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED, "true")
+    injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "true")
     CapturedEnvironment.useFixedProcessInfo(new CapturedEnvironment.ProcessInfo(cls, jar))
     ProcessTags.reset()
     def tags = ProcessTags.getTagsForSerialization()
@@ -38,7 +38,7 @@ class ProcessTagsForkedTest extends DDSpecification {
 
   def 'should load default tags jboss (mode #mode)'() {
     setup:
-    injectSysConfig(EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED, "true")
+    injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "true")
     if (jbossHome != null) {
       System.setProperty("jboss.home.dir", jbossHome)
     }
@@ -76,7 +76,7 @@ class ProcessTagsForkedTest extends DDSpecification {
 
   def 'should lazily recalculate when a tag is added'() {
     setup:
-    injectSysConfig(EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED, "true")
+    injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "true")
     ProcessTags.reset()
     when:
     def processTags = ProcessTags.tagsForSerialization