Skip to content

Commit eb8720f

Browse files
authored
Clear context class loader from our threads (#14241)
1 parent e4547d4 commit eb8720f

File tree

4 files changed

+4
-0
lines changed
  • instrumentation
    • jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/engine
    • runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17
  • javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling
  • muzzle/src/main/java/io/opentelemetry/javaagent/tooling

4 files changed

+4
-0
lines changed

instrumentation/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/engine/BeanFinder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class BeanFinder {
3535
runnable -> {
3636
Thread result = new Thread(runnable, "jmx_bean_finder");
3737
result.setDaemon(true);
38+
result.setContextClassLoader(null);
3839
return result;
3940
});
4041
private final long discoveryDelay;

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/RuntimeMetrics.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ private JfrRuntimeMetrics(OpenTelemetry openTelemetry, Predicate<JfrFeature> fea
103103
recordingStream.onMetadata(event -> startUpLatch.countDown());
104104
Thread daemonRunner = new Thread(recordingStream::start, "OpenTelemetry JFR-Metrics-Runner");
105105
daemonRunner.setDaemon(true);
106+
daemonRunner.setContextClassLoader(null);
106107
daemonRunner.start();
107108
}
108109

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,7 @@ public void run() {
492492
Thread thread = new Thread(this::runAgentListeners);
493493
thread.setName("delayed-agent-listeners");
494494
thread.setDaemon(true);
495+
thread.setContextClassLoader(null);
495496
thread.start();
496497
}
497498

muzzle/src/main/java/io/opentelemetry/javaagent/tooling/TransformSafeLogger.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public final class TransformSafeLogger {
3333
Thread thread = new Thread(new LogMessageQueueReader());
3434
thread.setName("otel-javaagent-transform-safe-logger");
3535
thread.setDaemon(true);
36+
thread.setContextClassLoader(null);
3637
thread.start();
3738
} else {
3839
logMessageQueue = null;

0 commit comments

Comments
 (0)