Skip to content

AddHttpHeaderToLogContextFilter: Filter immediately for getField presence #184

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

Merged
merged 1 commit into from
Jul 19, 2024
Merged

AddHttpHeaderToLogContextFilter: Filter immediately for getField presence #184

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
13 changes: 6 additions & 7 deletions ...src/main/java/com/sap/hcp/cf/logging/servlet/filter/AddHttpHeadersToLogContextFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.stream.Stream;

import javax.servlet.http.HttpServletRequest;
Expand All @@ -23,8 +22,8 @@
*/
public class AddHttpHeadersToLogContextFilter extends AbstractLoggingFilter {

private List<HttpHeader> headers;
private List<String> fields;
private final List<HttpHeader> headers;
private final List<String> fields;

/**
* The default constructor uses {@link HttpHeaders#propagated()} to define
Expand Down Expand Up @@ -53,16 +52,16 @@ public AddHttpHeadersToLogContextFilter(HttpHeader... headers) {
*/
public AddHttpHeadersToLogContextFilter(List<? extends HttpHeader> list, HttpHeader... custom) {
Stream<HttpHeader> allHeaders = Stream.concat(list.stream(), Arrays.stream(custom));
this.headers = unmodifiableList(allHeaders.filter(HttpHeader::isPropagated).collect(toList()));
this.fields = unmodifiableList(headers.stream().map(HttpHeader::getField).filter(Objects::nonNull).collect(
toList()));
this.headers = unmodifiableList(allHeaders
.filter(HttpHeader::isPropagated).filter(h -> h.getField() != null).collect(toList()));
this.fields = unmodifiableList(headers.stream().map(HttpHeader::getField).collect(toList()));
}

@Override
protected void beforeFilter(HttpServletRequest request, HttpServletResponse response) {
for (HttpHeader header: headers) {
String headerValue = HttpHeaderUtilities.getHeaderValue(request, header);
if (header.getField() != null && headerValue != null) {
if (headerValue != null) {
LogContext.add(header.getField(), headerValue);
}
}
Expand Down