From b231306f57c0aeb4b0ffb38f688bafa48df8ba53 Mon Sep 17 00:00:00 2001
From: Andrew Kent <andrew.kent@datadoghq.com>
Date: Fri, 8 Dec 2017 16:56:43 -0800
Subject: [PATCH] init global tracer in premain

---
 .../main/java/com/datadoghq/agent/AgentRulesManager.java    | 1 +
 .../com/datadoghq/agent/InstrumentationRulesManager.java    | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dd-java-agent/src/main/java/com/datadoghq/agent/AgentRulesManager.java b/dd-java-agent/src/main/java/com/datadoghq/agent/AgentRulesManager.java
index c7a56335b9..cc89b63730 100644
--- a/dd-java-agent/src/main/java/com/datadoghq/agent/AgentRulesManager.java
+++ b/dd-java-agent/src/main/java/com/datadoghq/agent/AgentRulesManager.java
@@ -24,6 +24,7 @@ public class AgentRulesManager {
   public AgentRulesManager(final TracingAgentConfig config) {
     agentTracerConfig = config;
     instrumentationRulesManager = new InstrumentationRulesManager(config, this);
+    instrumentationRulesManager.initTracer();
   }
 
   /** This method initializes the manager. */
diff --git a/dd-java-agent/src/main/java/com/datadoghq/agent/InstrumentationRulesManager.java b/dd-java-agent/src/main/java/com/datadoghq/agent/InstrumentationRulesManager.java
index 10075ef423..2b72178871 100644
--- a/dd-java-agent/src/main/java/com/datadoghq/agent/InstrumentationRulesManager.java
+++ b/dd-java-agent/src/main/java/com/datadoghq/agent/InstrumentationRulesManager.java
@@ -120,11 +120,9 @@ public class InstrumentationRulesManager {
     log.info("Initializing on classloader {}", classLoader);
 
     injector.inject(classLoader);
-
-    initTracer();
   }
 
-  private void initTracer() {
+  void initTracer() {
     synchronized (SYNC) {
       if (!GlobalTracer.isRegistered()) {
         // Try to obtain a tracer using the TracerResolver
@@ -135,6 +133,8 @@ public class InstrumentationRulesManager {
           } catch (final RuntimeException re) {
             log.warn("Failed to register tracer '" + resolved + "'", re);
           }
+        } else {
+          log.warn("Failed to resolve dd tracer");
         }
       }
     }