Merge branch '1.1.x' into main

Author: marcingrzejszczak

.github/workflows/maven.yml

@@ -5,9 +5,9 @@ name: Build
 
 on:
   push:
-    branches: [ main ]
+    branches: [ 1.1.x ]
   pull_request:
-    branches: [ main ]
+    branches: [ 1.1.x ]
 
 jobs:
   build:
@@ -28,4 +28,4 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Build with Maven
-      run: ./mvnw clean install -B -U
+      run: ./mvnw clean install -B -U

benchmarks/pom.xml

@@ -22,7 +22,7 @@
 	<name>Benchmarks</name>
 	<description>Benchmarks (JMH)</description>
 	<groupId>org.springframework.cloud</groupId>
-	<version>1.0.0-M8</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<artifactId>otel-benchmarks</artifactId>
 
 	<parent>

docs/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-otel-parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-sleuth-otel-docs</artifactId>

docs/src/main/asciidoc/project-features.adoc

@@ -81,6 +81,13 @@ Regardless of the chosen tracer implementation it's enough to add `spring-cloud-
 You can choose whether to do that via HTTP or messaging.
 You can read more about how to do that in "<<howto.adoc#how-to-set-up-sleuth-with-otel-zipkin-messaging,how to section>>".
 
+[[features-traces-actuator]]
+== Traces Actuator Endpoint
+
+Spring Cloud Sleuth comes with a `traces` Actuator endpoint that can store finished spans. The endpoint can be queried either via an HTTP Get method to simply retrieve the list of stored spans or via HTTP Post method to retrieve the list and clear it.
+
+In order to represent the OTel spans in a Zipkin format you need to add the `io.opentelemetry:opentelemetry-exporter-zipkin` to the classpath. To represent the spans in an OTLP format you need to add `io.opentelemetry:opentelemetry-exporter-otlp-common` to the classpath.
+
 [[features-whats-next]]
 == What to Read Next
 

docs/src/main/asciidoc/spring-cloud-sleuth-otel.adoc

@@ -0,0 +1 @@
+include::_index.adoc[]

docs/src/main/asciidoc/spring-cloud-sleuth-otel.adoc

@@ -0,0 +1 @@
+include::_index_single.adoc[]

docs/src/main/asciidoc/spring-cloud-sleuth-otel.htmlsingleadoc

@@ -21,15 +21,15 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-sleuth-otel-parent</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Sleuth OTel</name>
 	<description>Spring Cloud Sleuth OTel</description>
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.0.3</version>
+		<version>3.1.0-SNAPSHOT</version>
 		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>
@@ -57,15 +57,18 @@
 		<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.3</spring-cloud-build.version>
-		<spring-cloud-commons.version>3.0.3</spring-cloud-commons.version>
-		<spring-cloud-sleuth.version>3.0.3</spring-cloud-sleuth.version>
-		<spring-cloud-gateway.version>3.0.3</spring-cloud-gateway.version>
-		<spring-cloud-circuitbreaker.version>2.0.2</spring-cloud-circuitbreaker.version>
-		<spring-cloud-stream.version>3.1.3</spring-cloud-stream.version>
-		<spring-cloud-function.version>3.1.3</spring-cloud-function.version>
-		<spring-cloud-netflix.version>3.0.3</spring-cloud-netflix.version>
-		<spring-cloud-openfeign.version>3.0.3</spring-cloud-openfeign.version>
+		<spring-cloud-build.version>3.1.0-SNAPSHOT</spring-cloud-build.version>
+		<spring-cloud-commons.version>3.1.0-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-sleuth.version>3.1.0-SNAPSHOT</spring-cloud-sleuth.version>
+		<spring-cloud-gateway.version>3.1.0-SNAPSHOT</spring-cloud-gateway.version>
+		<spring-cloud-config.version>3.1.0-SNAPSHOT</spring-cloud-config.version>
+		<spring-cloud-circuitbreaker.version>2.1.0-SNAPSHOT</spring-cloud-circuitbreaker.version>
+		<spring-cloud-stream.version>3.2.0-SNAPSHOT</spring-cloud-stream.version>
+		<spring-cloud-function.version>3.2.0-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-netflix.version>3.1.0-SNAPSHOT</spring-cloud-netflix.version>
+		<spring-cloud-openfeign.version>3.1.0-SNAPSHOT</spring-cloud-openfeign.version>
+		<spring-cloud-task.version>2.3.3-SNAPSHOT</spring-cloud-task.version>
+		<spring-cloud-deployer.version>2.7.0-SNAPSHOT</spring-cloud-deployer.version>
 		<opentracing.version>0.32.0</opentracing.version>
 		<opentelemetry.version>1.3.0</opentelemetry.version>
 		<opentelemetry.alpha.version>1.3.0-alpha</opentelemetry.alpha.version>
@@ -89,6 +92,7 @@
 		<awaitility.version>4.0.3</awaitility.version>
 		<archunit-junit5.version>0.14.1</archunit-junit5.version>
 		<jsr305.version>3.0.2</jsr305.version>
+		<testcontainers.version>1.15.3</testcontainers.version>
 	</properties>
 
 	<build>
@@ -215,6 +219,34 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-config-dependencies</artifactId>
+				<version>${spring-cloud-config.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-task-dependencies</artifactId>
+				<version>${spring-cloud-task.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-deployer-dependencies</artifactId>
+				<version>${spring-cloud-deployer.version}</version>
+				<scope>import</scope>
+				<type>pom</type>
+			</dependency>
+			<dependency>
+				<groupId>org.testcontainers</groupId>
+				<artifactId>testcontainers-bom</artifactId>
+				<version>${testcontainers.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 			<dependency>
 				<groupId>io.opentelemetry</groupId>
 				<artifactId>opentelemetry-bom</artifactId>

docs/src/main/asciidoc/spring-cloud-sleuth-otel.htmlsingleadoc

@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-otel-parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
@@ -207,6 +207,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>io.opentelemetry</groupId>
+			<artifactId>opentelemetry-exporter-otlp-common</artifactId>
+			<optional>true</optional>
+		</dependency>
 
 		<!-- Zipkin -->
 		<dependency>