[servicecomb-java-chassis] branch master updated: [SCB-2589] fix spans is null sometimes (#3104)

[sh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

shoothzj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
     new 771e7502e [SCB-2589] fix spans is null sometimes (#3104)
771e7502e is described below

commit 771e7502e0e8a1caf72a1d46913d172b0975853f
Author: david6969xin <86...@users.noreply.github.com>
AuthorDate: Tue Jun 21 22:38:57 2022 +0800

    [SCB-2589] fix spans is null sometimes (#3104)
---
 .../java/org/apache/servicecomb/tests/tracing/TracingTestBase.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/integration-tests/test-common/src/test/java/org/apache/servicecomb/tests/tracing/TracingTestBase.java b/integration-tests/test-common/src/test/java/org/apache/servicecomb/tests/tracing/TracingTestBase.java
index 9f1a1de80..4b4ba09a6 100644
--- a/integration-tests/test-common/src/test/java/org/apache/servicecomb/tests/tracing/TracingTestBase.java
+++ b/integration-tests/test-common/src/test/java/org/apache/servicecomb/tests/tracing/TracingTestBase.java
@@ -24,10 +24,12 @@ import java.lang.invoke.MethodHandles;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import org.apache.servicecomb.tests.EmbeddedAppender;
 import org.apache.servicecomb.tests.Log4jConfig;
+import org.awaitility.Awaitility;
 import org.hamcrest.MatcherAssert;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -62,7 +64,9 @@ public class TracingTestBase {
         .map(this::extractIds)
         .collect(Collectors.toList());
 
+    Awaitility.await().atMost(10, TimeUnit.SECONDS).until(() -> zipkin.getTrace(traceId(loggedIds)) != null);
     List<Span> spans = zipkin.getTrace(traceId(loggedIds));
+
     List<String> tracedValues = tracedValues(spans);
     int times = 100;
     while (tracedValues.size() < values.length && times > 0) {