Skip to content

Commit 9753766

Browse files
wilkinsonaphilwebb
authored andcommitted
Create spring-boot-tracing module
Issue: 46153
1 parent a17591d commit 9753766

File tree

90 files changed

+257
-277
lines changed

Some content is hidden

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

90 files changed

+257
-277
lines changed

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ include "spring-boot-project:spring-boot-tools:spring-boot-maven-plugin"
166166
include "spring-boot-project:spring-boot-tools:spring-boot-properties-migrator"
167167
include "spring-boot-project:spring-boot-tools:spring-boot-test-support"
168168
include "spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"
169+
include "spring-boot-project:spring-boot-tracing"
169170
include "spring-boot-project:spring-boot-tx"
170171
include "spring-boot-project:spring-boot-undertow"
171172
include "spring-boot-project:spring-boot-validation"

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,7 @@ dependencies {
7575
optional("io.lettuce:lettuce-core")
7676
optional("io.micrometer:micrometer-jakarta9")
7777
optional("io.micrometer:micrometer-observation")
78-
optional("io.micrometer:micrometer-tracing")
79-
optional("io.micrometer:micrometer-tracing-bridge-brave")
80-
optional("io.micrometer:micrometer-tracing-bridge-otel")
81-
optional("io.zipkin.reporter2:zipkin-reporter-brave")
82-
optional("io.opentelemetry:opentelemetry-exporter-zipkin")
83-
optional("io.opentelemetry:opentelemetry-exporter-otlp")
8478
optional("io.projectreactor.netty:reactor-netty-http")
85-
optional("io.prometheus:prometheus-metrics-tracer-common")
8679
optional("jakarta.persistence:jakarta.persistence-api")
8780
optional("jakarta.servlet:jakarta.servlet-api")
8881
optional("org.apache.activemq:activemq-broker")
@@ -123,10 +116,7 @@ dependencies {
123116
testImplementation(testFixtures(project(":spring-boot-project:spring-boot-web-server")))
124117
testImplementation("com.squareup.okhttp3:mockwebserver")
125118
testImplementation("io.micrometer:micrometer-observation-test")
126-
testImplementation("io.micrometer:micrometer-registry-prometheus")
127-
testImplementation("io.opentelemetry:opentelemetry-exporter-common")
128119
testImplementation("io.projectreactor:reactor-test")
129-
testImplementation("io.prometheus:prometheus-metrics-exposition-formats")
130120
testImplementation("jakarta.xml.bind:jakarta.xml.bind-api")
131121
testImplementation("org.apache.activemq:artemis-jakarta-client")
132122
testImplementation("org.apache.activemq:artemis-jakarta-server")
@@ -141,7 +131,6 @@ dependencies {
141131
testImplementation("org.springframework.security:spring-security-test")
142132
testImplementation("org.yaml:snakeyaml")
143133

144-
testRuntimeOnly("io.grpc:grpc-api:1.72.0")
145134
testRuntimeOnly("jakarta.management.j2ee:jakarta.management.j2ee-api")
146135
testRuntimeOnly("jakarta.transaction:jakarta.transaction-api")
147136
testRuntimeOnly("org.opensaml:opensaml-core:4.0.1")

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfiguration.java

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

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

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

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,43 +7,13 @@
77
"description": "Whether to enable SSL certificate health check.",
88
"defaultValue": true
99
},
10-
{
11-
"name": "management.otlp.tracing.export.enabled",
12-
"type": "java.lang.Boolean",
13-
"description": "Whether auto-configuration of tracing is enabled to export OTLP traces."
14-
},
1510
{
1611
"name": "management.promethus.metrics.export.pushgateway.base-url",
1712
"type": "java.lang.String",
1813
"deprecation": {
1914
"level": "error",
2015
"replacement": "management.prometheus.metrics.export.pushgateway.address"
2116
}
22-
},
23-
{
24-
"name": "management.tracing.enabled",
25-
"type": "java.lang.Boolean",
26-
"description": "Whether auto-configuration of tracing is enabled to export and propagate traces.",
27-
"defaultValue": true
28-
},
29-
{
30-
"name": "management.tracing.propagation.consume",
31-
"defaultValue": [
32-
"W3C",
33-
"B3",
34-
"B3_MULTI"
35-
]
36-
},
37-
{
38-
"name": "management.tracing.propagation.produce",
39-
"defaultValue": [
40-
"W3C"
41-
]
42-
},
43-
{
44-
"name": "management.zipkin.tracing.export.enabled",
45-
"type": "java.lang.Boolean",
46-
"description": "Whether auto-configuration of tracing is enabled to export Zipkin traces."
4717
}
4818
]
4919
}

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener

Lines changed: 0 additions & 1 deletion
This file was deleted.

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring.factories

Lines changed: 0 additions & 7 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,2 @@
11
org.springframework.boot.actuate.autoconfigure.security.reactive.ReactiveManagementWebSecurityAutoConfiguration
22
org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration
3-
org.springframework.boot.actuate.autoconfigure.tracing.BraveAutoConfiguration
4-
org.springframework.boot.actuate.autoconfigure.tracing.MicrometerTracingAutoConfiguration
5-
org.springframework.boot.actuate.autoconfigure.tracing.NoopTracerAutoConfiguration
6-
org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryTracingAutoConfiguration
7-
org.springframework.boot.actuate.autoconfigure.tracing.otlp.OtlpTracingAutoConfiguration
8-
org.springframework.boot.actuate.autoconfigure.tracing.prometheus.PrometheusExemplarsAutoConfiguration
9-
org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinTracingAutoConfiguration

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

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

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebEndpointsAutoConfigurationIntegrationTests.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import org.junit.jupiter.api.Test;
2020

2121
import org.springframework.boot.SpringBootConfiguration;
22-
import org.springframework.boot.actuate.autoconfigure.tracing.BraveAutoConfiguration;
23-
import org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryTracingAutoConfiguration;
2422
import org.springframework.boot.actuate.health.HealthEndpointWebExtension;
2523
import org.springframework.boot.actuate.health.ReactiveHealthEndpointWebExtension;
2624
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -57,18 +55,17 @@ void healthEndpointReactiveWebExtensionIsAutoConfigured() {
5755
private WebApplicationContextRunner servletWebRunner() {
5856
return new WebApplicationContextRunner()
5957
.withConfiguration(UserConfigurations.of(WebEndpointTestApplication.class))
60-
.withPropertyValues("management.tracing.enabled=false", "management.defaults.metrics.export.enabled=false");
58+
.withPropertyValues("management.defaults.metrics.export.enabled=false");
6159
}
6260

6361
private ReactiveWebApplicationContextRunner reactiveWebRunner() {
6462
return new ReactiveWebApplicationContextRunner()
6563
.withConfiguration(UserConfigurations.of(WebEndpointTestApplication.class))
66-
.withPropertyValues("management.tracing.enabled=false", "management.defaults.metrics.export.enabled=false");
64+
.withPropertyValues("management.defaults.metrics.export.enabled=false");
6765
}
6866

6967
@EnableAutoConfiguration(exclude = { CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class,
70-
RepositoryRestMvcAutoConfiguration.class, BraveAutoConfiguration.class,
71-
OpenTelemetryTracingAutoConfiguration.class })
68+
RepositoryRestMvcAutoConfiguration.class })
7269
@SpringBootConfiguration
7370
static class WebEndpointTestApplication {
7471

0 commit comments

Comments
 (0)