fix: pr suggestions

DataDog · daniel-mohedano · Sep 9, 2025 · Jul 4, 2025 · Jul 4, 2025 · Jul 4, 2025
commit d80e531c7671f0966b13c277e6bf5c7054380e59
@@ -105,8 +105,7 @@ public static void start(Instrumentation inst, SharedCommunicationObjects sco) {
       }
 
       if (executionSettings.isFailedTestReplayEnabled()) {
-        DebuggerConfigBridge.updateConfig(
-            new DebuggerConfigUpdate.Builder().setExceptionReplayEnabled(true).build());
+        DebuggerConfigBridge.updateConfig(new DebuggerConfigUpdate(null, true, null, null));
       }
 
       CiVisibilityCoverageServices.Child coverageServices =

@@ -87,6 +87,7 @@ public void start() {
 
   public void stop() {
     lowRateFlush(this);
+    snapshotSink.highRateFlush(null);
     cancelSchedule(this.flushIntervalScheduled);
     cancelSchedule(this.lowRateScheduled);
     probeStatusSink.stop();

@@ -19,18 +19,18 @@ public void enableDisable() {
     when(sco.featuresDiscovery(any())).thenReturn(mock(DDAgentFeaturesDiscovery.class));
     DebuggerAgent.run(mock(Instrumentation.class), sco);
     DefaultDebuggerConfigUpdater productConfigUpdater = new DefaultDebuggerConfigUpdater();
-    productConfigUpdater.updateConfig(DebuggerConfigUpdate.empty());
-    productConfigUpdater.updateConfig(DebuggerConfigUpdate.allEnabled());
+    productConfigUpdater.updateConfig(new DebuggerConfigUpdate());
+    productConfigUpdater.updateConfig(new DebuggerConfigUpdate(true, true, true, true));
     assertTrue(productConfigUpdater.isDynamicInstrumentationEnabled());
     assertTrue(productConfigUpdater.isExceptionReplayEnabled());
     assertTrue(productConfigUpdater.isCodeOriginEnabled());
     assertTrue(productConfigUpdater.isDistributedDebuggerEnabled());
-    productConfigUpdater.updateConfig(DebuggerConfigUpdate.empty());
+    productConfigUpdater.updateConfig(new DebuggerConfigUpdate());
     assertTrue(productConfigUpdater.isDynamicInstrumentationEnabled());
     assertTrue(productConfigUpdater.isExceptionReplayEnabled());
     assertTrue(productConfigUpdater.isCodeOriginEnabled());
     assertTrue(productConfigUpdater.isDistributedDebuggerEnabled());
-    productConfigUpdater.updateConfig(DebuggerConfigUpdate.allDisabled());
+    productConfigUpdater.updateConfig(new DebuggerConfigUpdate(false, false, false, false));
     assertFalse(productConfigUpdater.isDynamicInstrumentationEnabled());
     assertFalse(productConfigUpdater.isExceptionReplayEnabled());
     assertFalse(productConfigUpdater.isCodeOriginEnabled());

@@ -222,12 +222,11 @@ void applyConfigOverrides(LibConfig libConfig) {
 
     maybeOverride(builder::setTracingTags, parseTagListToMap(libConfig.tracingTags));
     DebuggerConfigBridge.updateConfig(
-        new DebuggerConfigUpdate.Builder()
-            .setDynamicInstrumentationEnabled(libConfig.dynamicInstrumentationEnabled)
-            .setExceptionReplayEnabled(libConfig.exceptionReplayEnabled)
-            .setCodeOriginEnabled(libConfig.codeOriginEnabled)
-            .setDistributedDebuggerEnabled(libConfig.liveDebuggingEnabled)
-            .build());
+        new DebuggerConfigUpdate(
+            libConfig.dynamicInstrumentationEnabled,
+            libConfig.exceptionReplayEnabled,
+            libConfig.codeOriginEnabled,
+            libConfig.liveDebuggingEnabled));
     builder.apply();
   }
 

@@ -19,9 +19,10 @@ public static void updateConfig(DebuggerConfigUpdate update) {
       LOGGER.debug("No config update detected, skipping");
       return;
     }
-    if (UPDATER.get() != null) {
-      LOGGER.debug("DebuggerConfigUpdater available, performing update");
-      UPDATER.get().updateConfig(update);
+    DebuggerConfigUpdater updater = UPDATER.get();
+    if (updater != null) {
+      LOGGER.debug("DebuggerConfigUpdater available, performing update: {}", update);
+      updater.updateConfig(update);
     } else {
       LOGGER.debug("DebuggerConfigUpdater not available, deferring update");
       DEFERRED_UPDATE.updateAndGet(existing -> DebuggerConfigUpdate.coalesce(existing, update));

@@ -1,18 +1,24 @@
 package datadog.trace.api.debugger;
 
-import java.util.Objects;
-
 public class DebuggerConfigUpdate {
   private final Boolean dynamicInstrumentationEnabled;
   private final Boolean exceptionReplayEnabled;
   private final Boolean codeOriginEnabled;
   private final Boolean distributedDebuggerEnabled;
 
-  private DebuggerConfigUpdate(Builder builder) {
-    this.dynamicInstrumentationEnabled = builder.dynamicInstrumentationEnabled;
-    this.exceptionReplayEnabled = builder.exceptionReplayEnabled;
-    this.codeOriginEnabled = builder.codeOriginEnabled;
-    this.distributedDebuggerEnabled = builder.distributedDebuggerEnabled;
+  public DebuggerConfigUpdate() {
+    this(null, null, null, null);
+  }
+
+  public DebuggerConfigUpdate(
+      Boolean dynamicInstrumentationEnabled,
+      Boolean exceptionReplayEnabled,
+      Boolean codeOriginEnabled,
+      Boolean distributedDebuggerEnabled) {
+    this.dynamicInstrumentationEnabled = dynamicInstrumentationEnabled;
+    this.exceptionReplayEnabled = exceptionReplayEnabled;
+    this.codeOriginEnabled = codeOriginEnabled;
+    this.distributedDebuggerEnabled = distributedDebuggerEnabled;
   }
 
   public Boolean getDynamicInstrumentationEnabled() {
@@ -31,16 +37,6 @@ public Boolean getDistributedDebuggerEnabled() {
     return distributedDebuggerEnabled;
   }
 
-  @Override
-  public boolean equals(Object o) {
-    if (!(o instanceof DebuggerConfigUpdate)) return false;
-    DebuggerConfigUpdate that = (DebuggerConfigUpdate) o;
-    return Objects.equals(dynamicInstrumentationEnabled, that.dynamicInstrumentationEnabled)
-        && Objects.equals(exceptionReplayEnabled, that.exceptionReplayEnabled)
-        && Objects.equals(codeOriginEnabled, that.codeOriginEnabled)
-        && Objects.equals(distributedDebuggerEnabled, that.distributedDebuggerEnabled);
-  }
-
   @Override
   public String toString() {
     return "DebuggerConfigUpdate{"
@@ -55,15 +51,6 @@ public String toString() {
         + '}';
   }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(
-        dynamicInstrumentationEnabled,
-        exceptionReplayEnabled,
-        codeOriginEnabled,
-        distributedDebuggerEnabled);
-  }
-
   public boolean hasUpdates() {
     return dynamicInstrumentationEnabled != null
         || exceptionReplayEnabled != null
@@ -77,76 +64,15 @@ public static DebuggerConfigUpdate coalesce(
       return update;
     }
 
-    return new Builder()
-        .setDynamicInstrumentationEnabled(
-            coalesceSetting(
-                existing.dynamicInstrumentationEnabled, update.dynamicInstrumentationEnabled))
-        .setExceptionReplayEnabled(
-            coalesceSetting(existing.exceptionReplayEnabled, update.exceptionReplayEnabled))
-        .setCodeOriginEnabled(coalesceSetting(existing.codeOriginEnabled, update.codeOriginEnabled))
-        .setDistributedDebuggerEnabled(
-            coalesceSetting(existing.distributedDebuggerEnabled, update.distributedDebuggerEnabled))
-        .build();
+    return new DebuggerConfigUpdate(
+        coalesceSetting(
+            existing.dynamicInstrumentationEnabled, update.dynamicInstrumentationEnabled),
+        coalesceSetting(existing.exceptionReplayEnabled, update.exceptionReplayEnabled),
+        coalesceSetting(existing.codeOriginEnabled, update.codeOriginEnabled),
+        coalesceSetting(existing.distributedDebuggerEnabled, update.distributedDebuggerEnabled));
   }
 
   private static Boolean coalesceSetting(Boolean existing, Boolean update) {
     return update != null ? update : existing;
   }
-
-  public static final class Builder {
-    private Boolean dynamicInstrumentationEnabled;
-    private Boolean exceptionReplayEnabled;
-    private Boolean codeOriginEnabled;
-    private Boolean distributedDebuggerEnabled;
-
-    public Builder setDynamicInstrumentationEnabled(Boolean dynamicInstrumentationEnabled) {
-      this.dynamicInstrumentationEnabled = dynamicInstrumentationEnabled;
-      return this;
-    }
-
-    public Builder setExceptionReplayEnabled(Boolean exceptionReplayEnabled) {
-      this.exceptionReplayEnabled = exceptionReplayEnabled;
-      return this;
-    }
-
-    public Builder setCodeOriginEnabled(Boolean codeOriginEnabled) {
-      this.codeOriginEnabled = codeOriginEnabled;
-      return this;
-    }
-
-    public Builder setDistributedDebuggerEnabled(Boolean distributedDebuggerEnabled) {
-      this.distributedDebuggerEnabled = distributedDebuggerEnabled;
-      return this;
-    }
-
-    public Builder enableAll() {
-      return setDynamicInstrumentationEnabled(true)
-          .setExceptionReplayEnabled(true)
-          .setCodeOriginEnabled(true)
-          .setDistributedDebuggerEnabled(true);
-    }
-
-    public Builder disableAll() {
-      return setDynamicInstrumentationEnabled(false)
-          .setExceptionReplayEnabled(false)
-          .setCodeOriginEnabled(false)
-          .setDistributedDebuggerEnabled(false);
-    }
-
-    public DebuggerConfigUpdate build() {
-      return new DebuggerConfigUpdate(this);
-    }
-  }
-
-  public static DebuggerConfigUpdate empty() {
-    return new Builder().build();
-  }
-
-  public static DebuggerConfigUpdate allEnabled() {
-    return new Builder().enableAll().build();
-  }
-
-  public static DebuggerConfigUpdate allDisabled() {
-    return new Builder().disableAll().build();
-  }
 }
@@ -20,22 +20,22 @@ class DebuggerConfigBridgeTest extends Specification {
 
     when:
     DebuggerConfigBridge.setUpdater(updater)
-    DebuggerConfigBridge.updateConfig(new DebuggerConfigUpdate.Builder().setExceptionReplayEnabled(true).build())
+    DebuggerConfigBridge.updateConfig(new DebuggerConfigUpdate(null, true, null, null))
 
     then:
     updater.calls == 1
     DebuggerConfigBridge.isExceptionReplayEnabled()
 
     when:
-    DebuggerConfigBridge.updateConfig(new DebuggerConfigUpdate.Builder().setDynamicInstrumentationEnabled(true).build())
+    DebuggerConfigBridge.updateConfig(new DebuggerConfigUpdate(true, null, null, null))
 
     then:
     updater.calls == 2
     DebuggerConfigBridge.isExceptionReplayEnabled()
     DebuggerConfigBridge.isDynamicInstrumentationEnabled()
 
     when:
-    DebuggerConfigBridge.updateConfig(DebuggerConfigUpdate.allDisabled())
+    DebuggerConfigBridge.updateConfig(new DebuggerConfigUpdate(false, false, false, false))
 
     then:
     updater.calls == 3
@@ -50,7 +50,7 @@ class DebuggerConfigBridgeTest extends Specification {
     DebuggerConfigBridge.setUpdater(updater)
 
     when:
-    DebuggerConfigBridge.updateConfig(new DebuggerConfigUpdate.Builder().build())
+    DebuggerConfigBridge.updateConfig(new DebuggerConfigUpdate())
 
     then:
     updater.calls == 0
@@ -60,9 +60,9 @@ class DebuggerConfigBridgeTest extends Specification {
     def updater = new MockDebuggerConfigUpdater()
 
     when:
-    DebuggerConfigBridge.updateConfig(new DebuggerConfigUpdate.Builder().setExceptionReplayEnabled(false).build())
-    DebuggerConfigBridge.updateConfig(DebuggerConfigUpdate.allEnabled())
-    DebuggerConfigBridge.updateConfig(new DebuggerConfigUpdate.Builder().setExceptionReplayEnabled(false).build())
+    DebuggerConfigBridge.updateConfig(new DebuggerConfigUpdate(null, false, null, null))
+    DebuggerConfigBridge.updateConfig(new DebuggerConfigUpdate(true, true, true, true))
+    DebuggerConfigBridge.updateConfig(new DebuggerConfigUpdate(null, false, null, null))
 
     then:
     updater.calls == 0

@@ -5,8 +5,8 @@ import spock.lang.Specification
 class DebuggerConfigUpdateTest extends Specification {
 
   def "test update coalesce"() {
-    def existing = new DebuggerConfigUpdate.Builder().setExceptionReplayEnabled(true).setDynamicInstrumentationEnabled(false).build()
-    def update = new DebuggerConfigUpdate.Builder().setExceptionReplayEnabled(false).setCodeOriginEnabled(true).build()
+    def existing = new DebuggerConfigUpdate(false, true, null, null)
+    def update = new DebuggerConfigUpdate(null, false, true, null)
 
     when:
     def result = DebuggerConfigUpdate.coalesce(existing, update)