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/cmd/init/BUILD.bazel b/core/cmd/init/BUILD.bazel
index 8402367..a6d1ee2 100644
--- a/core/cmd/init/BUILD.bazel
+++ b/core/cmd/init/BUILD.bazel
@@ -25,13 +25,13 @@
"//core/internal/localstorage/declarative:go_default_library",
"//core/internal/network:go_default_library",
"//core/internal/network/dns:go_default_library",
+ "//core/pkg/logtree:go_default_library",
"//core/pkg/tpm:go_default_library",
"//core/proto/api:go_default_library",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//codes:go_default_library",
"@org_golang_google_grpc//status:go_default_library",
"@org_golang_x_sys//unix:go_default_library",
- "@org_uber_go_zap//:go_default_library",
],
)
diff --git a/core/cmd/init/main.go b/core/cmd/init/main.go
index 433f435..989f953 100644
--- a/core/cmd/init/main.go
+++ b/core/cmd/init/main.go
@@ -29,9 +29,10 @@
"os/signal"
"runtime/debug"
+ "git.monogon.dev/source/nexantic.git/core/pkg/logtree"
+
"git.monogon.dev/source/nexantic.git/core/internal/network/dns"
- "go.uber.org/zap"
"golang.org/x/sys/unix"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
@@ -79,10 +80,32 @@
panic(fmt.Sprintf("failed to halt node: %v\n", err))
}
}()
- logger, err := zap.NewDevelopment()
+
+ // Set up logger for Smalltown. Currently logs everything to stderr.
+ lt := logtree.New()
+ reader, err := lt.Read("", logtree.WithChildren(), logtree.WithStream())
if err != nil {
- panic(err)
+ panic(fmt.Errorf("could not set up root log reader: %v", err))
}
+ go func() {
+ for {
+ p := <-reader.Stream
+ if p.Leveled != nil {
+ // Use glog-like layout, but with supervisor DN instead of filename.
+ timestamp := p.Leveled.Timestamp()
+ _, month, day := timestamp.Date()
+ hour, minute, second := timestamp.Clock()
+ nsec := timestamp.Nanosecond() / 1000
+ fmt.Fprintf(os.Stderr, "%s%02d%02d %02d:%02d:%02d.%06d %s] %s\n", p.Leveled.Severity(), month, day, hour, minute, second, nsec, p.DN, p.Leveled.Message())
+ }
+ if p.Raw != nil {
+ fmt.Fprintf(os.Stderr, "%-32s R %s\n", p.DN, p.Raw)
+ }
+ }
+ }()
+
+ // Initial logger. Used until we get to a supervisor.
+ logger := lt.MustLeveledFor("init")
// Remount onto a tmpfs and re-exec if needed. Otherwise, keep running.
err = switchRoot(logger)
@@ -92,7 +115,7 @@
// Linux kernel default is 4096 which is far too low. Raise it to 1M which is what gVisor suggests.
if err := unix.Setrlimit(unix.RLIMIT_NOFILE, &unix.Rlimit{Cur: 1048576, Max: 1048576}); err != nil {
- logger.Panic("Failed to raise rlimits", zap.Error(err))
+ logger.Fatalf("Failed to raise rlimits: %v", err)
}
logger.Info("Starting Smalltown Init")
@@ -100,8 +123,8 @@
signalChannel := make(chan os.Signal, 2)
signal.Notify(signalChannel)
- if err := tpm.Initialize(logger.With(zap.String("component", "tpm"))); err != nil {
- logger.Panic("Failed to initialize TPM 2.0", zap.Error(err))
+ if err := tpm.Initialize(logger); err != nil {
+ logger.Fatalf("Failed to initialize TPM 2.0: %v", err)
}
corednsRegistrationChan := make(chan *dns.ExtraDirective)
@@ -127,7 +150,7 @@
// Start root initialization code as a supervisor one-shot runnable. This means waiting for the network, starting
// the cluster manager, and then starting all services related to the node's roles.
// TODO(q3k): move this to a separate 'init' service.
- supervisor.New(ctxS, logger, func(ctx context.Context) error {
+ supervisor.New(ctxS, func(ctx context.Context) error {
logger := supervisor.Logger(ctx)
// Start storage and network - we need this to get anything else done.
@@ -189,7 +212,7 @@
// Ensure Kubernetes PKI objects exist in etcd.
kpkiKV := m.ConsensusKV("cluster", "kpki")
- kpki := pki.NewKubernetes(logger.Named("kpki"), kpkiKV)
+ kpki := pki.NewKubernetes(lt.MustLeveledFor("pki.kubernetes"), kpkiKV)
if err := kpki.EnsureAll(ctx); err != nil {
return fmt.Errorf("failed to ensure kubernetes PKI present: %w", err)
}
@@ -233,7 +256,7 @@
supervisor.Signal(ctx, supervisor.SignalHealthy)
supervisor.Signal(ctx, supervisor.SignalDone)
return nil
- })
+ }, supervisor.WithExistingLogtree(lt))
// We're PID1, so orphaned processes get reparented to us to clean up
for {
@@ -259,7 +282,7 @@
for {
res, err := unix.Wait4(-1, &status, unix.WNOHANG, &rusage)
if err != nil && err != unix.ECHILD {
- logger.Error("Failed to wait on orphaned child", zap.Error(err))
+ logger.Errorf("Failed to wait on orphaned child: %v", err)
break
}
if res <= 0 {
@@ -271,11 +294,11 @@
// In order not to break backwards compatibility in the unlikely case
// of an application actually using SIGURG on its own, they're not filtering them.
// (https://github.com/golang/go/issues/37942)
- logger.Debug("Ignoring SIGURG")
+ logger.V(5).Info("Ignoring SIGURG")
// TODO(lorenz): We can probably get more than just SIGCHLD as init, but I can't think
// of any others right now, just log them in case we hit any of them.
default:
- logger.Warn("Got unexpected signal", zap.String("signal", sig.String()))
+ logger.Warningf("Got unexpected signal %s", sig.String())
}
}
}
diff --git a/core/cmd/init/switchroot.go b/core/cmd/init/switchroot.go
index d51b1fa..8308a25 100644
--- a/core/cmd/init/switchroot.go
+++ b/core/cmd/init/switchroot.go
@@ -25,14 +25,15 @@
"strings"
"syscall"
- "go.uber.org/zap"
+ "git.monogon.dev/source/nexantic.git/core/pkg/logtree"
+
"golang.org/x/sys/unix"
)
// switchRoot moves the root from initramfs into a tmpfs
// This is necessary because you cannot pivot_root from a initramfs (and runsc wants to do that).
// In the future, we should instead use something like squashfs instead of an initramfs and just nuke this.
-func switchRoot(log *zap.Logger) error {
+func switchRoot(log logtree.LeveledLogger) error {
// We detect the need to remount to tmpfs over env vars.
// The first run of /init (from initramfs) will not have this var, and will be re-exec'd from a new tmpfs root with
// that variable set.
@@ -78,7 +79,10 @@
return fmt.Errorf("could not list root files: %w", err)
}
- log.Info("Copying to tmpfs", zap.Strings("paths", paths), zap.Strings("dirs", dirs))
+ log.Info("Copying paths to tmpfs:")
+ for _, p := range paths {
+ log.Infof(" - %s", p)
+ }
// Make new root at /mnt
if err := os.Mkdir("/mnt", 0755); err != nil {
diff --git a/core/cmd/nanoswitch/BUILD b/core/cmd/nanoswitch/BUILD
index c70e20f..92044e6 100644
--- a/core/cmd/nanoswitch/BUILD
+++ b/core/cmd/nanoswitch/BUILD
@@ -17,7 +17,6 @@
"@com_github_insomniacslk_dhcp//dhcpv4/server4:go_default_library",
"@com_github_vishvananda_netlink//:go_default_library",
"@org_golang_x_sys//unix:go_default_library",
- "@org_uber_go_zap//:go_default_library",
],
)
diff --git a/core/cmd/nanoswitch/nanoswitch.go b/core/cmd/nanoswitch/nanoswitch.go
index 73e5135..7f17b1e 100644
--- a/core/cmd/nanoswitch/nanoswitch.go
+++ b/core/cmd/nanoswitch/nanoswitch.go
@@ -36,7 +36,6 @@
"github.com/insomniacslk/dhcp/dhcpv4"
"github.com/insomniacslk/dhcp/dhcpv4/server4"
"github.com/vishvananda/netlink"
- "go.uber.org/zap"
"golang.org/x/sys/unix"
"git.monogon.dev/source/nexantic.git/core/internal/common"
@@ -73,7 +72,7 @@
}
reply, err := dhcpv4.NewReplyFromRequest(m)
if err != nil {
- supervisor.Logger(ctx).Warn("Failed to generate DHCP reply", zap.Error(err))
+ supervisor.Logger(ctx).Warningf("Failed to generate DHCP reply: %v", err)
return
}
reply.UpdateOption(dhcpv4.OptServerIdentifier(switchIP))
@@ -85,7 +84,7 @@
defaultLeaseOptions(reply)
currentIP[3]++ // Works only because it's a /24
reply.YourIPAddr = currentIP
- supervisor.Logger(ctx).Info("Replying with DHCP IP", zap.String("ip", reply.YourIPAddr.String()))
+ supervisor.Logger(ctx).Infof("Replying with DHCP IP %s", reply.YourIPAddr.String())
case dhcpv4.MessageTypeRequest:
reply.UpdateOption(dhcpv4.OptMessageType(dhcpv4.MessageTypeAck))
defaultLeaseOptions(reply)
@@ -94,7 +93,7 @@
supervisor.Logger(ctx).Info("Ignoring Release/Decline")
}
if _, err := conn.WriteTo(reply.ToBytes(), peer); err != nil {
- supervisor.Logger(ctx).Warn("Cannot reply to client", zap.Error(err))
+ supervisor.Logger(ctx).Warningf("Cannot reply to client: %v", err)
}
})
if err != nil {
@@ -134,7 +133,7 @@
defer conn.Close()
upstreamConn, err := net.DialTCP("tcp", nil, &net.TCPAddr{IP: targetIP, Port: int(port)})
if err != nil {
- logger.Info("Userspace proxy failed to connect to upstream", zap.Error(err))
+ logger.Infof("Userspace proxy failed to connect to upstream: %v", err)
return
}
defer upstreamConn.Close()
@@ -175,12 +174,7 @@
}
func main() {
- logger, err := zap.NewDevelopment()
- if err != nil {
- panic(err)
- }
-
- supervisor.New(context.Background(), logger, func(ctx context.Context) error {
+ supervisor.New(context.Background(), func(ctx context.Context) error {
logger := supervisor.Logger(ctx)
logger.Info("Starting NanoSwitch, a tiny TOR switch emulator")
@@ -207,7 +201,7 @@
links, err := netlink.LinkList()
if err != nil {
- logger.Panic("Failed to list links", zap.Error(err))
+ logger.Fatalf("Failed to list links: %v", err)
}
var externalLink netlink.Link
var vmLinks []netlink.Link
@@ -226,16 +220,16 @@
}
vmBridgeLink := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: "vmbridge", Flags: net.FlagUp}}
if err := netlink.LinkAdd(vmBridgeLink); err != nil {
- logger.Panic("Failed to create vmbridge", zap.Error(err))
+ logger.Fatalf("Failed to create vmbridge: %v", err)
}
for _, link := range vmLinks {
if err := netlink.LinkSetMaster(link, vmBridgeLink); err != nil {
- logger.Panic("Failed to add VM interface to bridge", zap.Error(err))
+ logger.Fatalf("Failed to add VM interface to bridge: %v", err)
}
- logger.Info("Assigned interface to bridge", zap.String("if", link.Attrs().Name))
+ logger.Infof("Assigned interface %s to bridge", link.Attrs().Name)
}
if err := netlink.AddrReplace(vmBridgeLink, &netlink.Addr{IPNet: &net.IPNet{IP: switchIP, Mask: switchSubnetMask}}); err != nil {
- logger.Panic("Failed to assign static IP to vmbridge")
+ logger.Fatalf("Failed to assign static IP to vmbridge: %v", err)
}
if externalLink != nil {
nat := c.AddTable(&nftables.Table{
@@ -273,7 +267,7 @@
dhcpClient := dhcp.New()
supervisor.Run(ctx, "dhcp-client", dhcpClient.Run(externalLink))
if err := ioutil.WriteFile("/proc/sys/net/ipv4/ip_forward", []byte("1\n"), 0644); err != nil {
- logger.Panic("Failed to write ip forwards", zap.Error(err))
+ logger.Fatalf("Failed to write ip forwards: %v", err)
}
status, err := dhcpClient.Status(ctx, true)
if err != nil {