refactor

Author: amarziali

dd-java-agent/instrumentation/spring-boot/src/main/java/datadog/trace/instrumentation/springboot/SpringApplicationInstrumentation.java

@@ -63,7 +63,7 @@ public static void afterEnvironmentPostProcessed(
         AgentTracer.get().updatePreferredServiceName(applicationName);
         ProcessTags.addTag("springboot.application", applicationName);
       }
-      if (Config.get().isExperimentalCollectProcessTagsEnabled()) {
+      if (Config.get().isExperimentalPropagateProcessTagsEnabled()) {
         final String[] profiles = environment.getActiveProfiles();
         if (profiles != null && profiles.length > 0) {
           ProcessTags.addTag("springboot.profile", profiles[0]);
@@ -92,7 +92,7 @@ public static void afterEnvironmentPostProcessed(
         AgentTracer.get().updatePreferredServiceName(applicationName);
         ProcessTags.addTag("springboot.application", applicationName);
       }
-      if (Config.get().isExperimentalCollectProcessTagsEnabled()) {
+      if (Config.get().isExperimentalPropagateProcessTagsEnabled()) {
         final String[] profiles = environment.getActiveProfiles();
         if (profiles != null && profiles.length > 0) {
           ProcessTags.addTag("springboot.profile", profiles[0]);

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

@@ -78,7 +78,7 @@ class SerializingMetricWriterTest extends DDSpecification {
     void accept(int messageCount, ByteBuffer buffer) {
       MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer)
       int mapSize = unpacker.unpackMapHeader()
-      assert mapSize == (6 + (Config.get().isExperimentalCollectProcessTagsEnabled() ? 1 : 0))
+      assert mapSize == (6 + (Config.get().isExperimentalPropagateProcessTagsEnabled() ? 1 : 0))
       assert unpacker.unpackString() == "RuntimeId"
       assert unpacker.unpackString() == wellKnownTags.getRuntimeId() as String
       assert unpacker.unpackString() == "Seq"
@@ -89,7 +89,7 @@ class SerializingMetricWriterTest extends DDSpecification {
       assert unpacker.unpackString() == wellKnownTags.getEnv() as String
       assert unpacker.unpackString() == "Version"
       assert unpacker.unpackString() == wellKnownTags.getVersion() as String
-      if (Config.get().isExperimentalCollectProcessTagsEnabled()) {
+      if (Config.get().isExperimentalPropagateProcessTagsEnabled()) {
         assert unpacker.unpackString() == "ProcessTags"
         assert unpacker.unpackString() == ProcessTags.tagsForSerialization as String
       }

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

@@ -347,7 +347,7 @@ class TraceMapperV04PayloadTest extends DDSpecification {
               } else if (DDTags.ORIGIN_KEY.equals(entry.getKey())) {
                 assertEquals(expectedSpan.getOrigin(), entry.getValue())
               } else if (DDTags.PROCESS_TAGS.equals(entry.getKey())) {
-                assertTrue(Config.get().isExperimentalCollectProcessTagsEnabled())
+                assertTrue(Config.get().isExperimentalPropagateProcessTagsEnabled())
                 assertEquals(0, k)
                 assertEquals(ProcessTags.tagsForSerialization.toString(), entry.getValue())
               } else {

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

@@ -248,7 +248,7 @@ class TraceMapperV05PayloadTest extends DDSpecification {
               } else if(DDTags.ORIGIN_KEY.equals(entry.getKey())) {
                 assertEquals(expectedSpan.getOrigin(), entry.getValue())
               } else if (DDTags.PROCESS_TAGS.equals(entry.getKey())) {
-                assertTrue(Config.get().isExperimentalCollectProcessTagsEnabled())
+                assertTrue(Config.get().isExperimentalPropagateProcessTagsEnabled())
                 assertEquals(0, k)
                 assertEquals(ProcessTags.tagsForSerialization.toString(), entry.getValue())
               } else {

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

@@ -150,7 +150,7 @@ public static String getHostName() {
   private final boolean peerServiceDefaultsEnabled;
   private final Map<String, String> peerServiceComponentOverrides;
   private final boolean removeIntegrationServiceNamesEnabled;
-  private final boolean experimentalCollectProcessTagsEnabled;
+  private final boolean experimentalPropagateProcessTagsEnabled;
   private final Map<String, String> peerServiceMapping;
   private final Map<String, String> serviceMapping;
   private final Map<String, String> tags;
@@ -847,7 +847,7 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
     // feature flag to remove fake services in v0
     removeIntegrationServiceNamesEnabled =
         configProvider.getBoolean(TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED, false);
-    experimentalCollectProcessTagsEnabled =
+    experimentalPropagateProcessTagsEnabled =
         configProvider.getBoolean(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, false);
 
     peerServiceMapping = configProvider.getMergedMap(TRACE_PEER_SERVICE_MAPPING);
@@ -2094,8 +2094,8 @@ public Set<String> getExperimentalFeaturesEnabled() {
     return experimentalFeaturesEnabled;
   }
 
-  public boolean isExperimentalCollectProcessTagsEnabled() {
-    return experimentalCollectProcessTagsEnabled;
+  public boolean isExperimentalPropagateProcessTagsEnabled() {
+    return experimentalPropagateProcessTagsEnabled;
   }
 
   public boolean isTraceEnabled() {
@@ -4909,6 +4909,8 @@ public String toString() {
         + cloudRequestPayloadTagging
         + ", cloudResponsePayloadTagging="
         + cloudResponsePayloadTagging
+        + ", experimentalPropagateProcessTagsEnabled="
+        + experimentalPropagateProcessTagsEnabled
         + '}';
   }
 }

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

@@ -13,7 +13,7 @@
 
 public class ProcessTags {
   private static final Logger LOGGER = LoggerFactory.getLogger(ProcessTags.class);
-  private static boolean enabled = Config.get().isExperimentalCollectProcessTagsEnabled();
+  private static boolean enabled = Config.get().isExperimentalPropagateProcessTagsEnabled();
 
   private static class Lazy {
     static final Map<String, String> TAGS = loadTags();
@@ -123,7 +123,7 @@ static void empty() {
   /** Visible for testing. */
   static void reset() {
     empty();
-    enabled = Config.get().isExperimentalCollectProcessTagsEnabled();
+    enabled = Config.get().isExperimentalPropagateProcessTagsEnabled();
     Lazy.TAGS.putAll(Lazy.loadTags());
   }
 }