From 3c09ac4e27ecba24fe8e2664eab820f6d57e8d2a Mon Sep 17 00:00:00 2001 From: ElliotG Date: Mon, 27 Mar 2023 09:42:08 -0600 Subject: [PATCH 1/2] Change from Warning to Error --- provisionerd/runner/runner.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisionerd/runner/runner.go b/provisionerd/runner/runner.go index 7e8f0f689a807..6bfcd6138dfb7 100644 --- a/provisionerd/runner/runner.go +++ b/provisionerd/runner/runner.go @@ -900,7 +900,7 @@ func (r *Runner) buildWorkspace(ctx context.Context, stage string, req *sdkproto }) case *sdkproto.Provision_Response_Complete: if msgType.Complete.Error != "" { - r.logger.Warn(context.Background(), "provision failed; updating state", + r.logger.Error(context.Background(), "provision failed; updating state", slog.F("state_length", len(msgType.Complete.State)), slog.F("error", msgType.Complete.Error), ) From 0b58a2fbbe1c29681fed4efa51af9778f76542d2 Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Wed, 5 Apr 2023 12:59:20 -0500 Subject: [PATCH 2/2] use `IgnoreErrors: true` in slogtest --- provisionerd/provisionerd_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provisionerd/provisionerd_test.go b/provisionerd/provisionerd_test.go index e15a79cf28d4f..fc6fb4282bcd9 100644 --- a/provisionerd/provisionerd_test.go +++ b/provisionerd/provisionerd_test.go @@ -1011,7 +1011,7 @@ func TestProvisionerd(t *testing.T) { t.Cleanup(func() { close(done) }) - logger := slogtest.Make(t, nil) + logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}) m := sync.Mutex{} var ops []string completeChan := make(chan struct{}) @@ -1120,7 +1120,7 @@ func createTar(t *testing.T, files map[string]string) []byte { // Creates a provisionerd implementation with the provided dialer and provisioners. func createProvisionerd(t *testing.T, dialer provisionerd.Dialer, provisioners provisionerd.Provisioners) *provisionerd.Server { server := provisionerd.New(dialer, &provisionerd.Options{ - Logger: slogtest.Make(t, nil).Named("provisionerd").Leveled(slog.LevelDebug), + Logger: slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Named("provisionerd").Leveled(slog.LevelDebug), JobPollInterval: 50 * time.Millisecond, UpdateInterval: 50 * time.Millisecond, Provisioners: provisioners,