Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -28,6 +29,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;
Expand All @@ -54,6 +57,8 @@
OtelSpringProperties.class
})
public class OpenTelemetryAutoConfiguration {
private static final Logger logger =
LoggerFactory.getLogger(OpenTelemetryAutoConfiguration.class);

public OpenTelemetryAutoConfiguration() {}

Expand Down Expand Up @@ -110,6 +115,11 @@ public AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk(
@Bean
public OpenTelemetry openTelemetry(
AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {
logger.info(
"OpenTelemetry Spring Boot starter ({}) has been started",
EmbeddedInstrumentationProperties.findVersion(
"io.opentelemetry.spring-boot-autoconfigure"));

return autoConfiguredOpenTelemetrySdk.getOpenTelemetrySdk();
}

Expand Down Expand Up @@ -146,6 +156,8 @@ public OtelMapConverter otelMapConverter() {

@Bean
public OpenTelemetry openTelemetry() {
logger.info("OpenTelemetry Spring Boot starter has been disabled");

return OpenTelemetry.noop();
}

Expand Down
Loading