Skip to content

Commit 88de3cc

Browse files
committed
Temporarily remove auto-config for Reactor context propagation
See gh-34201
1 parent 06ccdc1 commit 88de3cc

File tree

9 files changed

+0
-200
lines changed

9 files changed

+0
-200
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ dependencies {
221221
testImplementation("com.querydsl:querydsl-core")
222222
testImplementation("com.squareup.okhttp3:mockwebserver")
223223
testImplementation("com.sun.xml.messaging.saaj:saaj-impl")
224-
testImplementation("io.micrometer:context-propagation")
225224
testImplementation("io.projectreactor:reactor-test")
226225
testImplementation("io.r2dbc:r2dbc-h2")
227226
testImplementation("jakarta.json:jakarta.json-api")

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java

-43
This file was deleted.

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorProperties.java

-57
This file was deleted.

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/package-info.java

-20
This file was deleted.

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

-4
Original file line numberDiff line numberDiff line change
@@ -2176,10 +2176,6 @@
21762176
"level": "error"
21772177
}
21782178
},
2179-
{
2180-
"name": "spring.reactor.context-propagation",
2181-
"defaultValue": "auto"
2182-
},
21832179
{
21842180
"name": "spring.reactor.stacktrace-mode.enabled",
21852181
"description": "Whether Reactor should collect stacktrace information at runtime.",

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

-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ org.springframework.boot.autoconfigure.neo4j.Neo4jAutoConfiguration
9393
org.springframework.boot.autoconfigure.netty.NettyAutoConfiguration
9494
org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
9595
org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration
96-
org.springframework.boot.autoconfigure.reactor.ReactorAutoConfiguration
9796
org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration
9897
org.springframework.boot.autoconfigure.r2dbc.R2dbcTransactionManagerAutoConfiguration
9998
org.springframework.boot.autoconfigure.rsocket.RSocketMessagingAutoConfiguration

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfigurationTests.java

-64
This file was deleted.

spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/observability.adoc

-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,4 @@ For JDBC, the https://github.com/jdbc-observations/datasource-micrometer[Datasou
2121
Read more about it https://jdbc-observations.github.io/datasource-micrometer/docs/current/docs/html/[in the reference documentation].
2222
For R2DBC, the https://github.com/spring-projects-experimental/r2dbc-micrometer-spring-boot[Spring Boot Auto Configuration for R2DBC Observation] creates observations for R2DBC query invocations.
2323

24-
Observability support relies on the https://github.com/micrometer-metrics/context-propagation[Context Propagation library] for forwarding the current observation across threads and reactive pipelines.
25-
`ThreadLocal` values are automatically reinstated in reactive operators, this behavior is controlled with the configprop:spring.reactor.context-propagation[] property.
26-
2724
The next sections will provide more details about logging, metrics and traces.

spring-boot-project/spring-boot-parent/build.gradle

-7
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,6 @@ bom {
137137
]
138138
}
139139
}
140-
library("Micrometer Context Propagation", "1.0.2") {
141-
group("io.micrometer") {
142-
modules = [
143-
"context-propagation"
144-
]
145-
}
146-
}
147140
library("MockK", "1.10.6") {
148141
group("io.mockk") {
149142
modules = [

0 commit comments

Comments
 (0)