Skip to content

Commit 76e9c73

Browse files
committed
Create spring-boot-opentelemetry module
Renames `management.otlp.logging` properties to `management.opentelemetry.logging`. Issue: 46149
1 parent 866be14 commit 76e9c73

File tree

56 files changed

+921
-771
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+921
-771
lines changed

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ include "spring-boot-project:spring-boot-metrics"
119119
include "spring-boot-project:spring-boot-mongodb"
120120
include "spring-boot-project:spring-boot-mustache"
121121
include "spring-boot-project:spring-boot-netty"
122+
include "spring-boot-project:spring-boot-opentelemetry"
122123
include "spring-boot-project:spring-boot-parent"
123124
include "spring-boot-project:spring-boot-pulsar"
124125
include "spring-boot-project:spring-boot-quartz"

spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ dependencies {
5656
optional(project(":spring-boot-project:spring-boot-jsonb"))
5757
optional(project(":spring-boot-project:spring-boot-kafka"))
5858
optional(project(":spring-boot-project:spring-boot-metrics"))
59+
optional(project(":spring-boot-project:spring-boot-opentelemetry"))
5960
optional(project(":spring-boot-project:spring-boot-r2dbc"))
6061
optional(project(":spring-boot-project:spring-boot-restclient"))
6162
optional(project(":spring-boot-project:spring-boot-security-oauth2-client"))

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/OpenTelemetryLoggingAutoConfiguration.java

Lines changed: 0 additions & 61 deletions
This file was deleted.

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/otlp/OtlpLoggingConfigurations.java

Lines changed: 0 additions & 112 deletions
This file was deleted.

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsExportAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.springframework.beans.factory.ObjectProvider;
2525
import org.springframework.boot.actuate.autoconfigure.metrics.export.ConditionalOnEnabledMetricsExport;
2626
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
27-
import org.springframework.boot.actuate.autoconfigure.opentelemetry.OpenTelemetryProperties;
2827
import org.springframework.boot.autoconfigure.AutoConfiguration;
2928
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
3029
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -35,6 +34,7 @@
3534
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3635
import org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration;
3736
import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
37+
import org.springframework.boot.opentelemetry.autoconfigure.OpenTelemetryProperties;
3838
import org.springframework.context.annotation.Bean;
3939
import org.springframework.core.env.Environment;
4040
import org.springframework.core.task.VirtualThreadTaskExecutor;

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsPropertiesConfigAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828

2929
import org.springframework.boot.actuate.autoconfigure.metrics.export.otlp.OtlpMetricsProperties.Meter;
3030
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.StepRegistryPropertiesConfigAdapter;
31-
import org.springframework.boot.actuate.autoconfigure.opentelemetry.OpenTelemetryProperties;
32-
import org.springframework.boot.actuate.autoconfigure.opentelemetry.OpenTelemetryResourceAttributes;
31+
import org.springframework.boot.opentelemetry.autoconfigure.OpenTelemetryProperties;
32+
import org.springframework.boot.opentelemetry.autoconfigure.OpenTelemetryResourceAttributes;
3333
import org.springframework.core.env.Environment;
3434
import org.springframework.util.CollectionUtils;
3535

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ org.springframework.boot.actuate.autoconfigure.context.ShutdownEndpointAutoConfi
1111
org.springframework.boot.actuate.autoconfigure.endpoint.jackson.JacksonEndpointAutoConfiguration
1212
org.springframework.boot.actuate.autoconfigure.endpoint.jmx.JmxEndpointAutoConfiguration
1313
org.springframework.boot.actuate.autoconfigure.env.EnvironmentEndpointAutoConfiguration
14-
org.springframework.boot.actuate.autoconfigure.logging.LogFileWebEndpointAutoConfiguration
15-
org.springframework.boot.actuate.autoconfigure.logging.LoggersEndpointAutoConfiguration
16-
org.springframework.boot.actuate.autoconfigure.logging.OpenTelemetryLoggingAutoConfiguration
17-
org.springframework.boot.actuate.autoconfigure.logging.otlp.OtlpLoggingAutoConfiguration
1814
org.springframework.boot.actuate.autoconfigure.management.HeapDumpWebEndpointAutoConfiguration
1915
org.springframework.boot.actuate.autoconfigure.management.ThreadDumpEndpointAutoConfiguration
2016
org.springframework.boot.actuate.autoconfigure.metrics.data.RepositoryMetricsAutoConfiguration
@@ -44,7 +40,6 @@ org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfig
4440
org.springframework.boot.actuate.autoconfigure.observation.web.client.HttpClientObservationsAutoConfiguration
4541
org.springframework.boot.actuate.autoconfigure.observation.web.reactive.WebFluxObservationAutoConfiguration
4642
org.springframework.boot.actuate.autoconfigure.observation.web.servlet.WebMvcObservationAutoConfiguration
47-
org.springframework.boot.actuate.autoconfigure.opentelemetry.OpenTelemetryAutoConfiguration
4843
org.springframework.boot.actuate.autoconfigure.r2dbc.ConnectionFactoryHealthContributorAutoConfiguration
4944
org.springframework.boot.actuate.autoconfigure.r2dbc.R2dbcObservationAutoConfiguration
5045
org.springframework.boot.actuate.autoconfigure.sbom.SbomEndpointAutoConfiguration

0 commit comments

Comments
 (0)