From 8d869b0d382cb484253f332112b4fec6e9b4b4d8 Mon Sep 17 00:00:00 2001 From: Jessie Liu Date: Fri, 6 Sep 2024 21:40:24 +0000 Subject: [PATCH] text handler and experiment logging --- launcher/internal/experiments/experiments.go | 12 ++++++++++++ launcher/launcher/main.go | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/launcher/internal/experiments/experiments.go b/launcher/internal/experiments/experiments.go index d7a5b891..dacc8ff9 100644 --- a/launcher/internal/experiments/experiments.go +++ b/launcher/internal/experiments/experiments.go @@ -4,6 +4,7 @@ package experiments import ( "encoding/json" "fmt" + "log/slog" "os" ) @@ -44,3 +45,14 @@ func readJSONInput(b []byte) (Experiments, error) { } return experiments, nil } + +func (e Experiments) Log(logger *slog.Logger) { + logger.Info("Experiment settings", + slog.Bool("test_feature", e.EnableTestFeatureForImage), + slog.Bool("signed_container_image", e.EnableSignedContainerImage), + slog.Bool("on_demand_attestation", e.EnableOnDemandAttestation), + slog.Bool("memory_monitoring", e.EnableMemoryMonitoring), + slog.Bool("signed_container_cache", e.EnableSignedContainerCache), + slog.Bool("measure_memory_monitoring", e.EnableMeasureMemoryMonitor), + ) +} diff --git a/launcher/launcher/main.go b/launcher/launcher/main.go index c9ee3e47..efac0d82 100644 --- a/launcher/launcher/main.go +++ b/launcher/launcher/main.go @@ -83,7 +83,7 @@ func main() { } defer serialConsole.Close() - handler := slog.NewJSONHandler(io.MultiWriter(os.Stdout, serialConsole), nil) + handler := slog.NewTextHandler(io.MultiWriter(os.Stdout, serialConsole), nil) logger = slog.New(handler) logger.Info(welcomeMessage, "build_commit", BuildCommit) @@ -122,6 +122,7 @@ func main() { logger.Warn(fmt.Sprintf("failed to read experiment file: %v\n", err)) // do not fail if experiment retrieval fails } + e.Log(logger) launchSpec.Experiments = e defer func() {