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/consensus/consensus_test.go b/core/internal/consensus/consensus_test.go
index 6e225e0..a308cf4 100644
--- a/core/internal/consensus/consensus_test.go
+++ b/core/internal/consensus/consensus_test.go
@@ -26,8 +26,6 @@
"testing"
"time"
- "go.uber.org/zap"
-
"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/internal/localstorage/declarative"
@@ -38,7 +36,6 @@
ctx context.Context
ctxC context.CancelFunc
root *localstorage.Root
- logger *zap.Logger
tmpdir string
}
@@ -56,13 +53,10 @@
os.MkdirAll(root.Data.Etcd.FullPath(), 0700)
os.MkdirAll(root.Ephemeral.Consensus.FullPath(), 0700)
- logger, _ := zap.NewDevelopment()
-
return &boilerplate{
ctx: ctx,
ctxC: ctxC,
root: root,
- logger: logger,
tmpdir: tmp,
}
}
@@ -99,7 +93,7 @@
Port: common.MustConsume(common.AllocateTCPPort()),
})
- supervisor.New(b.ctx, b.logger, etcd.Run)
+ supervisor.New(b.ctx, etcd.Run)
waitEtcd(t, etcd)
kv := etcd.KV("foo", "bar")
@@ -124,7 +118,7 @@
ListenHost: "127.0.0.1",
Port: common.MustConsume(common.AllocateTCPPort()),
})
- supervisor.New(b.ctx, b.logger, etcd.Run)
+ supervisor.New(b.ctx, etcd.Run)
waitEtcd(t, etcd)
id, name, err := etcd.MemberInfo(b.ctx)
@@ -170,7 +164,7 @@
Port: common.MustConsume(common.AllocateTCPPort()),
})
ctx, ctxC := context.WithCancel(b.ctx)
- supervisor.New(ctx, b.logger, etcd.Run)
+ supervisor.New(ctx, etcd.Run)
waitEtcd(t, etcd)
kv := etcd.KV("foo", "bar")
if new {
@@ -215,7 +209,7 @@
ListenHost: "127.0.0.1",
Port: common.MustConsume(common.AllocateTCPPort()),
})
- supervisor.New(b.ctx, b.logger, etcd.Run)
+ supervisor.New(b.ctx, etcd.Run)
waitEtcd(t, etcd)
etcd.stateMu.Lock()