Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pubsub - Fix flaky OpenCensusUtilTest.testOpenCensusMessageReceiver() #4733

Merged
merged 1 commit into from
Mar 25, 2019
Merged

pubsub - Fix flaky OpenCensusUtilTest.testOpenCensusMessageReceiver() #4733

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion ...ents/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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}. */
Expand Down Expand Up @@ -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);
Expand All @@ -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();
}
}
}
}
}