include span in log/exception

Author: mcculls

dd-java-agent/instrumentation/opentracing/api-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTScopeManager.java

@@ -99,9 +99,9 @@ public void close() {
       if (agentSpan == tracer.activeSpan()) {
         tracer.closeActive();
       } else if (Config.get().isScopeStrictMode()) {
-        throw new RuntimeException("Tried to close scope when not on top");
+        throw new RuntimeException("Tried to close " + agentSpan + " scope when not on top");
       } else {
-        log.warn("Tried to close scope when not on top");
+        log.warn("Tried to close {} scope when not on top", agentSpan);
       }
     }
   }

dd-java-agent/instrumentation/opentracing/api-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTScopeManager.java

@@ -109,9 +109,9 @@ public void close() {
       if (agentSpan == tracer.activeSpan()) {
         tracer.closeActive();
       } else if (Config.get().isScopeStrictMode()) {
-        throw new RuntimeException("Tried to close scope when not on top");
+        throw new RuntimeException("Tried to close " + agentSpan + " scope when not on top");
       } else {
-        log.warn("Tried to close scope when not on top");
+        log.warn("Tried to close {} scope when not on top", agentSpan);
       }
     }
   }

dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScope.java

@@ -55,7 +55,7 @@ public final void close() {
       byte source = source();
       scopeManager.healthMetrics.onScopeCloseError(source);
       if (source == ScopeSource.MANUAL.id() && scopeManager.strictMode) {
-        throw new RuntimeException("Tried to close scope when not on top");
+        throw new RuntimeException("Tried to close " + span + " scope when not on top");
       }
     }
 

dd-trace-ot/src/main/java/datadog/opentracing/OTScopeManager.java

@@ -127,9 +127,9 @@ public void close() {
       if (agentSpan == tracer.activeSpan()) {
         tracer.closeActive();
       } else if (Config.get().isScopeStrictMode()) {
-        throw new RuntimeException("Tried to close scope when not on top");
+        throw new RuntimeException("Tried to close " + agentSpan + " scope when not on top");
       } else {
-        log.warn("Tried to close scope when not on top");
+        log.warn("Tried to close {} scope when not on top", agentSpan);
       }
     }
   }