Skip to content

fix: Incorrect method reference used in LazyTraceScheduledThreadPoolExecutor #1783

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

Closed
wants to merge 6 commits into from
Closed

fix: Incorrect method reference used in LazyTraceScheduledThreadPoolExecutor #1783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1bfe8a9
fix: Fix bad method reflection for LazyTraceScheduledThreadPoolExecutor
atsharp Nov 20, 2020
a00ad4e
Also fix newTaskForCallable
atsharp Nov 20, 2020
28982d5
tests
atsharp Nov 20, 2020
0b14b0b
try to make test assertions a bit cleaner
atsharp Nov 23, 2020
9fa24c2
clearer test cases
atsharp Nov 23, 2020
06d4e21
Merge branch 'master' into fix_LazyTraceScheduledThreadPoolExecutor_m…
atsharp Nov 23, 2020
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
14 changes: 7 additions & 7 deletions ...g/springframework/cloud/sleuth/instrument/async/LazyTraceScheduledThreadPoolExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ class LazyTraceScheduledThreadPoolExecutor extends ScheduledThreadPoolExecutor {
this.decorateTaskRunnable = ReflectionUtils.findMethod(ScheduledThreadPoolExecutor.class, "decorateTask",
Runnable.class, RunnableScheduledFuture.class);
makeAccessibleIfNotNull(this.decorateTaskRunnable);
this.decorateTaskCallable = ReflectionUtils.findMethod(ScheduledThreadPoolExecutor.class,
"decorateTaskCallable", Callable.class, RunnableScheduledFuture.class);
this.decorateTaskCallable = ReflectionUtils.findMethod(ScheduledThreadPoolExecutor.class, "decorateTask",
Callable.class, RunnableScheduledFuture.class);
makeAccessibleIfNotNull(this.decorateTaskCallable);
this.finalize = ReflectionUtils.findMethod(ScheduledThreadPoolExecutor.class, "finalize", null);
makeAccessibleIfNotNull(this.finalize);
Expand All @@ -105,7 +105,7 @@ class LazyTraceScheduledThreadPoolExecutor extends ScheduledThreadPoolExecutor {
Runnable.class, Object.class);
makeAccessibleIfNotNull(this.newTaskForRunnable);
this.newTaskForCallable = ReflectionUtils.findMethod(ScheduledThreadPoolExecutor.class, "newTaskFor",
Callable.class, Object.class);
Callable.class);
makeAccessibleIfNotNull(this.newTaskForCallable);
}

Expand All @@ -125,8 +125,8 @@ private void makeAccessibleIfNotNull(Method method) {
this.decorateTaskRunnable = ReflectionUtils.findMethod(ScheduledThreadPoolExecutor.class, "decorateTask",
Runnable.class, RunnableScheduledFuture.class);
makeAccessibleIfNotNull(this.decorateTaskRunnable);
this.decorateTaskCallable = ReflectionUtils.findMethod(ScheduledThreadPoolExecutor.class,
"decorateTaskCallable", Callable.class, RunnableScheduledFuture.class);
this.decorateTaskCallable = ReflectionUtils.findMethod(ScheduledThreadPoolExecutor.class, "decorateTask",
Callable.class, RunnableScheduledFuture.class);
makeAccessibleIfNotNull(this.decorateTaskCallable);
this.finalize = ReflectionUtils.findMethod(ScheduledThreadPoolExecutor.class, "finalize", null);
makeAccessibleIfNotNull(this.finalize);
Expand All @@ -140,7 +140,7 @@ private void makeAccessibleIfNotNull(Method method) {
Runnable.class, Object.class);
makeAccessibleIfNotNull(this.newTaskForRunnable);
this.newTaskForCallable = ReflectionUtils.findMethod(ScheduledThreadPoolExecutor.class, "newTaskFor",
Callable.class, Object.class);
Callable.class);
makeAccessibleIfNotNull(this.newTaskForCallable);
}

Expand Down Expand Up @@ -416,7 +416,7 @@ public <T> T invokeAny(Collection<? extends Callable<T>> tasks) throws Interrupt
return this.delegate.invokeAny(wrapCallableCollection(tasks));
}

private <T> Collection<? extends Callable<T>> wrapCallableCollection(Collection<? extends Callable<T>> tasks) {
<T> Collection<? extends Callable<T>> wrapCallableCollection(Collection<? extends Callable<T>> tasks) {
List<Callable<T>> ts = new ArrayList<>();
for (Callable<T> task : tasks) {
if (!(task instanceof TraceCallable)) {
Expand Down
Loading