Skip to content

Commit e2667ff

Browse files
committed
feat(jmxfetch): Clean up main loop on thread interrupt
1 parent 4ddf06e commit e2667ff

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

communication/src/main/java/datadog/communication/monitor/DDAgentStatsDConnection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ private void discoverConnectionSettings() {
186186

187187
if (null == host) {
188188
if (!OperatingSystem.isWindows() && new File(DEFAULT_DOGSTATSD_SOCKET_PATH).exists()) {
189-
log.info("Detected {}. Using it to send StatsD data.", DEFAULT_DOGSTATSD_SOCKET_PATH);
189+
log.info("Detected {}. Using it to send StatsD data.", DEFAULT_DOGSTATSD_SOCKET_PATH);
190190
host = DEFAULT_DOGSTATSD_SOCKET_PATH;
191191
port = 0; // tells dogstatsd client to treat host as a socket path
192192
} else {

dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JMXFetch.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ public void run() {
160160
try {
161161
Thread.sleep(DELAY_BETWEEN_RUN_ATTEMPTS);
162162
} catch (final InterruptedException ignore) {
163+
Thread.currentThread().interrupt();
164+
break;
163165
}
164166
}
165167
}

0 commit comments

Comments
 (0)