core: replace zap with logtree
Test Plan: Effective refactor. Only tests that could be affected are e2e tests that should continue to run, because we still are logging into the qemu console, even if differently.
X-Origin-Diff: phab/D642
GitOrigin-RevId: 0f12b1bc985af08a3cc269569273184321763e4b
diff --git a/core/internal/containerd/BUILD.bazel b/core/internal/containerd/BUILD.bazel
index 16269d1..5c74a63 100644
--- a/core/internal/containerd/BUILD.bazel
+++ b/core/internal/containerd/BUILD.bazel
@@ -11,7 +11,6 @@
"//core/pkg/logbuffer:go_default_library",
"@com_github_containerd_containerd//:go_default_library",
"@com_github_containerd_containerd//namespaces:go_default_library",
- "@org_uber_go_zap//:go_default_library",
],
)
diff --git a/core/internal/containerd/main.go b/core/internal/containerd/main.go
index 0c6d497..192039e 100644
--- a/core/internal/containerd/main.go
+++ b/core/internal/containerd/main.go
@@ -24,15 +24,14 @@
"os"
"os/exec"
"path/filepath"
+ "strings"
"time"
ctr "github.com/containerd/containerd"
"github.com/containerd/containerd/namespaces"
- "go.uber.org/zap"
-
- "git.monogon.dev/source/nexantic.git/core/internal/localstorage"
"git.monogon.dev/source/nexantic.git/core/internal/common/supervisor"
+ "git.monogon.dev/source/nexantic.git/core/internal/localstorage"
"git.monogon.dev/source/nexantic.git/core/pkg/logbuffer"
)
@@ -75,7 +74,7 @@
// debug logs) is not an issue for us.
time.Sleep(10 * time.Millisecond)
} else if err != nil {
- logger.Error("gVisor log pump failed, stopping it", zap.Error(err))
+ logger.Errorf("gVisor log pump failed, stopping it: %v", err)
return // It's likely that this will busy-loop printing errors if it encounters one, so bail
}
}
@@ -111,7 +110,7 @@
}
for _, dir := range preseedNamespaceDirs {
if !dir.IsDir() {
- logger.Warn("Non-Directory found in preseed folder, ignoring", zap.String("name", dir.Name()))
+ logger.Warningf("Non-Directory %q found in preseed folder, ignoring", dir.Name())
continue
}
namespace := dir.Name()
@@ -122,7 +121,7 @@
ctxWithNS := namespaces.WithNamespace(ctx, namespace)
for _, image := range images {
if image.IsDir() {
- logger.Warn("Directory found in preseed namespaced folder, ignoring", zap.String("name", image.Name()))
+ logger.Warningf("Directory %q found in preseed namespaced folder, ignoring", image.Name())
continue
}
imageFile, err := os.Open(filepath.Join(preseedNamespacesDir, namespace, image.Name()))
@@ -140,8 +139,7 @@
for _, img := range importedImages {
importedImageNames = append(importedImageNames, img.Name)
}
- logger.Info("Successfully imported preseeded bundle into containerd",
- zap.String("namespace", namespace), zap.Strings("images", importedImageNames))
+ logger.Infof("Successfully imported preseeded bundle %s/%s into containerd", namespace, strings.Join(importedImageNames, ","))
}
}
supervisor.Signal(ctx, supervisor.SignalHealthy)