Merge pull request #7 from spring-cloud-incubator/otel-upgrade-0.14

jonatan-ivanov · web-flow · commit eac53772fc7c · 2021-01-26T16:12:15.000-08:00
Otel upgrade to 0.14
diff --git a/pom.xml b/pom.xml
@@ -67,9 +67,9 @@
 		<spring-cloud-netflix.version>3.0.0</spring-cloud-netflix.version>
 		<spring-cloud-openfeign.version>3.0.0</spring-cloud-openfeign.version>
 		<opentracing.version>0.32.0</opentracing.version>
-		<opentelemetry.version>0.13.1</opentelemetry.version>
+		<opentelemetry.version>0.14.1</opentelemetry.version>
 		<!-- From maven local -->
-		<opentelemetry-instrumentation.version>0.13.0</opentelemetry-instrumentation.version>
+		<opentelemetry-instrumentation.version>0.14.0</opentelemetry-instrumentation.version>
 		<spring-security-boot-autoconfigure.version>2.3.4.RELEASE</spring-security-boot-autoconfigure.version>
 		<disable.nohttp.checks>false</disable.nohttp.checks>
 		<okhttp.version>4.9.0</okhttp.version>
diff --git a/spring-cloud-sleuth-otel-autoconfigure/pom.xml b/spring-cloud-sleuth-otel-autoconfigure/pom.xml
@@ -98,6 +98,10 @@
 			<groupId>io.opentelemetry</groupId>
 			<artifactId>opentelemetry-api</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.opentelemetry</groupId>
+			<artifactId>opentelemetry-semconv</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>io.opentelemetry</groupId>
 			<artifactId>opentelemetry-sdk-common</artifactId>
diff --git a/spring-cloud-sleuth-otel-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/otel/OtelAutoConfiguration.java b/spring-cloud-sleuth-otel-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/otel/OtelAutoConfiguration.java
@@ -20,8 +20,9 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import io.opentelemetry.api.DefaultOpenTelemetry;
+import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.metrics.MeterProvider;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.api.trace.TracerProvider;
 import io.opentelemetry.context.propagation.ContextPropagators;
@@ -31,8 +32,7 @@
 import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
-import io.opentelemetry.sdk.trace.spi.TracerProviderFactorySdk;
-import io.opentelemetry.spi.metrics.MeterProviderFactory;
+import io.opentelemetry.sdk.trace.spi.SdkTracerProviderFactory;
 import io.opentelemetry.spi.trace.TracerProviderFactory;
 
 import org.springframework.beans.factory.ObjectProvider;
@@ -48,7 +48,6 @@
 import org.springframework.cloud.sleuth.autoconfig.TraceConfiguration;
 import org.springframework.cloud.sleuth.autoconfig.brave.BraveAutoConfiguration;
 import org.springframework.cloud.sleuth.internal.SleuthContextListener;
-import org.springframework.cloud.sleuth.otel.bridge.OtelOpenTelemetry;
 import org.springframework.cloud.sleuth.otel.bridge.SpanExporterCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -77,19 +76,17 @@ public class OtelAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	OpenTelemetry otel(TracerProviderFactory tracerProviderFactory, MeterProviderFactory meterProviderFactory,
-			TracerProvider tracerProvider, MeterProvider meterProvider, ContextPropagators contextPropagators) {
-		OtelOpenTelemetry otelOpenTelemetry = new OtelOpenTelemetry(tracerProviderFactory, meterProviderFactory,
-				tracerProvider, meterProvider, contextPropagators);
-		OpenTelemetry.set(otelOpenTelemetry);
-		OpenTelemetry.setGlobalPropagators(contextPropagators);
-		return otelOpenTelemetry;
+	OpenTelemetry otel(TracerProvider tracerProvider, ContextPropagators contextPropagators) {
+		OpenTelemetry openTelemetry = DefaultOpenTelemetry.builder().setTracerProvider(tracerProvider)
+				.setPropagators(contextPropagators).build();
+		GlobalOpenTelemetry.set(openTelemetry);
+		return openTelemetry;
 	}
 
 	@Bean
 	@ConditionalOnMissingBean
 	TracerProviderFactory otelTracerProviderFactory() {
-		return new TracerProviderFactorySdk();
+		return new SdkTracerProviderFactory();
 	}
 
 	@Bean
@@ -98,18 +95,6 @@ TracerProvider otelTracerProvider(TracerProviderFactory tracerProviderFactory) {
 		return tracerProviderFactory.create();
 	}
 
-	@Bean
-	@ConditionalOnMissingBean
-	MeterProviderFactory otelMeterProviderFactory() {
-		return OpenTelemetry::getGlobalMeterProvider;
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	MeterProvider otelMeterProvider(MeterProviderFactory meterProviderFactory) {
-		return meterProviderFactory.create();
-	}
-
 	@Bean
 	@ConditionalOnMissingBean
 	TraceConfig otelTracerConfig(OtelProperties otelProperties, Sampler sampler) {
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>0.13.1</opentelemetry.version>
+		<opentelemetry.version>0.14.1</opentelemetry.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/spring-cloud-sleuth-otel/pom.xml b/spring-cloud-sleuth-otel/pom.xml
@@ -54,6 +54,10 @@
 			<groupId>io.opentelemetry</groupId>
 			<artifactId>opentelemetry-api</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.opentelemetry</groupId>
+			<artifactId>opentelemetry-semconv</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>io.opentelemetry</groupId>
 			<artifactId>opentelemetry-sdk-common</artifactId>
diff --git a/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/ArrayListSpanProcessor.java b/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/ArrayListSpanProcessor.java
@@ -28,6 +28,8 @@
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
+
 /**
  * Stores spans in a queue.
  *
@@ -78,6 +80,11 @@ public CompletableResultCode forceFlush() {
 		return CompletableResultCode.ofSuccess();
 	}
 
+	@Override
+	public void close() {
+		shutdown().join(10, SECONDS);
+	}
+
 	public SpanData takeLocalSpan() {
 		return this.spans.poll();
 	}
diff --git a/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/OtelOpenTelemetry.java b/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/OtelOpenTelemetry.java
diff --git a/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/propagation/CompositeTextMapPropagator.java b/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/propagation/CompositeTextMapPropagator.java
@@ -31,7 +31,7 @@
 import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapPropagator;
-import io.opentelemetry.extension.trace.propagation.AwsXRayPropagator;
+import io.opentelemetry.extension.trace.propagation.AwsXrayPropagator;
 import io.opentelemetry.extension.trace.propagation.B3Propagator;
 import io.opentelemetry.extension.trace.propagation.JaegerPropagator;
 import io.opentelemetry.extension.trace.propagation.OtTracerPropagator;
@@ -60,8 +60,8 @@ public class CompositeTextMapPropagator implements TextMapPropagator {
 	public CompositeTextMapPropagator(BeanFactory beanFactory, List<PropagationType> types) {
 		this.types = types;
 		if (isOnClasspath("io.opentelemetry.extension.trace.propagation.AwsXRayPropagator")) {
-			this.mapping.put(PropagationType.AWS, beanFactory.getBeanProvider(AwsXRayPropagator.class)
-					.getIfAvailable(AwsXRayPropagator::getInstance));
+			this.mapping.put(PropagationType.AWS, beanFactory.getBeanProvider(AwsXrayPropagator.class)
+					.getIfAvailable(AwsXrayPropagator::getInstance));
 		}
 		if (isOnClasspath("io.opentelemetry.extension.trace.propagation.B3Propagator")) {
 			this.mapping.put(PropagationType.B3,
diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/otel/OtelTestSpanHandler.java b/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.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import io.opentelemetry.context.Context;
@@ -121,6 +122,11 @@ public CompletableResultCode forceFlush() {
 		return spanProcessor.forceFlush();
 	}
 
+	@Override
+	public void close() {
+		shutdown().join(10, TimeUnit.SECONDS);
+	}
+
 	@Override
 	public String toString() {
 		return "OtelTestSpanHandler{" + "spanProcessor=" + this.spanProcessor + '}';
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
@@ -19,16 +19,16 @@
 import java.io.Closeable;
 import java.util.regex.Pattern;
 
+import io.opentelemetry.api.DefaultOpenTelemetry;
+import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.metrics.MeterProvider;
 import io.opentelemetry.api.trace.TracerProvider;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.extension.trace.propagation.B3Propagator;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.config.TraceConfig;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
-import io.opentelemetry.sdk.trace.spi.TracerProviderFactorySdk;
-import io.opentelemetry.spi.metrics.MeterProviderFactory;
+import io.opentelemetry.sdk.trace.spi.SdkTracerProviderFactory;
 import io.opentelemetry.spi.trace.TracerProviderFactory;
 
 import org.springframework.cloud.sleuth.CurrentTraceContext;
@@ -40,7 +40,6 @@
 import org.springframework.cloud.sleuth.http.HttpServerHandler;
 import org.springframework.cloud.sleuth.otel.bridge.ArrayListSpanProcessor;
 import org.springframework.cloud.sleuth.otel.bridge.OtelAccessor;
-import org.springframework.cloud.sleuth.otel.bridge.OtelOpenTelemetry;
 import org.springframework.cloud.sleuth.propagation.Propagator;
 import org.springframework.cloud.sleuth.test.TestSpanHandler;
 import org.springframework.cloud.sleuth.test.TestTracingAssertions;
@@ -57,7 +56,7 @@ public class OtelTestTracing implements TracerAware, TestTracingAware, TestTraci
 
 	OpenTelemetry openTelemetry = otel();
 
-	ContextPropagators defaultContextPropagators = OpenTelemetry.getGlobalPropagators();
+	ContextPropagators defaultContextPropagators = openTelemetry.getPropagators();
 
 	Sampler sampler = Sampler.alwaysOn();
 
@@ -80,30 +79,20 @@ protected ContextPropagators contextPropagators() {
 
 	OpenTelemetry otel() {
 		TracerProviderFactory providerFactory = otelTracerProviderFactory();
-		MeterProviderFactory meterProviderFactory = otelMeterProviderFactory();
-		OtelOpenTelemetry otelOpenTelemetry = new OtelOpenTelemetry(providerFactory, meterProviderFactory,
-				otelTracerProvider(providerFactory), otelMeterProvider(meterProviderFactory), this.contextPropagators);
-		OpenTelemetry.set(otelOpenTelemetry);
-		OpenTelemetry.setGlobalPropagators(contextPropagators);
-		return otelOpenTelemetry;
+		OpenTelemetry openTelemetry = DefaultOpenTelemetry.builder()
+				.setTracerProvider(otelTracerProvider(providerFactory)).setPropagators(this.contextPropagators).build();
+		GlobalOpenTelemetry.set(openTelemetry);
+		return openTelemetry;
 	}
 
 	TracerProviderFactory otelTracerProviderFactory() {
-		return new TracerProviderFactorySdk();
+		return new SdkTracerProviderFactory();
 	}
 
 	TracerProvider otelTracerProvider(TracerProviderFactory tracerProviderFactory) {
 		return tracerProviderFactory.create();
 	}
 
-	MeterProviderFactory otelMeterProviderFactory() {
-		return OpenTelemetry::getGlobalMeterProvider;
-	}
-
-	MeterProvider otelMeterProvider(MeterProviderFactory meterProviderFactory) {
-		return meterProviderFactory.create();
-	}
-
 	private void reset() {
 		this.contextPropagators = contextPropagators();
 		this.tracer = otelTracer();
@@ -134,7 +123,6 @@ public TestTracingAssertions assertions() {
 	@Override
 	public void close() {
 		this.spanProcessor.clear();
-		OpenTelemetry.setGlobalPropagators(this.defaultContextPropagators);
 		this.sampler = Sampler.alwaysOn();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@`
`28`	`28`	`import io.opentelemetry.sdk.trace.data.SpanData;`
`29`	`29`	`import io.opentelemetry.sdk.trace.export.SpanExporter;`
`30`	`30`
	`31`	`+import static java.util.concurrent.TimeUnit.SECONDS;`
	`32`	`+`
`31`	`33`	`/**`
`32`	`34`	`* Stores spans in a queue.`
`33`	`35`	`*`
`@@ -78,6 +80,11 @@ public CompletableResultCode forceFlush() {`
`78`	`80`	`return CompletableResultCode.ofSuccess();`
`79`	`81`	`}`
`80`	`82`
	`83`	`+ @Override`
	`84`	`+ public void close() {`
	`85`	`+ shutdown().join(10, SECONDS);`
	`86`	`+ }`
	`87`	`+`
`81`	`88`	`public SpanData takeLocalSpan() {`
`82`	`89`	`return this.spans.poll();`
`83`	`90`	`}`