Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Newly created spans should be activated #21

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Newly created spans should be activated #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/java/io/opentracing/contrib/concurrent/TracedScheduledExecutorService.java
View file
Original file line number Diff line number Diff line change
@@ -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 <T> ScheduledFuture<T> schedule(Callable<T> 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<T>(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) {