Skip to content

Fix spring-core latest dep tests #15299

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

Merged
merged 2 commits into from
Nov 14, 2025
Merged

Fix spring-core latest dep tests #15299

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
814f319
Fix spring-core latest dep tests
laurit Nov 14, 2025
6d74b72
./gradlew spotlessApply
otelbot[bot] Nov 14, 2025
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
26 changes: 24 additions & 2 deletions ...g/spring-core-2.0/javaagent/src/test/java/SimpleAsyncTaskExecutorInstrumentationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
* SPDX-License-Identifier: Apache-2.0
*/

import static org.junit.jupiter.api.Assumptions.assumeTrue;

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import java.lang.reflect.Method;
import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
import org.junit.jupiter.api.Test;
Expand All @@ -22,6 +25,23 @@ class SimpleAsyncTaskExecutorInstrumentationTest {

private static final SimpleAsyncTaskExecutor EXECUTOR = new SimpleAsyncTaskExecutor();

private static final Method submitListenableRunnable;
private static final Method submitListenableCallable;

static {
// removed in spring 7
submitListenableRunnable = findMethod("submitListenable", Runnable.class);
submitListenableCallable = findMethod("submitListenable", Callable.class);
}

private static Method findMethod(String name, Class<?>... parameterTypes) {
try {
return SimpleAsyncTaskExecutor.class.getMethod(name, parameterTypes);
} catch (Exception e) {
return null;
}
}

@Test
void executeRunnable() {
executeTwoTasks(EXECUTOR::execute);
Expand All @@ -39,12 +59,14 @@ void submitCallable() {

@Test
void submitListenableRunnable() {
executeTwoTasks(task -> EXECUTOR.submitListenable((Runnable) task));
assumeTrue(submitListenableRunnable != null);
executeTwoTasks(task -> submitListenableRunnable.invoke(EXECUTOR, task));
}

@Test
void submitListenableCallable() {
executeTwoTasks(task -> EXECUTOR.submitListenable((Callable<?>) task));
assumeTrue(submitListenableCallable != null);
executeTwoTasks(task -> submitListenableCallable.invoke(EXECUTOR, task));
}

private static void executeTwoTasks(ThrowingConsumer<AsyncTask> task) {
Expand Down
Loading