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

Fix couchbase flaky test (cleanup phase) #7598

Merged
merged 1 commit into from
Sep 11, 2024
+4 −12
Merged

Fix couchbase flaky test (cleanup phase) #7598

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
16 changes: 4 additions & 12 deletions ...instrumentation/couchbase/couchbase-2.0/src/test/groovy/util/AbstractCouchbaseTest.groovy
View file
Original file line number Diff line number Diff line change
@@ -114,25 +114,17 @@ abstract class AbstractCouchbaseTest extends VersionedNamingTestBase {
}

protected void cleanupCluster(CouchbaseAsyncCluster cluster, CouchbaseEnvironment environment) {
def cleanupSpan = runUnderTrace("cleanup") {
try {
cluster?.disconnect()?.timeout(10, TimeUnit.SECONDS)?.toBlocking()?.single()
environment.shutdown()
} catch (Throwable ex) {
// ignore
}
activeSpan()
try (def suppressScope = TEST_TRACER.muteTracing()) {
cluster?.disconnect()?.timeout(10, TimeUnit.SECONDS)?.toBlocking()?.single()
environment.shutdown()
}
TEST_WRITER.waitUntilReported(cleanupSpan as DDSpan, 60, TimeUnit.SECONDS)
}

protected void cleanupCluster(CouchbaseCluster cluster, CouchbaseEnvironment environment) {
def cleanupSpan = runUnderTrace("cleanup") {
try (def suppressScope = TEST_TRACER.muteTracing()) {
cluster?.disconnect()
environment.shutdown()
activeSpan()
}
TEST_WRITER.waitUntilReported(cleanupSpan as DDSpan)
}

void assertCouchbaseCall(TraceAssert trace, String name, String bucketName = null, Object parentSpan = null) {