From ba02250cf67483cae18383632cf8fa7fce3ce52f Mon Sep 17 00:00:00 2001
From: Nikolay Martynov <mar.kolya@gmail.com>
Date: Thu, 9 May 2019 16:12:35 -0400
Subject: [PATCH] Clarify log messages when tracing is disabled

---
 .../trace/agent/tooling/AgentInstaller.java   |  2 ++
 .../trace/agent/tooling/TracerInstaller.java  | 20 +++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
index 82930ab25f..ee8250c1b8 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
@@ -46,6 +46,8 @@ public class AgentInstaller {
   public static void installBytebuddyAgent(final Instrumentation inst) {
     if (Config.get().isTraceEnabled()) {
       installBytebuddyAgent(inst, new AgentBuilder.Listener[0]);
+    } else {
+      log.debug("Tracing is disabled, not installing instrumentations.");
     }
   }
 
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/TracerInstaller.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/TracerInstaller.java
index b0e3e66a23..3e507955a5 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/TracerInstaller.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/TracerInstaller.java
@@ -8,16 +8,20 @@ import lombok.extern.slf4j.Slf4j;
 public class TracerInstaller {
   /** Register a global tracer if no global tracer is already registered. */
   public static synchronized void installGlobalTracer() {
-    if (Config.get().isTraceEnabled() && !io.opentracing.util.GlobalTracer.isRegistered()) {
-      final DDTracer tracer = new DDTracer();
-      try {
-        io.opentracing.util.GlobalTracer.register(tracer);
-        datadog.trace.api.GlobalTracer.registerIfAbsent(tracer);
-      } catch (final RuntimeException re) {
-        log.warn("Failed to register tracer '" + tracer + "'", re);
+    if (Config.get().isTraceEnabled()) {
+      if (!io.opentracing.util.GlobalTracer.isRegistered()) {
+        final DDTracer tracer = new DDTracer();
+        try {
+          io.opentracing.util.GlobalTracer.register(tracer);
+          datadog.trace.api.GlobalTracer.registerIfAbsent(tracer);
+        } catch (final RuntimeException re) {
+          log.warn("Failed to register tracer '" + tracer + "'", re);
+        }
+      } else {
+        log.debug("GlobalTracer already registered.");
       }
     } else {
-      log.debug("GlobalTracer already registered.");
+      log.debug("Tracing is disabled, not installing GlobalTracer.");
     }
   }