Reduce flakiness in io.opentelemetry.javaagent.instrumentation.couchbase.v2_6.CouchbaseAsyncClient26Test.upsertAndGet(BucketSettings)[2]

Automated fix attempt based on Develocity flaky-test analysis.

Author: trask

instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseAsyncClientTest.java

@@ -121,7 +121,10 @@ void hasBucket(BucketSettings bucketSettings)
                         .hasNoParent()
                         .hasAttributesSatisfyingExactly(
                             equalTo(maybeStable(DB_SYSTEM), COUCHBASE),
-                            equalTo(maybeStable(DB_OPERATION), "Cluster.openBucket")),
+                            equalTo(maybeStable(DB_OPERATION), "Cluster.openBucket"),
+                            satisfies(NETWORK_TYPE, optionalNetworkType()),
+                            satisfies(NETWORK_PEER_ADDRESS, optionalNetworkPeerAddress()),
+                            satisfies(NETWORK_PEER_PORT, optionalNetworkPeerPort())),
                 span ->
                     span.hasName("ClusterManager.hasBucket")
                         .hasKind(SpanKind.CLIENT)
@@ -169,7 +172,10 @@ void upsert(BucketSettings bucketSettings)
                         .hasParent(trace.getSpan(0))
                         .hasAttributesSatisfyingExactly(
                             equalTo(maybeStable(DB_SYSTEM), COUCHBASE),
-                            equalTo(maybeStable(DB_OPERATION), "Cluster.openBucket")),
+                            equalTo(maybeStable(DB_OPERATION), "Cluster.openBucket"),
+                            satisfies(NETWORK_TYPE, optionalNetworkType()),
+                            satisfies(NETWORK_PEER_ADDRESS, optionalNetworkPeerAddress()),
+                            satisfies(NETWORK_PEER_PORT, optionalNetworkPeerPort())),
                 span ->
                     span.hasName("Bucket.upsert")
                         .hasKind(SpanKind.CLIENT)
@@ -227,7 +233,10 @@ void upsertAndGet(BucketSettings bucketSettings)
                         .hasParent(trace.getSpan(0))
                         .hasAttributesSatisfyingExactly(
                             equalTo(maybeStable(DB_SYSTEM), COUCHBASE),
-                            equalTo(maybeStable(DB_OPERATION), "Cluster.openBucket")),
+                            equalTo(maybeStable(DB_OPERATION), "Cluster.openBucket"),
+                            satisfies(NETWORK_TYPE, optionalNetworkType()),
+                            satisfies(NETWORK_PEER_ADDRESS, optionalNetworkPeerAddress()),
+                            satisfies(NETWORK_PEER_PORT, optionalNetworkPeerPort())),
                 span ->
                     span.hasName("Bucket.upsert")
                         .hasKind(SpanKind.CLIENT)
@@ -294,7 +303,10 @@ void query() throws ExecutionException, InterruptedException, TimeoutException {
                         .hasParent(trace.getSpan(0))
                         .hasAttributesSatisfyingExactly(
                             equalTo(maybeStable(DB_SYSTEM), COUCHBASE),
-                            equalTo(maybeStable(DB_OPERATION), "Cluster.openBucket")),
+                            equalTo(maybeStable(DB_OPERATION), "Cluster.openBucket"),
+                            satisfies(NETWORK_TYPE, optionalNetworkType()),
+                            satisfies(NETWORK_PEER_ADDRESS, optionalNetworkPeerAddress()),
+                            satisfies(NETWORK_PEER_PORT, optionalNetworkPeerPort())),
                 span ->
                     span.hasName(
                             emitStableDatabaseSemconv()

instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseTest.java

@@ -6,6 +6,7 @@
 package io.opentelemetry.instrumentation.couchbase;
 
 import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitOldDatabaseSemconv;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import com.couchbase.client.java.bucket.BucketType;
 import com.couchbase.client.java.cluster.BucketSettings;
@@ -129,4 +130,20 @@ protected LongAssertConsumer networkPeerPort() {
   protected StringAssertConsumer experimentalAttribute() {
     return includesExperimentalAttributes() ? val -> val.isNotNull() : val -> val.isNull();
   }
+
+  protected StringAssertConsumer optionalNetworkType() {
+    return val -> val.isIn(networkType(), null);
+  }
+
+  protected StringAssertConsumer optionalNetworkPeerAddress() {
+    return val -> val.isIn(networkPeerAddress(), null);
+  }
+
+  protected LongAssertConsumer optionalNetworkPeerPort() {
+    return includesNetworkAttributes()
+        ? val ->
+            val.satisfiesAnyOf(
+                v -> assertThat(v).isNull(), v -> assertThat(v).isGreaterThan(0L))
+        : val -> val.isNull();
+  }
 }