Skip to content
Draft
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,18 @@ public class RequestContextConstants {

public static final String AUTHORIZATION_HEADER = "authorization";

public static final String CTX_HEADER_PREFIX = "x-ctx-";
public static final String CTX_TENANT_ID_KEY = CTX_HEADER_PREFIX + "tenant-id";
public static final String CTX_REQUEST_ID_KEY = CTX_HEADER_PREFIX + "request-id";
public static final String CTX_CONTEXT_ID_KEY = CTX_HEADER_PREFIX + "context-id";
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only CTX_HEADER_PREFIX + "id"


/** The values in this set are looked up with case insensitivity. */
public static final Set<String> HEADER_PREFIXES_TO_BE_PROPAGATED =
Set.of(
TENANT_ID_HEADER_KEY,
CONTEXT_ID_HEADER_KEY,
SUPPRESS_USER_TRACKING_HEADER_KEY,
CTX_HEADER_PREFIX,
"X-B3-",
"grpc-trace-bin",
"traceparent",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package org.hypertrace.core.grpcutils.server;

import static org.hypertrace.core.grpcutils.context.RequestContextConstants.CONTEXT_ID_HEADER_KEY;
import static org.hypertrace.core.grpcutils.context.RequestContextConstants.CTX_CONTEXT_ID_KEY;
import static org.hypertrace.core.grpcutils.context.RequestContextConstants.CTX_HEADER_PREFIX;
import static org.hypertrace.core.grpcutils.context.RequestContextConstants.CTX_REQUEST_ID_KEY;
import static org.hypertrace.core.grpcutils.context.RequestContextConstants.CTX_TENANT_ID_KEY;
import static org.hypertrace.core.grpcutils.context.RequestContextConstants.REQUEST_ID_HEADER_KEY;
import static org.hypertrace.core.grpcutils.context.RequestContextConstants.TENANT_ID_HEADER_KEY;

Expand Down Expand Up @@ -66,9 +70,13 @@ public void onComplete() {
@Override
public void onMessage(ReqT message) {
try {
MDC.put(REQUEST_ID_HEADER_KEY, requestId);
opTenantId.ifPresent(s -> MDC.put(TENANT_ID_HEADER_KEY, s));
opContextId.ifPresent(s -> MDC.put(CONTEXT_ID_HEADER_KEY, s));
MDC.put(CTX_REQUEST_ID_KEY, requestId);
opTenantId.ifPresent(s -> MDC.put(CTX_TENANT_ID_KEY, s));
opContextId.ifPresent(s -> MDC.put(CTX_CONTEXT_ID_KEY, s));
currentContext.getAllHeaders().stream()
.filter(header -> header.getName().startsWith(CTX_HEADER_PREFIX))
.filter(header -> header.getValue() != null)
.forEach(header -> MDC.put(header.getName(), header.getValue()));
} catch (Exception e) {
log.error("Error while setting request context details in MDC params", e);
}
Expand Down
Loading