Upgrade OTel to 1.9.0 and OTel instrumentation to 1.9.1; fixes gh-95

Author: marcingrzejszczak

pom.xml

@@ -67,9 +67,9 @@
 		<spring-cloud-netflix.version>3.0.5-SNAPSHOT</spring-cloud-netflix.version>
 		<spring-cloud-openfeign.version>3.0.5-SNAPSHOT</spring-cloud-openfeign.version>
 		<opentracing.version>0.32.0</opentracing.version>
-		<opentelemetry.version>1.7.0</opentelemetry.version>
-		<opentelemetry.alpha.version>1.7.0-alpha</opentelemetry.alpha.version>
-		<opentelemetry-instrumentation.version>1.7.0-alpha</opentelemetry-instrumentation.version>
+		<opentelemetry.version>1.9.0</opentelemetry.version>
+		<opentelemetry.alpha.version>1.9.0-alpha</opentelemetry.alpha.version>
+		<opentelemetry-instrumentation.version>1.9.1-alpha</opentelemetry-instrumentation.version>
 		<wavefront.version>2.2.0</wavefront.version>
 		<spring-security-boot-autoconfigure.version>2.3.4.RELEASE</spring-security-boot-autoconfigure.version>
 		<disable.nohttp.checks>false</disable.nohttp.checks>

spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/OtelHttpClientHandler.java

@@ -66,7 +66,7 @@ public OtelHttpClientHandler(OpenTelemetry openTelemetry, @Nullable HttpRequestP
 
 		SpringHttpClientAttributesExtractor httpAttributesExtractor = new SpringHttpClientAttributesExtractor();
 		this.instrumenter = Instrumenter
-				.<HttpClientRequest, HttpClientResponse>newBuilder(openTelemetry, "org.springframework.cloud.sleuth",
+				.<HttpClientRequest, HttpClientResponse>builder(openTelemetry, "org.springframework.cloud.sleuth",
 						HttpSpanNameExtractor.create(httpAttributesExtractor))
 				.setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesExtractor))
 				.addAttributesExtractor(new HttpRequestNetClientAttributesExtractor())

spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/OtelHttpServerHandler.java

@@ -46,7 +46,7 @@
  */
 public class OtelHttpServerHandler implements HttpServerHandler {
 
-	private static final Log log = LogFactory.getLog(OtelHttpClientHandler.class);
+	private static final Log log = LogFactory.getLog(OtelHttpServerHandler.class);
 
 	private static final ContextKey<HttpServerRequest> REQUEST_CONTEXT_KEY = ContextKey
 			.named(OtelHttpServerHandler.class.getName() + ".request");
@@ -67,7 +67,7 @@ public OtelHttpServerHandler(OpenTelemetry openTelemetry, HttpRequestParser http
 
 		SpringHttpServerAttributesExtractor httpAttributesExtractor = new SpringHttpServerAttributesExtractor();
 		this.instrumenter = Instrumenter
-				.<HttpServerRequest, HttpServerResponse>newBuilder(openTelemetry, "org.springframework.cloud.sleuth",
+				.<HttpServerRequest, HttpServerResponse>builder(openTelemetry, "org.springframework.cloud.sleuth",
 						HttpSpanNameExtractor.create(httpAttributesExtractor))
 				.setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesExtractor))
 				.addAttributesExtractor(new HttpRequestNetServerAttributesExtractor())