diff --git a/src/main/java/io/opentracing/contrib/concurrent/TracedScheduledExecutorService.java b/src/main/java/io/opentracing/contrib/concurrent/TracedScheduledExecutorService.java index ad6b052..2b37dbb 100644 --- a/src/main/java/io/opentracing/contrib/concurrent/TracedScheduledExecutorService.java +++ b/src/main/java/io/opentracing/contrib/concurrent/TracedScheduledExecutorService.java @@ -32,7 +32,7 @@ public ScheduledFuture schedule(Runnable runnable, long delay, TimeUnit timeU Span span = createSpan("schedule"); try { Span toActivate = span != null ? span : tracer.activeSpan(); - return delegate.schedule(tracer.activeSpan() == null ? runnable : + return delegate.schedule(toActivate == null ? runnable : new TracedRunnable(runnable, tracer, toActivate), delay, timeUnit); } finally { if (span != null) { @@ -46,7 +46,7 @@ public ScheduledFuture schedule(Callable callable, long delay, TimeUni Span span = createSpan("schedule"); try { Span toActivate = span != null ? span : tracer.activeSpan(); - return delegate.schedule(tracer.activeSpan() == null ? callable : + return delegate.schedule(toActivate == null ? callable : new TracedCallable(callable, tracer, toActivate), delay, timeUnit); } finally { if (span != null) { @@ -61,7 +61,7 @@ public ScheduledFuture scheduleAtFixedRate(Runnable runnable, long initialDel Span span = createSpan("scheduleAtFixedRate"); try { Span toActivate = span != null ? span : tracer.activeSpan(); - return delegate.scheduleAtFixedRate(tracer.activeSpan() == null ? runnable : + return delegate.scheduleAtFixedRate(toActivate == null ? runnable : new TracedRunnable(runnable, tracer, toActivate), initialDelay, period, timeUnit); } finally { if (span != null) { @@ -76,7 +76,7 @@ public ScheduledFuture scheduleWithFixedDelay(Runnable runnable, long initial Span span = createSpan("scheduleWithFixedDelay"); try { Span toActivate = span != null ? span : tracer.activeSpan(); - return delegate.scheduleWithFixedDelay(tracer.activeSpan() == null ? runnable : + return delegate.scheduleWithFixedDelay(toActivate == null ? runnable : new TracedRunnable(runnable, tracer, toActivate), initialDelay, delay, timeUnit); } finally { if (span != null) {