Skip to content

Commit 9b06903

Browse files
authored
Make sure background/shutdown threads are in AGENT_THREAD_GROUP (#8217)
1 parent 6ece325 commit 9b06903

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

dd-java-agent/agent-crashtracking/src/main/java/com/datadog/crashtracking/ScriptInitializer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.datadog.crashtracking;
22

3+
import static datadog.trace.util.AgentThreadFactory.AGENT_THREAD_GROUP;
34
import static java.util.Comparator.reverseOrder;
45
import static java.util.Locale.ROOT;
56

@@ -92,6 +93,7 @@ static void writeConfig(Path scriptPath, String... entries) {
9293
Runtime.getRuntime()
9394
.addShutdownHook(
9495
new Thread(
96+
AGENT_THREAD_GROUP,
9597
() -> {
9698
try {
9799
LOG.debug("Deleting config file: {}", cfgPath);

dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/TempLocationManager.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.datadog.profiling.controller;
22

33
import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY;
4+
import static datadog.trace.util.AgentThreadFactory.AGENT_THREAD_GROUP;
45

56
import datadog.trace.api.config.ProfilingConfig;
67
import datadog.trace.bootstrap.config.provider.ConfigProvider;
@@ -297,6 +298,7 @@ private TempLocationManager() {
297298

298299
Thread selfCleanup =
299300
new Thread(
301+
AGENT_THREAD_GROUP,
300302
() -> {
301303
if (!waitForCleanup(1, TimeUnit.SECONDS)) {
302304
log.info(

0 commit comments

Comments
 (0)