Skip to content

Distributted logging for scan-id #90

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

Draft
Mayur-Rokade78 wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Distributted logging for scan-id #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ad6a12
changes
Mayur-Rokade78 Mar 3, 2026
da6be47
changes
Mayur-Rokade78 Mar 3, 2026
5085a8c
nit
Mayur-Rokade78 Mar 3, 2026
de6ab58
nit
Mayur-Rokade78 Mar 3, 2026
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: 3 additions & 0 deletions ...xt-utils/src/main/java/org/hypertrace/core/grpcutils/context/RequestContextConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,15 @@ public class RequestContextConstants {

public static final String AUTHORIZATION_HEADER = "authorization";

public static final String CTX_HEADER_PREFIX = "x-ctx-";

/** 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
20 changes: 20 additions & 0 deletions ...ontext-utils/src/main/java/org/hypertrace/core/grpcutils/context/ScanMetadataBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package org.hypertrace.core.grpcutils.context;

import static org.hypertrace.core.grpcutils.context.RequestContextConstants.REQUEST_ID_HEADER_KEY;
import static org.hypertrace.core.grpcutils.context.RequestContextConstants.TENANT_ID_HEADER_KEY;

import io.grpc.Metadata;

public class ScanMetadataBuilder {

public static final String CTX_SCAN_ID_HEADER_KEY = "x-ctx-scan-id";
Copy link

Copilot AI Mar 3, 2026

Choose a reason for hiding this comment

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

CTX_SCAN_ID_HEADER_KEY is a request-context header constant, but it's defined in ScanMetadataBuilder rather than alongside the other shared header constants in RequestContextConstants (e.g., TENANT_ID_HEADER_KEY, REQUEST_ID_HEADER_KEY, CTX_HEADER_PREFIX). Moving it (and optionally a Metadata.Key<String> form) into RequestContextConstants would make it easier for other modules to consistently reference the same header name and avoid duplication.

Suggested change
public static final String CTX_SCAN_ID_HEADER_KEY = "x-ctx-scan-id";
private static final String CTX_SCAN_ID_HEADER_KEY = "x-ctx-scan-id";

Copilot uses AI. Check for mistakes.

public static Metadata build(String tenantId, String requestId, String scanId) {
Metadata metadata = new Metadata();
metadata.put(Metadata.Key.of(TENANT_ID_HEADER_KEY, Metadata.ASCII_STRING_MARSHALLER), tenantId);
metadata.put(
Metadata.Key.of(REQUEST_ID_HEADER_KEY, Metadata.ASCII_STRING_MARSHALLER), requestId);
metadata.put(Metadata.Key.of(CTX_SCAN_ID_HEADER_KEY, Metadata.ASCII_STRING_MARSHALLER), scanId);
return metadata;
Comment on lines +12 to +18
Copy link

Copilot AI Mar 3, 2026

Choose a reason for hiding this comment

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

ScanMetadataBuilder is a new API surface for constructing outbound metadata, but there are no unit tests validating that the expected keys/values are set (tenant, request-id, and scan-id). Since grpc-context-utils already has a test suite, adding a small test for ScanMetadataBuilder.build(...) would help catch accidental header name regressions.

Copilot uses AI. Check for mistakes.
}
}
4 changes: 4 additions & 0 deletions ...ain/java/org/hypertrace/core/grpcutils/server/RequestContextLoggingServerInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
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_HEADER_PREFIX;
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 @@ -69,6 +70,9 @@ public void onMessage(ReqT message) {
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));
currentContext.getAllHeaders().stream()
.filter(header -> header.getName().startsWith(CTX_HEADER_PREFIX))
Copy link

Copilot AI Mar 3, 2026

Choose a reason for hiding this comment

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

The startsWith(CTX_HEADER_PREFIX) check is case-sensitive, but RequestContext preserves the original header name case (e.g., a caller could have put X-CTX-scan-id). This can cause x-ctx-* headers to be skipped and not logged in MDC. Consider performing a case-insensitive prefix check (e.g., compare on toLowerCase() or use regionMatches(true, ...)).

Suggested change
.filter(header -> header.getName().startsWith(CTX_HEADER_PREFIX))
.filter(
header ->
header
.getName()
.regionMatches(
true, 0, CTX_HEADER_PREFIX, 0, CTX_HEADER_PREFIX.length()))

Copilot uses AI. Check for mistakes.
Copy link

Copilot AI Mar 3, 2026

Choose a reason for hiding this comment

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

RequestContext.put(...) allows null header values, but this code unconditionally calls MDC.put(header.getName(), header.getValue()). SLF4J MDC implementations commonly reject null values (and even if allowed, it can lead to confusing log output). Consider filtering out headers with null values (similar to RequestContextAsCreds.applyRequestContext) or using MDC.remove(key) when the value is null.

Suggested change
.filter(header -> header.getName().startsWith(CTX_HEADER_PREFIX))
.filter(header -> header.getName().startsWith(CTX_HEADER_PREFIX))
.filter(header -> header.getValue() != null)

Copilot uses AI. Check for mistakes.
.forEach(header -> MDC.put(header.getName(), header.getValue()));
Comment on lines +73 to +75
Copy link

Copilot AI Mar 3, 2026

Choose a reason for hiding this comment

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

This change introduces new behavior (propagating all x-ctx-* headers into MDC) but grpc-server-utils currently has no test coverage for RequestContextLoggingServerInterceptor. Adding a unit test that asserts x-ctx-* headers appear in MDC on onMessage() and are cleared on onComplete()/onCancel() would help prevent regressions.

Copilot uses AI. Check for mistakes.
} catch (Exception e) {
log.error("Error while setting request context details in MDC params", e);
}
Expand Down
Loading