---

olavloite · sduskis · commit 121d9f96247e · 2019-03-25T15:22:49.000-04:00
yaml --- r: 23415 b: refs/heads/autosynth-dialogflow c: bab445b h: refs/heads/master i: 23413: 914ae6a 23411: 68d957f 23407: fc6043b
diff --git a/[refs] b/[refs]
@@ -128,7 +128,7 @@ refs/heads/autosynth-bigtable: 9e5429f45cf9face9fed585d0233534993e36b58
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
 refs/heads/autosynth-containeranalysis: af5b804492292b43372c9fe00386696136ccae89
 refs/heads/autosynth-datastore: d0fc1187000c7a50d8bddd89c3b7cdf1187ecb96
-refs/heads/autosynth-dialogflow: 554c109518b4d70e6264a1cd2b1a13be65e230f9
+refs/heads/autosynth-dialogflow: bab445bc0653297ef94543cb97e6c8c440b806a3
 refs/heads/autosynth-errorreporting: 1101a04e8be074802c35332d5fcf8297f61cae32
 refs/heads/autosynth-firestore: d1a44f9acc302750e37b008ecb9c1aa535cc94df
 refs/heads/autosynth-iot: f03bdd338a9056ca3b7ea6d9ca901649ba9aab78
diff --git a/branches/autosynth-dialogflow/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java b/branches/autosynth-dialogflow/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();
+        }
+      }
+    }
   }
 }
