Skip to content

fill correlation id MDC property from basic properties native field r… #238

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
Aug 6, 2024
Merged

fill correlation id MDC property from basic properties native field r… #238

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions common/src/main/java/org/iris_events/common/MDCEnricher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import static org.iris_events.common.MessagingHeaders.Message.CLIENT_TRACE_ID;
import static org.iris_events.common.MessagingHeaders.Message.CLIENT_VERSION;
import static org.iris_events.common.MessagingHeaders.Message.CORRELATION_ID;
import static org.iris_events.common.MessagingHeaders.Message.EVENT_TYPE;
import static org.iris_events.common.MessagingHeaders.Message.SESSION_ID;
import static org.iris_events.common.MessagingHeaders.Message.USER_ID;
Expand All @@ -20,7 +19,7 @@ public static void enrichMDC(final AMQP.BasicProperties properties) {
getStringHeader(properties, SESSION_ID).ifPresent(s -> MDC.put(MDCProperties.SESSION_ID, s));
getStringHeader(properties, USER_ID).ifPresent(s -> MDC.put(MDCProperties.USER_ID, s));
getStringHeader(properties, CLIENT_TRACE_ID).ifPresent(s -> MDC.put(MDCProperties.CLIENT_TRACE_ID, s));
getStringHeader(properties, CORRELATION_ID).ifPresent(s -> MDC.put(MDCProperties.CORRELATION_ID, s));
Optional.ofNullable(properties.getCorrelationId()).ifPresent(s -> MDC.put(MDCProperties.CORRELATION_ID, s));
getStringHeader(properties, EVENT_TYPE).ifPresent(s -> MDC.put(MDCProperties.EVENT_TYPE, s));
getStringHeader(properties, CLIENT_VERSION).ifPresent(s -> MDC.put(MDCProperties.CLIENT_VERSION, s));
}
Expand Down
1 change: 0 additions & 1 deletion common/src/main/java/org/iris_events/common/MessagingHeaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public static class Message {
public static final String REQUEST_URI = "x-request-uri";
public static final String SERVER_TIMESTAMP = "x-server-timestamp";
public static final String SUBSCRIPTION_ID = "x-subscription-id";
public static final String CORRELATION_ID = "x-correlation-id";
public static final String CACHE_TTL = "x-cache-ttl";
public static final String CLIENT_VERSION = "x-client-version";
}
Expand Down