spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-25 00:09:02 +00:00
Code Issues Projects Releases Wiki Activity

Complete Propagator.Getter implementation

Browse Source 
As of Micrometer Tracing 1.6.0, the `Propagator.Getter` interface
adds a new `getAll` method with a default implementation return a
singleton collection.

This commit adds the missing implementation override in both Servlet and
Reactor web server contexts.

Fixes gh-35965
This commit is contained in:
Brian Clozel
2025-12-08 11:07:30 +01:00
parent f19f1a667c
commit 9f77f401ad
4 changed files with 125 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/main/java/org/springframework/http/server/observation/ServerRequestObservationContext.java
+19 -1
View File
@@ -16,6 +16,9 @@
package org.springframework.http.server.observation;
import java.util.Collections;
import io.micrometer.observation.transport.Propagator;
import io.micrometer.observation.transport.RequestReplyReceiverContext;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@@ -32,10 +35,12 @@ import org.jspecify.annotations.Nullable;
*/
public class ServerRequestObservationContext extends RequestReplyReceiverContext<HttpServletRequest, HttpServletResponse> {
private static final HeaderGetter GETTER = new HeaderGetter();
private @Nullable String pathPattern;
public ServerRequestObservationContext(HttpServletRequest request, HttpServletResponse response) {
super(HttpServletRequest::getHeader);
super(GETTER);
setCarrier(request);
setResponse(response);
}
@@ -47,4 +52,17 @@ public class ServerRequestObservationContext extends RequestReplyReceiverContext
public void setPathPattern(@Nullable String pathPattern) {
this.pathPattern = pathPattern;
}
static final class HeaderGetter implements Propagator.Getter<HttpServletRequest> {
@Override
public String get(HttpServletRequest carrier, String key) {
return carrier.getHeader(key);
}
@Override
public Iterable<String> getAll(HttpServletRequest carrier, String key) {
return Collections.list(carrier.getHeaders(key));
}
}
}
spring-web/src/main/java/org/springframework/http/server/reactive/observation/ServerRequestObservationContext.java
+16 -1
View File
@@ -20,6 +20,7 @@ import java.util.Collections;
import java.util.Map;
import java.util.Optional;
import io.micrometer.observation.transport.Propagator;
import io.micrometer.observation.transport.RequestReplyReceiverContext;
import org.jspecify.annotations.Nullable;
@@ -46,6 +47,7 @@ public class ServerRequestObservationContext extends RequestReplyReceiverContext
*/
public static final String CURRENT_OBSERVATION_CONTEXT_ATTRIBUTE = ServerRequestObservationContext.class.getName();
private static final HeaderGetter GETTER = new HeaderGetter();
private final Map<String, Object> attributes;
@@ -63,7 +65,7 @@ public class ServerRequestObservationContext extends RequestReplyReceiverContext
public ServerRequestObservationContext(
ServerHttpRequest request, ServerHttpResponse response, Map<String, Object> attributes) {
super((req, key) -> req.getHeaders().getFirst(key));
super(GETTER);
setCarrier(request);
setResponse(response);
this.attributes = Collections.unmodifiableMap(attributes);
@@ -129,4 +131,17 @@ public class ServerRequestObservationContext extends RequestReplyReceiverContext
(ServerRequestObservationContext) attributes.get(CURRENT_OBSERVATION_CONTEXT_ATTRIBUTE));
}
static final class HeaderGetter implements Propagator.Getter<ServerHttpRequest> {
@Override
public @Nullable String get(ServerHttpRequest carrier, String key) {
return carrier.getHeaders().getFirst(key);
}
@Override
public Iterable<String> getAll(ServerHttpRequest carrier, String key) {
return carrier.getHeaders().getOrEmpty(key);
}
}
}