Upgrade OpenTracing to v0.32 (#83)

Signed-off-by: Sjoerd Talsma <sjoerd@talsma-ict.nl>

Author: sjoerdtalsma

opentracing-span-propagation/src/main/java/nl/talsmasoftware/context/opentracing/ContextScopeManager.java

@@ -70,8 +70,13 @@ public Scope activate(Span span, boolean finishSpanOnClose) {
         return new ThreadLocalSpanContext(getClass(), span, finishSpanOnClose);
     }
 
+    @Override
+    public Scope activate(Span span) {
+        return new ThreadLocalSpanContext(getClass(), span, false);
+    }
+
     /**
-     * The currently active {@link Scope} containing the active span {@link Scope#span()}.
+     * The currently active {@link Scope} containing the {@linkplain #activeSpan() active span}.
      *
      * @return the active scope, or {@code null} if none could be found.
      */
@@ -80,6 +85,12 @@ public Scope active() {
         return ThreadLocalSpanContext.current();
     }
 
+    @Override
+    public Span activeSpan() {
+        Context<Span> current = ThreadLocalSpanContext.current();
+        return current == null ? null : current.getValue();
+    }
+
     /**
      * Initializes a new context for the given {@linkplain Span}.
      *

opentracing-span-propagation/src/main/java/nl/talsmasoftware/context/opentracing/OpentracingContextTimer.java

@@ -36,7 +36,7 @@
  */
 public class OpentracingContextTimer implements ContextTimer {
     private static final String SYS_ENABLED = "opentracing.trace.contextmanager";
-    private static final String ENV_ENABLED = SYS_ENABLED.toUpperCase().replace('.', '_');
+    private static final String ENV_ENABLED = System.getenv(SYS_ENABLED.toUpperCase().replace('.', '_'));
     private static final String LOG_FIELD_THREAD = "context.thread";
 
     @Override
@@ -62,7 +62,7 @@ public void update(Class<?> type, String method, long duration, TimeUnit unit) {
 
     private static boolean reportContextSwitchesFor(Class<?> type) {
         boolean enableTracing = false;
-        final String prop = System.getProperty(SYS_ENABLED, System.getenv(ENV_ENABLED));
+        final String prop = System.getProperty(SYS_ENABLED, ENV_ENABLED);
         if ("1".equals(prop) || "true".equalsIgnoreCase(prop) || "enabled".equalsIgnoreCase(prop)) {
             // Only report spans for entire snapshots, not individual context managers
             // Could be made configurable if somebody ever asks for it..

opentracing-span-propagation/src/main/java/nl/talsmasoftware/context/opentracing/SpanManager.java

@@ -16,7 +16,6 @@
 package nl.talsmasoftware.context.opentracing;
 
 import io.opentracing.Scope;
-import io.opentracing.ScopeManager;
 import io.opentracing.Span;
 import io.opentracing.util.GlobalTracer;
 import nl.talsmasoftware.context.Context;
@@ -28,8 +27,7 @@
 /**
  * Manager for <a href="http://opentracing.io/">OpenTracing</a> {@linkplain Span}.
  * <p>
- * Management of {@linkplain Span spans} is delegated to the {@linkplain ScopeManager}
- * from the {@linkplain GlobalTracer}.
+ * Management of {@linkplain Span spans} is delegated to the {@linkplain GlobalTracer}.
  *
  * @author Sjoerd Talsma
  */
@@ -50,7 +48,7 @@ public Context<Span> getActiveContext() {
     }
 
     /**
-     * {@linkplain ScopeManager#activate(Span, boolean) Activates} the given {@linkplain Span span}.
+     * {@linkplain io.opentracing.ScopeManager#activate(Span) Activates} the given {@linkplain Span span}.
      * <p>
      * {@linkplain Context#close() Closing} the returned {@link Context} will also close the
      * corresponding {@link Scope} as it was also activated by us.<br>
@@ -69,7 +67,7 @@ public Context<Span> getActiveContext() {
      */
     @Override
     public Context<Span> initializeNewContext(final Span span) {
-        Scope scope = span == null ? null : GlobalTracer.get().scopeManager().activate(span, false);
+        Scope scope = span == null ? null : GlobalTracer.get().scopeManager().activate(span);
         return new SpanContext(span, scope);
     }
 

pom.xml

@@ -85,7 +85,7 @@
         <root.basedir>${project.basedir}</root.basedir>
 
         <metrics.version>4.1.0</metrics.version>
-        <opentracing-api.version>0.31.0</opentracing-api.version>
+        <opentracing-api.version>0.32.0</opentracing-api.version>
         <spring-security.version>5.1.5.RELEASE</spring-security.version>
         <servlet-api.version>4.0.1</servlet-api.version>