Upgrade OTel to 1.12.0 and OTel instrumentation to 1.11.1

jonatan-ivanov · jonatan-ivanov · commit 9d6470a98904 · 2022-03-07T14:11:37.000-08:00
fixes gh-104
diff --git a/pom.xml b/pom.xml
@@ -70,9 +70,9 @@
 		<spring-cloud-task.version>2.4.0</spring-cloud-task.version>
 		<spring-cloud-deployer.version>2.7.0</spring-cloud-deployer.version>
 		<opentracing.version>0.32.0</opentracing.version>
-		<opentelemetry.version>1.10.1</opentelemetry.version>
-		<opentelemetry.alpha.version>1.10.1-alpha</opentelemetry.alpha.version>
-		<opentelemetry-instrumentation.version>1.10.1-alpha</opentelemetry-instrumentation.version>
+		<opentelemetry.version>1.12.0</opentelemetry.version>
+		<opentelemetry.alpha.version>1.12.0-alpha</opentelemetry.alpha.version>
+		<opentelemetry-instrumentation.version>1.11.1-alpha</opentelemetry-instrumentation.version>
 		<opentelemetry-proto.version>0.11.0-alpha</opentelemetry-proto.version>
 		<wavefront.version>2.2.0</wavefront.version>
 		<spring-security-boot-autoconfigure.version>2.3.4.RELEASE</spring-security-boot-autoconfigure.version>
diff --git a/spring-cloud-sleuth-otel-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/otel/OtelBridgeConfiguration.java b/spring-cloud-sleuth-otel-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/otel/OtelBridgeConfiguration.java
@@ -21,8 +21,8 @@
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.context.ContextStorage;
 import io.opentelemetry.context.propagation.ContextPropagators;
-import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesExtractor;
-import io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesGetter;
+import io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerAttributesGetter;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -60,8 +60,8 @@
 import org.springframework.cloud.sleuth.otel.bridge.OtelTracer;
 import org.springframework.cloud.sleuth.otel.bridge.SkipPatternSampler;
 import org.springframework.cloud.sleuth.otel.bridge.SpanExporterCustomizer;
-import org.springframework.cloud.sleuth.otel.bridge.SpringHttpClientAttributesExtractor;
-import org.springframework.cloud.sleuth.otel.bridge.SpringHttpServerAttributesExtractor;
+import org.springframework.cloud.sleuth.otel.bridge.SpringHttpClientAttributesGetter;
+import org.springframework.cloud.sleuth.otel.bridge.SpringHttpServerAttributesGetter;
 import org.springframework.cloud.sleuth.propagation.Propagator;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Bean;
@@ -128,15 +128,15 @@ HttpClientHandler otelHttpClientHandler(io.opentelemetry.api.OpenTelemetry openT
 				@Nullable @HttpClientRequestParser HttpRequestParser httpClientRequestParser,
 				@Nullable @HttpClientResponseParser HttpResponseParser httpClientResponseParser,
 				SamplerFunction<HttpRequest> samplerFunction,
-				HttpClientAttributesExtractor<HttpClientRequest, HttpClientResponse> otelHttpAttributesExtractor) {
+				HttpClientAttributesGetter<HttpClientRequest, HttpClientResponse> otelHttpAttributesGetter) {
 			return new OtelHttpClientHandler(openTelemetry, httpClientRequestParser, httpClientResponseParser,
-					samplerFunction, otelHttpAttributesExtractor);
+					samplerFunction, otelHttpAttributesGetter);
 		}
 
 		@Bean
 		@ConditionalOnMissingBean
-		HttpClientAttributesExtractor<HttpClientRequest, HttpClientResponse> otelHttpClientAttributesExtractor() {
-			return new SpringHttpClientAttributesExtractor();
+		HttpClientAttributesGetter<HttpClientRequest, HttpClientResponse> otelHttpClientAttributesGetter() {
+			return new SpringHttpClientAttributesGetter();
 		}
 
 		@Bean
@@ -145,15 +145,15 @@ HttpServerHandler otelHttpServerHandler(io.opentelemetry.api.OpenTelemetry openT
 				@Nullable @HttpServerRequestParser HttpRequestParser httpServerRequestParser,
 				@Nullable @HttpServerResponseParser HttpResponseParser httpServerResponseParser,
 				ObjectProvider<SkipPatternProvider> skipPatternProvider,
-				HttpServerAttributesExtractor<HttpServerRequest, HttpServerResponse> otelHttpAttributesExtractor) {
+				HttpServerAttributesGetter<HttpServerRequest, HttpServerResponse> otelHttpAttributesGetter) {
 			return new OtelHttpServerHandler(openTelemetry, httpServerRequestParser, httpServerResponseParser,
-					skipPatternProvider.getIfAvailable(() -> () -> Pattern.compile("")), otelHttpAttributesExtractor);
+					skipPatternProvider.getIfAvailable(() -> () -> Pattern.compile("")), otelHttpAttributesGetter);
 		}
 
 		@Bean
 		@ConditionalOnMissingBean
-		HttpServerAttributesExtractor<HttpServerRequest, HttpServerResponse> otelHttpServerAttributesExtractor() {
-			return new SpringHttpServerAttributesExtractor();
+		HttpServerAttributesGetter<HttpServerRequest, HttpServerResponse> otelHttpServerAttributesGetter() {
+			return new SpringHttpServerAttributesGetter();
 		}
 
 		@Bean
diff --git a/spring-cloud-sleuth-otel-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/otel/actuate/OtelOtlpFinishedSpanWriter.java b/spring-cloud-sleuth-otel-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/otel/actuate/OtelOtlpFinishedSpanWriter.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import io.opentelemetry.exporter.otlp.internal.traces.ResourceSpansMarshaler;
+import io.opentelemetry.exporter.internal.otlp.traces.ResourceSpansMarshaler;
 import io.opentelemetry.proto.trace.v1.ResourceSpans;
 import io.opentelemetry.sdk.trace.data.SpanData;
 
diff --git a/spring-cloud-sleuth-otel-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/otel/actuate/TraceSleuthOtelActuatorAutoConfiguration.java b/spring-cloud-sleuth-otel-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/otel/actuate/TraceSleuthOtelActuatorAutoConfiguration.java
@@ -59,7 +59,7 @@ Supplier<FinishedSpanWriter> sleuthZipkinOtelFinishedSpanWriter() {
 	}
 
 	@Bean
-	@ConditionalOnClass(name = "io.opentelemetry.exporter.otlp.internal.traces.ResourceSpansMarshaler")
+	@ConditionalOnClass(name = "io.opentelemetry.exporter.internal.otlp.traces.ResourceSpansMarshaler")
 	Supplier<FinishedSpanWriter> sleuthOtlpOtelFinishedSpanWriter() {
 		return OtelOtlpFinishedSpanWriter::new;
 	}
diff --git a/spring-cloud-sleuth-otel-dependencies/pom.xml b/spring-cloud-sleuth-otel-dependencies/pom.xml
@@ -31,7 +31,7 @@
 	<name>spring-cloud-sleuth-otel-dependencies</name>
 	<description>Spring Cloud Sleuth OTel Dependencies</description>
 	<properties>
-		<opentelemetry.version>1.10.1</opentelemetry.version>
+		<opentelemetry.version>1.12.0</opentelemetry.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/HttpRequestNetClientAttributesGetter.java b/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/HttpRequestNetClientAttributesGetter.java
@@ -16,7 +16,7 @@
 
 package org.springframework.cloud.sleuth.otel.bridge;
 
-import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
 
 import org.springframework.cloud.sleuth.http.HttpRequest;
 import org.springframework.cloud.sleuth.http.HttpResponse;
@@ -27,7 +27,7 @@
  *
  * @author Nikita Salnikov-Tarnovski
  */
-class HttpRequestNetClientAttributesExtractor extends NetClientAttributesExtractor<HttpRequest, HttpResponse> {
+class HttpRequestNetClientAttributesGetter implements NetClientAttributesGetter<HttpRequest, HttpResponse> {
 
 	@Nullable
 	@Override
diff --git a/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/HttpRequestNetServerAttributesGetter.java b/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/HttpRequestNetServerAttributesGetter.java
@@ -16,18 +16,17 @@
 
 package org.springframework.cloud.sleuth.otel.bridge;
 
-import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter;
 
 import org.springframework.cloud.sleuth.http.HttpRequest;
-import org.springframework.cloud.sleuth.http.HttpResponse;
 import org.springframework.lang.Nullable;
 
 /**
  * Extracts OpenTelemetry network semantic attributes value for server http spans.
  *
  * @author Nikita Salnikov-Tarnovski
  */
-class HttpRequestNetServerAttributesExtractor extends NetServerAttributesExtractor<HttpRequest, HttpResponse> {
+class HttpRequestNetServerAttributesGetter implements NetServerAttributesGetter<HttpRequest> {
 
 	@Nullable
 	@Override
diff --git a/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/OtelHttpClientHandler.java b/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/OtelHttpClientHandler.java
@@ -21,8 +21,10 @@
 import io.opentelemetry.context.ContextKey;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesGetter;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanNameExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanStatusExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -62,17 +64,17 @@ public class OtelHttpClientHandler implements HttpClientHandler {
 
 	public OtelHttpClientHandler(OpenTelemetry openTelemetry, @Nullable HttpRequestParser httpClientRequestParser,
 			@Nullable HttpResponseParser httpClientResponseParser, SamplerFunction<HttpRequest> samplerFunction,
-			HttpClientAttributesExtractor<HttpClientRequest, HttpClientResponse> httpAttributesExtractor) {
+			HttpClientAttributesGetter<HttpClientRequest, HttpClientResponse> httpAttributesGetter) {
 		this.httpClientRequestParser = httpClientRequestParser;
 		this.httpClientResponseParser = httpClientResponseParser;
 		this.samplerFunction = samplerFunction;
 		this.instrumenter = Instrumenter
 				.<HttpClientRequest, HttpClientResponse>builder(openTelemetry, "org.springframework.cloud.sleuth",
-						HttpSpanNameExtractor.create(httpAttributesExtractor))
-				.setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesExtractor))
-				.addAttributesExtractor(new HttpRequestNetClientAttributesExtractor())
-				.addAttributesExtractor(httpAttributesExtractor).addAttributesExtractor(new PathAttributeExtractor())
-				.newClientInstrumenter(HttpClientRequest::header);
+						HttpSpanNameExtractor.create(httpAttributesGetter))
+				.setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesGetter))
+				.addAttributesExtractor(NetClientAttributesExtractor.create(new HttpRequestNetClientAttributesGetter()))
+				.addAttributesExtractor(HttpClientAttributesExtractor.create(httpAttributesGetter))
+				.addAttributesExtractor(new PathAttributeExtractor()).newClientInstrumenter(HttpClientRequest::header);
 	}
 
 	@Override
diff --git a/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/OtelHttpServerHandler.java b/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/OtelHttpServerHandler.java
@@ -24,8 +24,10 @@
 import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerAttributesGetter;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanNameExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanStatusExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesExtractor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -63,17 +65,17 @@ public class OtelHttpServerHandler implements HttpServerHandler {
 
 	public OtelHttpServerHandler(OpenTelemetry openTelemetry, HttpRequestParser httpServerRequestParser,
 			HttpResponseParser httpServerResponseParser, SkipPatternProvider skipPatternProvider,
-			HttpServerAttributesExtractor<HttpServerRequest, HttpServerResponse> httpAttributesExtractor) {
+			HttpServerAttributesGetter<HttpServerRequest, HttpServerResponse> httpAttributesGetter) {
 		this.httpServerRequestParser = httpServerRequestParser;
 		this.httpServerResponseParser = httpServerResponseParser;
 		this.pattern = skipPatternProvider.skipPattern();
 		this.instrumenter = Instrumenter
 				.<HttpServerRequest, HttpServerResponse>builder(openTelemetry, "org.springframework.cloud.sleuth",
-						HttpSpanNameExtractor.create(httpAttributesExtractor))
-				.setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesExtractor))
-				.addAttributesExtractor(new HttpRequestNetServerAttributesExtractor())
-				.addAttributesExtractor(httpAttributesExtractor).addAttributesExtractor(new PathAttributeExtractor())
-				.newServerInstrumenter(getGetter());
+						HttpSpanNameExtractor.create(httpAttributesGetter))
+				.setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesGetter))
+				.addAttributesExtractor(NetServerAttributesExtractor.create(new HttpRequestNetServerAttributesGetter()))
+				.addAttributesExtractor(HttpServerAttributesExtractor.create(httpAttributesGetter))
+				.addAttributesExtractor(new PathAttributeExtractor()).newServerInstrumenter(getGetter());
 	}
 
 	@Override
diff --git a/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/SpringHttpClientAttributesGetter.java b/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/SpringHttpClientAttributesGetter.java
@@ -19,7 +19,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesGetter;
 
 import org.springframework.cloud.sleuth.http.HttpClientRequest;
 import org.springframework.cloud.sleuth.http.HttpClientResponse;
@@ -30,66 +30,66 @@
  *
  * @author Nikita Salnikov-Tarnovski
  */
-public class SpringHttpClientAttributesExtractor
-		extends HttpClientAttributesExtractor<HttpClientRequest, HttpClientResponse> {
+public class SpringHttpClientAttributesGetter
+		implements HttpClientAttributesGetter<HttpClientRequest, HttpClientResponse> {
 
 	@Nullable
 	@Override
-	protected String url(HttpClientRequest httpClientRequest) {
+	public String url(HttpClientRequest httpClientRequest) {
 		return httpClientRequest.url();
 	}
 
 	@Nullable
 	@Override
-	protected String flavor(HttpClientRequest httpClientRequest, @Nullable HttpClientResponse httpClientResponse) {
+	public String flavor(HttpClientRequest httpClientRequest, @Nullable HttpClientResponse httpClientResponse) {
 		return null;
 	}
 
 	@Override
-	protected String method(HttpClientRequest httpClientRequest) {
+	public String method(HttpClientRequest httpClientRequest) {
 		return httpClientRequest.method();
 	}
 
 	@Override
-	protected List<String> requestHeader(HttpClientRequest httpClientRequest, String name) {
+	public List<String> requestHeader(HttpClientRequest httpClientRequest, String name) {
 		String value = httpClientRequest.header(name);
 		return value == null ? Collections.emptyList() : Collections.singletonList(value);
 	}
 
 	@Nullable
 	@Override
-	protected Long requestContentLength(HttpClientRequest httpClientRequest,
+	public Long requestContentLength(HttpClientRequest httpClientRequest,
 			@Nullable HttpClientResponse httpClientResponse) {
 		return null;
 	}
 
 	@Nullable
 	@Override
-	protected Long requestContentLengthUncompressed(HttpClientRequest httpClientRequest,
+	public Long requestContentLengthUncompressed(HttpClientRequest httpClientRequest,
 			@Nullable HttpClientResponse httpClientResponse) {
 		return null;
 	}
 
 	@Override
-	protected Integer statusCode(HttpClientRequest httpClientRequest, HttpClientResponse httpClientResponse) {
+	public Integer statusCode(HttpClientRequest httpClientRequest, HttpClientResponse httpClientResponse) {
 		return httpClientResponse.statusCode();
 	}
 
 	@Nullable
 	@Override
-	protected Long responseContentLength(HttpClientRequest httpClientRequest, HttpClientResponse httpClientResponse) {
+	public Long responseContentLength(HttpClientRequest httpClientRequest, HttpClientResponse httpClientResponse) {
 		return null;
 	}
 
 	@Nullable
 	@Override
-	protected Long responseContentLengthUncompressed(HttpClientRequest httpClientRequest,
+	public Long responseContentLengthUncompressed(HttpClientRequest httpClientRequest,
 			HttpClientResponse httpClientResponse) {
 		return null;
 	}
 
 	@Override
-	protected List<String> responseHeader(HttpClientRequest httpClientRequest, HttpClientResponse httpClientResponse,
+	public List<String> responseHeader(HttpClientRequest httpClientRequest, HttpClientResponse httpClientResponse,
 			String name) {
 		String value = httpClientResponse.header(name);
 		return value == null ? Collections.emptyList() : Collections.singletonList(value);
diff --git a/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/SpringHttpServerAttributesGetter.java b/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/SpringHttpServerAttributesGetter.java
diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/otel/OtelTestTracing.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/otel/OtelTestTracing.java
diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/otel/bridge/OtelAccessor.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/otel/bridge/OtelAccessor.java

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ Supplier<FinishedSpanWriter> sleuthZipkinOtelFinishedSpanWriter() {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`@Bean`
`62`		`- @ConditionalOnClass(name = "io.opentelemetry.exporter.otlp.internal.traces.ResourceSpansMarshaler")`
	`62`	`+ @ConditionalOnClass(name = "io.opentelemetry.exporter.internal.otlp.traces.ResourceSpansMarshaler")`
`63`	`63`	`Supplier<FinishedSpanWriter> sleuthOtlpOtelFinishedSpanWriter() {`
`64`	`64`	`return OtelOtlpFinishedSpanWriter::new;`
`65`	`65`	`}`