Skip to content

Commit 9cf0973

Browse files
authored
Retry opening couchbase 3.1 bucket (#12865)
1 parent 265cbe4 commit 9cf0973

File tree

1 file changed

+14
-4
lines changed
  • instrumentation/couchbase/couchbase-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1

1 file changed

+14
-4
lines changed

instrumentation/couchbase/couchbase-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1/CouchbaseClient31Test.java

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55

66
package io.opentelemetry.javaagent.instrumentation.couchbase.v3_1;
77

8+
import static org.awaitility.Awaitility.await;
9+
810
import com.couchbase.client.core.env.TimeoutConfig;
911
import com.couchbase.client.core.error.DocumentNotFoundException;
12+
import com.couchbase.client.core.error.UnambiguousTimeoutException;
1013
import com.couchbase.client.java.Bucket;
1114
import com.couchbase.client.java.Cluster;
1215
import com.couchbase.client.java.ClusterOptions;
@@ -62,11 +65,18 @@ static void setup() {
6265
ClusterOptions.clusterOptions(couchbase.getUsername(), couchbase.getPassword())
6366
.environment(environment));
6467

65-
Bucket bucket = cluster.bucket("test");
66-
collection = bucket.defaultCollection();
68+
// wait and retry in the hope that it will help against test flakiness
69+
await()
70+
.atMost(Duration.ofMinutes(2))
71+
.ignoreException(UnambiguousTimeoutException.class)
72+
.until(
73+
() -> {
74+
Bucket bucket = cluster.bucket("test");
75+
collection = bucket.defaultCollection();
6776

68-
// Wait 1 minute due to slow startup contributing to flakiness
69-
bucket.waitUntilReady(Duration.ofMinutes(1));
77+
bucket.waitUntilReady(Duration.ofSeconds(30));
78+
return true;
79+
});
7080
}
7181

7282
@AfterAll

0 commit comments

Comments
 (0)