---

olavloite · sduskis · commit f4a7c9c32026 · 2019-03-25T15:22:49.000-04:00
yaml --- r: 22973 b: refs/heads/autosynth-bigtable c: bab445b h: refs/heads/master i: 22971: fc03513
diff --git a/[refs] b/[refs]
@@ -124,7 +124,7 @@ refs/heads/autosynth-asset: 7d535c3023644faa89492d4a553d8c403e073fa7
 refs/heads/autosynth-automl: 7fcabb1e54ca9ded6bec10f41590d29ece3a6367
 refs/heads/autosynth-bigquerydatatransfer: d88aa5aae5fd9d3c6d75bbab1a05162c6d4d948f
 refs/heads/autosynth-bigquerystorage: d2c53da3b012e38c662e4df0738042435f19365f
-refs/heads/autosynth-bigtable: 554c109518b4d70e6264a1cd2b1a13be65e230f9
+refs/heads/autosynth-bigtable: bab445bc0653297ef94543cb97e6c8c440b806a3
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
 refs/heads/autosynth-containeranalysis: 0f377286f60df2b6fd37c183bf170c68dc014cfb
 refs/heads/autosynth-datastore: 9acd400b484d6691a080c9152a331d88d24fefc1
diff --git a/branches/autosynth-bigtable/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java b/branches/autosynth-bigtable/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();
+        }
+      }
+    }
   }
 }
