From 5e2a3106e9d941f20e7fe307d6c2505af97f4c61 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Tue, 20 May 2025 12:30:35 +0200 Subject: [PATCH 1/4] log start of spring boot starter --- .../autoconfigure/OpenTelemetryAutoConfiguration.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java index bb1c806a3ee3..47580cc2a492 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java @@ -28,6 +28,8 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -54,6 +56,8 @@ OtelSpringProperties.class }) public class OpenTelemetryAutoConfiguration { + private static final Logger logger = + LoggerFactory.getLogger(OpenTelemetryAutoConfiguration.class); public OpenTelemetryAutoConfiguration() {} @@ -110,6 +114,8 @@ public AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk( @Bean public OpenTelemetry openTelemetry( AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) { + logger.info("Starting OpenTelemetry Spring Boot starter"); + return autoConfiguredOpenTelemetrySdk.getOpenTelemetrySdk(); } From 7bae3901d5d7a6d691ecc960e6c4c8beea92a467 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Wed, 28 May 2025 10:02:31 +0200 Subject: [PATCH 2/4] log version --- .../autoconfigure/OpenTelemetryAutoConfiguration.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java index 47580cc2a492..47c160b7aa03 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java @@ -7,6 +7,7 @@ import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.trace.TracerProvider; +import io.opentelemetry.instrumentation.api.internal.EmbeddedInstrumentationProperties; import io.opentelemetry.instrumentation.spring.autoconfigure.internal.OtelMapConverter; import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled; import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelResourceProperties; @@ -114,7 +115,10 @@ public AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk( @Bean public OpenTelemetry openTelemetry( AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) { - logger.info("Starting OpenTelemetry Spring Boot starter"); + logger.info( + "OpenTelemetry Spring Boot starter has been started: {}", + EmbeddedInstrumentationProperties.findVersion( + "io.opentelemetry.spring-boot-autoconfigure")); return autoConfiguredOpenTelemetrySdk.getOpenTelemetrySdk(); } From 6a47524c808e86bcc58cdc51daa06e440369642d Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Wed, 28 May 2025 10:06:20 +0200 Subject: [PATCH 3/4] log disabled --- .../spring/autoconfigure/OpenTelemetryAutoConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java index 47c160b7aa03..e62592e60672 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java @@ -156,6 +156,8 @@ public OtelMapConverter otelMapConverter() { @Bean public OpenTelemetry openTelemetry() { + logger.info("OpenTelemetry Spring Boot starter has been disabled"); + return OpenTelemetry.noop(); } From 504570ae8ba1febabb3ac8a2a2348cc770e7c444 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Wed, 4 Jun 2025 09:47:52 +0200 Subject: [PATCH 4/4] Update instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java Co-authored-by: Trask Stalnaker --- .../spring/autoconfigure/OpenTelemetryAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java index e62592e60672..6b2a99d0c521 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java @@ -116,7 +116,7 @@ public AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk( public OpenTelemetry openTelemetry( AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) { logger.info( - "OpenTelemetry Spring Boot starter has been started: {}", + "OpenTelemetry Spring Boot starter ({}) has been started", EmbeddedInstrumentationProperties.findVersion( "io.opentelemetry.spring-boot-autoconfigure"));