Make sure background/shutdown threads are in AGENT_THREAD_GROUP

DataDog · Jan 15, 2025 · a3ab61d · a3ab61d
1 parent 6ece325
commit a3ab61d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/...-agent/agent-crashtracking/src/main/java/com/datadog/crashtracking/ScriptInitializer.java b/...-agent/agent-crashtracking/src/main/java/com/datadog/crashtracking/ScriptInitializer.java
@@ -1,5 +1,6 @@
 package com.datadog.crashtracking;
 
+import static datadog.trace.util.AgentThreadFactory.AGENT_THREAD_GROUP;
 import static java.util.Comparator.reverseOrder;
 import static java.util.Locale.ROOT;
 
@@ -92,6 +93,7 @@ static void writeConfig(Path scriptPath, String... entries) {
       Runtime.getRuntime()
           .addShutdownHook(
               new Thread(
+                  AGENT_THREAD_GROUP,
                   () -> {
                     try {
                       LOG.debug("Deleting config file: {}", cfgPath);

diff --git a/...filing-controller/src/main/java/com/datadog/profiling/controller/TempLocationManager.java b/...filing-controller/src/main/java/com/datadog/profiling/controller/TempLocationManager.java
@@ -1,6 +1,7 @@
 package com.datadog.profiling.controller;
 
 import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY;
+import static datadog.trace.util.AgentThreadFactory.AGENT_THREAD_GROUP;
 
 import datadog.trace.api.config.ProfilingConfig;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
@@ -297,6 +298,7 @@ private TempLocationManager() {
 
     Thread selfCleanup =
         new Thread(
+            AGENT_THREAD_GROUP,
             () -> {
               if (!waitForCleanup(1, TimeUnit.SECONDS)) {
                 log.info(