github/zot
1
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2026-06-17 21:17:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: migrate from github.com/rs/zerolog to golang-native log/slog (#3405)

Browse Source 
* fix: migrate from github.com/rs/zerolog to golang-native log/slog

We have been using zerolog for a really long time.
golang now has structured logging using slog.
Best to move to this in interests of long-term support.

This is a tech debt item.

Signed-off-by: Ramkumar Chinchani <rchincha.dev@gmail.com>

* fix: a few changes on top

Signed-off-by: Ramkumar Chinchani <rchincha.dev@gmail.com>

* fix: address comments

Signed-off-by: Ramkumar Chinchani <rchincha.dev@gmail.com>

---------

Signed-off-by: Ramkumar Chinchani <rchincha.dev@gmail.com>
This commit is contained in:
Ramkumar Chinchani
2025-10-03 12:34:03 -07:00
committed by GitHub
parent d5779cfec8
commit b1842ab9e0
65 changed files with 816 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cli/client/cve_cmd_test.go
+6 -6
View File
@@ -50,7 +50,7 @@ func TestNegativeServerResponse(t *testing.T) {
dir := t.TempDir()
srcStorageCtlr := ociutils.GetDefaultStoreController(dir, log.NewLogger("debug", ""))
srcStorageCtlr := ociutils.GetDefaultStoreController(dir, log.NewTestLogger())
err := WriteImageToFileSystem(CreateDefaultVulnerableImage(), "zot-cve-test", "0.0.1", srcStorageCtlr)
So(err, ShouldBeNil)
@@ -82,7 +82,7 @@ func TestNegativeServerResponse(t *testing.T) {
writers := io.MultiWriter(os.Stdout, logFile)
ctlr := api.NewController(conf)
ctlr.Log.Logger = ctlr.Log.Output(writers)
ctlr.Log = log.NewLoggerWithWriter("info", writers)
cm := test.NewControllerManager(ctlr)
cm.StartAndWait(conf.HTTP.Port)
@@ -119,7 +119,7 @@ func TestNegativeServerResponse(t *testing.T) {
dir := t.TempDir()
imageStore := local.NewImageStore(dir, false, false,
log.NewLogger("debug", ""), monitoring.NewMetricsServer(false, log.NewLogger("debug", "")), nil, nil, nil, nil)
log.NewTestLogger(), monitoring.NewMetricsServer(false, log.NewTestLogger()), nil, nil, nil, nil)
storeController := storage.StoreController{
DefaultStore: imageStore,
@@ -163,7 +163,7 @@ func TestNegativeServerResponse(t *testing.T) {
writers := io.MultiWriter(os.Stdout, logFile)
ctlr := api.NewController(conf)
ctlr.Log.Logger = ctlr.Log.Output(writers)
ctlr.Log = log.NewLoggerWithWriter("info", writers)
if err := ctlr.Init(); err != nil {
panic(err)
@@ -238,7 +238,7 @@ func TestCVEDiffList(t *testing.T) {
writers := io.MultiWriter(os.Stdout, logFile)
ctlr := api.NewController(conf)
ctlr.Log.Logger = ctlr.Log.Output(writers)
ctlr.Log = log.NewLoggerWithWriter("info", writers)
if err := ctlr.Init(); err != nil {
panic(err)
@@ -513,7 +513,7 @@ func TestServerCVEResponse(t *testing.T) {
writers := io.MultiWriter(os.Stdout, logFile)
ctlr := api.NewController(conf)
ctlr.Log.Logger = ctlr.Log.Output(writers)
ctlr.Log = log.NewLoggerWithWriter("info", writers)
if err := ctlr.Init(); err != nil {
panic(err)
pkg/cli/client/image_cmd_test.go
+1 -1
View File
@@ -900,7 +900,7 @@ func TestServerResponseGQLWithoutPermissions(t *testing.T) {
dir := t.TempDir()
srcStorageCtlr := ociutils.GetDefaultStoreController(dir, zlog.NewLogger("debug", ""))
srcStorageCtlr := ociutils.GetDefaultStoreController(dir, zlog.NewTestLogger())
err := WriteImageToFileSystem(CreateDefaultImage(), "zot-test", "0.0.1", srcStorageCtlr)
So(err, ShouldBeNil)
pkg/cli/client/root.go
+3 -2
View File
@@ -5,10 +5,10 @@ package client
import (
distspec "github.com/opencontainers/distribution-spec/specs-go"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"zotregistry.dev/zot/pkg/api/config"
"zotregistry.dev/zot/pkg/log"
)
// "zli" - client-side cli.
@@ -21,7 +21,8 @@ func NewCliRootCmd() *cobra.Command {
Long: "`zli`",
Run: func(cmd *cobra.Command, args []string) {
if showVersion {
log.Info().Str("distribution-spec", distspec.Version).Str("commit", config.Commit).
logger := log.NewLogger("info", "")
logger.Info().Str("distribution-spec", distspec.Version).Str("commit", config.Commit).
Str("binary-type", config.BinaryType).Str("go version", config.GoVersion).Msg("version")
} else {
_ = cmd.Usage()