diff --git a/opentracing-spring-web-itest/common/src/test/java/io/opentracing/contrib/spring/web/interceptor/itest/common/app/TestController.java b/opentracing-spring-web-itest/common/src/test/java/io/opentracing/contrib/spring/web/interceptor/itest/common/app/TestController.java index 6eadcb73..bcbc9bc1 100644 --- a/opentracing-spring-web-itest/common/src/test/java/io/opentracing/contrib/spring/web/interceptor/itest/common/app/TestController.java +++ b/opentracing-spring-web-itest/common/src/test/java/io/opentracing/contrib/spring/web/interceptor/itest/common/app/TestController.java @@ -84,11 +84,11 @@ public String localSpan(HttpServletRequest request) { @RequestMapping("/async") public Callable async() { verifyActiveSpan(); - final Span cont = tracer.scopeManager().active().span(); + final Span cont = tracer.scopeManager().activeSpan(); return new Callable() { public String call() throws Exception { - try (Scope scope = tracer.scopeManager().activate(cont, false)) { - if (tracer.scopeManager().active() == null) { + try (Scope scope = tracer.scopeManager().activate(cont)) { + if (tracer.scopeManager().activeSpan() == null) { throw new RuntimeException("No active span"); } Thread.sleep(1000); @@ -161,7 +161,7 @@ public void mappedExceptionHandler(MappedException ex) { } private void verifyActiveSpan() { - if (tracer.scopeManager().active() == null) { + if (tracer.scopeManager().activeSpan() == null) { throw new RuntimeException("No active span"); } } diff --git a/opentracing-spring-web/src/main/java/io/opentracing/contrib/spring/web/client/TracingClientResponseMono.java b/opentracing-spring-web/src/main/java/io/opentracing/contrib/spring/web/client/TracingClientResponseMono.java index cc29b74e..e5950ec5 100644 --- a/opentracing-spring-web/src/main/java/io/opentracing/contrib/spring/web/client/TracingClientResponseMono.java +++ b/opentracing-spring-web/src/main/java/io/opentracing/contrib/spring/web/client/TracingClientResponseMono.java @@ -62,7 +62,7 @@ public void subscribe(final CoreSubscriber subscriber) { .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT) .start(); - try (final Scope scope = tracer.scopeManager().activate(span, false)) { + try (final Scope scope = tracer.scopeManager().activate(span)) { final ClientRequest.Builder requestBuilder = ClientRequest.from(request); requestBuilder.headers(httpHeaders -> tracer.inject(span.context(), Format.Builtin.HTTP_HEADERS, new HttpHeadersCarrier(httpHeaders))); diff --git a/opentracing-spring-web/src/main/java/io/opentracing/contrib/spring/web/webfilter/TracingOperator.java b/opentracing-spring-web/src/main/java/io/opentracing/contrib/spring/web/webfilter/TracingOperator.java index b7aa0b83..68bf55b7 100644 --- a/opentracing-spring-web/src/main/java/io/opentracing/contrib/spring/web/webfilter/TracingOperator.java +++ b/opentracing-spring-web/src/main/java/io/opentracing/contrib/spring/web/webfilter/TracingOperator.java @@ -70,7 +70,7 @@ public void subscribe(final CoreSubscriber subscriber) { .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_SERVER) .start(); - try (final Scope scope = tracer.scopeManager().activate(span, false)) { + try (final Scope scope = tracer.scopeManager().activate(span)) { exchange.getAttributes().put(TracingWebFilter.SERVER_SPAN_CONTEXT, span.context()); source.subscribe(new TracingSubscriber(subscriber, exchange, context, span, spanDecorators)); } diff --git a/pom.xml b/pom.xml index dc52c8d6..5397994f 100644 --- a/pom.xml +++ b/pom.xml @@ -58,15 +58,15 @@ ${project.basedir} 3.0.0 - 0.32.0 - 0.3.0 - 0.1.6 - 0.2.0 + 0.33.0 + 0.4.0 + 0.1.8 + 0.3.1 4.12 2.23.4 - 2.1.5.RELEASE + 2.1.6.RELEASE - 5.1.7.RELEASE + 5.1.8.RELEASE 2.21.0 0.8.5.RELEASE