Suggestions

amarziali · amarziali · commit d81fa1b0786c · 2025-09-11T11:28:22.000+02:00
diff --git a/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java b/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java
@@ -159,7 +159,7 @@ public DDAgentFeaturesDiscovery featuresDiscovery(Config config) {
               ret.discover(); // safe to run on same thread
             } else {
               // avoid performing blocking I/O operation on application thread
-              AgentTaskScheduler.getInstance().execute(ret::discoverIfOutdated);
+              AgentTaskScheduler.get().execute(ret::discoverIfOutdated);
             }
           }
           featuresDiscovery = ret;
diff --git a/communication/src/main/java/datadog/communication/monitor/DDAgentStatsDConnection.java b/communication/src/main/java/datadog/communication/monitor/DDAgentStatsDConnection.java
@@ -87,7 +87,7 @@ private void scheduleConnect() {
         log.debug(
             "Scheduling StatsD connection in {} seconds - {}", remainingDelay, statsDAddress());
       }
-      AgentTaskScheduler.getInstance()
+      AgentTaskScheduler.get()
           .scheduleWithJitter(ConnectTask.INSTANCE, this, remainingDelay, SECONDS);
     } else {
       doConnect();
@@ -168,7 +168,7 @@ private void doConnect() {
               log.debug(
                   "Scheduling StatsD connection in {} seconds - {}", RETRY_DELAY, statsDAddress());
             }
-            AgentTaskScheduler.getInstance()
+            AgentTaskScheduler.get()
                 .scheduleWithJitter(ConnectTask.INSTANCE, this, RETRY_DELAY, SECONDS);
           } else {
             log.debug("Max retries have been reached. Will not attempt again.");
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
@@ -513,7 +513,7 @@ public static void startDatadogTracer(InitializationTelemetry initTelemetry) thr
 
   private static void registerLogManagerCallback(final ClassLoadCallBack callback) {
     // one minute fail-safe in case the class was unintentionally loaded during premain
-    AgentTaskScheduler.getInstance().schedule(callback, 1, TimeUnit.MINUTES);
+    AgentTaskScheduler.get().schedule(callback, 1, TimeUnit.MINUTES);
     try {
       final Class<?> agentInstallerClass = AGENT_CLASSLOADER.loadClass(AGENT_INSTALLER_CLASS_NAME);
       final Method registerCallbackMethod =
@@ -526,7 +526,7 @@ private static void registerLogManagerCallback(final ClassLoadCallBack callback)
 
   private static void registerMBeanServerBuilderCallback(final ClassLoadCallBack callback) {
     // one minute fail-safe in case the class was unintentionally loaded during premain
-    AgentTaskScheduler.getInstance().schedule(callback, 1, TimeUnit.MINUTES);
+    AgentTaskScheduler.get().schedule(callback, 1, TimeUnit.MINUTES);
     try {
       final Class<?> agentInstallerClass = AGENT_CLASSLOADER.loadClass(AGENT_INSTALLER_CLASS_NAME);
       final Method registerCallbackMethod =
@@ -785,7 +785,7 @@ private static void startCrashTracking() {
       if (forceEarlyStart) {
         initializeCrashTrackingDefault();
       } else {
-        AgentTaskScheduler.getInstance().execute(Agent::initializeCrashTrackingDefault);
+        AgentTaskScheduler.get().execute(Agent::initializeCrashTrackingDefault);
       }
     } else {
       // for Java 8 we are relying on JMX to give us the process PID
@@ -796,7 +796,7 @@ private static void startCrashTracking() {
 
   private static void scheduleJmxStart(final int jmxStartDelay) {
     if (jmxStartDelay > 0) {
-      AgentTaskScheduler.getInstance()
+      AgentTaskScheduler.get()
           .scheduleWithJitter(new JmxStartTask(), jmxStartDelay, TimeUnit.SECONDS);
     } else {
       startJmx();
@@ -843,7 +843,7 @@ When getJmxStartDelay() is set to 0 we will attempt to initialize the JMX subsys
           */
           if (getJmxStartDelay() == 0) {
             log.debug("Waiting for profiler initialization");
-            AgentTaskScheduler.getInstance()
+            AgentTaskScheduler.get()
                 .scheduleWithJitter(PROFILER_INIT_AFTER_JMX, 500, TimeUnit.MILLISECONDS);
           } else {
             log.debug("Initializing profiler");
diff --git a/dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java b/dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
@@ -83,7 +83,7 @@ public static void installBytebuddyAgent(final Instrumentation inst) {
       }
       int poolCleaningInterval = InstrumenterConfig.get().getResolverResetInterval();
       if (poolCleaningInterval > 0) {
-        AgentTaskScheduler.getInstance()
+        AgentTaskScheduler.get()
             .scheduleAtFixedRate(
                 SharedTypePools::clear,
                 poolCleaningInterval,
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/SourceFileTrackingTransformer.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/SourceFileTrackingTransformer.java
@@ -29,7 +29,7 @@ public class SourceFileTrackingTransformer implements ClassFileTransformer {
 
   private final ClassesToRetransformFinder finder;
   private final Queue<SourceFileItem> queue = new ConcurrentLinkedQueue<>();
-  private final AgentTaskScheduler scheduler = AgentTaskScheduler.getInstance();
+  private final AgentTaskScheduler scheduler = AgentTaskScheduler.get();
   private final AtomicInteger queueSize = new AtomicInteger(0);
   private AgentTaskScheduler.Scheduled<Runnable> scheduled;
   // this field MUST only be used in flush() calling thread
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/codeorigin/DefaultCodeOriginRecorder.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/codeorigin/DefaultCodeOriginRecorder.java
@@ -48,7 +48,7 @@ public class DefaultCodeOriginRecorder implements CodeOriginRecorder {
   private AgentTaskScheduler scheduler;
 
   public DefaultCodeOriginRecorder(Config config, ConfigurationUpdater configurationUpdater) {
-    this(config, configurationUpdater, AgentTaskScheduler.getInstance());
+    this(config, configurationUpdater, AgentTaskScheduler.get());
   }
 
   public DefaultCodeOriginRecorder(
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/AbstractExceptionDebugger.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/AbstractExceptionDebugger.java
@@ -94,8 +94,7 @@ public void handleException(Throwable t, AgentSpan span) {
           if (!applyConfigAsync) {
             applyExceptionConfiguration(fingerprint);
           } else {
-            AgentTaskScheduler.getInstance()
-                .execute(() -> applyExceptionConfiguration(fingerprint));
+            AgentTaskScheduler.get().execute(() -> applyExceptionConfiguration(fingerprint));
           }
           break;
         } else {
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/DebuggerSink.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/DebuggerSink.java
@@ -36,7 +36,7 @@ public class DebuggerSink {
   private final String tags;
   private final AtomicLong highRateDropped = new AtomicLong();
   private final int uploadFlushInterval;
-  private final AgentTaskScheduler lowRateScheduler = AgentTaskScheduler.getInstance();
+  private final AgentTaskScheduler lowRateScheduler = AgentTaskScheduler.get();
   private volatile AgentTaskScheduler.Scheduled<DebuggerSink> lowRateScheduled;
   private volatile AgentTaskScheduler.Scheduled<DebuggerSink> flushIntervalScheduled;
   private volatile long currentLowRateFlushInterval = LOW_RATE_INITIAL_FLUSH_INTERVAL;
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDBEnablement.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDBEnablement.java
@@ -58,7 +58,7 @@ public void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollin
       SymDbRemoteConfigRecord symDb = deserializeSymDb(content);
       if (symDb.isUploadSymbols()) {
         // can be long, make it async
-        AgentTaskScheduler.getInstance().execute(this::startSymbolExtraction);
+        AgentTaskScheduler.get().execute(this::startSymbolExtraction);
       } else {
         stopSymbolExtraction();
       }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolAggregator.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolAggregator.java
@@ -64,10 +64,10 @@ public SymbolAggregator(
 
   public void start() {
     flushRemainingScopeScheduled =
-        AgentTaskScheduler.getInstance()
+        AgentTaskScheduler.get()
             .scheduleAtFixedRate(this::flushRemainingScopes, this, 0, 1, TimeUnit.SECONDS);
     scanJarsScheduled =
-        AgentTaskScheduler.getInstance()
+        AgentTaskScheduler.get()
             .scheduleAtFixedRate(this::scanQueuedJars, this, 0, 1, TimeUnit.SECONDS);
   }
 
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastSystem.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastSystem.java
@@ -102,7 +102,7 @@ public static void start(
     if (VERBOSITY != Verbosity.OFF) {
       IastMetricCollector.register(new IastMetricCollector());
     }
-    final Reporter reporter = new Reporter(config, AgentTaskScheduler.getInstance());
+    final Reporter reporter = new Reporter(config, AgentTaskScheduler.get());
     final boolean globalContext = config.getIastContextMode() == GLOBAL;
     final IastContext.Provider contextProvider = contextProvider(iast, globalContext);
     if (overheadController == null) {
@@ -111,7 +111,7 @@ public static void start(
               globalContext ? UNLIMITED : config.getIastRequestSampling(),
               config.getIastMaxConcurrentRequests(),
               globalContext,
-              AgentTaskScheduler.getInstance());
+              AgentTaskScheduler.get());
     }
     IastContext.Provider.register(contextProvider);
     final Dependencies dependencies =
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedMap.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/taint/TaintedMap.java
@@ -76,11 +76,7 @@ static TaintedMap build(final int capacity) {
   static TaintedMap buildWithPurge(final int capacity, int maxAge, TimeUnit maxAgeUnit) {
     final TaintedMapImpl map =
         new TaintedMapImpl(
-            capacity,
-            DEFAULT_MAX_BUCKET_SIZE,
-            maxAge,
-            maxAgeUnit,
-            AgentTaskScheduler.getInstance());
+            capacity, DEFAULT_MAX_BUCKET_SIZE, maxAge, maxAgeUnit, AgentTaskScheduler.get());
     return IastSystem.DEBUG ? new Debug(map) : map;
   }
 
@@ -136,7 +132,7 @@ class TaintedMapImpl implements TaintedMap, Runnable {
      */
     TaintedMapImpl(
         final int capacity, final int maxBucketSize, final int maxAge, final TimeUnit maxAgeUnit) {
-      this(capacity, maxBucketSize, maxAge, maxAgeUnit, AgentTaskScheduler.getInstance());
+      this(capacity, maxBucketSize, maxAge, maxAgeUnit, AgentTaskScheduler.get());
     }
 
     TaintedMapImpl(
@@ -352,7 +348,7 @@ public void put(@Nonnull final TaintedObject entry) {
       delegate.put(entry);
       final long putOps = puts.updateAndGet(current -> current == Long.MAX_VALUE ? 0 : current + 1);
       if (putOps % COMPUTE_STATISTICS_INTERVAL == 0 && LOGGER.isDebugEnabled()) {
-        AgentTaskScheduler.getInstance().execute(this::computeStatistics);
+        AgentTaskScheduler.get().execute(this::computeStatistics);
       }
     }
 
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/WeakMaps.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/WeakMaps.java
@@ -14,7 +14,7 @@ public class WeakMaps {
   public static <K, V> WeakMap<K, V> newWeakMap() {
     final WeakConcurrentMap<K, V> map = new WeakConcurrentMap<>(false, true);
     if (!Platform.isNativeImageBuilder()) {
-      AgentTaskScheduler.getInstance()
+      AgentTaskScheduler.get()
           .weakScheduleAtFixedRate(
               MapCleaningTask.INSTANCE,
               map,
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/ConflatingMetricsAggregator.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/ConflatingMetricsAggregator.java
@@ -203,7 +203,7 @@ public void start() {
     sink.register(this);
     thread.start();
     cancellation =
-        AgentTaskScheduler.getInstance()
+        AgentTaskScheduler.get()
             .scheduleAtFixedRate(
                 new ReportTask(),
                 this,
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/OkHttpSink.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/OkHttpSink.java
@@ -83,7 +83,7 @@ public void accept(int messageCount, ByteBuffer buffer) {
     } else {
       if (asyncTaskStarted.compareAndSet(false, true)) {
         this.future =
-            AgentTaskScheduler.getInstance()
+            AgentTaskScheduler.get()
                 .scheduleAtFixedRate(new Sender(enqueuedRequests), this, 1, 1, SECONDS);
       }
       sendAsync(messageCount, buffer);
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
@@ -793,7 +793,7 @@ private CoreTracer(
     // Schedule the metrics aggregator to begin reporting after a random delay of 1 to 10 seconds
     // (using milliseconds granularity.) This avoids a fleet of traced applications starting at the
     // same time from sending metrics in sync.
-    AgentTaskScheduler.getInstance()
+    AgentTaskScheduler.get()
         .scheduleWithJitter(MetricsAggregator::start, metricsAggregator, 1, SECONDS);
 
     if (dataStreamsMonitoring == null) {
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/StatusLogger.java b/dd-trace-core/src/main/java/datadog/trace/core/StatusLogger.java
@@ -27,7 +27,7 @@ public final class StatusLogger extends JsonAdapter<Config>
     implements AgentTaskScheduler.Task<Config>, JsonAdapter.Factory {
 
   public static void logStatus(Config config) {
-    AgentTaskScheduler.getInstance().schedule(new StatusLogger(), config, 500, MILLISECONDS);
+    AgentTaskScheduler.get().schedule(new StatusLogger(), config, 500, MILLISECONDS);
   }
 
   @Override
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java
@@ -128,7 +128,7 @@ public DefaultDataStreamsMonitoring(
   public void start() {
     checkDynamicConfig();
     cancellation =
-        AgentTaskScheduler.getInstance()
+        AgentTaskScheduler.get()
             .scheduleAtFixedRate(
                 new ReportTask(),
                 this,
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/monitor/TracerHealthMetrics.java b/dd-trace-core/src/main/java/datadog/trace/core/monitor/TracerHealthMetrics.java
@@ -155,7 +155,7 @@ public class TracerHealthMetrics extends HealthMetrics implements AutoCloseable
   public void start() {
     if (started.compareAndSet(false, true)) {
       cancellation =
-          AgentTaskScheduler.getInstance()
+          AgentTaskScheduler.get()
               .scheduleAtFixedRate(new Flush(), this, interval, interval, units);
     }
   }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java
@@ -430,7 +430,7 @@ private static final class RootIterationCleaner
 
     public static void scheduleFor(Map<ScopeStack, ContinuableScope> rootIterationScopes) {
       long period = Math.min(iterationKeepAlive, 10_000);
-      AgentTaskScheduler.getInstance()
+      AgentTaskScheduler.get()
           .scheduleAtFixedRate(
               CLEANER, rootIterationScopes, iterationKeepAlive, period, TimeUnit.MILLISECONDS);
     }
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/test/DDCoreSpecification.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/test/DDCoreSpecification.groovy
@@ -1,6 +1,5 @@
 package datadog.trace.core.test
 
-import static datadog.trace.util.AgentThreadFactory.AgentThread.TASK_SCHEDULER
 
 import datadog.trace.api.DDSpanId
 import datadog.trace.api.DDTraceId
@@ -36,7 +35,6 @@ abstract class DDCoreSpecification extends DDSpecification {
   }
 
 
-
   protected boolean useNoopStatsDClient() {
     return true
   }
@@ -58,10 +56,14 @@ abstract class DDCoreSpecification extends DDSpecification {
 
   @Override
   void cleanup() {
-    unclosedTracers.each {it.close()}
+    unclosedTracers.each {
+      try {
+        it.close()
+      } catch (Throwable ignored) {
+      }
+    }
     unclosedTracers.clear()
-    AgentTaskScheduler.getInstance().shutdown(10, TimeUnit.SECONDS)
-    AgentTaskScheduler.INSTANCE = new AgentTaskScheduler(TASK_SCHEDULER)
+    AgentTaskScheduler.shutdownAndReset(10, TimeUnit.SECONDS)
   }
 
   protected CoreTracerBuilder tracerBuilder() {
diff --git a/internal-api/src/main/java/datadog/trace/api/sampling/AdaptiveSampler.java b/internal-api/src/main/java/datadog/trace/api/sampling/AdaptiveSampler.java
@@ -173,7 +173,7 @@ public AdaptiveSampler(
         averageLookback,
         budgetLookback,
         null,
-        AgentTaskScheduler.getInstance(),
+        AgentTaskScheduler.get(),
         startSampler);
   }
 
@@ -199,7 +199,7 @@ public AdaptiveSampler(
         averageLookback,
         budgetLookback,
         listener,
-        AgentTaskScheduler.getInstance(),
+        AgentTaskScheduler.get(),
         true);
   }
 
diff --git a/internal-api/src/main/java/datadog/trace/util/AgentTaskScheduler.java b/internal-api/src/main/java/datadog/trace/util/AgentTaskScheduler.java
@@ -27,10 +27,22 @@ public class AgentTaskScheduler implements Executor {
 
   private static final long SHUTDOWN_TIMEOUT = 5; // seconds
 
-  public static AgentTaskScheduler getInstance() {
+  public static AgentTaskScheduler get() {
     return INSTANCE;
   }
 
+  /**
+   * This method is only for testing. It shuts down the existing executor and swap the instance with
+   * a fresh one.
+   *
+   * @param timeout the amount of time to wait for the shutdown.
+   * @param unit the unit of the time amount.
+   */
+  static void shutdownAndReset(long timeout, TimeUnit unit) {
+    INSTANCE.shutdown(timeout, unit);
+    INSTANCE = new AgentTaskScheduler(TASK_SCHEDULER);
+  }
+
   public interface Task<T> {
     void run(T target);
   }
diff --git a/internal-api/src/main/java/datadog/trace/util/TempLocationManager.java b/internal-api/src/main/java/datadog/trace/util/TempLocationManager.java
@@ -298,7 +298,7 @@ private TempLocationManager() {
     tempDir = baseTempDir.resolve(TEMPDIR_PREFIX + pid);
     if (runStartupCleanup) {
       // do not execute the background cleanup task when running in tests
-      AgentTaskScheduler.getInstance().execute(cleanupTask);
+      AgentTaskScheduler.get().execute(cleanupTask);
     }
 
     createTempDir(tempDir);
diff --git a/telemetry/src/main/java/datadog/telemetry/dependency/DependencyService.java b/telemetry/src/main/java/datadog/telemetry/dependency/DependencyService.java
@@ -31,7 +31,7 @@ public class DependencyService implements Runnable {
 
   public void schedulePeriodicResolution() {
     scheduledTask =
-        AgentTaskScheduler.getInstance()
+        AgentTaskScheduler.get()
             .scheduleAtFixedRate(
                 AgentTaskScheduler.RunnableTask.INSTANCE,
                 this,

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public DDAgentFeaturesDiscovery featuresDiscovery(Config config) {`
`159`	`159`	`ret.discover(); // safe to run on same thread`
`160`	`160`	`} else {`
`161`	`161`	`// avoid performing blocking I/O operation on application thread`
`162`		`- AgentTaskScheduler.getInstance().execute(ret::discoverIfOutdated);`
	`162`	`+ AgentTaskScheduler.get().execute(ret::discoverIfOutdated);`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`	`featuresDiscovery = ret;`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public static void installBytebuddyAgent(final Instrumentation inst) {`
`83`	`83`	`}`
`84`	`84`	`int poolCleaningInterval = InstrumenterConfig.get().getResolverResetInterval();`
`85`	`85`	`if (poolCleaningInterval > 0) {`
`86`		`- AgentTaskScheduler.getInstance()`
	`86`	`+ AgentTaskScheduler.get()`
`87`	`87`	`.scheduleAtFixedRate(`
`88`	`88`	`SharedTypePools::clear,`
`89`	`89`	`poolCleaningInterval,`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public class DefaultCodeOriginRecorder implements CodeOriginRecorder {`
`48`	`48`	`private AgentTaskScheduler scheduler;`
`49`	`49`
`50`	`50`	`public DefaultCodeOriginRecorder(Config config, ConfigurationUpdater configurationUpdater) {`
`51`		`- this(config, configurationUpdater, AgentTaskScheduler.getInstance());`
	`51`	`+ this(config, configurationUpdater, AgentTaskScheduler.get());`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public DefaultCodeOriginRecorder(`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollin`
`58`	`58`	`SymDbRemoteConfigRecord symDb = deserializeSymDb(content);`
`59`	`59`	`if (symDb.isUploadSymbols()) {`
`60`	`60`	`// can be long, make it async`
`61`		`- AgentTaskScheduler.getInstance().execute(this::startSymbolExtraction);`
	`61`	`+ AgentTaskScheduler.get().execute(this::startSymbolExtraction);`
`62`	`62`	`} else {`
`63`	`63`	`stopSymbolExtraction();`
`64`	`64`	`}`