dilim/containerd
1
0
Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-08-09 17:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13411 from moosepass/moosepass/fix-tracing-hook-order

Browse Source 
Register tracing log hook before signal handling
This commit is contained in:
Maksym Pavlenko
2026-06-25 04:38:55 +00:00
committed by GitHub
parent ef8a596035 125c15bcd0
commit fc5a32efec
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/containerd/command/main.go
View File

@@ -163,6 +163,12 @@ can be used and modified as necessary as a custom configuration.`
return err
}
// Register the tracing hook as soon as config is available. Later startup
// steps may start goroutines that log, so avoid mutating hooks after hook
// reads may have begun.
tracingHook := tracing.NewLogrusHook(tracing.WithTraceIDField(config.Debug.LogTraceID))
logrus.StandardLogger().AddHook(tracingHook)
// Make sure top-level directories are created early.
if err := server.CreateTopLevelDirectories(config); err != nil {
return err
@@ -195,10 +201,6 @@ can be used and modified as necessary as a custom configuration.`
log.G(ctx).WithError(w).Warn("cleanup temp mount")
}
// Register logging hook for tracing
tracingHook := tracing.NewLogrusHook(tracing.WithTraceIDField(config.Debug.LogTraceID))
logrus.StandardLogger().AddHook(tracingHook)
log.G(ctx).WithFields(log.Fields{
"version": version.Version,
"revision": version.Revision,