---

olavloite · sduskis · commit f3ed052eb6fb · 2019-03-25T15:22:49.000-04:00
yaml --- r: 20857 b: refs/heads/autosynth-iamcredentials c: bab445b h: refs/heads/master i: 20855: c05e8e5
diff --git a/[refs] b/[refs]
@@ -162,7 +162,7 @@ refs/heads/pubsub-ordering-keys: 858d4e986a0ba48e08f00d42f51cbdecb175f5d6
 refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
 refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
 refs/tags/v0.77.0: 28a85a77883ccf5d48f297fd0ef3b3dca6ce01f0
-refs/heads/autosynth-iamcredentials: 554c109518b4d70e6264a1cd2b1a13be65e230f9
+refs/heads/autosynth-iamcredentials: bab445bc0653297ef94543cb97e6c8c440b806a3
 refs/heads/release-google-cloud-java-v0.78.0: fae5e980779cf0173a152636b278015b9f60ee55
 refs/heads/release-google-cloud-java-v0.81.0: 0352cd0dd11f4fd1fbd1ff16e7a96beaccc7b475
 refs/heads/release-google-cloud-java-v0.81.1-SNAPSHOT: 5a74ccb1f12506a3b67b65521881298fde20bd6f
diff --git a/branches/autosynth-iamcredentials/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java b/branches/autosynth-iamcredentials/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java
@@ -22,7 +22,9 @@
 import static com.google.cloud.pubsub.v1.OpenCensusUtil.TRACE_CONTEXT_KEY;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.fail;
 
+import com.google.common.base.Stopwatch;
 import com.google.protobuf.ByteString;
 import com.google.pubsub.v1.PubsubMessage;
 import io.opencensus.common.Scope;
@@ -40,6 +42,7 @@
 import io.opencensus.trace.export.SpanData;
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import org.junit.Test;
 
 /** Tests for {@link OpenCensusUtil}. */
@@ -123,8 +126,8 @@ private TestMessageReceiver(SpanContext parentLinkedSpan, TagContext originalTag
     @Override
     public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
       assertEquals(originalTagContext, tagger.getCurrentTagContext());
+      assertSpanCount(1);
       Collection<SpanData> spanDatas = runningSpanStore.getRunningSpans(RECEIVER_FILTER);
-      assertEquals(spanDatas.size(), 1);
       for (SpanData spanData : spanDatas) {
         List<Link> links = spanData.getLinks().getLinks();
         assertEquals(links.size(), 1);
@@ -135,5 +138,19 @@ public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
       }
       consumer.ack();
     }
+
+    private void assertSpanCount(int expected) {
+      Stopwatch watch = Stopwatch.createStarted();
+      while (true) {
+        Collection<SpanData> spanDatas = runningSpanStore.getRunningSpans(RECEIVER_FILTER);
+        if (spanDatas.size() == 1) {
+          break;
+        }
+        Thread.yield();
+        if (watch.elapsed(TimeUnit.SECONDS) >= 5) {
+          fail();
+        }
+      }
+    }
   }
 }
