Bumped to latest ga versions before the release

Author: marcingrzejszczak

pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.0.5-SNAPSHOT</version>
+		<version>3.0.4</version>
 		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>
@@ -57,15 +57,15 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
 		<maven.compiler.testSource>1.8</maven.compiler.testSource>
-		<spring-cloud-build.version>3.0.5-SNAPSHOT</spring-cloud-build.version>
-		<spring-cloud-commons.version>3.0.5-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-sleuth.version>3.0.5-SNAPSHOT</spring-cloud-sleuth.version>
-		<spring-cloud-gateway.version>3.0.5-SNAPSHOT</spring-cloud-gateway.version>
-		<spring-cloud-circuitbreaker.version>2.0.3-SNAPSHOT</spring-cloud-circuitbreaker.version>
-		<spring-cloud-stream.version>3.1.4-SNAPSHOT</spring-cloud-stream.version>
-		<spring-cloud-function.version>3.1.4-SNAPSHOT</spring-cloud-function.version>
-		<spring-cloud-netflix.version>3.0.5-SNAPSHOT</spring-cloud-netflix.version>
-		<spring-cloud-openfeign.version>3.0.5-SNAPSHOT</spring-cloud-openfeign.version>
+		<spring-cloud-build.version>3.0.4</spring-cloud-build.version>
+		<spring-cloud-commons.version>3.0.4</spring-cloud-commons.version>
+		<spring-cloud-sleuth.version>3.0.4</spring-cloud-sleuth.version>
+		<spring-cloud-gateway.version>3.0.4</spring-cloud-gateway.version>
+		<spring-cloud-circuitbreaker.version>2.0.2</spring-cloud-circuitbreaker.version>
+		<spring-cloud-stream.version>3.1.4</spring-cloud-stream.version>
+		<spring-cloud-function.version>3.1.4</spring-cloud-function.version>
+		<spring-cloud-netflix.version>3.0.4</spring-cloud-netflix.version>
+		<spring-cloud-openfeign.version>3.0.5</spring-cloud-openfeign.version>
 		<opentracing.version>0.32.0</opentracing.version>
 		<opentelemetry.version>1.9.0</opentelemetry.version>
 		<opentelemetry.alpha.version>1.9.0-alpha</opentelemetry.alpha.version>

spring-cloud-sleuth-otel-dependencies/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.0.5-SNAPSHOT</version>
+		<version>3.0.4</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-sleuth-otel-dependencies</artifactId>

tests/common/src/main/java/org/springframework/cloud/sleuth/otel/OtelTestSpanHandler.java

@@ -19,6 +19,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Queue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -38,6 +39,8 @@
 import org.springframework.cloud.sleuth.otel.bridge.OtelAccessor;
 import org.springframework.cloud.sleuth.test.TestSpanHandler;
 
+import static org.assertj.core.api.BDDAssertions.then;
+
 /**
  * Test abstraction to store handled spans.
  *
@@ -93,6 +96,33 @@ public FinishedSpan get(int index) {
 		return reportedSpans().get(index);
 	}
 
+	@Override
+	public void assertAllSpansWereFinishedOrAbandoned(Queue<Span> createdSpans) {
+		List<FinishedSpan> finishedSpans = reportedSpans();
+		then(finishedSpans).as("There should be that many finished spans as many created ones")
+				.hasSize(createdSpans.size());
+		// finished -> a,b,c ; created -> b,c,d => matchedFinished = b,c
+		List<FinishedSpan> matchedFinishedSpans = finishedSpans.stream()
+				.filter(f -> createdSpans.stream().anyMatch(cs -> f.getSpanId().equals(cs.context().spanId())))
+				.collect(Collectors.toList());
+		// finished -> a,b,c ; created -> b,c,d => matchedCreated = b,c
+		List<Span> matchedCreatedSpans = createdSpans.stream()
+				.filter(cs -> finishedSpans.stream().anyMatch(f -> cs.context().spanId().equals(f.getSpanId())))
+				.collect(Collectors.toList());
+		// finished -> a,b,c ; created -> b,c,d => missingFinished = a
+		List<FinishedSpan> missingFinishedSpans = finishedSpans.stream()
+				.filter(f -> matchedFinishedSpans.stream().noneMatch(m -> m.getSpanId().equals(f.getSpanId())))
+				.collect(Collectors.toList());
+		// finished -> a,b,c ; created -> b,c,d => missingCreated = d
+		List<Span> missingCreatedSpans = createdSpans.stream().filter(
+				f -> matchedCreatedSpans.stream().noneMatch(m -> m.context().spanId().equals(f.context().spanId())))
+				.collect(Collectors.toList());
+		if (!missingFinishedSpans.isEmpty() || !missingCreatedSpans.isEmpty()) {
+			throw new AssertionError("There were unmatched created spans " + missingCreatedSpans
+					+ " and/or finished span " + missingFinishedSpans);
+		}
+	}
+
 	@Override
 	public Iterator<FinishedSpan> iterator() {
 		return reportedSpans().iterator();

tests/otel/spring-cloud-sleuth-zipkin-tests/src/test/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/OtelZipkinAutoConfigurationTests.java

@@ -16,16 +16,60 @@
 
 package org.springframework.cloud.sleuth.autoconfig.zipkin2;
 
+import java.util.concurrent.TimeUnit;
+
 import io.opentelemetry.sdk.trace.samplers.Sampler;
+import okhttp3.mockwebserver.RecordedRequest;
+import org.awaitility.Awaitility;
+import zipkin2.reporter.AsyncReporter;
 
+import org.springframework.cloud.sleuth.Tracer;
 import org.springframework.cloud.sleuth.autoconfig.otel.OtelAutoConfiguration;
 import org.springframework.cloud.sleuth.autoconfig.otel.zipkin2.ZipkinOtelAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import static org.assertj.core.api.BDDAssertions.then;
+
 public class OtelZipkinAutoConfigurationTests
 		extends org.springframework.cloud.sleuth.autoconfig.zipkin2.ZipkinAutoConfigurationTests {
 
+	@Override
+	void defaultsToV2Endpoint() throws Exception {
+		zipkinRunner().withPropertyValues("spring.zipkin.base-url=" + this.server.url("/").toString()).run(context -> {
+			context.getBean(Tracer.class).nextSpan().name("foo").tag("foo", "bar").start().end();
+
+			context.getBean(ZipkinAutoConfiguration.REPORTER_BEAN_NAME, AsyncReporter.class).flush();
+			Awaitility.await().atMost(5, TimeUnit.SECONDS)
+					.untilAsserted(() -> then(this.server.getRequestCount()).isGreaterThan(1));
+
+			Awaitility.await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
+				RecordedRequest request = this.server.takeRequest(1, TimeUnit.SECONDS);
+				then(request).isNotNull();
+				then(request.getPath()).isEqualTo("/api/v2/spans");
+				then(request.getBody().readUtf8()).contains("localEndpoint");
+			});
+		});
+	}
+
+	@Override
+	public void encoderDirectsEndpoint() throws Exception {
+		zipkinRunner().withPropertyValues("spring.zipkin.base-url=" + this.server.url("/").toString(),
+				"spring.zipkin.encoder=JSON_V1").run(context -> {
+					context.getBean(Tracer.class).nextSpan().name("foo").tag("foo", "bar").start().end();
+
+					Awaitility.await().atMost(5, TimeUnit.SECONDS)
+							.untilAsserted(() -> then(this.server.getRequestCount()).isGreaterThan(0));
+
+					Awaitility.await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
+						RecordedRequest request = this.server.takeRequest(1, TimeUnit.SECONDS);
+						then(request).isNotNull();
+						then(request.getPath()).isEqualTo("/api/v1/spans");
+						then(request.getBody().readUtf8()).contains("binaryAnnotations");
+					});
+				});
+	}
+
 	@Override
 	protected Class tracerZipkinConfiguration() {
 		return ZipkinOtelAutoConfiguration.class;