Create activation origin config for telemetry

Signed-off-by: sezen.leblay <[email protected]>

Author: sezen-datadog

dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigServiceImpl.java

@@ -21,6 +21,7 @@
 import static datadog.remoteconfig.Capabilities.CAPABILITY_ASM_TRUSTED_IPS;
 import static datadog.remoteconfig.Capabilities.CAPABILITY_ASM_USER_BLOCKING;
 import static datadog.remoteconfig.Capabilities.CAPABILITY_ENDPOINT_FINGERPRINT;
+import static datadog.trace.api.config.AppSecConfig.APPSEC_ENABLED;
 
 import com.datadog.appsec.AppSecModule;
 import com.datadog.appsec.AppSecSystem;
@@ -45,6 +46,8 @@
 import datadog.remoteconfig.state.ConfigKey;
 import datadog.remoteconfig.state.ProductListener;
 import datadog.trace.api.Config;
+import datadog.trace.api.ConfigCollector;
+import datadog.trace.api.ConfigOrigin;
 import datadog.trace.api.ProductActivation;
 import datadog.trace.api.UserIdCollectionMode;
 import datadog.trace.api.telemetry.LogCollector;
@@ -522,6 +525,13 @@ private void setAppSecActivation(final AppSecFeatures.Asm asm) {
       newState = tracerConfig.getAppSecActivation() == ProductActivation.FULLY_ENABLED;
     } else {
       newState = asm.enabled;
+      if (asm.enabled) {
+        // Report AppSec activation change via telemetry when enabled via remote config
+        ConfigCollector.get().put(APPSEC_ENABLED, true, ConfigOrigin.REMOTE);
+      } else {
+        // Report AppSec activation change via telemetry when disabled via remote config
+        ConfigCollector.get().put(APPSEC_ENABLED, false, ConfigOrigin.REMOTE);
+      }
     }
     if (AppSecSystem.isActive() != newState) {
       log.info("AppSec {} (runtime)", newState ? "enabled" : "disabled");

dd-smoke-tests/dynamic-config/src/main/java/datadog/smoketest/dynamicconfig/ServiceMappingApplication.java

@@ -17,21 +17,37 @@ public static void main(String[] args) throws InterruptedException {
     Tracer tracer = GlobalTracer.get();
 
     long startTime = System.nanoTime();
+    boolean initialMappingObserved = false;
+    boolean updatedMappingObserved = false;
 
     while (System.nanoTime() - startTime < TIMEOUT_IN_NANOS) {
       Span span = tracer.buildSpan("someOperation").start();
       span.setTag(DDTags.SERVICE_NAME, ORIGINAL_SERVICE_NAME);
       String serviceName = ((MutableSpan) span).getServiceName();
 
-      if (serviceName.equals(MAPPED_SERVICE_NAME)) {
-        System.out.println("Service mapping updated to dynamic value");
-        System.exit(0);
+      if (!initialMappingObserved && serviceName.equals(MAPPED_SERVICE_NAME)) {
+        System.out.println("Initial service mapping updated to dynamic value");
+        initialMappingObserved = true;
+      }
+
+      // Wait for a second mapping (simulate a new config pushed after startup)
+      if (initialMappingObserved && !updatedMappingObserved && serviceName.equals("baz")) {
+        System.out.println("Updated service mapping applied");
+        updatedMappingObserved = true;
+        break;
       }
 
       Thread.sleep(500);
     }
 
-    System.out.println("Service mapping never updated");
-    System.exit(1);
+    if (initialMappingObserved && updatedMappingObserved) {
+      System.exit(0);
+    } else if (initialMappingObserved) {
+      System.out.println("Only initial mapping observed");
+      System.exit(2);
+    } else {
+      System.out.println("Service mapping never updated");
+      System.exit(1);
+    }
   }
 }

dd-smoke-tests/dynamic-config/src/test/groovy/datadog/smoketest/DynamicServiceMappingSmokeTest.groovy

@@ -1,7 +1,6 @@
 package datadog.smoketest
 
 import datadog.smoketest.dynamicconfig.ServiceMappingApplication
-
 import static java.util.concurrent.TimeUnit.SECONDS
 
 class DynamicServiceMappingSmokeTest extends AbstractSmokeTest {
@@ -21,11 +20,13 @@ class DynamicServiceMappingSmokeTest extends AbstractSmokeTest {
 
     ProcessBuilder processBuilder = new ProcessBuilder(command)
     processBuilder.directory(new File(buildDirectory))
+    return processBuilder
   }
 
-  def "Updated service mapping observed"() {
-    when:
-    def newConfig = """
+  @Override
+  def setup() {
+    // Set the initial remote configuration before the application starts
+    def initialConfig = """
         {
           "lib_config": {
             "tracing_service_mapping": [{
@@ -35,11 +36,64 @@ class DynamicServiceMappingSmokeTest extends AbstractSmokeTest {
           }
         }
     """ as String
+    setRemoteConfig("datadog/2/APM_TRACING/config_overrides/config", initialConfig)
+  }
 
-    setRemoteConfig("datadog/2/APM_TRACING/config_overrides/config", newConfig)
+  def "Service mapping updates are observed and reported via telemetry"() {
+    when:
+    // Wait for the app to start and apply the initial mapping
+    assert !testedProcess.waitFor(5, SECONDS) // app should still be running
+
+    // Set the updated mapping after startup
+    def updatedConfig = """
+        {
+          "lib_config": {
+            "tracing_service_mapping": [{
+              "from_key": "${ServiceMappingApplication.ORIGINAL_SERVICE_NAME}",
+              "to_name": "baz"
+            }]
+          }
+        }
+    """ as String
+    setRemoteConfig("datadog/2/APM_TRACING/config_overrides/config", updatedConfig)
 
     then:
+    // Wait for the process to exit (should be 0 if both mappings observed)
     assert testedProcess.waitFor(TIMEOUT_SECS, SECONDS)
     assert testedProcess.exitValue() == 0
+
+    // Debug: Print all received telemetry messages
+    println "=== All received telemetry messages ==="
+    telemetryFlatMessages.each { msg ->
+      println "Telemetry: ${msg.request_type} - ${msg.payload?.configuration?.size() ?: 0} configs"
+      if (msg.payload?.configuration) {
+        msg.payload.configuration.each { config ->
+          if (config.name?.contains("service") || config.name?.contains("mapping")) {
+            println "  Config: ${config.name} = ${config.value} (origin: ${config.origin})"
+          }
+        }
+      }
+    }
+    println "=== End telemetry messages ==="
+
+    // Check initial mapping in app-started telemetry
+    def startedTelemetry = telemetryFlatMessages.find { it.request_type == "app-started" }
+    assert startedTelemetry != null : "No app-started telemetry message found. Received: ${telemetryFlatMessages.collect { it.request_type }}"
+    def startedConfigs = startedTelemetry.payload.configuration
+    def initialMapping = startedConfigs.find {
+      it.name == "service_mapping" && it.origin == "remote_config"
+    }
+    initialMapping != null
+    initialMapping.value == "${ServiceMappingApplication.ORIGINAL_SERVICE_NAME}:${ServiceMappingApplication.MAPPED_SERVICE_NAME}"
+
+    // Check updated mapping in app-client-configuration-change telemetry
+    def changeTelemetry = telemetryFlatMessages.find { it.request_type == "app-client-configuration-change" }
+    assert changeTelemetry != null : "No app-client-configuration-change telemetry message found. Received: ${telemetryFlatMessages.collect { it.request_type }}"
+    def changeConfigs = changeTelemetry.payload.configuration
+    def updatedMapping = changeConfigs.find {
+      it.name == "service_mapping" && it.origin == "remote_config"
+    }
+    updatedMapping != null
+    updatedMapping.value == "${ServiceMappingApplication.ORIGINAL_SERVICE_NAME}:baz"
   }
 }

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

@@ -1,5 +1,6 @@
 package datadog.trace.api;
 
+import static datadog.trace.api.config.AppSecConfig.APPSEC_ENABLED;
 import static datadog.trace.api.config.GeneralConfig.DATA_STREAMS_ENABLED;
 import static datadog.trace.api.config.GeneralConfig.RUNTIME_METRICS_ENABLED;
 import static datadog.trace.api.config.GeneralConfig.TRACE_DEBUG;
@@ -97,6 +98,7 @@ public final class Builder {
     boolean runtimeMetricsEnabled;
     boolean logsInjectionEnabled;
     boolean dataStreamsEnabled;
+    boolean appsecEnabled;
 
     Map<String, String> serviceMapping;
     Map<String, String> requestHeaderTags;
@@ -119,6 +121,7 @@ public final class Builder {
       this.runtimeMetricsEnabled = snapshot.runtimeMetricsEnabled;
       this.logsInjectionEnabled = snapshot.logsInjectionEnabled;
       this.dataStreamsEnabled = snapshot.dataStreamsEnabled;
+      this.appsecEnabled = snapshot.appsecEnabled;
 
       this.serviceMapping = snapshot.serviceMapping;
       this.requestHeaderTags = snapshot.requestHeaderTags;
@@ -150,6 +153,11 @@ public Builder setDataStreamsEnabled(boolean dataStreamsEnabled) {
       return this;
     }
 
+    public Builder setAppsecEnabled(boolean appsecEnabled) {
+      this.appsecEnabled = appsecEnabled;
+      return this;
+    }
+
     public Builder setServiceMapping(Map<String, String> serviceMapping) {
       return setServiceMapping(serviceMapping.entrySet());
     }
@@ -284,6 +292,7 @@ static void reportConfigChange(Snapshot newSnapshot) {
     update.put(RUNTIME_METRICS_ENABLED, newSnapshot.runtimeMetricsEnabled);
     update.put(LOGS_INJECTION_ENABLED, newSnapshot.logsInjectionEnabled);
     update.put(DATA_STREAMS_ENABLED, newSnapshot.dataStreamsEnabled);
+    update.put(APPSEC_ENABLED, newSnapshot.appsecEnabled);
 
     update.put(SERVICE_MAPPING, newSnapshot.serviceMapping);
     update.put(REQUEST_HEADER_TAGS, newSnapshot.requestHeaderTags);
@@ -309,6 +318,7 @@ public static class Snapshot implements TraceConfig {
     final boolean runtimeMetricsEnabled;
     final boolean logsInjectionEnabled;
     final boolean dataStreamsEnabled;
+    final boolean appsecEnabled;
 
     final Map<String, String> serviceMapping;
     final Map<String, String> requestHeaderTags;
@@ -330,6 +340,9 @@ protected Snapshot(DynamicConfig<?>.Builder builder, Snapshot oldSnapshot) {
       this.runtimeMetricsEnabled = builder.runtimeMetricsEnabled;
       this.logsInjectionEnabled = builder.logsInjectionEnabled;
       this.dataStreamsEnabled = builder.dataStreamsEnabled;
+      this.appsecEnabled =
+          (boolean) ConfigCollector.get().collect().get(APPSEC_ENABLED).value
+              && ConfigCollector.get().collect().get(APPSEC_ENABLED).origin == ConfigOrigin.REMOTE;
 
       this.serviceMapping = nullToEmpty(builder.serviceMapping);
       this.requestHeaderTags = nullToEmpty(builder.requestHeaderTags);
@@ -374,6 +387,10 @@ public boolean isDataStreamsEnabled() {
       return dataStreamsEnabled;
     }
 
+    public boolean isAppsecEnabled() {
+      return appsecEnabled;
+    }
+
     @Override
     public Map<String, String> getServiceMapping() {
       return serviceMapping;
@@ -430,6 +447,8 @@ public String toString() {
           + logsInjectionEnabled
           + ", dataStreamsEnabled="
           + dataStreamsEnabled
+          + ", appsecEnabled="
+          + appsecEnabled
           + ", serviceMapping="
           + serviceMapping
           + ", requestHeaderTags="