Fix ClassCastException when a wrapped span impl is activated instead …

jaeger-core/src/main/java/com/uber/jaeger/Tracer.java

@@ -148,9 +148,9 @@ public ScopeManager scopeManager() {
   }
 
   @Override
-  public Span activeSpan() {
+  public io.opentracing.Span activeSpan() {
     Scope scope = this.scopeManager.active();
-    return scope == null ? null : (Span) scope.span();
+    return scope == null ? null : scope.span();
   }
 
   @Override

jaeger-core/src/test/java/com/uber/jaeger/TracerTest.java

@@ -35,6 +35,7 @@
 import java.io.Closeable;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 public class TracerTest {
 
@@ -53,15 +54,15 @@ public void setUp() throws Exception {
   @Test
   public void testBuildSpan() {
     String expectedOperation = "fry";
-    Span span = (Span) tracer.buildSpan(expectedOperation).startManual();
+    Span span = (Span) tracer.buildSpan(expectedOperation).start();
 
     assertEquals(expectedOperation, span.getOperationName());
   }
 
   @Test
   public void testTracerMetrics() {
     String expectedOperation = "fry";
-    tracer.buildSpan(expectedOperation).startManual();
+    tracer.buildSpan(expectedOperation).start();
     assertEquals(
         1L, metricsReporter.counters.get("jaeger.spans.group=sampling.sampled=y").longValue());
     assertEquals(
@@ -80,7 +81,7 @@ public void testRegisterInjector() {
             .withStatsReporter(metricsReporter)
             .registerInjector(Format.Builtin.TEXT_MAP, injector)
             .build();
-    Span span = (Span) tracer.buildSpan("leela").startManual();
+    Span span = (Span) tracer.buildSpan("leela").start();
 
     TextMap carrier = mock(TextMap.class);
     tracer.inject(span.context(), Format.Builtin.TEXT_MAP, carrier);
@@ -122,7 +123,7 @@ public void testWithBaggageRestrictionManager() {
         new Tracer.Builder("TracerTestService", new InMemoryReporter(), new ConstSampler(true))
             .withMetrics(metrics)
             .build();
-    Span span = (Span) tracer.buildSpan("some-operation").startManual();
+    Span span = (Span) tracer.buildSpan("some-operation").start();
     final String key = "key";
     tracer.setBaggage(span, key, "value");
 
@@ -157,4 +158,11 @@ public void testAsChildOfAcceptNull() {
     span.finish();
     assertTrue(span.getReferences().isEmpty());
   }
+
+  @Test
+  public void testActiveSpan() {
+    io.opentracing.Span mockSpan = Mockito.mock(io.opentracing.Span.class);
+    tracer.scopeManager().activate(mockSpan, true);
+    assertEquals(mockSpan, tracer.activeSpan());
+  }
 }