fix: remove snapshot product and async instrumentation config

DataDog · daniel-mohedano · Sep 9, 2025 · Jul 4, 2025 · Jul 4, 2025 · Jul 4, 2025
commit f1f12645f0cbe92fbb1900a461142736e5d339e3
@@ -82,7 +82,6 @@ abstract class CiVisibilitySmokeTest extends Specification {
     def requiredSnapshotFields = ["captures", "exceptionId", "probe", "stack"]
 
     logs.each { log ->
-      assert log.product == "test_optimization"
       requiredLogFields.each { field -> log.containsKey(field) }
 
       Map<String, Object> debuggerMap = log.debugger as Map<String, Object>

diff --git a/...agent/agent-debugger/src/main/java/com/datadog/debugger/agent/JsonSnapshotSerializer.java b/...agent/agent-debugger/src/main/java/com/datadog/debugger/agent/JsonSnapshotSerializer.java
@@ -14,15 +14,13 @@
 public class JsonSnapshotSerializer implements DebuggerContext.ValueSerializer {
   private static final String DD_TRACE_ID = "dd.trace_id";
   private static final String DD_SPAN_ID = "dd.span_id";
-  public static final String TEST_OPT_PRODUCT = "test_optimization";
   private static final JsonAdapter<IntakeRequest> ADAPTER =
       MoshiHelper.createMoshiSnapshot().adapter(IntakeRequest.class);
   private static final JsonAdapter<CapturedContext.CapturedValue> VALUE_ADAPTER =
       new MoshiSnapshotHelper.CapturedValueAdapter();
 
-  public String serializeSnapshot(String serviceName, Snapshot snapshot, Config config) {
-    IntakeRequest request =
-        new IntakeRequest(serviceName, new DebuggerIntakeRequestData(snapshot), config);
+  public String serializeSnapshot(String serviceName, Snapshot snapshot) {
+    IntakeRequest request = new IntakeRequest(serviceName, new DebuggerIntakeRequestData(snapshot));
     handleCorrelationFields(snapshot, request);
     handleDuration(snapshot, request);
     handlerLogger(snapshot, request);
@@ -55,7 +53,6 @@ public static class IntakeRequest {
     private final String service;
     private final DebuggerIntakeRequestData debugger;
     private final String ddsource = "dd_debugger";
-    private final String product;
     private final String message;
 
     private final String ddtags;
@@ -88,15 +85,14 @@ public static class IntakeRequest {
     @Json(name = "logger.thread_name")
     private String loggerThreadName;
 
-    public IntakeRequest(String service, DebuggerIntakeRequestData debugger, Config config) {
+    public IntakeRequest(String service, DebuggerIntakeRequestData debugger) {
       this.service = service;
       this.debugger = debugger;
       this.message = debugger.snapshot.getMessage();
       this.ddtags = debugger.snapshot.getProbe().getStrTags();
       this.timestamp = debugger.snapshot.getTimestamp();
       final CharSequence pt = ProcessTags.getTagsForSerialization();
       this.processTags = pt != null ? pt.toString() : null;
-      this.product = config.isCiVisibilityEnabled() ? TEST_OPT_PRODUCT : null;
     }
 
     public String getService() {
@@ -111,10 +107,6 @@ public String getDdsource() {
       return ddsource;
     }
 
-    public String getProduct() {
-      return product;
-    }
-
     public String getMessage() {
       return message;
     }

@@ -27,7 +27,7 @@ public DefaultExceptionDebugger(
         classNameFiltering,
         config.getDebuggerMaxExceptionPerSecond(),
         config.getDebuggerExceptionMaxCapturedFrames(),
-        config.isDebuggerExceptionAsyncConfig());
+        true);
   }
 
   DefaultExceptionDebugger(

diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SnapshotSink.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SnapshotSink.java
@@ -45,12 +45,10 @@ public class SnapshotSink {
   private final AtomicBoolean started = new AtomicBoolean();
   private volatile AgentTaskScheduler.Scheduled<SnapshotSink> highRateScheduled;
   private volatile long currentHighRateFlushInterval = HIGH_RATE_MAX_FLUSH_INTERVAL_MS;
-  private final Config config;
 
   public SnapshotSink(Config config, String tags, BatchUploader snapshotUploader) {
     this.serviceName = TagsHelper.sanitize(config.getServiceName());
     this.batchSize = config.getDynamicInstrumentationUploadBatchSize();
-    this.config = config;
     this.tags = tags;
     this.snapshotUploader = snapshotUploader;
   }
@@ -185,8 +183,7 @@ private List<String> getSerializedSnapshots(BlockingQueue<Snapshot> queue, int l
 
   private String serializeSnapshot(String serviceName, Snapshot snapshot) {
     snapshot.getId(); // Ensure id is generated
-    String str =
-        DebuggerAgent.getSnapshotSerializer().serializeSnapshot(serviceName, snapshot, config);
+    String str = DebuggerAgent.getSnapshotSerializer().serializeSnapshot(serviceName, snapshot);
     String prunedStr = SnapshotPruner.prune(str, MAX_SNAPSHOT_SIZE, 4);
     if (prunedStr.length() != str.length()) {
       LOGGER.debug(

diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java
@@ -124,22 +124,6 @@ public void addSnapshot(boolean processTagsEnabled) throws IOException {
     }
   }
 
-  @Test
-  public void addFailedTestReplaySnapshot() throws IOException {
-    when(config.isCiVisibilityEnabled()).thenReturn(true);
-    ProcessTags.reset(config);
-    DebuggerSink sink = createDefaultDebuggerSink();
-    DebuggerAgentHelper.injectSerializer(new JsonSnapshotSerializer());
-    Snapshot snapshot = createSnapshot();
-    sink.addSnapshot(snapshot);
-    sink.lowRateFlush(sink);
-    verify(batchUploader).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
-    String strPayload = new String(payloadCaptor.getValue(), StandardCharsets.UTF_8);
-    System.out.println(strPayload);
-    JsonSnapshotSerializer.IntakeRequest intakeRequest = assertOneIntakeRequest(strPayload);
-    assertEquals(JsonSnapshotSerializer.TEST_OPT_PRODUCT, intakeRequest.getProduct());
-  }
-
   @Test
   public void addMultipleSnapshots() throws IOException {
     when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(2);

diff --git a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java
@@ -208,7 +208,6 @@ public final class ConfigDefaults {
   static final boolean DEFAULT_DEBUGGER_EXCEPTION_CAPTURE_INTERMEDIATE_SPANS_ENABLED = true;
   static final int DEFAULT_DEBUGGER_EXCEPTION_MAX_CAPTURED_FRAMES = 3;
   static final int DEFAULT_DEBUGGER_EXCEPTION_CAPTURE_INTERVAL_SECONDS = 60 * 60;
-  static final boolean DEFAULT_DEBUGGER_EXCEPTION_ASYNC_CONFIG = true;
   static final boolean DEFAULT_DISTRIBUTED_DEBUGGER_ENABLED = false;
   static final boolean DEFAULT_DEBUGGER_SOURCE_FILE_TRACKING_ENABLED = true;
 

diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/DebuggerConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/DebuggerConfig.java
@@ -58,8 +58,6 @@ public final class DebuggerConfig {
       "exception.replay.capture.max.frames";
   public static final String DEBUGGER_EXCEPTION_CAPTURE_INTERVAL_SECONDS =
       "exception.replay.capture.interval.seconds";
-  public static final String DEBUGGER_EXCEPTION_ASYNC_CONFIG =
-      "internal.exception.replay.async.config";
   public static final String DEBUGGER_EXCEPTION_CAPTURE_INTERMEDIATE_SPANS_ENABLED =
       "exception.replay.capture.intermediate.spans.enabled";
   public static final String DISTRIBUTED_DEBUGGER_ENABLED = "distributed.debugger.enabled";

@@ -54,7 +54,6 @@
 import static datadog.trace.api.ConfigDefaults.DEFAULT_DB_CLIENT_HOST_SPLIT_BY_INSTANCE_TYPE_SUFFIX;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_DB_DBM_PROPAGATION_MODE_MODE;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_DB_DBM_TRACE_PREPARED_STATEMENTS;
-import static datadog.trace.api.ConfigDefaults.DEFAULT_DEBUGGER_EXCEPTION_ASYNC_CONFIG;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_DEBUGGER_EXCEPTION_CAPTURE_INTERMEDIATE_SPANS_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_DEBUGGER_EXCEPTION_CAPTURE_INTERVAL_SECONDS;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_DEBUGGER_EXCEPTION_ENABLED;
@@ -282,7 +281,6 @@
 import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_TAGS;
 import static datadog.trace.api.config.CwsConfig.CWS_ENABLED;
 import static datadog.trace.api.config.CwsConfig.CWS_TLS_REFRESH;
-import static datadog.trace.api.config.DebuggerConfig.DEBUGGER_EXCEPTION_ASYNC_CONFIG;
 import static datadog.trace.api.config.DebuggerConfig.DEBUGGER_EXCEPTION_CAPTURE_INTERMEDIATE_SPANS_ENABLED;
 import static datadog.trace.api.config.DebuggerConfig.DEBUGGER_EXCEPTION_CAPTURE_INTERVAL_SECONDS;
 import static datadog.trace.api.config.DebuggerConfig.DEBUGGER_EXCEPTION_CAPTURE_MAX_FRAMES;
@@ -1083,7 +1081,6 @@ public static String getHostName() {
   private final boolean debuggerExceptionCaptureIntermediateSpansEnabled;
   private final int debuggerExceptionMaxCapturedFrames;
   private final int debuggerExceptionCaptureInterval;
-  private final boolean debuggerExceptionAsyncConfig;
   private final boolean debuggerCodeOriginEnabled;
   private final int debuggerCodeOriginMaxUserFrames;
   private final boolean distributedDebuggerEnabled;
@@ -2456,9 +2453,6 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
         configProvider.getInteger(
             DEBUGGER_EXCEPTION_CAPTURE_INTERVAL_SECONDS,
             DEFAULT_DEBUGGER_EXCEPTION_CAPTURE_INTERVAL_SECONDS);
-    debuggerExceptionAsyncConfig =
-        configProvider.getBoolean(
-            DEBUGGER_EXCEPTION_ASYNC_CONFIG, DEFAULT_DEBUGGER_EXCEPTION_ASYNC_CONFIG);
     debuggerSourceFileTrackingEnabled =
         configProvider.getBoolean(
             DEBUGGER_SOURCE_FILE_TRACKING_ENABLED, DEFAULT_DEBUGGER_SOURCE_FILE_TRACKING_ENABLED);
@@ -4120,10 +4114,6 @@ public int getDebuggerExceptionCaptureInterval() {
     return debuggerExceptionCaptureInterval;
   }
 
-  public boolean isDebuggerExceptionAsyncConfig() {
-    return debuggerExceptionAsyncConfig;
-  }
-
   public boolean isDebuggerCodeOriginEnabled() {
     return debuggerCodeOriginEnabled;
   }