Ensure auto-detected service name is the same for every process in the same build

Author: nikita-tkachenko-datadog

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemModuleImpl.java

@@ -12,6 +12,7 @@
 import datadog.trace.api.civisibility.domain.JavaAgent;
 import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector;
 import datadog.trace.api.config.CiVisibilityConfig;
+import datadog.trace.api.config.GeneralConfig;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
 import datadog.trace.bootstrap.instrumentation.api.Tags;
@@ -99,6 +100,8 @@ public <T extends CoverageCalculator> BuildSystemModuleImpl(
     settings =
         new BuildModuleSettings(
             getPropertiesPropagatedToChildProcess(
+                config.getServiceName(),
+                config.isServiceNameSetByUser(),
                 moduleName,
                 startCommand,
                 classpath,
@@ -125,6 +128,8 @@ public void set(Map<String, String> carrier, String key, String value) {
   }
 
   private Map<String, String> getPropertiesPropagatedToChildProcess(
+      String serviceName,
+      boolean userProvidedServiceName,
       String moduleName,
       String startCommand,
       @Nullable Collection<Path> classpath,
@@ -190,6 +195,11 @@ private Map<String, String> getPropertiesPropagatedToChildProcess(
             CiVisibilityConfig.CIVISIBILITY_INJECTED_TRACER_VERSION),
         TracerVersion.TRACER_VERSION);
 
+    propagatedSystemProperties.put(
+        Strings.propertyNameToSystemPropertyName(GeneralConfig.SERVICE_NAME), serviceName);
+    propagatedSystemProperties.put(
+        Strings.propertyNameToSystemPropertyName(GeneralConfig.SERVICE_NAME_SET_BY_USER),
+        String.valueOf(userProvidedServiceName));
     propagatedSystemProperties.put(
         Strings.propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_MODULE_NAME),
         moduleName);

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

@@ -21,6 +21,7 @@ public final class GeneralConfig {
   public static final String SITE = "site";
 
   public static final String SERVICE_NAME = "service.name";
+  public static final String SERVICE_NAME_SET_BY_USER = "service.name.set.by.user";
   public static final String ENV = "env";
   public static final String VERSION = "version";
   public static final String PRIMARY_TAG = "primary.tag";

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

@@ -631,7 +631,8 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
       serviceNameSetByUser = false;
       serviceName = configProvider.getString(SERVICE, DEFAULT_SERVICE_NAME, SERVICE_NAME);
     } else {
-      serviceNameSetByUser = true;
+      // might be an auto-detected name propagated from instrumented parent process
+      serviceNameSetByUser = configProvider.getBoolean(SERVICE_NAME_SET_BY_USER, true);
       serviceName = userProvidedServiceName;
     }