Merge pull request #34216 from ttddyy

wilkinsona · wilkinsona · commit c63e21f95126 · 2023-02-24T12:26:37.000Z
* gh-34216: Specify @order to the defaultTracingObservationHandler bean definition Closes gh-34216
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/MicrometerTracingAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/MicrometerTracingAutoConfiguration.java
@@ -62,6 +62,7 @@ public class MicrometerTracingAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnBean(Tracer.class)
+	@Order(DEFAULT_TRACING_OBSERVATION_HANDLER_ORDER)
 	public DefaultTracingObservationHandler defaultTracingObservationHandler(Tracer tracer) {
 		return new DefaultTracingObservationHandler(tracer);
 	}

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ public class MicrometerTracingAutoConfiguration {`
`62`	`62`	`@Bean`
`63`	`63`	`@ConditionalOnMissingBean`
`64`	`64`	`@ConditionalOnBean(Tracer.class)`
	`65`	`+ @Order(DEFAULT_TRACING_OBSERVATION_HANDLER_ORDER)`
`65`	`66`	`public DefaultTracingObservationHandler defaultTracingObservationHandler(Tracer tracer) {`
`66`	`67`	`return new DefaultTracingObservationHandler(tracer);`
`67`	`68`	`}`