chore: add standard test logger ignoring db canceled (#15556)

Refactors our use of `slogtest` to instantiate a "standard logger" across most of our tests.  This standard logger incorporates https://github.com/coder/slog/pull/217 to also ignore database query canceled errors by default, which are a source of low-severity flakes.

Any test that has set non-default `slogtest.Options` is left alone. In particular, `coderdtest` defaults to ignoring all errors. We might consider revisiting that decision now that we have better tools to target the really common flaky Error logs on shutdown.

coderd/activitybump_test.go

@@ -8,7 +8,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/agent/agenttest"
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/coderd/database"
@@ -203,7 +202,7 @@ func TestWorkspaceActivityBump(t *testing.T) {
 		resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
 		conn, err := workspacesdk.New(client).
 			DialAgent(ctx, resources[0].Agents[0].ID, &workspacesdk.DialAgentOptions{
-				Logger: slogtest.Make(t, nil),
+				Logger: testutil.Logger(t),
 			})
 		require.NoError(t, err)
 		defer conn.Close()
@@ -241,7 +240,7 @@ func TestWorkspaceActivityBump(t *testing.T) {
 		resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
 		conn, err := workspacesdk.New(client).
 			DialAgent(ctx, resources[0].Agents[0].ID, &workspacesdk.DialAgentOptions{
-				Logger: slogtest.Make(t, nil),
+				Logger: testutil.Logger(t),
 			})
 		require.NoError(t, err)
 		defer conn.Close()

coderd/agentapi/apps_test.go

@@ -8,13 +8,12 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 
-	"cdr.dev/slog/sloggers/slogtest"
-
 	agentproto "github.com/coder/coder/v2/agent/proto"
 	"github.com/coder/coder/v2/coderd/agentapi"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbmock"
 	"github.com/coder/coder/v2/coderd/wspubsub"
+	"github.com/coder/coder/v2/testutil"
 )
 
 func TestBatchUpdateAppHealths(t *testing.T) {
@@ -62,7 +61,7 @@ func TestBatchUpdateAppHealths(t *testing.T) {
 				return agent, nil
 			},
 			Database: dbM,
-			Log:      slogtest.Make(t, nil),
+			Log:      testutil.Logger(t),
 			PublishWorkspaceUpdateFn: func(ctx context.Context, wa *database.WorkspaceAgent, kind wspubsub.WorkspaceEventKind) error {
 				publishCalled = true
 				return nil
@@ -100,7 +99,7 @@ func TestBatchUpdateAppHealths(t *testing.T) {
 				return agent, nil
 			},
 			Database: dbM,
-			Log:      slogtest.Make(t, nil),
+			Log:      testutil.Logger(t),
 			PublishWorkspaceUpdateFn: func(ctx context.Context, wa *database.WorkspaceAgent, kind wspubsub.WorkspaceEventKind) error {
 				publishCalled = true
 				return nil
@@ -139,7 +138,7 @@ func TestBatchUpdateAppHealths(t *testing.T) {
 				return agent, nil
 			},
 			Database: dbM,
-			Log:      slogtest.Make(t, nil),
+			Log:      testutil.Logger(t),
 			PublishWorkspaceUpdateFn: func(ctx context.Context, wa *database.WorkspaceAgent, kind wspubsub.WorkspaceEventKind) error {
 				publishCalled = true
 				return nil
@@ -174,7 +173,7 @@ func TestBatchUpdateAppHealths(t *testing.T) {
 				return agent, nil
 			},
 			Database:                 dbM,
-			Log:                      slogtest.Make(t, nil),
+			Log:                      testutil.Logger(t),
 			PublishWorkspaceUpdateFn: nil,
 		}
 
@@ -203,7 +202,7 @@ func TestBatchUpdateAppHealths(t *testing.T) {
 				return agent, nil
 			},
 			Database:                 dbM,
-			Log:                      slogtest.Make(t, nil),
+			Log:                      testutil.Logger(t),
 			PublishWorkspaceUpdateFn: nil,
 		}
 
@@ -233,7 +232,7 @@ func TestBatchUpdateAppHealths(t *testing.T) {
 				return agent, nil
 			},
 			Database:                 dbM,
-			Log:                      slogtest.Make(t, nil),
+			Log:                      testutil.Logger(t),
 			PublishWorkspaceUpdateFn: nil,
 		}
 

coderd/agentapi/lifecycle_test.go

@@ -13,13 +13,13 @@ import (
 	"go.uber.org/mock/gomock"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
-	"cdr.dev/slog/sloggers/slogtest"
 	agentproto "github.com/coder/coder/v2/agent/proto"
 	"github.com/coder/coder/v2/coderd/agentapi"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbmock"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/wspubsub"
+	"github.com/coder/coder/v2/testutil"
 )
 
 func TestUpdateLifecycle(t *testing.T) {
@@ -72,7 +72,7 @@ func TestUpdateLifecycle(t *testing.T) {
 			},
 			WorkspaceID: workspaceID,
 			Database:    dbM,
-			Log:         slogtest.Make(t, nil),
+			Log:         testutil.Logger(t),
 			PublishWorkspaceUpdateFn: func(ctx context.Context, agent *database.WorkspaceAgent, kind wspubsub.WorkspaceEventKind) error {
 				publishCalled = true
 				return nil
@@ -112,7 +112,7 @@ func TestUpdateLifecycle(t *testing.T) {
 			},
 			WorkspaceID: workspaceID,
 			Database:    dbM,
-			Log:         slogtest.Make(t, nil),
+			Log:         testutil.Logger(t),
 			// Test that nil publish fn works.
 			PublishWorkspaceUpdateFn: nil,
 		}
@@ -155,7 +155,7 @@ func TestUpdateLifecycle(t *testing.T) {
 			},
 			WorkspaceID: workspaceID,
 			Database:    dbM,
-			Log:         slogtest.Make(t, nil),
+			Log:         testutil.Logger(t),
 			PublishWorkspaceUpdateFn: func(ctx context.Context, agent *database.WorkspaceAgent, kind wspubsub.WorkspaceEventKind) error {
 				publishCalled = true
 				return nil
@@ -201,7 +201,7 @@ func TestUpdateLifecycle(t *testing.T) {
 			},
 			WorkspaceID:              workspaceID,
 			Database:                 dbM,
-			Log:                      slogtest.Make(t, nil),
+			Log:                      testutil.Logger(t),
 			PublishWorkspaceUpdateFn: nil,
 			TimeNowFn: func() time.Time {
 				return now
@@ -234,7 +234,7 @@ func TestUpdateLifecycle(t *testing.T) {
 			},
 			WorkspaceID: workspaceID,
 			Database:    dbM,
-			Log:         slogtest.Make(t, nil),
+			Log:         testutil.Logger(t),
 			PublishWorkspaceUpdateFn: func(ctx context.Context, agent *database.WorkspaceAgent, kind wspubsub.WorkspaceEventKind) error {
 				atomic.AddInt64(&publishCalled, 1)
 				return nil
@@ -307,7 +307,7 @@ func TestUpdateLifecycle(t *testing.T) {
 			},
 			WorkspaceID: workspaceID,
 			Database:    dbM,
-			Log:         slogtest.Make(t, nil),
+			Log:         testutil.Logger(t),
 			PublishWorkspaceUpdateFn: func(ctx context.Context, agent *database.WorkspaceAgent, kind wspubsub.WorkspaceEventKind) error {
 				publishCalled = true
 				return nil
@@ -345,7 +345,7 @@ func TestUpdateStartup(t *testing.T) {
 			},
 			WorkspaceID: workspaceID,
 			Database:    dbM,
-			Log:         slogtest.Make(t, nil),
+			Log:         testutil.Logger(t),
 			// Not used by UpdateStartup.
 			PublishWorkspaceUpdateFn: nil,
 		}
@@ -391,7 +391,7 @@ func TestUpdateStartup(t *testing.T) {
 			},
 			WorkspaceID: workspaceID,
 			Database:    dbM,
-			Log:         slogtest.Make(t, nil),
+			Log:         testutil.Logger(t),
 			// Not used by UpdateStartup.
 			PublishWorkspaceUpdateFn: nil,
 		}
@@ -422,7 +422,7 @@ func TestUpdateStartup(t *testing.T) {
 			},
 			WorkspaceID: workspaceID,
 			Database:    dbM,
-			Log:         slogtest.Make(t, nil),
+			Log:         testutil.Logger(t),
 			// Not used by UpdateStartup.
 			PublishWorkspaceUpdateFn: nil,
 		}

coderd/agentapi/logs_test.go

@@ -13,7 +13,6 @@ import (
 	"go.uber.org/mock/gomock"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
-	"cdr.dev/slog/sloggers/slogtest"
 	agentproto "github.com/coder/coder/v2/agent/proto"
 	"github.com/coder/coder/v2/coderd/agentapi"
 	"github.com/coder/coder/v2/coderd/database"
@@ -21,6 +20,7 @@ import (
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/wspubsub"
 	"github.com/coder/coder/v2/codersdk/agentsdk"
+	"github.com/coder/coder/v2/testutil"
 )
 
 func TestBatchCreateLogs(t *testing.T) {
@@ -50,7 +50,7 @@ func TestBatchCreateLogs(t *testing.T) {
 				return agent, nil
 			},
 			Database: dbM,
-			Log:      slogtest.Make(t, nil),
+			Log:      testutil.Logger(t),
 			PublishWorkspaceUpdateFn: func(ctx context.Context, wa *database.WorkspaceAgent, kind wspubsub.WorkspaceEventKind) error {
 				publishWorkspaceUpdateCalled = true
 				return nil
@@ -154,7 +154,7 @@ func TestBatchCreateLogs(t *testing.T) {
 				return agentWithLogs, nil
 			},
 			Database: dbM,
-			Log:      slogtest.Make(t, nil),
+			Log:      testutil.Logger(t),
 			PublishWorkspaceUpdateFn: func(ctx context.Context, wa *database.WorkspaceAgent, kind wspubsub.WorkspaceEventKind) error {
 				publishWorkspaceUpdateCalled = true
 				return nil
@@ -202,7 +202,7 @@ func TestBatchCreateLogs(t *testing.T) {
 				return overflowedAgent, nil
 			},
 			Database: dbM,
-			Log:      slogtest.Make(t, nil),
+			Log:      testutil.Logger(t),
 			PublishWorkspaceUpdateFn: func(ctx context.Context, wa *database.WorkspaceAgent, kind wspubsub.WorkspaceEventKind) error {
 				publishWorkspaceUpdateCalled = true
 				return nil
@@ -233,7 +233,7 @@ func TestBatchCreateLogs(t *testing.T) {
 				return agent, nil
 			},
 			Database: dbM,
-			Log:      slogtest.Make(t, nil),
+			Log:      testutil.Logger(t),
 			// Test that they are ignored when nil.
 			PublishWorkspaceUpdateFn:          nil,
 			PublishWorkspaceAgentLogsUpdateFn: nil,
@@ -295,7 +295,7 @@ func TestBatchCreateLogs(t *testing.T) {
 					return agent, nil
 				},
 				Database: dbM,
-				Log:      slogtest.Make(t, nil),
+				Log:      testutil.Logger(t),
 				PublishWorkspaceUpdateFn: func(ctx context.Context, wa *database.WorkspaceAgent, kind wspubsub.WorkspaceEventKind) error {
 					publishWorkspaceUpdateCalled = true
 					return nil
@@ -339,7 +339,7 @@ func TestBatchCreateLogs(t *testing.T) {
 					return agent, nil
 				},
 				Database: dbM,
-				Log:      slogtest.Make(t, nil),
+				Log:      testutil.Logger(t),
 				PublishWorkspaceUpdateFn: func(ctx context.Context, wa *database.WorkspaceAgent, kind wspubsub.WorkspaceEventKind) error {
 					publishWorkspaceUpdateCalled = true
 					return nil
@@ -386,7 +386,7 @@ func TestBatchCreateLogs(t *testing.T) {
 				return agent, nil
 			},
 			Database: dbM,
-			Log:      slogtest.Make(t, nil),
+			Log:      testutil.Logger(t),
 			PublishWorkspaceUpdateFn: func(ctx context.Context, wa *database.WorkspaceAgent, kind wspubsub.WorkspaceEventKind) error {
 				publishWorkspaceUpdateCalled = true
 				return nil

coderd/agentapi/metadata_test.go

@@ -12,14 +12,13 @@ import (
 	"go.uber.org/mock/gomock"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
-	"cdr.dev/slog/sloggers/slogtest"
-
 	agentproto "github.com/coder/coder/v2/agent/proto"
 	"github.com/coder/coder/v2/coderd/agentapi"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbmock"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/database/pubsub"
+	"github.com/coder/coder/v2/testutil"
 )
 
 type fakePublisher struct {
@@ -87,7 +86,7 @@ func TestBatchUpdateMetadata(t *testing.T) {
 			},
 			Database: dbM,
 			Pubsub:   pub,
-			Log:      slogtest.Make(t, nil),
+			Log:      testutil.Logger(t),
 			TimeNowFn: func() time.Time {
 				return now
 			},
@@ -172,7 +171,7 @@ func TestBatchUpdateMetadata(t *testing.T) {
 			},
 			Database: dbM,
 			Pubsub:   pub,
-			Log:      slogtest.Make(t, nil),
+			Log:      testutil.Logger(t),
 			TimeNowFn: func() time.Time {
 				return now
 			},
@@ -241,7 +240,7 @@ func TestBatchUpdateMetadata(t *testing.T) {
 			},
 			Database: dbM,
 			Pubsub:   pub,
-			Log:      slogtest.Make(t, nil),
+			Log:      testutil.Logger(t),
 			TimeNowFn: func() time.Time {
 				return now
 			},

coderd/coderd_test.go

@@ -19,8 +19,6 @@ import (
 	"go.uber.org/goleak"
 	"tailscale.com/tailcfg"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbfake"
 	"github.com/coder/coder/v2/codersdk/workspacesdk"
@@ -62,7 +60,7 @@ func TestDERP(t *testing.T) {
 	ctx := testutil.Context(t, testutil.WaitMedium)
 	client := coderdtest.New(t, nil)
 
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	derpPort, err := strconv.Atoi(client.URL.Port())
 	require.NoError(t, err)
@@ -217,7 +215,7 @@ func TestDERPForceWebSockets(t *testing.T) {
 	resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
 	conn, err := wsclient.DialAgent(ctx, resources[0].Agents[0].ID,
 		&workspacesdk.DialAgentOptions{
-			Logger: slogtest.Make(t, nil).Leveled(slog.LevelDebug).Named("client"),
+			Logger: testutil.Logger(t).Named("client"),
 		},
 	)
 	require.NoError(t, err)

coderd/cryptokeys/cache_test.go

@@ -11,8 +11,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
 
-	"cdr.dev/slog/sloggers/slogtest"
-
 	"github.com/coder/coder/v2/coderd/cryptokeys"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/testutil"
@@ -33,7 +31,7 @@ func TestCryptoKeyCache(t *testing.T) {
 			t.Parallel()
 			var (
 				ctx    = testutil.Context(t, testutil.WaitShort)
-				logger = slogtest.Make(t, nil)
+				logger = testutil.Logger(t)
 				clock  = quartz.NewMock(t)
 			)
 
@@ -63,7 +61,7 @@ func TestCryptoKeyCache(t *testing.T) {
 			t.Parallel()
 			var (
 				ctx    = testutil.Context(t, testutil.WaitShort)
-				logger = slogtest.Make(t, nil)
+				logger = testutil.Logger(t)
 				clock  = quartz.NewMock(t)
 			)
 
@@ -103,7 +101,7 @@ func TestCryptoKeyCache(t *testing.T) {
 
 			var (
 				ctx    = testutil.Context(t, testutil.WaitShort)
-				logger = slogtest.Make(t, nil)
+				logger = testutil.Logger(t)
 				clock  = quartz.NewMock(t)
 			)
 			now := clock.Now().UTC()
@@ -143,7 +141,7 @@ func TestCryptoKeyCache(t *testing.T) {
 
 			var (
 				ctx    = testutil.Context(t, testutil.WaitShort)
-				logger = slogtest.Make(t, nil)
+				logger = testutil.Logger(t)
 			)
 
 			ff := &fakeFetcher{
@@ -166,7 +164,7 @@ func TestCryptoKeyCache(t *testing.T) {
 
 			var (
 				ctx    = testutil.Context(t, testutil.WaitShort)
-				logger = slogtest.Make(t, nil)
+				logger = testutil.Logger(t)
 				clock  = quartz.NewMock(t)
 			)
 
@@ -202,7 +200,7 @@ func TestCryptoKeyCache(t *testing.T) {
 			t.Parallel()
 			var (
 				ctx    = testutil.Context(t, testutil.WaitShort)
-				logger = slogtest.Make(t, nil)
+				logger = testutil.Logger(t)
 				clock  = quartz.NewMock(t)
 			)
 
@@ -238,7 +236,7 @@ func TestCryptoKeyCache(t *testing.T) {
 
 			var (
 				ctx    = testutil.Context(t, testutil.WaitShort)
-				logger = slogtest.Make(t, nil)
+				logger = testutil.Logger(t)
 				clock  = quartz.NewMock(t)
 			)
 
@@ -270,7 +268,7 @@ func TestCryptoKeyCache(t *testing.T) {
 
 			var (
 				ctx    = testutil.Context(t, testutil.WaitShort)
-				logger = slogtest.Make(t, nil)
+				logger = testutil.Logger(t)
 				clock  = quartz.NewMock(t)
 			)
 
@@ -302,7 +300,7 @@ func TestCryptoKeyCache(t *testing.T) {
 
 			var (
 				ctx    = testutil.Context(t, testutil.WaitShort)
-				logger = slogtest.Make(t, nil)
+				logger = testutil.Logger(t)
 				clock  = quartz.NewMock(t)
 			)
 
@@ -323,7 +321,7 @@ func TestCryptoKeyCache(t *testing.T) {
 
 		var (
 			ctx    = testutil.Context(t, testutil.WaitShort)
-			logger = slogtest.Make(t, nil)
+			logger = testutil.Logger(t)
 			clock  = quartz.NewMock(t)
 		)
 
@@ -386,7 +384,7 @@ func TestCryptoKeyCache(t *testing.T) {
 
 		var (
 			ctx    = testutil.Context(t, testutil.WaitShort)
-			logger = slogtest.Make(t, nil)
+			logger = testutil.Logger(t)
 			clock  = quartz.NewMock(t)
 		)
 
@@ -442,7 +440,7 @@ func TestCryptoKeyCache(t *testing.T) {
 
 		var (
 			ctx    = testutil.Context(t, testutil.WaitShort)
-			logger = slogtest.Make(t, nil)
+			logger = testutil.Logger(t)
 			clock  = quartz.NewMock(t)
 		)
 

coderd/cryptokeys/rotate_internal_test.go

@@ -8,8 +8,6 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbgen"
 	"github.com/coder/coder/v2/coderd/database/dbtestutil"
@@ -28,7 +26,7 @@ func Test_rotateKeys(t *testing.T) {
 			db, _       = dbtestutil.NewDB(t)
 			clock       = quartz.NewMock(t)
 			keyDuration = time.Hour * 24 * 7
-			logger      = slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+			logger      = testutil.Logger(t)
 			ctx         = testutil.Context(t, testutil.WaitShort)
 		)
 
@@ -113,7 +111,7 @@ func Test_rotateKeys(t *testing.T) {
 			db, _       = dbtestutil.NewDB(t)
 			clock       = quartz.NewMock(t)
 			keyDuration = time.Hour * 24 * 7
-			logger      = slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+			logger      = testutil.Logger(t)
 			ctx         = testutil.Context(t, testutil.WaitShort)
 		)
 
@@ -169,7 +167,7 @@ func Test_rotateKeys(t *testing.T) {
 			db, _       = dbtestutil.NewDB(t)
 			clock       = quartz.NewMock(t)
 			keyDuration = time.Hour * 24 * 7
-			logger      = slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+			logger      = testutil.Logger(t)
 			ctx         = testutil.Context(t, testutil.WaitShort)
 		)
 
@@ -222,7 +220,7 @@ func Test_rotateKeys(t *testing.T) {
 			db, _       = dbtestutil.NewDB(t)
 			clock       = quartz.NewMock(t)
 			keyDuration = time.Hour * 24 * 7
-			logger      = slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+			logger      = testutil.Logger(t)
 			ctx         = testutil.Context(t, testutil.WaitShort)
 		)
 
@@ -271,7 +269,7 @@ func Test_rotateKeys(t *testing.T) {
 			db, _       = dbtestutil.NewDB(t)
 			clock       = quartz.NewMock(t)
 			keyDuration = time.Hour * 24 * 7
-			logger      = slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+			logger      = testutil.Logger(t)
 			ctx         = testutil.Context(t, testutil.WaitShort)
 		)
 
@@ -302,7 +300,7 @@ func Test_rotateKeys(t *testing.T) {
 			db, _       = dbtestutil.NewDB(t)
 			clock       = quartz.NewMock(t)
 			keyDuration = time.Hour * 24 * 7
-			logger      = slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+			logger      = testutil.Logger(t)
 			ctx         = testutil.Context(t, testutil.WaitShort)
 		)
 
@@ -351,7 +349,7 @@ func Test_rotateKeys(t *testing.T) {
 			db, _       = dbtestutil.NewDB(t)
 			clock       = quartz.NewMock(t)
 			keyDuration = time.Hour * 24 * 30
-			logger      = slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+			logger      = testutil.Logger(t)
 			ctx         = testutil.Context(t, testutil.WaitShort)
 		)
 
@@ -449,7 +447,7 @@ func Test_rotateKeys(t *testing.T) {
 			db, _       = dbtestutil.NewDB(t)
 			clock       = quartz.NewMock(t)
 			keyDuration = time.Hour * 24 * 7
-			logger      = slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+			logger      = testutil.Logger(t)
 			ctx         = testutil.Context(t, testutil.WaitShort)
 		)
 
@@ -472,7 +470,7 @@ func Test_rotateKeys(t *testing.T) {
 			db, _       = dbtestutil.NewDB(t)
 			clock       = quartz.NewMock(t)
 			keyDuration = time.Hour * 24 * 5
-			logger      = slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+			logger      = testutil.Logger(t)
 			ctx         = testutil.Context(t, testutil.WaitShort)
 		)
 
@@ -518,7 +516,7 @@ func Test_rotateKeys(t *testing.T) {
 			db, _       = dbtestutil.NewDB(t)
 			clock       = quartz.NewMock(t)
 			keyDuration = time.Hour * 24 * 3
-			logger      = slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+			logger      = testutil.Logger(t)
 			ctx         = testutil.Context(t, testutil.WaitShort)
 		)
 

coderd/cryptokeys/rotate_test.go

@@ -6,9 +6,6 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
-
 	"github.com/coder/coder/v2/coderd/cryptokeys"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbgen"
@@ -26,7 +23,7 @@ func TestRotator(t *testing.T) {
 		var (
 			db, _  = dbtestutil.NewDB(t)
 			clock  = quartz.NewMock(t)
-			logger = slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+			logger = testutil.Logger(t)
 			ctx    = testutil.Context(t, testutil.WaitShort)
 		)
 
@@ -50,7 +47,7 @@ func TestRotator(t *testing.T) {
 		var (
 			db, _  = dbtestutil.NewDB(t)
 			clock  = quartz.NewMock(t)
-			logger = slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+			logger = testutil.Logger(t)
 			ctx    = testutil.Context(t, testutil.WaitShort)
 		)
 

coderd/database/awsiamrds/awsiamrds_test.go

@@ -7,8 +7,6 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/cli"
 	"github.com/coder/coder/v2/coderd/database/awsiamrds"
 	"github.com/coder/coder/v2/coderd/database/pubsub"
@@ -27,14 +25,14 @@ func TestDriver(t *testing.T) {
 		t.Skip()
 	}
 
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
 	defer cancel()
 
 	sqlDriver, err := awsiamrds.Register(ctx, "postgres")
 	require.NoError(t, err)
 
-	db, err := cli.ConnectToPostgres(ctx, slogtest.Make(t, nil), sqlDriver, url)
+	db, err := cli.ConnectToPostgres(ctx, testutil.Logger(t), sqlDriver, url)
 	require.NoError(t, err)
 	defer func() {
 		_ = db.Close()

coderd/database/dbmetrics/dbmetrics_test.go

@@ -10,11 +10,11 @@ import (
 
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/sloghuman"
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/coderd/coderdtest/promhelp"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbmem"
 	"github.com/coder/coder/v2/coderd/database/dbmetrics"
+	"github.com/coder/coder/v2/testutil"
 )
 
 func TestInTxMetrics(t *testing.T) {
@@ -31,7 +31,7 @@ func TestInTxMetrics(t *testing.T) {
 
 		db := dbmem.New()
 		reg := prometheus.NewRegistry()
-		db = dbmetrics.NewQueryMetrics(db, slogtest.Make(t, nil), reg)
+		db = dbmetrics.NewQueryMetrics(db, testutil.Logger(t), reg)
 
 		err := db.InTx(func(s database.Store) error {
 			return nil
@@ -49,7 +49,7 @@ func TestInTxMetrics(t *testing.T) {
 
 		db := dbmem.New()
 		reg := prometheus.NewRegistry()
-		db = dbmetrics.NewDBMetrics(db, slogtest.Make(t, nil), reg)
+		db = dbmetrics.NewDBMetrics(db, testutil.Logger(t), reg)
 
 		err := db.InTx(func(s database.Store) error {
 			return nil

coderd/database/dbpurge/dbpurge_test.go

@@ -47,7 +47,7 @@ func TestPurge(t *testing.T) {
 	// We want to make sure dbpurge is actually started so that this test is meaningful.
 	clk := quartz.NewMock(t)
 	done := awaitDoTick(ctx, t, clk)
-	purger := dbpurge.New(context.Background(), slogtest.Make(t, nil), dbmem.New(), clk)
+	purger := dbpurge.New(context.Background(), testutil.Logger(t), dbmem.New(), clk)
 	<-done // wait for doTick() to run.
 	require.NoError(t, purger.Close())
 }

coderd/database/dbrollup/dbrollup_test.go

@@ -28,7 +28,7 @@ func TestMain(m *testing.M) {
 
 func TestRollup_Close(t *testing.T) {
 	t.Parallel()
-	rolluper := dbrollup.New(slogtest.Make(t, nil), dbmem.New(), dbrollup.WithInterval(250*time.Millisecond))
+	rolluper := dbrollup.New(testutil.Logger(t), dbmem.New(), dbrollup.WithInterval(250*time.Millisecond))
 	err := rolluper.Close()
 	require.NoError(t, err)
 }
@@ -57,7 +57,7 @@ func TestRollup_TwoInstancesUseLocking(t *testing.T) {
 	}
 
 	db, ps := dbtestutil.NewDB(t, dbtestutil.WithDumpOnFailure())
-	logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: false}).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	var (
 		org   = dbgen.Organization(t, db, database.Organization{})

coderd/database/dbtestutil/db.go

@@ -19,10 +19,10 @@ import (
 	"golang.org/x/xerrors"
 
 	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbmem"
 	"github.com/coder/coder/v2/coderd/database/pubsub"
+	"github.com/coder/coder/v2/testutil"
 )
 
 // WillUsePostgres returns true if a call to NewDB() will return a real, postgres-backed Store and Pubsub.
@@ -90,7 +90,7 @@ func NewDBWithSQLDB(t testing.TB, opts ...Option) (database.Store, pubsub.Pubsub
 func NewDB(t testing.TB, opts ...Option) (database.Store, pubsub.Pubsub) {
 	t.Helper()
 
-	o := options{logger: slogtest.Make(t, nil).Named("pubsub").Leveled(slog.LevelDebug)}
+	o := options{logger: testutil.Logger(t).Named("pubsub")}
 	for _, opt := range opts {
 		opt(&o)
 	}

coderd/database/pubsub/pubsub_internal_test.go

@@ -10,8 +10,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/testutil"
 )
 
@@ -147,7 +145,7 @@ func Test_msgQueue_Full(t *testing.T) {
 func TestPubSub_DoesntBlockNotify(t *testing.T) {
 	t.Parallel()
 	ctx := testutil.Context(t, testutil.WaitShort)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	uut := newWithoutListener(logger, nil)
 	fListener := newFakePqListener()
@@ -183,7 +181,7 @@ func TestPubSub_DoesntBlockNotify(t *testing.T) {
 func TestPubSub_DoesntRaceListenUnlisten(t *testing.T) {
 	t.Parallel()
 	ctx := testutil.Context(t, testutil.WaitShort)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	uut := newWithoutListener(logger, nil)
 	fListener := newFakePqListener()

coderd/database/pubsub/pubsub_linux_test.go

@@ -38,7 +38,7 @@ func TestPubsub(t *testing.T) {
 	t.Run("Postgres", func(t *testing.T) {
 		ctx, cancelFunc := context.WithCancel(context.Background())
 		defer cancelFunc()
-		logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+		logger := testutil.Logger(t)
 
 		connectionURL, err := dbtestutil.Open(t)
 		require.NoError(t, err)
@@ -67,7 +67,7 @@ func TestPubsub(t *testing.T) {
 	t.Run("PostgresCloseCancel", func(t *testing.T) {
 		ctx, cancelFunc := context.WithCancel(context.Background())
 		defer cancelFunc()
-		logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+		logger := testutil.Logger(t)
 		connectionURL, err := dbtestutil.Open(t)
 		require.NoError(t, err)
 		db, err := sql.Open("postgres", connectionURL)
@@ -82,7 +82,7 @@ func TestPubsub(t *testing.T) {
 	t.Run("NotClosedOnCancelContext", func(t *testing.T) {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
-		logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+		logger := testutil.Logger(t)
 		connectionURL, err := dbtestutil.Open(t)
 		require.NoError(t, err)
 		db, err := sql.Open("postgres", connectionURL)
@@ -117,7 +117,7 @@ func TestPubsub_ordering(t *testing.T) {
 
 	ctx, cancelFunc := context.WithCancel(context.Background())
 	defer cancelFunc()
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	connectionURL, err := dbtestutil.Open(t)
 	require.NoError(t, err)
@@ -300,7 +300,7 @@ func TestMeasureLatency(t *testing.T) {
 
 	newPubsub := func() (pubsub.Pubsub, func()) {
 		ctx, cancel := context.WithCancel(context.Background())
-		logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+		logger := testutil.Logger(t)
 		connectionURL, err := dbtestutil.Open(t)
 		require.NoError(t, err)
 		db, err := sql.Open("postgres", connectionURL)
@@ -318,7 +318,7 @@ func TestMeasureLatency(t *testing.T) {
 	t.Run("MeasureLatency", func(t *testing.T) {
 		t.Parallel()
 
-		logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+		logger := testutil.Logger(t)
 		ps, done := newPubsub()
 		defer done()
 
@@ -334,7 +334,7 @@ func TestMeasureLatency(t *testing.T) {
 	t.Run("MeasureLatencyRecvTimeout", func(t *testing.T) {
 		t.Parallel()
 
-		logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+		logger := testutil.Logger(t)
 		ctrl := gomock.NewController(t)
 		ps := psmock.NewMockPubsub(ctrl)
 

coderd/database/pubsub/pubsub_test.go

@@ -23,7 +23,7 @@ func TestPGPubsub_Metrics(t *testing.T) {
 		t.Skip("test only with postgres")
 	}
 
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	connectionURL, err := dbtestutil.Open(t)
 	require.NoError(t, err)
 	db, err := sql.Open("postgres", connectionURL)

coderd/devtunnel/tunnel_test.go

@@ -16,12 +16,9 @@ import (
 	"testing"
 	"time"
 
-	"cdr.dev/slog"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/coderd/devtunnel"
 	"github.com/coder/coder/v2/testutil"
 	"github.com/coder/wgtunnel/tunneld"
@@ -76,7 +73,7 @@ func TestTunnel(t *testing.T) {
 			tunServer := newTunnelServer(t)
 			cfg := tunServer.config(t, c.version)
 
-			tun, err := devtunnel.NewWithConfig(ctx, slogtest.Make(t, nil).Leveled(slog.LevelDebug), cfg)
+			tun, err := devtunnel.NewWithConfig(ctx, testutil.Logger(t), cfg)
 			require.NoError(t, err)
 			require.Len(t, tun.OtherURLs, 1)
 			t.Log(tun.URL, tun.OtherURLs[0])

coderd/httpmw/recover_test.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/coderd/httpmw"
 	"github.com/coder/coder/v2/coderd/tracing"
+	"github.com/coder/coder/v2/testutil"
 )
 
 func TestRecover(t *testing.T) {
@@ -58,7 +58,7 @@ func TestRecover(t *testing.T) {
 			t.Parallel()
 
 			var (
-				log = slogtest.Make(t, nil)
+				log = testutil.Logger(t)
 				r   = httptest.NewRequest("GET", "/", nil)
 				w   = &tracing.StatusWriter{
 					ResponseWriter: httptest.NewRecorder(),

coderd/insights_test.go

@@ -46,7 +46,7 @@ func TestDeploymentInsights(t *testing.T) {
 	require.NoError(t, err)
 
 	db, ps := dbtestutil.NewDB(t, dbtestutil.WithDumpOnFailure())
-	logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: false}).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	rollupEvents := make(chan dbrollup.Event)
 	client := coderdtest.New(t, &coderdtest.Options{
 		Database:                  db,
@@ -87,7 +87,7 @@ func TestDeploymentInsights(t *testing.T) {
 
 	conn, err := workspacesdk.New(client).
 		DialAgent(ctx, resources[0].Agents[0].ID, &workspacesdk.DialAgentOptions{
-			Logger: slogtest.Make(t, nil).Named("dialagent"),
+			Logger: testutil.Logger(t).Named("dialagent"),
 		})
 	require.NoError(t, err)
 	defer conn.Close()
@@ -127,7 +127,7 @@ func TestUserActivityInsights_SanityCheck(t *testing.T) {
 	t.Parallel()
 
 	db, ps := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: false}).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	client := coderdtest.New(t, &coderdtest.Options{
 		Database:                  db,
 		Pubsub:                    ps,
@@ -502,7 +502,7 @@ func TestTemplateInsights_Golden(t *testing.T) {
 	}
 
 	prepare := func(t *testing.T, templates []*testTemplate, users []*testUser, testData map[*testWorkspace]testDataGen) (*codersdk.Client, chan dbrollup.Event) {
-		logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: false}).Leveled(slog.LevelDebug)
+		logger := testutil.Logger(t)
 		db, ps := dbtestutil.NewDB(t)
 		events := make(chan dbrollup.Event)
 		client := coderdtest.New(t, &coderdtest.Options{
@@ -1421,7 +1421,7 @@ func TestUserActivityInsights_Golden(t *testing.T) {
 	}
 
 	prepare := func(t *testing.T, templates []*testTemplate, users []*testUser, testData map[*testWorkspace]testDataGen) (*codersdk.Client, chan dbrollup.Event) {
-		logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: false}).Leveled(slog.LevelDebug)
+		logger := testutil.Logger(t)
 		db, ps := dbtestutil.NewDB(t)
 		events := make(chan dbrollup.Event)
 		client := coderdtest.New(t, &coderdtest.Options{

coderd/jwtutils/jwt_test.go

@@ -11,8 +11,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 
-	"cdr.dev/slog/sloggers/slogtest"
-
 	"github.com/coder/coder/v2/coderd/cryptokeys"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbgen"
@@ -239,7 +237,7 @@ func TestJWS(t *testing.T) {
 				Feature:  database.CryptoKeyFeatureOIDCConvert,
 				StartsAt: time.Now(),
 			})
-			log     = slogtest.Make(t, nil)
+			log     = testutil.Logger(t)
 			fetcher = &cryptokeys.DBFetcher{DB: db}
 		)
 
@@ -329,7 +327,7 @@ func TestJWE(t *testing.T) {
 				Feature:  database.CryptoKeyFeatureWorkspaceAppsAPIKey,
 				StartsAt: time.Now(),
 			})
-			log = slogtest.Make(t, nil)
+			log = testutil.Logger(t)
 
 			fetcher = &cryptokeys.DBFetcher{DB: db}
 		)

coderd/metricscache/metricscache_test.go

@@ -10,7 +10,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbgen"
 	"github.com/coder/coder/v2/coderd/database/dbmem"
@@ -30,7 +29,7 @@ func TestCache_TemplateWorkspaceOwners(t *testing.T) {
 
 	var (
 		db    = dbmem.New()
-		cache = metricscache.New(db, slogtest.Make(t, nil), metricscache.Intervals{
+		cache = metricscache.New(db, testutil.Logger(t), metricscache.Intervals{
 			TemplateBuildTimes: testutil.IntervalFast,
 		}, false)
 	)
@@ -181,7 +180,7 @@ func TestCache_BuildTime(t *testing.T) {
 
 			var (
 				db    = dbmem.New()
-				cache = metricscache.New(db, slogtest.Make(t, nil), metricscache.Intervals{
+				cache = metricscache.New(db, testutil.Logger(t), metricscache.Intervals{
 					TemplateBuildTimes: testutil.IntervalFast,
 				}, false)
 			)
@@ -276,7 +275,7 @@ func TestCache_BuildTime(t *testing.T) {
 func TestCache_DeploymentStats(t *testing.T) {
 	t.Parallel()
 	db := dbmem.New()
-	cache := metricscache.New(db, slogtest.Make(t, nil), metricscache.Intervals{
+	cache := metricscache.New(db, testutil.Logger(t), metricscache.Intervals{
 		DeploymentStats: testutil.IntervalFast,
 	}, false)
 	defer cache.Close()

coderd/notifications/manager_test.go

@@ -13,15 +13,13 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/xerrors"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
-	"github.com/coder/coder/v2/coderd/database/dbtestutil"
 	"github.com/coder/quartz"
 	"github.com/coder/serpent"
 
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
 	"github.com/coder/coder/v2/coderd/database/dbgen"
+	"github.com/coder/coder/v2/coderd/database/dbtestutil"
 	"github.com/coder/coder/v2/coderd/notifications"
 	"github.com/coder/coder/v2/coderd/notifications/dispatch"
 	"github.com/coder/coder/v2/coderd/notifications/types"
@@ -36,7 +34,7 @@ func TestBufferedUpdates(t *testing.T) {
 	// nolint:gocritic // Unit test.
 	ctx := dbauthz.AsSystemRestricted(testutil.Context(t, testutil.WaitSuperLong))
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	interceptor := &syncInterceptor{Store: store}
 	santa := &santaHandler{}
@@ -108,7 +106,7 @@ func TestBuildPayload(t *testing.T) {
 	// nolint:gocritic // Unit test.
 	ctx := dbauthz.AsSystemRestricted(testutil.Context(t, testutil.WaitSuperLong))
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	// GIVEN: a set of helpers to be injected into the templates
 	const label = "Click here!"
@@ -166,7 +164,7 @@ func TestStopBeforeRun(t *testing.T) {
 	// nolint:gocritic // Unit test.
 	ctx := dbauthz.AsSystemRestricted(testutil.Context(t, testutil.WaitSuperLong))
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	// GIVEN: a standard manager
 	mgr, err := notifications.NewManager(defaultNotificationsConfig(database.NotificationMethodSmtp), store, defaultHelpers(), createMetrics(), logger.Named("notifications-manager"))

coderd/notifications/metrics_test.go

@@ -16,8 +16,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/quartz"
 	"github.com/coder/serpent"
 
@@ -41,7 +39,7 @@ func TestMetrics(t *testing.T) {
 	// nolint:gocritic // Unit test.
 	ctx := dbauthz.AsSystemRestricted(testutil.Context(t, testutil.WaitSuperLong))
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	reg := prometheus.NewRegistry()
 	metrics := notifications.NewMetrics(reg)
@@ -215,7 +213,7 @@ func TestPendingUpdatesMetric(t *testing.T) {
 	// nolint:gocritic // Unit test.
 	ctx := dbauthz.AsSystemRestricted(testutil.Context(t, testutil.WaitSuperLong))
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	reg := prometheus.NewRegistry()
 	metrics := notifications.NewMetrics(reg)
@@ -306,7 +304,7 @@ func TestInflightDispatchesMetric(t *testing.T) {
 	// nolint:gocritic // Unit test.
 	ctx := dbauthz.AsSystemRestricted(testutil.Context(t, testutil.WaitSuperLong))
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	reg := prometheus.NewRegistry()
 	metrics := notifications.NewMetrics(reg)
@@ -385,7 +383,7 @@ func TestCustomMethodMetricCollection(t *testing.T) {
 	// nolint:gocritic // Unit test.
 	ctx := dbauthz.AsSystemRestricted(testutil.Context(t, testutil.WaitSuperLong))
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	var (
 		reg             = prometheus.NewRegistry()

coderd/notifications/notifications_test.go

@@ -35,7 +35,6 @@ import (
 	"golang.org/x/xerrors"
 
 	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
@@ -73,7 +72,7 @@ func TestBasicNotificationRoundtrip(t *testing.T) {
 	// nolint:gocritic // Unit test.
 	ctx := dbauthz.AsNotifier(testutil.Context(t, testutil.WaitSuperLong))
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	method := database.NotificationMethodSmtp
 
 	// GIVEN: a manager with standard config but a faked dispatch handler
@@ -137,7 +136,7 @@ func TestSMTPDispatch(t *testing.T) {
 	// nolint:gocritic // Unit test.
 	ctx := dbauthz.AsNotifier(testutil.Context(t, testutil.WaitSuperLong))
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	// start mock SMTP server
 	mockSMTPSrv := smtpmock.New(smtpmock.ConfigurationAttr{
@@ -199,7 +198,7 @@ func TestWebhookDispatch(t *testing.T) {
 	// nolint:gocritic // Unit test.
 	ctx := dbauthz.AsNotifier(testutil.Context(t, testutil.WaitSuperLong))
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	sent := make(chan dispatch.WebhookPayload, 1)
 	// Mock server to simulate webhook endpoint.
@@ -279,7 +278,7 @@ func TestBackpressure(t *testing.T) {
 	}
 
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	// nolint:gocritic // Unit test.
 	ctx := dbauthz.AsNotifier(testutil.Context(t, testutil.WaitShort))
 
@@ -409,7 +408,7 @@ func TestRetries(t *testing.T) {
 	// nolint:gocritic // Unit test.
 	ctx := dbauthz.AsNotifier(testutil.Context(t, testutil.WaitSuperLong))
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	// GIVEN: a mock HTTP server which will receive webhooksand a map to track the dispatch attempts
 
@@ -503,7 +502,7 @@ func TestExpiredLeaseIsRequeued(t *testing.T) {
 	// nolint:gocritic // Unit test.
 	ctx := dbauthz.AsNotifier(testutil.Context(t, testutil.WaitSuperLong))
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	// GIVEN: a manager which has its updates intercepted and paused until measurements can be taken
 
@@ -602,7 +601,7 @@ func TestInvalidConfig(t *testing.T) {
 	t.Parallel()
 
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	// GIVEN: invalid config with dispatch period <= lease period
 	const (
@@ -628,7 +627,7 @@ func TestNotifierPaused(t *testing.T) {
 	// nolint:gocritic // Unit test.
 	ctx := dbauthz.AsNotifier(testutil.Context(t, testutil.WaitSuperLong))
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	// Prepare the test.
 	handler := &fakeHandler{}
@@ -1380,7 +1379,7 @@ func TestDisabledBeforeEnqueue(t *testing.T) {
 	// nolint:gocritic // Unit test.
 	ctx := dbauthz.AsNotifier(testutil.Context(t, testutil.WaitSuperLong))
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	// GIVEN: an enqueuer & a sample user
 	cfg := defaultNotificationsConfig(database.NotificationMethodSmtp)
@@ -1416,7 +1415,7 @@ func TestDisabledAfterEnqueue(t *testing.T) {
 	// nolint:gocritic // Unit test.
 	ctx := dbauthz.AsNotifier(testutil.Context(t, testutil.WaitSuperLong))
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	method := database.NotificationMethodSmtp
 	cfg := defaultNotificationsConfig(method)
@@ -1473,7 +1472,7 @@ func TestCustomNotificationMethod(t *testing.T) {
 	// nolint:gocritic // Unit test.
 	ctx := dbauthz.AsNotifier(testutil.Context(t, testutil.WaitSuperLong))
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	received := make(chan uuid.UUID, 1)
 
@@ -1614,7 +1613,7 @@ func TestNotificationDuplicates(t *testing.T) {
 	// nolint:gocritic // Unit test.
 	ctx := dbauthz.AsNotifier(testutil.Context(t, testutil.WaitSuperLong))
 	store, _ := dbtestutil.NewDB(t)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	method := database.NotificationMethodSmtp
 	cfg := defaultNotificationsConfig(method)

coderd/prometheusmetrics/prometheusmetrics_test.go

@@ -99,7 +99,7 @@ func TestActiveUsers(t *testing.T) {
 		t.Run(tc.Name, func(t *testing.T) {
 			t.Parallel()
 			registry := prometheus.NewRegistry()
-			closeFunc, err := prometheusmetrics.ActiveUsers(context.Background(), slogtest.Make(t, nil), registry, tc.Database(t), time.Millisecond)
+			closeFunc, err := prometheusmetrics.ActiveUsers(context.Background(), testutil.Logger(t), registry, tc.Database(t), time.Millisecond)
 			require.NoError(t, err)
 			t.Cleanup(closeFunc)
 
@@ -165,7 +165,7 @@ func TestUsers(t *testing.T) {
 			registry := prometheus.NewRegistry()
 			mClock := quartz.NewMock(t)
 			db := tc.Database(t)
-			closeFunc, err := prometheusmetrics.Users(context.Background(), slogtest.Make(t, nil), mClock, registry, db, time.Millisecond)
+			closeFunc, err := prometheusmetrics.Users(context.Background(), testutil.Logger(t), mClock, registry, db, time.Millisecond)
 			require.NoError(t, err)
 			t.Cleanup(closeFunc)
 
@@ -246,7 +246,7 @@ func TestWorkspaceLatestBuildTotals(t *testing.T) {
 		t.Run(tc.Name, func(t *testing.T) {
 			t.Parallel()
 			registry := prometheus.NewRegistry()
-			closeFunc, err := prometheusmetrics.Workspaces(context.Background(), slogtest.Make(t, nil).Leveled(slog.LevelWarn), registry, tc.Database(), testutil.IntervalFast)
+			closeFunc, err := prometheusmetrics.Workspaces(context.Background(), testutil.Logger(t).Leveled(slog.LevelWarn), registry, tc.Database(), testutil.IntervalFast)
 			require.NoError(t, err)
 			t.Cleanup(closeFunc)
 
@@ -320,7 +320,7 @@ func TestWorkspaceLatestBuildStatuses(t *testing.T) {
 		t.Run(tc.Name, func(t *testing.T) {
 			t.Parallel()
 			registry := prometheus.NewRegistry()
-			closeFunc, err := prometheusmetrics.Workspaces(context.Background(), slogtest.Make(t, nil), registry, tc.Database(), testutil.IntervalFast)
+			closeFunc, err := prometheusmetrics.Workspaces(context.Background(), testutil.Logger(t), registry, tc.Database(), testutil.IntervalFast)
 			require.NoError(t, err)
 			t.Cleanup(closeFunc)
 
@@ -413,7 +413,7 @@ func TestAgents(t *testing.T) {
 	derpMapFn := func() *tailcfg.DERPMap {
 		return derpMap
 	}
-	coordinator := tailnet.NewCoordinator(slogtest.Make(t, nil).Leveled(slog.LevelDebug))
+	coordinator := tailnet.NewCoordinator(testutil.Logger(t))
 	coordinatorPtr := atomic.Pointer[tailnet.Coordinator]{}
 	coordinatorPtr.Store(&coordinator)
 	agentInactiveDisconnectTimeout := 1 * time.Hour // don't need to focus on this value in tests
@@ -485,7 +485,7 @@ func TestAgentStats(t *testing.T) {
 	t.Cleanup(cancelFunc)
 
 	db, pubsub := dbtestutil.NewDB(t)
-	log := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	log := testutil.Logger(t)
 
 	batcher, closeBatcher, err := workspacestats.NewBatcher(ctx,
 		// We had previously set the batch size to 1 here, but that caused
@@ -499,7 +499,7 @@ func TestAgentStats(t *testing.T) {
 	require.NoError(t, err, "create stats batcher failed")
 	t.Cleanup(closeBatcher)
 
-	tLogger := slogtest.Make(t, nil)
+	tLogger := testutil.Logger(t)
 	// Build sample workspaces with test agents and fake agent client
 	client, _, _ := coderdtest.NewWithAPI(t, &coderdtest.Options{
 		Database:                 db,

coderd/provisionerdserver/acquirer_test.go

@@ -17,8 +17,6 @@ import (
 	"go.uber.org/goleak"
 	"golang.org/x/exp/slices"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbmem"
 	"github.com/coder/coder/v2/coderd/database/dbtestutil"
@@ -40,7 +38,7 @@ func TestAcquirer_Store(t *testing.T) {
 	ps := pubsub.NewInMemory()
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
 	defer cancel()
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	_ = provisionerdserver.NewAcquirer(ctx, logger.Named("acquirer"), db, ps)
 }
 
@@ -50,7 +48,7 @@ func TestAcquirer_Single(t *testing.T) {
 	ps := pubsub.NewInMemory()
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
 	defer cancel()
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	uut := provisionerdserver.NewAcquirer(ctx, logger.Named("acquirer"), fs, ps)
 
 	orgID := uuid.New()
@@ -77,7 +75,7 @@ func TestAcquirer_MultipleSameDomain(t *testing.T) {
 	ps := pubsub.NewInMemory()
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
 	defer cancel()
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	uut := provisionerdserver.NewAcquirer(ctx, logger.Named("acquirer"), fs, ps)
 
 	acquirees := make([]*testAcquiree, 0, 10)
@@ -123,7 +121,7 @@ func TestAcquirer_WaitsOnNoJobs(t *testing.T) {
 	ps := pubsub.NewInMemory()
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
 	defer cancel()
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	uut := provisionerdserver.NewAcquirer(ctx, logger.Named("acquirer"), fs, ps)
 
 	orgID := uuid.New()
@@ -175,7 +173,7 @@ func TestAcquirer_RetriesPending(t *testing.T) {
 	ps := pubsub.NewInMemory()
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
 	defer cancel()
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	uut := provisionerdserver.NewAcquirer(ctx, logger.Named("acquirer"), fs, ps)
 
 	orgID := uuid.New()
@@ -219,7 +217,7 @@ func TestAcquirer_DifferentDomains(t *testing.T) {
 	ps := pubsub.NewInMemory()
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
 	defer cancel()
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	orgID := uuid.New()
 	pt := []database.ProvisionerType{database.ProvisionerTypeEcho}
@@ -266,7 +264,7 @@ func TestAcquirer_BackupPoll(t *testing.T) {
 	ps := pubsub.NewInMemory()
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
 	defer cancel()
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	uut := provisionerdserver.NewAcquirer(
 		ctx, logger.Named("acquirer"), fs, ps,
 		provisionerdserver.TestingBackupPollDuration(testutil.IntervalMedium),
@@ -297,7 +295,7 @@ func TestAcquirer_UnblockOnCancel(t *testing.T) {
 	ps := pubsub.NewInMemory()
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
 	defer cancel()
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	pt := []database.ProvisionerType{database.ProvisionerTypeEcho}
 	orgID := uuid.New()
@@ -476,7 +474,7 @@ func TestAcquirer_MatchTags(t *testing.T) {
 			ctx := testutil.Context(t, testutil.WaitShort)
 			// NOTE: explicitly not using fake store for this test.
 			db, ps := dbtestutil.NewDB(t)
-			log := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+			log := testutil.Logger(t)
 			org, err := db.InsertOrganization(ctx, database.InsertOrganizationParams{
 				ID:          uuid.New(),
 				Name:        "test org",

coderd/provisionerdserver/provisionerdserver_test.go

@@ -13,16 +13,13 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/xerrors"
-	"storj.io/drpc"
-
-	"cdr.dev/slog"
-
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/oauth2"
+	"golang.org/x/xerrors"
+	"storj.io/drpc"
 
 	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/serpent"
@@ -2202,7 +2199,7 @@ type overrides struct {
 
 func setup(t *testing.T, ignoreLogErrors bool, ov *overrides) (proto.DRPCProvisionerDaemonServer, database.Store, pubsub.Pubsub, database.ProvisionerDaemon) {
 	t.Helper()
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	db := dbmem.New()
 	ps := pubsub.NewInMemory()
 	defOrg, err := db.GetDefaultOrganization(context.Background())

coderd/provisionerjobs_internal_test.go

@@ -16,8 +16,6 @@ import (
 	"go.uber.org/mock/gomock"
 	"nhooyr.io/websocket"
 
-	"cdr.dev/slog/sloggers/slogtest"
-
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbmock"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
@@ -147,7 +145,7 @@ func Test_logFollower_completeBeforeFollow(t *testing.T) {
 	t.Parallel()
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
 	defer cancel()
-	logger := slogtest.Make(t, nil)
+	logger := testutil.Logger(t)
 	ctrl := gomock.NewController(t)
 	mDB := dbmock.NewMockStore(ctrl)
 	ps := pubsub.NewInMemory()
@@ -210,7 +208,7 @@ func Test_logFollower_completeBeforeSubscribe(t *testing.T) {
 	t.Parallel()
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
 	defer cancel()
-	logger := slogtest.Make(t, nil)
+	logger := testutil.Logger(t)
 	ctrl := gomock.NewController(t)
 	mDB := dbmock.NewMockStore(ctrl)
 	ps := pubsub.NewInMemory()
@@ -288,7 +286,7 @@ func Test_logFollower_EndOfLogs(t *testing.T) {
 	t.Parallel()
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
 	defer cancel()
-	logger := slogtest.Make(t, nil)
+	logger := testutil.Logger(t)
 	ctrl := gomock.NewController(t)
 	mDB := dbmock.NewMockStore(ctrl)
 	ps := pubsub.NewInMemory()

coderd/tailnet_test.go

@@ -20,8 +20,6 @@ import (
 	"go.opentelemetry.io/otel/trace"
 	"tailscale.com/tailcfg"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/agent"
 	"github.com/coder/coder/v2/agent/agenttest"
 	"github.com/coder/coder/v2/agent/proto"
@@ -392,7 +390,7 @@ type agentWithID struct {
 }
 
 func setupServerTailnetAgent(t *testing.T, agentNum int, opts ...tailnettest.DERPAndStunOption) ([]agentWithID, *coderd.ServerTailnet) {
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	derpMap, derpServer := tailnettest.RunDERPAndSTUN(t, opts...)
 
 	coord := tailnet.NewCoordinator(logger)

coderd/telemetry/telemetry_test.go

@@ -15,8 +15,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/buildinfo"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbgen"
@@ -186,7 +184,7 @@ func collectSnapshot(t *testing.T, db database.Store, addOptionsFn func(opts tel
 	require.NoError(t, err)
 	options := telemetry.Options{
 		Database:     db,
-		Logger:       slogtest.Make(t, nil).Leveled(slog.LevelDebug),
+		Logger:       testutil.Logger(t),
 		URL:          serverURL,
 		DeploymentID: uuid.NewString(),
 	}

coderd/templates_test.go

@@ -11,8 +11,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"cdr.dev/slog/sloggers/slogtest"
-
 	"github.com/coder/coder/v2/agent/agenttest"
 	"github.com/coder/coder/v2/coderd/audit"
 	"github.com/coder/coder/v2/coderd/coderdtest"
@@ -1342,7 +1340,7 @@ func TestTemplateMetrics(t *testing.T) {
 
 	conn, err := workspacesdk.New(client).
 		DialAgent(ctx, resources[0].Agents[0].ID, &workspacesdk.DialAgentOptions{
-			Logger: slogtest.Make(t, nil).Named("tailnet"),
+			Logger: testutil.Logger(t).Named("tailnet"),
 		})
 	require.NoError(t, err)
 	defer func() {

coderd/unhanger/detector_test.go

@@ -15,7 +15,6 @@ import (
 	"go.uber.org/goleak"
 
 	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
@@ -38,7 +37,7 @@ func TestDetectorNoJobs(t *testing.T) {
 	var (
 		ctx        = testutil.Context(t, testutil.WaitLong)
 		db, pubsub = dbtestutil.NewDB(t)
-		log        = slogtest.Make(t, nil)
+		log        = testutil.Logger(t)
 		tickCh     = make(chan time.Time)
 		statsCh    = make(chan unhanger.Stats)
 	)
@@ -61,7 +60,7 @@ func TestDetectorNoHungJobs(t *testing.T) {
 	var (
 		ctx        = testutil.Context(t, testutil.WaitLong)
 		db, pubsub = dbtestutil.NewDB(t)
-		log        = slogtest.Make(t, nil)
+		log        = testutil.Logger(t)
 		tickCh     = make(chan time.Time)
 		statsCh    = make(chan unhanger.Stats)
 	)
@@ -108,7 +107,7 @@ func TestDetectorHungWorkspaceBuild(t *testing.T) {
 	var (
 		ctx        = testutil.Context(t, testutil.WaitLong)
 		db, pubsub = dbtestutil.NewDB(t)
-		log        = slogtest.Make(t, nil)
+		log        = testutil.Logger(t)
 		tickCh     = make(chan time.Time)
 		statsCh    = make(chan unhanger.Stats)
 	)
@@ -230,7 +229,7 @@ func TestDetectorHungWorkspaceBuildNoOverrideState(t *testing.T) {
 	var (
 		ctx        = testutil.Context(t, testutil.WaitLong)
 		db, pubsub = dbtestutil.NewDB(t)
-		log        = slogtest.Make(t, nil)
+		log        = testutil.Logger(t)
 		tickCh     = make(chan time.Time)
 		statsCh    = make(chan unhanger.Stats)
 	)
@@ -353,7 +352,7 @@ func TestDetectorHungWorkspaceBuildNoOverrideStateIfNoExistingBuild(t *testing.T
 	var (
 		ctx        = testutil.Context(t, testutil.WaitLong)
 		db, pubsub = dbtestutil.NewDB(t)
-		log        = slogtest.Make(t, nil)
+		log        = testutil.Logger(t)
 		tickCh     = make(chan time.Time)
 		statsCh    = make(chan unhanger.Stats)
 	)
@@ -446,7 +445,7 @@ func TestDetectorHungOtherJobTypes(t *testing.T) {
 	var (
 		ctx        = testutil.Context(t, testutil.WaitLong)
 		db, pubsub = dbtestutil.NewDB(t)
-		log        = slogtest.Make(t, nil)
+		log        = testutil.Logger(t)
 		tickCh     = make(chan time.Time)
 		statsCh    = make(chan unhanger.Stats)
 	)
@@ -550,7 +549,7 @@ func TestDetectorHungCanceledJob(t *testing.T) {
 	var (
 		ctx        = testutil.Context(t, testutil.WaitLong)
 		db, pubsub = dbtestutil.NewDB(t)
-		log        = slogtest.Make(t, nil)
+		log        = testutil.Logger(t)
 		tickCh     = make(chan time.Time)
 		statsCh    = make(chan unhanger.Stats)
 	)
@@ -652,7 +651,7 @@ func TestDetectorPushesLogs(t *testing.T) {
 			var (
 				ctx        = testutil.Context(t, testutil.WaitLong)
 				db, pubsub = dbtestutil.NewDB(t)
-				log        = slogtest.Make(t, nil)
+				log        = testutil.Logger(t)
 				tickCh     = make(chan time.Time)
 				statsCh    = make(chan unhanger.Stats)
 			)
@@ -770,7 +769,7 @@ func TestDetectorMaxJobsPerRun(t *testing.T) {
 	var (
 		ctx        = testutil.Context(t, testutil.WaitLong)
 		db, pubsub = dbtestutil.NewDB(t)
-		log        = slogtest.Make(t, nil)
+		log        = testutil.Logger(t)
 		tickCh     = make(chan time.Time)
 		statsCh    = make(chan unhanger.Stats)
 		org        = dbgen.Organization(t, db, database.Organization{})

coderd/userauth_test.go

@@ -1404,7 +1404,7 @@ func TestUserOIDC(t *testing.T) {
 
 		var (
 			ctx    = testutil.Context(t, testutil.WaitMedium)
-			logger = slogtest.Make(t, nil)
+			logger = testutil.Logger(t)
 		)
 
 		auditor := audit.NewMock()

coderd/workspaceagents_test.go

@@ -464,7 +464,7 @@ func TestWorkspaceAgentTailnet(t *testing.T) {
 
 		return workspacesdk.New(client).
 			DialAgent(ctx, resources[0].Agents[0].ID, &workspacesdk.DialAgentOptions{
-				Logger: slogtest.Make(t, nil).Named("client").Leveled(slog.LevelDebug),
+				Logger: testutil.Logger(t).Named("client"),
 			})
 	}()
 	require.NoError(t, err)
@@ -561,7 +561,7 @@ func TestWorkspaceAgentClientCoordinate_ResumeToken(t *testing.T) {
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()
 
-		logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+		logger := testutil.Logger(t)
 		clock := quartz.NewMock(t)
 		resumeTokenSigningKey, err := tailnet.GenerateResumeTokenSigningKey()
 		mgr := jwtutils.StaticKey{
@@ -633,7 +633,7 @@ func TestWorkspaceAgentClientCoordinate_ResumeToken(t *testing.T) {
 	t.Run("BadJWT", func(t *testing.T) {
 		t.Parallel()
 
-		logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+		logger := testutil.Logger(t)
 		clock := quartz.NewMock(t)
 		resumeTokenSigningKey, err := tailnet.GenerateResumeTokenSigningKey()
 		mgr := jwtutils.StaticKey{
@@ -797,7 +797,7 @@ func TestWorkspaceAgentTailnetDirectDisabled(t *testing.T) {
 
 	conn, err := workspacesdk.New(client).
 		DialAgent(ctx, resources[0].Agents[0].ID, &workspacesdk.DialAgentOptions{
-			Logger: slogtest.Make(t, nil).Named("client").Leveled(slog.LevelDebug),
+			Logger: testutil.Logger(t).Named("client"),
 		})
 	require.NoError(t, err)
 	defer conn.Close()
@@ -1747,7 +1747,7 @@ func TestWorkspaceAgent_Startup(t *testing.T) {
 func TestWorkspaceAgent_UpdatedDERP(t *testing.T) {
 	t.Parallel()
 
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 
 	dv := coderdtest.DeploymentValues(t)
 	err := dv.DERP.Config.BlockDirect.Set("true")
@@ -1936,7 +1936,7 @@ func TestOwnedWorkspacesCoordinate(t *testing.T) {
 	t.Parallel()
 
 	ctx := testutil.Context(t, testutil.WaitLong)
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	firstClient, _, api := coderdtest.NewWithAPI(t, &coderdtest.Options{
 		Coordinator: tailnet.NewCoordinator(logger),
 	})

coderd/workspaceagentsrpc_internal_test.go

@@ -16,8 +16,6 @@ import (
 	"go.uber.org/mock/gomock"
 	"nhooyr.io/websocket"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbmock"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
@@ -32,7 +30,7 @@ func TestAgentConnectionMonitor_ContextCancel(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	mDB := dbmock.NewMockStore(ctrl)
 	fUpdater := &fakeUpdater{}
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	agent := database.WorkspaceAgent{
 		ID: uuid.New(),
 		FirstConnectedAt: sql.NullTime{
@@ -106,7 +104,7 @@ func TestAgentConnectionMonitor_PingTimeout(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	mDB := dbmock.NewMockStore(ctrl)
 	fUpdater := &fakeUpdater{}
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	agent := database.WorkspaceAgent{
 		ID: uuid.New(),
 		FirstConnectedAt: sql.NullTime{
@@ -166,7 +164,7 @@ func TestAgentConnectionMonitor_BuildOutdated(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	mDB := dbmock.NewMockStore(ctrl)
 	fUpdater := &fakeUpdater{}
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	agent := database.WorkspaceAgent{
 		ID: uuid.New(),
 		FirstConnectedAt: sql.NullTime{
@@ -247,7 +245,7 @@ func TestAgentConnectionMonitor_StartClose(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	mDB := dbmock.NewMockStore(ctrl)
 	fUpdater := &fakeUpdater{}
-	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t)
 	agent := database.WorkspaceAgent{
 		ID: uuid.New(),
 		FirstConnectedAt: sql.NullTime{

coderd/workspaceapps/apptest/setup.go

@@ -17,8 +17,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/agent"
 	agentproto "github.com/coder/coder/v2/agent/proto"
 	"github.com/coder/coder/v2/coderd/coderdtest"
@@ -441,7 +439,7 @@ func createWorkspaceWithApps(t *testing.T, client *codersdk.Client, orgID uuid.U
 	}
 	agentCloser := agent.New(agent.Options{
 		Client: agentClient,
-		Logger: slogtest.Make(t, nil).Named("agent").Leveled(slog.LevelDebug),
+		Logger: testutil.Logger(t).Named("agent"),
 	})
 	t.Cleanup(func() {
 		_ = agentCloser.Close()

coderd/workspaceapps_test.go

@@ -10,8 +10,6 @@ import (
 	"github.com/go-jose/go-jose/v4/jwt"
 	"github.com/stretchr/testify/require"
 
-	"cdr.dev/slog/sloggers/slogtest"
-
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/coderd/cryptokeys"
 	"github.com/coder/coder/v2/coderd/database"
@@ -189,7 +187,7 @@ func TestWorkspaceApplicationAuth(t *testing.T) {
 			t.Parallel()
 
 			ctx := testutil.Context(t, testutil.WaitMedium)
-			logger := slogtest.Make(t, nil)
+			logger := testutil.Logger(t)
 			accessURL, err := url.Parse(c.accessURL)
 			require.NoError(t, err)
 

coderd/workspaces_test.go

@@ -19,8 +19,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
-
 	"github.com/coder/coder/v2/agent/agenttest"
 	"github.com/coder/coder/v2/coderd/audit"
 	"github.com/coder/coder/v2/coderd/coderdtest"
@@ -2502,7 +2500,7 @@ func TestWorkspaceWatcher(t *testing.T) {
 	require.NoError(t, err)
 
 	// Wait events are easier to debug with timestamped logs.
-	logger := slogtest.Make(t, nil).Named(t.Name()).Leveled(slog.LevelDebug)
+	logger := testutil.Logger(t).Named(t.Name())
 	wait := func(event string, ready func(w codersdk.Workspace) bool) {
 		for {
 			select {

coderd/workspacestats/activitybump_test.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/google/uuid"
 
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbgen"
 	"github.com/coder/coder/v2/coderd/database/dbtestutil"
@@ -172,7 +171,7 @@ func Test_ActivityBumpWorkspace(t *testing.T) {
 				var (
 					now   = dbtime.Now()
 					ctx   = testutil.Context(t, testutil.WaitShort)
-					log   = slogtest.Make(t, nil)
+					log   = testutil.Logger(t)
 					db, _ = dbtestutil.NewDB(t, dbtestutil.WithTimezone(tz))
 					org   = dbgen.Organization(t, db, database.Organization{})
 					user  = dbgen.User(t, db, database.User{

coderd/workspacestats/tracker_test.go

@@ -12,8 +12,6 @@ import (
 	"go.uber.org/goleak"
 	"go.uber.org/mock/gomock"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbfake"
@@ -31,7 +29,7 @@ func TestTracker(t *testing.T) {
 
 	ctrl := gomock.NewController(t)
 	mDB := dbmock.NewMockStore(ctrl)
-	log := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+	log := testutil.Logger(t)
 
 	tickCh := make(chan time.Time)
 	flushCh := make(chan int, 1)

coderd/workspaceupdates_test.go

@@ -10,7 +10,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/coderd"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
@@ -98,7 +97,7 @@ func TestWorkspaceUpdates(t *testing.T) {
 			cbs: map[string]pubsub.ListenerWithErr{},
 		}
 
-		updateProvider := coderd.NewUpdatesProvider(slogtest.Make(t, nil), ps, db, &mockAuthorizer{})
+		updateProvider := coderd.NewUpdatesProvider(testutil.Logger(t), ps, db, &mockAuthorizer{})
 		t.Cleanup(func() {
 			_ = updateProvider.Close()
 		})
@@ -255,7 +254,7 @@ func TestWorkspaceUpdates(t *testing.T) {
 			cbs: map[string]pubsub.ListenerWithErr{},
 		}
 
-		updateProvider := coderd.NewUpdatesProvider(slogtest.Make(t, nil), ps, db, &mockAuthorizer{})
+		updateProvider := coderd.NewUpdatesProvider(testutil.Logger(t), ps, db, &mockAuthorizer{})
 		t.Cleanup(func() {
 			_ = updateProvider.Close()
 		})