Skip to content

Fix testLatestDeps #18324

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
trask merged 1 commit into from
Apr 27, 2026
Merged

Fix testLatestDeps #18324

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
19 changes: 18 additions & 1 deletion ...src/main/java/io/opentelemetry/instrumentation/testing/internal/AutoCleanupExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.util.concurrent.ConcurrentLinkedDeque;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;

/**
Expand All @@ -21,9 +22,13 @@
* <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
* at any time.
*/
public class AutoCleanupExtension implements AfterEachCallback, AfterAllCallback {
public class AutoCleanupExtension
implements BeforeAllCallback, AfterEachCallback, AfterAllCallback {
private final Deque<AutoCloseable> thingsToCleanUp = new ConcurrentLinkedDeque<>();
private final Deque<AutoCloseable> thingsToCleanUpAfterAll = new ConcurrentLinkedDeque<>();
// Tracks the first (outermost) container the extension is registered in, so that afterAll only
// runs deferAfterAll cleanups once — not once per @Nested container.
private volatile ExtensionContext rootContext;

public static AutoCleanupExtension create() {
return new AutoCleanupExtension();
Expand All @@ -41,6 +46,13 @@ public void deferAfterAll(AutoCloseable cleanupAction) {
thingsToCleanUpAfterAll.push(cleanupAction);
}

@Override
public void beforeAll(ExtensionContext extensionContext) {
if (rootContext == null) {
rootContext = extensionContext;
}
}

@Override
public void afterEach(ExtensionContext extensionContext) throws Exception {
List<Exception> exceptions = new ArrayList<>();
Expand All @@ -56,6 +68,11 @@ public void afterEach(ExtensionContext extensionContext) throws Exception {

@Override
public void afterAll(ExtensionContext extensionContext) throws Exception {
// afterAll fires once per container the extension is registered in, including each @Nested
// class. Only run deferAfterAll cleanups when the outermost container completes.
if (extensionContext != rootContext) {
return;
}
List<Exception> exceptions = new ArrayList<>();
while (!thingsToCleanUpAfterAll.isEmpty()) {
try {
Expand Down
Loading