Skip to content

Fix flaky couchbase spring test #12392

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 1 commit into from
Oct 3, 2024
Merged

Fix flaky couchbase spring test #12392

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
12 changes: 8 additions & 4 deletions ...telemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
import com.couchbase.client.java.view.DesignDocument;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.instrumentation.couchbase.AbstractCouchbaseTest;
import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import java.util.Collections;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
Expand All @@ -30,6 +30,8 @@ public abstract class AbstractCouchbaseSpringRepositoryTest extends AbstractCouc
@RegisterExtension
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();

@RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();

private ConfigurableApplicationContext applicationContext;
private TestRepository repository;

Expand Down Expand Up @@ -64,11 +66,10 @@ void setUp() {
repository = applicationContext.getBean(TestRepository.class);
}

@AfterEach
void cleanUpTest() {
private void cleanUpTest() {
testing.clearData();
repository.deleteAll();
testing.waitForTraces(1);
testing.waitForTraces(2);
}

@AfterAll
Expand Down Expand Up @@ -103,6 +104,7 @@ void emptyRepo() {
void save() {
TestDocument document = new TestDocument();
TestDocument result = repository.save(document);
cleanup.deferCleanup(this::cleanUpTest);

assertThat(result).isEqualTo(document);

Expand All @@ -124,6 +126,7 @@ void saveAndRetrieve() {
repository.save(document);
return findById(repository, "1");
});
cleanup.deferCleanup(this::cleanUpTest);

assertThat(result).isEqualTo(document);

Expand All @@ -149,6 +152,7 @@ void saveAndUpdate() {
document.setData("other data");
repository.save(document);
});
cleanup.deferCleanup(this::cleanUpTest);

testing.waitAndAssertTraces(
trace ->
Expand Down
Loading