From 471c572b4acf16f00d2a095983a406240ab3cad8 Mon Sep 17 00:00:00 2001 From: Jean Bisutti Date: Wed, 17 Jul 2024 13:48:57 +0200 Subject: [PATCH] OTel Spring starter update from 2.6.0 (#4842) Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Severin Neumann --- .../java/spring-boot-starter/getting-started.md | 8 ++++---- .../other-spring-autoconfig.md | 17 +---------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/content/en/docs/zero-code/java/spring-boot-starter/getting-started.md b/content/en/docs/zero-code/java/spring-boot-starter/getting-started.md index 18520fb77..c4706aea9 100644 --- a/content/en/docs/zero-code/java/spring-boot-starter/getting-started.md +++ b/content/en/docs/zero-code/java/spring-boot-starter/getting-started.md @@ -50,8 +50,8 @@ The following example shows how to import the OpenTelemetry BOMs using Maven: io.opentelemetry.instrumentation - opentelemetry-instrumentation-bom-alpha - {{% param vers.instrumentation %}}-alpha + opentelemetry-instrumentation-bom + {{% param vers.instrumentation %}} pom import @@ -74,7 +74,7 @@ plugins { dependencies { implementation(platform(SpringBootPlugin.BOM_COORDINATES)) implementation(platform("io.opentelemetry:opentelemetry-bom:{{% param vers.otel %}}")) - implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:{{% param vers.instrumentation %}}-alpha")) + implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:{{% param vers.instrumentation %}}")) } ``` @@ -91,7 +91,7 @@ plugins { dependencyManagement { imports { mavenBom("io.opentelemetry:opentelemetry-bom:{{% param vers.otel %}}") - mavenBom("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:{{% param vers.instrumentation %}}-alpha") + mavenBom("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:{{% param vers.instrumentation %}}") } } ``` diff --git a/content/en/docs/zero-code/java/spring-boot-starter/other-spring-autoconfig.md b/content/en/docs/zero-code/java/spring-boot-starter/other-spring-autoconfig.md index ed2676c4b..012e9c060 100644 --- a/content/en/docs/zero-code/java/spring-boot-starter/other-spring-autoconfig.md +++ b/content/en/docs/zero-code/java/spring-boot-starter/other-spring-autoconfig.md @@ -5,22 +5,7 @@ weight: 70 --- Instead of using the OpenTelemetry Spring starter, you can use the OpenTelemetry -autoconfiguration features with an annotation or the Zipkin starter. - -## Spring support - -Autoconfiguration is natively supported by Spring Boot applications. To enable -these features in "vanilla" use `@EnableOpenTelemetry` to complete a component -scan of this package. - -```java -import io.opentelemetry.instrumentation.spring.autoconfigure.EnableOpenTelemetry; -import org.springframework.context.annotation.Configuration; - -@Configuration -@EnableOpenTelemetry -public class OpenTelemetryConfig {} -``` +Zipkin starter. ## Zipkin starter