go.mod: github.com/containerd/containerd v1.7.7, containerd/nri v0.4.0, switch to github.com/containerd/log module #598
Conversation
This file contains 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
thaJeztah
commented
Jun 21, 2024
Comment on lines
+242
to
+244
| // FIXME(thaJeztah): ucontainerd's log does not set "PadLevelText: true" | ||
| _ = log.SetFormat(log.TextFormat) | ||
| ctx := log.WithLogger(context.Background(), log.L) |
There was a problem hiding this comment.
This currently uses a different format than what was used before;
- Now uses
RFC3339NanoFixedformat - Now uses
FullTimestamp: true - ❌ does not use
PadLevelText: true
https://github.com/containerd/log/blob/v0.1.0/context.go#L153-L158
case TextFormat:
L.Logger.SetFormatter(&logrus.TextFormatter{
TimestampFormat: RFC3339NanoFixed,
FullTimestamp: true,
})
return nil
Comment on lines
+149
to
+151
| // FIXME(thaJeztah): ucontainerd's log does not set "PadLevelText: true" | ||
| _ = log.SetFormat(log.TextFormat) | ||
| ctx := log.WithLogger(context.Background(), log.L) |
thaJeztah
changed the title
Update to the first release of containerd to alias the log package to the new containerd/log module. This update of the containerd module also comes with an updated version of github.com/containerd/nr, which has some breaking changes in the interface definitions. the optimizer-nri-plugin and prefetchfilees-nri-pugin pacakges had to be updated due to [containerd/nri@9d86150] changing the interface to require a context to be passed. [containerd/nri@9d86150]: containerd/nri@9d86150 Full diffs: - https://github.com/containerd/containerd/v1.7.0...v1.7.7 - containerd/nri@v0.3.0...v0.4.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
switch_to_containerd_log
branch
from
4f9292d
to
0fd3526
Compare
containerd 1.7.7 and up alias the log package to the new module, and deprecate the package. This patch: - replaces existing uses of the log package to use the module - replaces some direct uses of logrus to use the log module - enables the depguard linter to prevent accidental use of the deprecated packages. There is one change in behavior in the nri-plugins, which now use the default format as used by the containerd log module. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
switch_to_containerd_log
branch
from
0fd3526
to
1eee7eb
Compare
|
@imeoer ptal 🤗 |
|
LGTM, thanks for the careful work! :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
go.mod: github.com/containerd/containerd v1.7.7, containerd/nri v0.4.0
Update to the first release of containerd to alias the log package to the new containerd/log module.
This update of the containerd module also comes with an updated version of github.com/containerd/nr, which has some breaking changes in the interface definitions.
the optimizer-nri-plugin and prefetchfilees-nri-pugin pacakges had to be updated due to containerd/nri@9d86150 changing the interface to require a context to be passed.
Full diffs:
switch to github.com/containerd/log module
containerd 1.7.7 and up alias the log package to the new module,
and deprecate the package.
This patch:
There is one change in behavior in the nri-plugins, which now
use the default format as used by the containerd log module.