tracing: add option to inject trace ID into logrus fields#13117
Merged
mxpv merged 1 commit intocontainerd:mainfrom Apr 1, 2026
Merged
tracing: add option to inject trace ID into logrus fields#13117mxpv merged 1 commit intocontainerd:mainfrom
mxpv merged 1 commit intocontainerd:mainfrom
Conversation
Introduce functional options to NewLogrusHook to allow optional Trace ID injection into log fields. This enables log-trace correlation via the [debug] config without breaking existing external consumers of pkg/tracing. Signed-off-by: Hasan Siddiqui <hasiddiqui@google.com>
samuelkarp
reviewed
Mar 30, 2026
samuelkarp
approved these changes
Mar 31, 2026
mxpv
approved these changes
Mar 31, 2026
github-project-automation
Bot
moved this from Needs Reviewers
to Review In Progress
in Pull Request Review
github-project-automation
Bot
moved this from Review In Progress
to Done
in Pull Request Review
This was referenced Apr 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR introduces the ability to inject OpenTelemetry Trace IDs directly into logrus entry fields. This is particularly useful for correlating logs and traces in distributed environments.
Key Changes:
WithTraceIDFieldfunctional option toNewLogrusHookto preserve API stability for external consumers.log_trace_idtoggle to the[debug]section of the containerd configuration.tracing.LogrusHook.Firemethod to extract and set the trace_id field when enabled.Implements #13116.