Skip to content

Fix traceId discrepancy in case error in servlet web #17134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 6.4.x
Choose a base branch
from
Open

Fix traceId discrepancy in case error in servlet web #17134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions web/src/main/java/org/springframework/security/web/ObservationFilterChainDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationConvention;
import io.micrometer.observation.ObservationRegistry;
import io.micrometer.observation.ObservationView;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
Expand All @@ -46,6 +47,7 @@
* wraps the chain in before and after observations
*
* @author Josh Cummings
* @author Nikita Konev
* @since 6.0
*/
public final class ObservationFilterChainDecorator implements FilterChainProxy.FilterChainDecorator {
Expand All @@ -54,6 +56,12 @@ public final class ObservationFilterChainDecorator implements FilterChainProxy.F

private static final String ATTRIBUTE = ObservationFilterChainDecorator.class + ".observation";

private static final String ATTRIBUTE_BEFORE_OBSERVATION_VIEW = ObservationFilterChainDecorator.class
+ ".observation.view.before";

private static final String ATTRIBUTE_AFTER_OBSERVATION_VIEW = ObservationFilterChainDecorator.class
+ ".observation.view.after";

static final String UNSECURED_OBSERVATION_NAME = "spring.security.http.unsecured.requests";

static final String SECURED_OBSERVATION_NAME = "spring.security.http.secured.requests";
Expand Down Expand Up @@ -250,9 +258,30 @@ private void wrapFilter(ServletRequest request, ServletResponse response, Filter
private AroundFilterObservation parent(HttpServletRequest request) {
FilterChainObservationContext beforeContext = FilterChainObservationContext.before();
FilterChainObservationContext afterContext = FilterChainObservationContext.after();

Object maybeBeforeObservationView = request.getAttribute(ATTRIBUTE_BEFORE_OBSERVATION_VIEW);
if (maybeBeforeObservationView != null) {
ObservationView observationView = (ObservationView) maybeBeforeObservationView;
beforeContext.setParentObservation(observationView);
}

Object maybeAfterObservationView = request.getAttribute(ATTRIBUTE_AFTER_OBSERVATION_VIEW);
if (maybeAfterObservationView != null) {
ObservationView observationView = (ObservationView) maybeAfterObservationView;
afterContext.setParentObservation(observationView);
}

Observation before = Observation.createNotStarted(this.convention, () -> beforeContext, this.registry);
Observation after = Observation.createNotStarted(this.convention, () -> afterContext, this.registry);
AroundFilterObservation parent = AroundFilterObservation.create(before, after);

if (maybeBeforeObservationView == null) {
request.setAttribute(ATTRIBUTE_BEFORE_OBSERVATION_VIEW, before.getContext().getParentObservation());
}
if (maybeAfterObservationView == null) {
request.setAttribute(ATTRIBUTE_AFTER_OBSERVATION_VIEW, after.getContext().getParentObservation());
}

request.setAttribute(ATTRIBUTE, parent);
return parent;
}
Expand Down