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

Improve test resilience #35077

Merged
merged 1 commit into from
Jul 28, 2023
Merged

Improve test resilience #35077

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
10 changes: 9 additions & 1 deletion ...on-tests/opentelemetry/src/test/java/io/quarkus/it/opentelemetry/AbstractEndUserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;

import jakarta.enterprise.inject.Instance;
Expand Down Expand Up @@ -42,7 +43,14 @@ public AbstractEndUserTest(Predicate<Instance<EndUserSpanProcessor>> predicate)
@BeforeEach
@AfterEach
protected void reset() {
inMemorySpanExporter.reset();
await().atMost(5, TimeUnit.SECONDS).until(() -> {
// make sure spans from previous tests are not included
List<SpanData> finishedSpanItems = inMemorySpanExporter.getFinishedSpanItems();
if (finishedSpanItems.size() > 0) {
inMemorySpanExporter.reset();
}
return finishedSpanItems.size() == 0;
});
}

protected List<SpanData> getSpans() {
Expand Down