open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clarify log messages when tracing is disabled

This commit is contained in:
Nikolay Martynov 2019-05-09 16:12:35 -04:00
parent e4416464cb
commit ba02250cf6
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
View File

@ -46,6 +46,8 @@ public class AgentInstaller {
public static void installBytebuddyAgent(final Instrumentation inst) { public static void installBytebuddyAgent(final Instrumentation inst) {
if (Config.get().isTraceEnabled()) { if (Config.get().isTraceEnabled()) {
installBytebuddyAgent(inst, new AgentBuilder.Listener[0]); installBytebuddyAgent(inst, new AgentBuilder.Listener[0]);
} else {
log.debug("Tracing is disabled, not installing instrumentations.");
} }
} }

20
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/TracerInstaller.java
View File

@ -8,16 +8,20 @@ import lombok.extern.slf4j.Slf4j;
public class TracerInstaller { public class TracerInstaller {
/** Register a global tracer if no global tracer is already registered. */ /** Register a global tracer if no global tracer is already registered. */
public static synchronized void installGlobalTracer() { public static synchronized void installGlobalTracer() {
if (Config.get().isTraceEnabled() && !io.opentracing.util.GlobalTracer.isRegistered()) { if (Config.get().isTraceEnabled()) {
final DDTracer tracer = new DDTracer(); if (!io.opentracing.util.GlobalTracer.isRegistered()) {
try { final DDTracer tracer = new DDTracer();
io.opentracing.util.GlobalTracer.register(tracer); try {
datadog.trace.api.GlobalTracer.registerIfAbsent(tracer); io.opentracing.util.GlobalTracer.register(tracer);
} catch (final RuntimeException re) { datadog.trace.api.GlobalTracer.registerIfAbsent(tracer);
log.warn("Failed to register tracer '" + tracer + "'", re); } catch (final RuntimeException re) {
log.warn("Failed to register tracer '" + tracer + "'", re);
}
} else {
log.debug("GlobalTracer already registered.");
} }
} else { } else {
log.debug("GlobalTracer already registered."); log.debug("Tracing is disabled, not installing GlobalTracer.");
} }
} }