diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index a243a588d009..669b71837d01 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -51,6 +51,7 @@
       </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
+          <package name="" withSubpackages="true" static="false" module="true" />
           <package name="java" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="javax" withSubpackages="true" static="false" />
@@ -119,4 +120,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
+</component>
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationProperties.java
index e004eb04ccdc..dd451083cfaa 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationProperties.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationProperties.java
@@ -128,9 +128,9 @@ public static class ServerRequests {
 				private String name = "http.server.requests";
 
 				/**
-				 * Whether to write the "X-Trace-Id" HTTP response header.
+				 * Whether to write the "traceresponse" HTTP response header.
 				 */
-				private boolean writeTraceHeader = false;
+				private boolean writeTraceresponse = false;
 
 				public String getName() {
 					return this.name;
@@ -140,12 +140,12 @@ public void setName(String name) {
 					this.name = name;
 				}
 
-				public boolean isWriteTraceHeader() {
-					return this.writeTraceHeader;
+				public boolean isWriteTraceresponse() {
+					return this.writeTraceresponse;
 				}
 
-				public void setWriteTraceHeader(boolean writeTraceHeader) {
-					this.writeTraceHeader = writeTraceHeader;
+				public void setWriteTraceresponse(boolean writeTraceresponse) {
+					this.writeTraceresponse = writeTraceresponse;
 				}
 
 			}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/reactive/WebFluxObservationAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/reactive/WebFluxObservationAutoConfiguration.java
index 94d125f63f2a..cc42826093b3 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/reactive/WebFluxObservationAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/reactive/WebFluxObservationAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,20 +20,24 @@
 import io.micrometer.core.instrument.config.MeterFilter;
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationRegistry;
+import io.micrometer.tracing.Tracer;
 
 import org.springframework.boot.actuate.autoconfigure.metrics.MetricsProperties;
 import org.springframework.boot.actuate.autoconfigure.metrics.OnlyOnceLoggingDenyMeterFilter;
 import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.observation.ObservationProperties;
+import org.springframework.boot.actuate.web.tracing.reactive.TraceResponseObservationWebFilter;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.server.reactive.observation.DefaultServerRequestObservationConvention;
 import org.springframework.http.server.reactive.observation.ServerRequestObservationConvention;
@@ -61,6 +65,15 @@ public class WebFluxObservationAutoConfiguration {
 		this.observationProperties = observationProperties;
 	}
 
+	@Bean
+	@ConditionalOnBooleanProperty("management.observations.http.server.requests.write-traceresponse")
+	@ConditionalOnBean(Tracer.class)
+	@ConditionalOnMissingBean
+	@Order(Ordered.HIGHEST_PRECEDENCE + 1)
+	public TraceResponseObservationWebFilter traceResponseObservationWebFilter() {
+		return new TraceResponseObservationWebFilter();
+	}
+
 	@Bean
 	@Order(0)
 	MeterFilter metricsHttpServerUriTagFilter(MetricsProperties metricsProperties) {
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/ObservationFilterConfigurations.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/ObservationFilterConfigurations.java
index e9f5a980be46..01474e53ce7b 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/ObservationFilterConfigurations.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/ObservationFilterConfigurations.java
@@ -22,6 +22,7 @@
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.actuate.autoconfigure.observation.ObservationProperties;
+import org.springframework.boot.actuate.web.tracing.servlet.TraceResponseHeaderObservationFilter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -54,16 +55,18 @@ static <T extends ServerHttpObservationFilter> FilterRegistrationBean<T> filterR
 	static class TracingHeaderObservation {
 
 		@Bean
-		@ConditionalOnBooleanProperty("management.observations.http.server.requests.write-trace-header")
+		@ConditionalOnBooleanProperty("management.observations.http.server.requests.write-traceresponse")
 		@ConditionalOnBean(Tracer.class)
-		@ConditionalOnMissingFilterBean({ ServerHttpObservationFilter.class, TraceHeaderObservationFilter.class })
-		FilterRegistrationBean<TraceHeaderObservationFilter> webMvcObservationFilter(ObservationRegistry registry,
-				Tracer tracer, ObjectProvider<ServerRequestObservationConvention> customConvention,
+		@ConditionalOnMissingFilterBean({ ServerHttpObservationFilter.class,
+				TraceResponseHeaderObservationFilter.class })
+		FilterRegistrationBean<TraceResponseHeaderObservationFilter> webMvcObservationFilter(
+				ObservationRegistry registry, ObjectProvider<ServerRequestObservationConvention> customConvention,
 				ObservationProperties observationProperties) {
 			String name = observationProperties.getHttp().getServer().getRequests().getName();
 			ServerRequestObservationConvention convention = customConvention
 				.getIfAvailable(() -> new DefaultServerRequestObservationConvention(name));
-			TraceHeaderObservationFilter filter = new TraceHeaderObservationFilter(tracer, registry, convention);
+			TraceResponseHeaderObservationFilter filter = new TraceResponseHeaderObservationFilter(registry,
+					convention);
 			return filterRegistration(filter);
 		}
 
@@ -73,7 +76,8 @@ FilterRegistrationBean<TraceHeaderObservationFilter> webMvcObservationFilter(Obs
 	static class DefaultObservation {
 
 		@Bean
-		@ConditionalOnMissingFilterBean({ ServerHttpObservationFilter.class, TraceHeaderObservationFilter.class })
+		@ConditionalOnMissingFilterBean({ ServerHttpObservationFilter.class,
+				TraceResponseHeaderObservationFilter.class })
 		FilterRegistrationBean<ServerHttpObservationFilter> webMvcObservationFilter(ObservationRegistry registry,
 				ObjectProvider<ServerRequestObservationConvention> customConvention,
 				ObservationProperties observationProperties) {
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/TraceHeaderObservationFilter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/TraceHeaderObservationFilter.java
deleted file mode 100644
index 47ea0783e9ea..000000000000
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/TraceHeaderObservationFilter.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2012-2025 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.boot.actuate.autoconfigure.observation.web.servlet;
-
-import io.micrometer.observation.Observation.Scope;
-import io.micrometer.observation.ObservationRegistry;
-import io.micrometer.tracing.Span;
-import io.micrometer.tracing.Tracer;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import org.springframework.http.server.observation.ServerRequestObservationConvention;
-import org.springframework.util.Assert;
-import org.springframework.web.filter.ServerHttpObservationFilter;
-
-/**
- * {@link ServerHttpObservationFilter} that writes the current {@link Span} in an HTTP
- * response header. By default, the {@code "X-Trace-Id"} header is used.
- *
- * @author Brian Clozel
- * @since 3.5.0
- */
-public class TraceHeaderObservationFilter extends ServerHttpObservationFilter {
-
-	private static final String TRACE_ID_HEADER_NAME = "X-Trace-Id";
-
-	private final Tracer tracer;
-
-	/**
-	 * Create a {@link TraceHeaderObservationFilter} that will write the
-	 * {@code "X-Trace-Id"} HTTP response header.
-	 * @param tracer the current tracer
-	 * @param observationRegistry the current observation registry
-	 */
-	public TraceHeaderObservationFilter(Tracer tracer, ObservationRegistry observationRegistry) {
-		super(observationRegistry);
-		Assert.notNull(tracer, "'tracer' must not be null");
-		this.tracer = tracer;
-	}
-
-	/**
-	 * Create a {@link TraceHeaderObservationFilter} that will write the
-	 * {@code "X-Trace-Id"} HTTP response header.
-	 * @param tracer the current tracer
-	 * @param observationRegistry the current observation registry
-	 * @param observationConvention the custom observation convention to use.
-	 */
-	public TraceHeaderObservationFilter(Tracer tracer, ObservationRegistry observationRegistry,
-			ServerRequestObservationConvention observationConvention) {
-		super(observationRegistry, observationConvention);
-		Assert.notNull(tracer, "'tracer' must not be null");
-		this.tracer = tracer;
-	}
-
-	@Override
-	protected void onScopeOpened(Scope scope, HttpServletRequest request, HttpServletResponse response) {
-		Span currentSpan = this.tracer.currentSpan();
-		if (currentSpan != null && !currentSpan.isNoop()) {
-			response.setHeader(TRACE_ID_HEADER_NAME, currentSpan.context().traceId());
-		}
-	}
-
-}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/reactive/WebFluxObservationAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/reactive/WebFluxObservationAutoConfigurationTests.java
index 384be8d4ae30..08cd5933dfa8 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/reactive/WebFluxObservationAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/reactive/WebFluxObservationAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@
 import java.time.temporal.ChronoUnit;
 
 import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.tracing.Tracer;
+import io.micrometer.tracing.test.simple.SimpleTracer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -27,6 +29,7 @@
 import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
 import org.springframework.boot.actuate.autoconfigure.metrics.web.TestController;
 import org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration;
+import org.springframework.boot.actuate.web.tracing.reactive.TraceResponseObservationWebFilter;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
 import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
@@ -117,6 +120,25 @@ void shouldBackOffOnCustomServerRequestObservationConvention() {
 			});
 	}
 
+	@Test
+	void shouldNotConfigureTraceResponseObservationWebFilterByDefault() {
+		this.contextRunner
+			.run((context) -> assertThat(context).doesNotHaveBean(TraceResponseObservationWebFilter.class));
+	}
+
+	@Test
+	void shouldNotConfigureTraceResponseObservationWebFilterIfTracerMissing() {
+		this.contextRunner.withPropertyValues("management.observations.http.server.requests.write-traceresponse=true")
+			.run((context) -> assertThat(context).doesNotHaveBean(TraceResponseObservationWebFilter.class));
+	}
+
+	@Test
+	void shouldConfigureTraceResponseObservationWebFilter() {
+		this.contextRunner.withPropertyValues("management.observations.http.server.requests.write-traceresponse=true")
+			.withBean(Tracer.class, SimpleTracer::new)
+			.run((context) -> assertThat(context).hasSingleBean(TraceResponseObservationWebFilter.class));
+	}
+
 	private MeterRegistry getInitializedMeterRegistry(AssertableReactiveWebApplicationContext context) {
 		return getInitializedMeterRegistry(context, "http.server.requests");
 	}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/WebMvcObservationAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/WebMvcObservationAutoConfigurationTests.java
index d044fdec7f6d..b152bf71d60d 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/WebMvcObservationAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/WebMvcObservationAutoConfigurationTests.java
@@ -20,7 +20,6 @@
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.observation.tck.TestObservationRegistry;
-import io.micrometer.tracing.Tracer;
 import jakarta.servlet.DispatcherType;
 import jakarta.servlet.Filter;
 import org.junit.jupiter.api.Test;
@@ -31,6 +30,7 @@
 import org.springframework.boot.actuate.autoconfigure.metrics.web.TestController;
 import org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.tracing.NoopTracerAutoConfiguration;
+import org.springframework.boot.actuate.web.tracing.servlet.TraceResponseHeaderObservationFilter;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
@@ -78,7 +78,7 @@ void definesFilterWhenRegistryIsPresent() {
 			assertThat(context).hasSingleBean(FilterRegistrationBean.class);
 			assertThat(context.getBean(FilterRegistrationBean.class).getFilter())
 				.isInstanceOf(ServerHttpObservationFilter.class)
-				.isNotInstanceOf(TraceHeaderObservationFilter.class);
+				.isNotInstanceOf(TraceResponseHeaderObservationFilter.class);
 		});
 	}
 
@@ -132,18 +132,18 @@ void filterRegistrationDoesNotBackOffWithOtherFilter() {
 	@Test
 	void usesTracingFilterWhenTracingIsPresentAndEnabled() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(NoopTracerAutoConfiguration.class))
-			.withPropertyValues("management.observations.http.server.requests.write-trace-header=true")
+			.withPropertyValues("management.observations.http.server.requests.write-traceresponse=true")
 			.run((context) -> {
 				assertThat(context).hasSingleBean(FilterRegistrationBean.class);
 				assertThat(context.getBean(FilterRegistrationBean.class).getFilter())
-					.isInstanceOf(TraceHeaderObservationFilter.class);
+					.isInstanceOf(TraceResponseHeaderObservationFilter.class);
 			});
 	}
 
 	@Test
 	void tracingFilterRegistrationHasExpectedDispatcherTypesAndOrder() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(NoopTracerAutoConfiguration.class))
-			.withPropertyValues("management.observations.http.server.requests.write-trace-header=true")
+			.withPropertyValues("management.observations.http.server.requests.write-traceresponse=true")
 			.run((context) -> {
 				FilterRegistrationBean<?> registration = context.getBean(FilterRegistrationBean.class);
 				assertThat(registration).hasFieldOrPropertyWithValue("dispatcherTypes",
@@ -155,7 +155,7 @@ void tracingFilterRegistrationHasExpectedDispatcherTypesAndOrder() {
 	@Test
 	void filterRegistrationBacksOffWithAnotherTraceHeaderObservationFilterRegistration() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(NoopTracerAutoConfiguration.class))
-			.withPropertyValues("management.observations.http.server.requests.write-trace-header=true")
+			.withPropertyValues("management.observations.http.server.requests.write-traceresponse=true")
 			.withUserConfiguration(TestTraceHeaderObservationFilterRegistrationConfiguration.class)
 			.run((context) -> {
 				assertThat(context).hasSingleBean(FilterRegistrationBean.class);
@@ -167,10 +167,10 @@ void filterRegistrationBacksOffWithAnotherTraceHeaderObservationFilterRegistrati
 	@Test
 	void filterRegistrationBacksOffWithAnotherTraceHeaderObservationFilter() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(NoopTracerAutoConfiguration.class))
-			.withPropertyValues("management.observations.http.server.requests.write-trace-header=true")
+			.withPropertyValues("management.observations.http.server.requests.write-traceresponse=true")
 			.withUserConfiguration(TestTraceHeaderObservationFilterConfiguration.class)
 			.run((context) -> assertThat(context).doesNotHaveBean(FilterRegistrationBean.class)
-				.hasSingleBean(TraceHeaderObservationFilter.class));
+				.hasSingleBean(TraceResponseHeaderObservationFilter.class));
 	}
 
 	@Test
@@ -254,7 +254,7 @@ static class TestTraceHeaderObservationFilterRegistrationConfiguration {
 
 		@Bean
 		@SuppressWarnings("unchecked")
-		FilterRegistrationBean<TraceHeaderObservationFilter> testTraceHeaderObservationFilter() {
+		FilterRegistrationBean<TraceResponseHeaderObservationFilter> testTraceHeaderObservationFilter() {
 			return mock(FilterRegistrationBean.class);
 		}
 
@@ -264,8 +264,8 @@ FilterRegistrationBean<TraceHeaderObservationFilter> testTraceHeaderObservationF
 	static class TestTraceHeaderObservationFilterConfiguration {
 
 		@Bean
-		TraceHeaderObservationFilter testTraceHeaderObservationFilter() {
-			return new TraceHeaderObservationFilter(Tracer.NOOP, TestObservationRegistry.create());
+		TraceResponseHeaderObservationFilter testTraceHeaderObservationFilter() {
+			return new TraceResponseHeaderObservationFilter(TestObservationRegistry.create());
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-actuator/build.gradle b/spring-boot-project/spring-boot-actuator/build.gradle
index 90a7233376dd..976da9252c9c 100644
--- a/spring-boot-project/spring-boot-actuator/build.gradle
+++ b/spring-boot-project/spring-boot-actuator/build.gradle
@@ -97,6 +97,7 @@ dependencies {
 	testImplementation("org.assertj:assertj-core")
 	testImplementation("com.jayway.jsonpath:json-path")
 	testImplementation("io.micrometer:micrometer-observation-test")
+	testImplementation("io.micrometer:micrometer-tracing-test")
 	testImplementation("io.projectreactor:reactor-test")
 	testImplementation("io.r2dbc:r2dbc-h2")
 	testImplementation("net.minidev:json-smart")
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/tracing/reactive/TraceResponseObservationWebFilter.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/tracing/reactive/TraceResponseObservationWebFilter.java
new file mode 100644
index 000000000000..4882a1399862
--- /dev/null
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/tracing/reactive/TraceResponseObservationWebFilter.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.actuate.web.tracing.reactive;
+
+import io.micrometer.tracing.Span;
+import io.micrometer.tracing.handler.TracingObservationHandler.TracingContext;
+import reactor.core.publisher.Mono;
+
+import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.http.server.reactive.observation.ServerRequestObservationContext;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebFilter;
+import org.springframework.web.server.WebFilterChain;
+
+/**
+ * {@link WebFilter} that writes the current Trace context information in a
+ * {@code "traceresponse"} HTTP response header.
+ *
+ * @author Brian Clozel
+ * @since 3.5.0
+ * @see <a href=
+ * "https://w3c.github.io/trace-context/#trace-context-http-response-headers-format">Trace
+ * Context W3C spec</a>
+ */
+public class TraceResponseObservationWebFilter implements WebFilter {
+
+	@Override
+	public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
+		ServerHttpResponse response = exchange.getResponse();
+		response.beforeCommit(() -> {
+			ServerRequestObservationContext.findCurrent(exchange.getAttributes()).ifPresent((observationContext) -> {
+				TracingContext tracingContext = observationContext.get(TracingContext.class);
+				if (tracingContext != null) {
+					Span currentSpan = tracingContext.getSpan();
+					if (currentSpan != null && !currentSpan.isNoop()) {
+						response.getHeaders().add("traceresponse", createTraceResponseHeader(currentSpan));
+					}
+				}
+			});
+			return Mono.empty();
+		});
+		return chain.filter(exchange);
+	}
+
+	private static String createTraceResponseHeader(Span currentSpan) {
+		StringBuilder traceresponse = new StringBuilder();
+		// version
+		traceresponse.append("00-");
+		// trace-id
+		traceresponse.append(currentSpan.context().traceId());
+		traceresponse.append("-");
+		// child-id
+		traceresponse.append(currentSpan.context().spanId());
+		traceresponse.append("-");
+		// trace-flags
+		traceresponse.append("000000");
+		if (currentSpan.context().parentId() != null) {
+			traceresponse.append("1");
+		}
+		else {
+			traceresponse.append("0");
+		}
+		if (Boolean.TRUE.equals(currentSpan.context().sampled())) {
+			traceresponse.append("1");
+		}
+		else {
+			traceresponse.append("0");
+		}
+		return traceresponse.toString();
+	}
+
+}
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/tracing/reactive/package-info.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/tracing/reactive/package-info.java
new file mode 100644
index 000000000000..505fe67d4fa8
--- /dev/null
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/tracing/reactive/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Actuator tracing support for Reactive applications.
+ */
+package org.springframework.boot.actuate.web.tracing.reactive;
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/tracing/servlet/TraceResponseHeaderObservationFilter.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/tracing/servlet/TraceResponseHeaderObservationFilter.java
new file mode 100644
index 000000000000..1ff6942436fa
--- /dev/null
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/tracing/servlet/TraceResponseHeaderObservationFilter.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.actuate.web.tracing.servlet;
+
+import io.micrometer.observation.Observation.Scope;
+import io.micrometer.observation.ObservationRegistry;
+import io.micrometer.tracing.Span;
+import io.micrometer.tracing.handler.TracingObservationHandler.TracingContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.springframework.http.server.observation.ServerRequestObservationConvention;
+import org.springframework.web.filter.ServerHttpObservationFilter;
+
+/**
+ * {@link ServerHttpObservationFilter} that writes the current Trace context information
+ * in a {@code "traceresponse"} HTTP response header.
+ *
+ * @author Brian Clozel
+ * @since 3.5.0
+ * @see <a href=
+ * "https://w3c.github.io/trace-context/#trace-context-http-response-headers-format">Trace
+ * Context W3C spec</a>
+ */
+public class TraceResponseHeaderObservationFilter extends ServerHttpObservationFilter {
+
+	/**
+	 * Create a {@link TraceResponseHeaderObservationFilter} that will write the
+	 * {@code "traceresponse"} HTTP response header.
+	 * @param observationRegistry the current observation registry
+	 */
+	public TraceResponseHeaderObservationFilter(ObservationRegistry observationRegistry) {
+		super(observationRegistry);
+	}
+
+	/**
+	 * Create a {@link TraceResponseHeaderObservationFilter} that will write the
+	 * {@code "traceresponse"} HTTP response header.
+	 * @param observationRegistry the current observation registry
+	 * @param observationConvention the custom observation convention to use.
+	 */
+	public TraceResponseHeaderObservationFilter(ObservationRegistry observationRegistry,
+			ServerRequestObservationConvention observationConvention) {
+		super(observationRegistry, observationConvention);
+	}
+
+	@Override
+	protected void onScopeOpened(Scope scope, HttpServletRequest request, HttpServletResponse response) {
+		findObservationContext(request).ifPresent((observationContext) -> {
+			TracingContext tracingContext = observationContext.get(TracingContext.class);
+			if (tracingContext != null) {
+				Span currentSpan = tracingContext.getSpan();
+				if (currentSpan != null && !currentSpan.isNoop()) {
+					response.setHeader("traceresponse", createTraceResponseHeader(currentSpan));
+				}
+			}
+		});
+	}
+
+	private static String createTraceResponseHeader(Span currentSpan) {
+		StringBuilder traceresponse = new StringBuilder();
+		// version
+		traceresponse.append("00-");
+		// trace-id
+		traceresponse.append(currentSpan.context().traceId());
+		traceresponse.append("-");
+		// child-id
+		traceresponse.append(currentSpan.context().spanId());
+		traceresponse.append("-");
+		// trace-flags
+		traceresponse.append("000000");
+		if (currentSpan.context().parentId() != null) {
+			traceresponse.append("1");
+		}
+		else {
+			traceresponse.append("0");
+		}
+		if (Boolean.TRUE.equals(currentSpan.context().sampled())) {
+			traceresponse.append("1");
+		}
+		else {
+			traceresponse.append("0");
+		}
+		return traceresponse.toString();
+	}
+
+}
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/tracing/servlet/package-info.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/tracing/servlet/package-info.java
new file mode 100644
index 000000000000..1da3dbb3e43b
--- /dev/null
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/tracing/servlet/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Actuator tracing support for Servlet applications.
+ */
+package org.springframework.boot.actuate.web.tracing.servlet;
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/tracing/reactive/TraceResponseObservationWebFilterTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/tracing/reactive/TraceResponseObservationWebFilterTests.java
new file mode 100644
index 000000000000..1bbb57f7d845
--- /dev/null
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/tracing/reactive/TraceResponseObservationWebFilterTests.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.actuate.web.tracing.reactive;
+
+import java.time.Duration;
+
+import io.micrometer.observation.Observation;
+import io.micrometer.observation.tck.TestObservationRegistry;
+import io.micrometer.tracing.Tracer;
+import io.micrometer.tracing.handler.DefaultTracingObservationHandler;
+import io.micrometer.tracing.test.simple.SimpleTracer;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+import org.springframework.http.server.reactive.observation.ServerRequestObservationContext;
+import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
+import org.springframework.mock.web.server.MockServerWebExchange;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebFilterChain;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link TraceResponseObservationWebFilter}.
+ *
+ * @author Brian Clozel
+ */
+class TraceResponseObservationWebFilterTests {
+
+	TestObservationRegistry observationRegistry = TestObservationRegistry.create();
+
+	TraceResponseObservationWebFilter filter = new TraceResponseObservationWebFilter();
+
+	@Test
+	void shouldWriteTraceHeaderWhenCurrentTrace() {
+		configureTracingSupport(new SimpleTracer());
+		ObservedExchange observedExchange = createObservedExchange();
+		observedExchange.observation()
+			.observe(() -> this.filter.filter(observedExchange.exchange(), new TestWebFilterChain())
+				.block(Duration.ofSeconds(2)));
+		assertThat(observedExchange.exchange().getResponse().getHeaders().getFirst("traceresponse"))
+			.matches("00-[0-9a-f]+-[0-9a-f]+-000000[01]{2}");
+	}
+
+	@Test
+	void shouldWriteTraceHeaderSampledFlagWhenParentSpan() {
+		configureTracingSupport(new SimpleTracer());
+		ObservedExchange observedExchange = createObservedExchange();
+		Observation parentObservation = Observation.createNotStarted("parent", this.observationRegistry);
+		parentObservation.start();
+		observedExchange.observation().parentObservation(parentObservation);
+		observedExchange.observation()
+			.observe(() -> this.filter.filter(observedExchange.exchange(), new TestWebFilterChain())
+				.block(Duration.ofSeconds(2)));
+		parentObservation.stop();
+		assertThat(observedExchange.exchange().getResponse().getHeaders().getFirst("traceresponse"))
+			.matches("00-[0-9a-f]+-[0-9a-f]+-00000010");
+	}
+
+	@Test
+	void shouldNotWriteTraceHeaderWhenNoCurrentTrace() {
+		configureTracingSupport(Tracer.NOOP);
+		ObservedExchange observedExchange = createObservedExchange();
+		observedExchange.observation()
+			.observe(() -> this.filter.filter(observedExchange.exchange(), new TestWebFilterChain())
+				.block(Duration.ofSeconds(2)));
+		assertThat(observedExchange.exchange().getResponse().getHeaders().keySet()).doesNotContain("traceresponse");
+	}
+
+	void configureTracingSupport(Tracer tracer) {
+		this.observationRegistry.observationConfig().observationHandler(new DefaultTracingObservationHandler(tracer));
+	}
+
+	private ObservedExchange createObservedExchange() {
+		MockServerHttpRequest request = MockServerHttpRequest.get("/test").build();
+		MockServerWebExchange exchange = MockServerWebExchange.from(request);
+		Observation observation = Observation.createNotStarted("http.server.requests",
+				() -> new ServerRequestObservationContext(exchange.getRequest(), exchange.getResponse(),
+						exchange.getRequest().getAttributes()),
+				this.observationRegistry);
+		exchange.getAttributes()
+			.put(ServerRequestObservationContext.CURRENT_OBSERVATION_CONTEXT_ATTRIBUTE, observation.getContext());
+		return new ObservedExchange(exchange, observation);
+	}
+
+	private record ObservedExchange(MockServerWebExchange exchange, Observation observation) {
+	}
+
+	static class TestWebFilterChain implements WebFilterChain {
+
+		@Override
+		public Mono<Void> filter(ServerWebExchange exchange) {
+			return exchange.getResponse().setComplete();
+		}
+
+	}
+
+}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/TraceHeaderObservationFilterTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/tracing/servlet/TraceResponseHeaderObservationFilterTests.java
similarity index 61%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/TraceHeaderObservationFilterTests.java
rename to spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/tracing/servlet/TraceResponseHeaderObservationFilterTests.java
index 75d7a7a13ff2..fadef1f12e70 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/TraceHeaderObservationFilterTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/tracing/servlet/TraceResponseHeaderObservationFilterTests.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.observation.web.servlet;
+package org.springframework.boot.actuate.web.tracing.servlet;
 
 import io.micrometer.observation.tck.TestObservationRegistry;
 import io.micrometer.tracing.Tracer;
 import io.micrometer.tracing.handler.DefaultTracingObservationHandler;
+import io.micrometer.tracing.test.simple.SimpleSpan;
 import io.micrometer.tracing.test.simple.SimpleTracer;
 import jakarta.servlet.FilterChain;
 import org.junit.jupiter.api.Test;
@@ -29,33 +30,44 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link TraceHeaderObservationFilter}.
+ * Tests for {@link TraceResponseHeaderObservationFilter}.
  *
  * @author Brian Clozel
  */
-class TraceHeaderObservationFilterTests {
+class TraceResponseHeaderObservationFilterTests {
 
 	TestObservationRegistry observationRegistry = TestObservationRegistry.create();
 
 	@Test
 	void shouldWriteTraceHeaderWhenCurrentTrace() throws Exception {
-		TraceHeaderObservationFilter filter = createFilter(new SimpleTracer());
+		TraceResponseHeaderObservationFilter filter = createFilter(new SimpleTracer());
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		filter.doFilter(new MockHttpServletRequest(), response, getFilterChain());
-		assertThat(response.getHeader("X-Trace-Id")).isNotEmpty();
+		assertThat(response.getHeader("traceresponse")).matches("00-[0-9a-f]+-[0-9a-f]+-000000[01]{2}");
+	}
+
+	@Test
+	void shouldWriteTraceHeaderSampledFlagWhenParentSpan() throws Exception {
+		SimpleTracer simpleTracer = new SimpleTracer();
+		// create a parent span
+		SimpleSpan parentSpan = simpleTracer.nextSpan();
+		TraceResponseHeaderObservationFilter filter = createFilter(simpleTracer);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		filter.doFilter(new MockHttpServletRequest(), response, getFilterChain());
+		assertThat(response.getHeader("traceresponse")).matches("00-[0-9a-f]+-[0-9a-f]+-00000010");
 	}
 
 	@Test
 	void shouldNotWriteTraceHeaderWhenNoCurrentTrace() throws Exception {
-		TraceHeaderObservationFilter filter = createFilter(Tracer.NOOP);
+		TraceResponseHeaderObservationFilter filter = createFilter(Tracer.NOOP);
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		filter.doFilter(new MockHttpServletRequest(), response, getFilterChain());
-		assertThat(response.getHeaderNames()).doesNotContain("X-Trace-Id");
+		assertThat(response.getHeaderNames()).doesNotContain("traceresponse");
 	}
 
-	private TraceHeaderObservationFilter createFilter(Tracer tracer) {
+	private TraceResponseHeaderObservationFilter createFilter(Tracer tracer) {
 		this.observationRegistry.observationConfig().observationHandler(new DefaultTracingObservationHandler(tracer));
-		return new TraceHeaderObservationFilter(tracer, this.observationRegistry);
+		return new TraceResponseHeaderObservationFilter(this.observationRegistry);
 	}
 
 	private static FilterChain getFilterChain() {
diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/metrics.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/metrics.adoc
index 7a43a7bf3ae5..caae60d02ecb 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/metrics.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/metrics.adoc
@@ -775,8 +775,9 @@ See the {url-spring-framework-docs}/integration/observability.html#observability
 To add to the default tags, provide a javadoc:org.springframework.context.annotation.Bean[format=annotation] that extends javadoc:org.springframework.http.server.observation.DefaultServerRequestObservationConvention[] from the `org.springframework.http.server.observation` package.
 To replace the default tags, provide a javadoc:org.springframework.context.annotation.Bean[format=annotation] that implements javadoc:org.springframework.http.server.observation.ServerRequestObservationConvention[].
 
-If the application is using xref:actuator/tracing.adoc#actuator.micrometer-tracing[tracing], you can configure the HTTP server observations to include an `X-Trace-Id`
-HTTP response header containing the current trace ID. For that, you will need to enable the following configuration property: configprop:management.observations.http.server.requests.write-trace-header[].
+If the application is using xref:actuator/tracing.adoc#actuator.micrometer-tracing[tracing], you can configure the HTTP server observations to include a
+https://w3c.github.io/trace-context/#trace-context-http-response-headers-format[`traceresponse` HTTP response header] containing the current trace context information.
+For that, you will need to enable the following configuration property: configprop:management.observations.http.server.requests.write-traceresponse[].
 
 TIP: In some cases, exceptions handled in web controllers are not recorded as request metrics tags.
 Applications can opt in and record exceptions by xref:web/servlet.adoc#web.servlet.spring-mvc.error-handling[setting handled exceptions as request attributes].