Improve stability of tracing tests

Author: ghillert

carts/pom.xml

@@ -79,6 +79,12 @@
         </dependency>
 
         <!-- test dependencies -->
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${version.lib.awaitility}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

carts/src/test/java/com/oracle/coherence/examples/sockshop/spring/carts/CartMetricsTests.java

@@ -9,6 +9,7 @@
 import com.oracle.coherence.examples.sockshop.spring.carts.model.Item;
 import com.oracle.coherence.examples.sockshop.spring.test.config.TestSpanConfig;
 import com.oracle.coherence.examples.sockshop.spring.test.tracing.CustomSpanFilter;
+import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
@@ -22,10 +23,12 @@
 import org.springframework.http.MediaType;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.web.reactive.server.WebTestClient;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 
 /**
  * Integration test to ensure Coherence metrics are properly exposed when
@@ -36,13 +39,16 @@
 @SpringBootTest(
 		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		properties = {
-				"coherence.metrics.http.enabled=true"
+				"coherence.metrics.http.enabled=true",
+				"spring.zipkin.enabled=true",
+				"spring.sleuth.sampler.probability=1.0"
 		}
 )
 @AutoConfigureWebTestClient
 @DirtiesContext
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @Import(TestSpanConfig.class)
+@Slf4j
 public class CartMetricsTests {
 
 	public static final int COHERENCE_METRICS_PORT = 9612;
@@ -85,7 +91,12 @@ void verifyCoherenceMetrics() {
 	@Test
 	@Order(3)
 	void verifySpringCloudSleuthTraces() {
+		await().untilAsserted(() ->
+				assertThat(this.spanHandler.getSpans())
+						.hasSize(1));
+
 		final List<FinishedSpan> spans = this.spanHandler.getSpans();
+		log.info("\n" + StringUtils.collectionToDelimitedString(spans, "\n"));
 		assertThat(spans)
 				.hasSize(1)
 				.extracting(FinishedSpan::getName)

carts/src/test/resources/application.yaml

@@ -4,6 +4,3 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at
 # https://oss.oracle.com/licenses/upl.
 #
-opentracing:
-  jaeger:
-    enabled: false

catalog/pom.xml

@@ -79,6 +79,12 @@
         </dependency>
 
         <!-- test dependencies -->
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${version.lib.awaitility}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

catalog/src/test/java/com/oracle/coherence/examples/sockshop/spring/catalog/CatalogMetricsTests.java

@@ -11,6 +11,7 @@
 import com.oracle.coherence.examples.sockshop.spring.test.tracing.CustomSpanFilter;
 import com.oracle.coherence.spring.configuration.annotation.CoherenceCache;
 import com.tangosol.net.NamedCache;
+import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
@@ -24,6 +25,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.web.reactive.server.WebTestClient;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 
@@ -38,13 +40,16 @@
 @SpringBootTest(
 		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		properties = {
-				"coherence.metrics.http.enabled=true"
+				"coherence.metrics.http.enabled=true",
+				"spring.zipkin.enabled=true",
+				"spring.sleuth.sampler.probability=1.0"
 		}
 )
 @AutoConfigureWebTestClient
 @DirtiesContext
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @Import(TestSpanConfig.class)
+@Slf4j
 public class CatalogMetricsTests {
 
 	@CoherenceCache
@@ -87,6 +92,7 @@ void verifyCoherenceMetrics() {
 	@Order(3)
 	void verifySpringCloudSleuthTraces() {
 		final List<FinishedSpan> spans = this.spanHandler.getSpans();
+		log.info("\n" + StringUtils.collectionToDelimitedString(spans, "\n"));
 		assertThat(spans)
 				.hasSize(0);
 	}

catalog/src/test/resources/application.yaml

@@ -4,6 +4,3 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at
 # https://oss.oracle.com/licenses/upl.
 #
-opentracing:
-  jaeger:
-    enabled: false

orders/pom.xml

@@ -79,6 +79,12 @@
         </dependency>
 
         <!-- test dependencies -->
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${version.lib.awaitility}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

orders/src/main/resources/application.yaml

@@ -13,7 +13,7 @@ spring:
     propagation:
       type: B3,W3C
     opentracing:
-      enabled: true
+      enabled:
   zipkin:
     base-url: http://jaeger-agent:9411
     enabled: false

orders/src/test/java/com/oracle/coherence/examples/sockshop/spring/orders/CoherenceOrderRepositoryIT.java

@@ -12,6 +12,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
 
 import static com.oracle.coherence.examples.sockshop.spring.orders.TestDataFactory.order;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -21,6 +22,7 @@
  * Tests for Coherence repository implementation.
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@DirtiesContext
 class CoherenceOrderRepositoryIT {
     @Autowired
     private TestOrderRepository orders;

orders/src/test/java/com/oracle/coherence/examples/sockshop/spring/orders/CoherenceOrderResourceIT.java

@@ -20,6 +20,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.http.HttpStatus;
+import org.springframework.test.annotation.DirtiesContext;
 
 import java.net.URI;
 import java.time.LocalDate;
@@ -37,6 +38,7 @@
  * using Coherence for persistence.
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@DirtiesContext
 public class CoherenceOrderResourceIT {
 
 	@LocalServerPort