diff --git a/agent/agent.go b/agent/agent.go index 21918bbc52..dd00707d30 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -36,7 +36,8 @@ import ( "tailscale.com/types/netlogtype" "tailscale.com/util/clientmetric" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/clistat" "github.com/coder/coder/v2/agent/agentcontainers" "github.com/coder/coder/v2/agent/agentexec" diff --git a/agent/agent_internal_test.go b/agent/agent_internal_test.go index 66b39729a8..098d624533 100644 --- a/agent/agent_internal_test.go +++ b/agent/agent_internal_test.go @@ -6,8 +6,9 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/testutil" diff --git a/agent/agent_test.go b/agent/agent_test.go index e7d8bcefea..f9e1ee89c8 100644 --- a/agent/agent_test.go +++ b/agent/agent_test.go @@ -43,8 +43,9 @@ import ( "golang.org/x/crypto/ssh" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/agent/agentcontainers" diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go index 4c00e28892..67f5496f82 100644 --- a/agent/agentcontainers/api.go +++ b/agent/agentcontainers/api.go @@ -26,7 +26,8 @@ import ( "github.com/spf13/afero" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent/agentcontainers/ignore" "github.com/coder/coder/v2/agent/agentcontainers/watcher" "github.com/coder/coder/v2/agent/agentexec" diff --git a/agent/agentcontainers/api_test.go b/agent/agentcontainers/api_test.go index ebacdd3689..1048cf17b8 100644 --- a/agent/agentcontainers/api_test.go +++ b/agent/agentcontainers/api_test.go @@ -27,9 +27,12 @@ import ( "go.uber.org/mock/gomock" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + + "cdr.dev/slog/v3/sloggers/sloghuman" + + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/agent/agentcontainers" "github.com/coder/coder/v2/agent/agentcontainers/acmock" "github.com/coder/coder/v2/agent/agentcontainers/watcher" diff --git a/agent/agentcontainers/devcontainer.go b/agent/agentcontainers/devcontainer.go index 555e406e0b..15377b7ec3 100644 --- a/agent/agentcontainers/devcontainer.go +++ b/agent/agentcontainers/devcontainer.go @@ -7,7 +7,8 @@ import ( "github.com/google/uuid" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/codersdk" ) diff --git a/agent/agentcontainers/devcontainercli.go b/agent/agentcontainers/devcontainercli.go index a0872f02b0..ec68190eb0 100644 --- a/agent/agentcontainers/devcontainercli.go +++ b/agent/agentcontainers/devcontainercli.go @@ -13,7 +13,8 @@ import ( "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent/agentexec" "github.com/coder/coder/v2/codersdk" ) diff --git a/agent/agentcontainers/devcontainercli_test.go b/agent/agentcontainers/devcontainercli_test.go index c850d1fb38..3a616d6b43 100644 --- a/agent/agentcontainers/devcontainercli_test.go +++ b/agent/agentcontainers/devcontainercli_test.go @@ -21,8 +21,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/agent/agentcontainers" "github.com/coder/coder/v2/agent/agentexec" "github.com/coder/coder/v2/codersdk" diff --git a/agent/agentcontainers/execer.go b/agent/agentcontainers/execer.go index 323401f34c..0dad7913fa 100644 --- a/agent/agentcontainers/execer.go +++ b/agent/agentcontainers/execer.go @@ -7,7 +7,8 @@ import ( "runtime" "strings" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent/agentexec" "github.com/coder/coder/v2/agent/usershell" "github.com/coder/coder/v2/pty" diff --git a/agent/agentcontainers/ignore/dir.go b/agent/agentcontainers/ignore/dir.go index d97e2ef223..de8a8be3d3 100644 --- a/agent/agentcontainers/ignore/dir.go +++ b/agent/agentcontainers/ignore/dir.go @@ -14,7 +14,7 @@ import ( "github.com/spf13/afero" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) const ( diff --git a/agent/agentcontainers/subagent.go b/agent/agentcontainers/subagent.go index d514bf74c6..db47f354e9 100644 --- a/agent/agentcontainers/subagent.go +++ b/agent/agentcontainers/subagent.go @@ -7,7 +7,7 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/codersdk" diff --git a/agent/agentscripts/agentscripts.go b/agent/agentscripts/agentscripts.go index bde3305b15..f957198c29 100644 --- a/agent/agentscripts/agentscripts.go +++ b/agent/agentscripts/agentscripts.go @@ -20,7 +20,7 @@ import ( "golang.org/x/xerrors" "google.golang.org/protobuf/types/known/timestamppb" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/agent/agentssh" "github.com/coder/coder/v2/agent/proto" diff --git a/agent/agentscripts/agentscripts_other.go b/agent/agentscripts/agentscripts_other.go index 81be689512..d2f8418c09 100644 --- a/agent/agentscripts/agentscripts_other.go +++ b/agent/agentscripts/agentscripts_other.go @@ -7,7 +7,7 @@ import ( "os/exec" "syscall" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) func cmdSysProcAttr() *syscall.SysProcAttr { diff --git a/agent/agentscripts/agentscripts_windows.go b/agent/agentscripts/agentscripts_windows.go index 4799d0829c..b9a864ffcd 100644 --- a/agent/agentscripts/agentscripts_windows.go +++ b/agent/agentscripts/agentscripts_windows.go @@ -6,7 +6,7 @@ import ( "os/exec" "syscall" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) func cmdSysProcAttr() *syscall.SysProcAttr { diff --git a/agent/agentsocket/server.go b/agent/agentsocket/server.go index aed3afe4f7..43cc5ea6af 100644 --- a/agent/agentsocket/server.go +++ b/agent/agentsocket/server.go @@ -10,7 +10,8 @@ import ( "storj.io/drpc/drpcmux" "storj.io/drpc/drpcserver" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent/agentsocket/proto" "github.com/coder/coder/v2/agent/unit" "github.com/coder/coder/v2/codersdk/drpcsdk" diff --git a/agent/agentsocket/server_test.go b/agent/agentsocket/server_test.go index da74039c40..121cc56b82 100644 --- a/agent/agentsocket/server_test.go +++ b/agent/agentsocket/server_test.go @@ -10,7 +10,8 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/require" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/agent/agentsocket" "github.com/coder/coder/v2/agent/agenttest" diff --git a/agent/agentsocket/service.go b/agent/agentsocket/service.go index 60248a8fe6..10d9101985 100644 --- a/agent/agentsocket/service.go +++ b/agent/agentsocket/service.go @@ -6,7 +6,8 @@ import ( "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent/agentsocket/proto" "github.com/coder/coder/v2/agent/unit" ) diff --git a/agent/agentsocket/service_test.go b/agent/agentsocket/service_test.go index 320ac8f4f6..8bb3bdf220 100644 --- a/agent/agentsocket/service_test.go +++ b/agent/agentsocket/service_test.go @@ -8,7 +8,8 @@ import ( "github.com/stretchr/testify/require" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent/agentsocket" "github.com/coder/coder/v2/agent/unit" "github.com/coder/coder/v2/testutil" diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go index c769e5f07f..f9b50f082b 100644 --- a/agent/agentssh/agentssh.go +++ b/agent/agentssh/agentssh.go @@ -27,7 +27,7 @@ import ( gossh "golang.org/x/crypto/ssh" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/agent/agentcontainers" "github.com/coder/coder/v2/agent/agentexec" diff --git a/agent/agentssh/agentssh_test.go b/agent/agentssh/agentssh_test.go index 7bf91123d5..3f42a0d3cc 100644 --- a/agent/agentssh/agentssh_test.go +++ b/agent/agentssh/agentssh_test.go @@ -24,8 +24,8 @@ import ( "go.uber.org/goleak" "golang.org/x/crypto/ssh" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/agent/agentexec" "github.com/coder/coder/v2/agent/agentssh" diff --git a/agent/agentssh/exec_other.go b/agent/agentssh/exec_other.go index aef496a1ef..ff9101be2a 100644 --- a/agent/agentssh/exec_other.go +++ b/agent/agentssh/exec_other.go @@ -7,7 +7,7 @@ import ( "os" "syscall" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) func cmdSysProcAttr() *syscall.SysProcAttr { diff --git a/agent/agentssh/exec_windows.go b/agent/agentssh/exec_windows.go index 0dafa67958..aab8f2bd7e 100644 --- a/agent/agentssh/exec_windows.go +++ b/agent/agentssh/exec_windows.go @@ -5,7 +5,7 @@ import ( "os" "syscall" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) func cmdSysProcAttr() *syscall.SysProcAttr { diff --git a/agent/agentssh/forward.go b/agent/agentssh/forward.go index adce24c8a9..8d9970b769 100644 --- a/agent/agentssh/forward.go +++ b/agent/agentssh/forward.go @@ -15,7 +15,7 @@ import ( gossh "golang.org/x/crypto/ssh" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) // streamLocalForwardPayload describes the extra data sent in a diff --git a/agent/agentssh/jetbrainstrack.go b/agent/agentssh/jetbrainstrack.go index 874f4c278c..e4a63a091d 100644 --- a/agent/agentssh/jetbrainstrack.go +++ b/agent/agentssh/jetbrainstrack.go @@ -10,7 +10,7 @@ import ( "go.uber.org/atomic" gossh "golang.org/x/crypto/ssh" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) // localForwardChannelData is copied from the ssh package. diff --git a/agent/agentssh/x11.go b/agent/agentssh/x11.go index 06cbf5fd84..bfbdfc689c 100644 --- a/agent/agentssh/x11.go +++ b/agent/agentssh/x11.go @@ -21,7 +21,7 @@ import ( gossh "golang.org/x/crypto/ssh" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) const ( diff --git a/agent/agenttest/client.go b/agent/agenttest/client.go index c5c1bf561f..294cb7667e 100644 --- a/agent/agenttest/client.go +++ b/agent/agenttest/client.go @@ -21,7 +21,8 @@ import ( "storj.io/drpc/drpcserver" "tailscale.com/tailcfg" - "cdr.dev/slog" + "cdr.dev/slog/v3" + agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" diff --git a/agent/apphealth.go b/agent/apphealth.go index 4fb551077a..f8380c1cfd 100644 --- a/agent/apphealth.go +++ b/agent/apphealth.go @@ -9,7 +9,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" "github.com/coder/quartz" diff --git a/agent/boundary_logs_test.go b/agent/boundary_logs_test.go index 63bf21fe25..335778039e 100644 --- a/agent/boundary_logs_test.go +++ b/agent/boundary_logs_test.go @@ -14,7 +14,7 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/timestamppb" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/agent/boundarylogproxy" "github.com/coder/coder/v2/agent/boundarylogproxy/codec" diff --git a/agent/boundarylogproxy/proxy.go b/agent/boundarylogproxy/proxy.go index 4fd0e82e0f..9878093ac2 100644 --- a/agent/boundarylogproxy/proxy.go +++ b/agent/boundarylogproxy/proxy.go @@ -14,7 +14,8 @@ import ( "golang.org/x/xerrors" "google.golang.org/protobuf/proto" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent/boundarylogproxy/codec" agentproto "github.com/coder/coder/v2/agent/proto" ) diff --git a/agent/checkpoint.go b/agent/checkpoint.go index 3f6c7b2c6d..de5abbba43 100644 --- a/agent/checkpoint.go +++ b/agent/checkpoint.go @@ -5,7 +5,7 @@ import ( "runtime" "sync" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) // checkpoint allows a goroutine to communicate when it is OK to proceed beyond some async condition diff --git a/agent/checkpoint_internal_test.go b/agent/checkpoint_internal_test.go index 61cb2b7f56..1d98dcbc17 100644 --- a/agent/checkpoint_internal_test.go +++ b/agent/checkpoint_internal_test.go @@ -6,7 +6,8 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/xerrors" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/testutil" ) diff --git a/agent/files.go b/agent/files.go index 4ac707c602..01f4b66567 100644 --- a/agent/files.go +++ b/agent/files.go @@ -17,7 +17,8 @@ import ( "golang.org/x/text/transform" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/workspacesdk" diff --git a/agent/metrics.go b/agent/metrics.go index 1755e43a1a..54b1219223 100644 --- a/agent/metrics.go +++ b/agent/metrics.go @@ -9,7 +9,8 @@ import ( prompb "github.com/prometheus/client_model/go" "tailscale.com/util/clientmetric" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent/proto" ) diff --git a/agent/proto/resourcesmonitor/resources_monitor.go b/agent/proto/resourcesmonitor/resources_monitor.go index 7dea49614c..3cb46bf06a 100644 --- a/agent/proto/resourcesmonitor/resources_monitor.go +++ b/agent/proto/resourcesmonitor/resources_monitor.go @@ -4,7 +4,8 @@ import ( "context" "time" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent/proto" "github.com/coder/quartz" ) diff --git a/agent/proto/resourcesmonitor/resources_monitor_test.go b/agent/proto/resourcesmonitor/resources_monitor_test.go index da8ffef293..4f0691ff38 100644 --- a/agent/proto/resourcesmonitor/resources_monitor_test.go +++ b/agent/proto/resourcesmonitor/resources_monitor_test.go @@ -8,8 +8,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/agent/proto/resourcesmonitor" "github.com/coder/quartz" diff --git a/agent/reconnectingpty/buffered.go b/agent/reconnectingpty/buffered.go index 40b1b5dfe2..baec5bc5a8 100644 --- a/agent/reconnectingpty/buffered.go +++ b/agent/reconnectingpty/buffered.go @@ -12,7 +12,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/agent/agentexec" "github.com/coder/coder/v2/pty" diff --git a/agent/reconnectingpty/reconnectingpty.go b/agent/reconnectingpty/reconnectingpty.go index 4b5251ef31..a06fedee81 100644 --- a/agent/reconnectingpty/reconnectingpty.go +++ b/agent/reconnectingpty/reconnectingpty.go @@ -13,7 +13,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent/agentexec" "github.com/coder/coder/v2/codersdk/workspacesdk" "github.com/coder/coder/v2/pty" diff --git a/agent/reconnectingpty/screen.go b/agent/reconnectingpty/screen.go index ffab2f7d5b..cddd890f11 100644 --- a/agent/reconnectingpty/screen.go +++ b/agent/reconnectingpty/screen.go @@ -18,7 +18,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent/agentexec" "github.com/coder/coder/v2/pty" ) diff --git a/agent/reconnectingpty/server.go b/agent/reconnectingpty/server.go index 89abda1bf7..33387e1b20 100644 --- a/agent/reconnectingpty/server.go +++ b/agent/reconnectingpty/server.go @@ -13,7 +13,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent/agentcontainers" "github.com/coder/coder/v2/agent/agentssh" "github.com/coder/coder/v2/agent/usershell" diff --git a/agent/stats.go b/agent/stats.go index 898d7117c6..32835aa6b7 100644 --- a/agent/stats.go +++ b/agent/stats.go @@ -9,7 +9,8 @@ import ( "golang.org/x/xerrors" "tailscale.com/types/netlogtype" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent/proto" ) diff --git a/cli/agent.go b/cli/agent.go index 6c95c73163..6d4ad020e8 100644 --- a/cli/agent.go +++ b/cli/agent.go @@ -21,10 +21,11 @@ import ( "github.com/prometheus/client_golang/prometheus" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" - "cdr.dev/slog/sloggers/slogjson" - "cdr.dev/slog/sloggers/slogstackdriver" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "cdr.dev/slog/v3/sloggers/slogjson" + "cdr.dev/slog/v3/sloggers/slogstackdriver" + "github.com/coder/serpent" "github.com/coder/coder/v2/agent" diff --git a/cli/clilog/clilog.go b/cli/clilog/clilog.go index e2ad3d339f..cea4084d87 100644 --- a/cli/clilog/clilog.go +++ b/cli/clilog/clilog.go @@ -11,10 +11,11 @@ import ( "golang.org/x/xerrors" "gopkg.in/natefinch/lumberjack.v2" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" - "cdr.dev/slog/sloggers/slogjson" - "cdr.dev/slog/sloggers/slogstackdriver" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "cdr.dev/slog/v3/sloggers/slogjson" + "cdr.dev/slog/v3/sloggers/slogstackdriver" + "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/serpent" diff --git a/cli/clitest/clitest.go b/cli/clitest/clitest.go index 3e506a26b6..2fc055e0b8 100644 --- a/cli/clitest/clitest.go +++ b/cli/clitest/clitest.go @@ -17,8 +17,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/cli" "github.com/coder/coder/v2/cli/config" "github.com/coder/coder/v2/codersdk" diff --git a/cli/exp_scaletest.go b/cli/exp_scaletest.go index 9d4212a7af..88d39f65fa 100644 --- a/cli/exp_scaletest.go +++ b/cli/exp_scaletest.go @@ -24,8 +24,8 @@ import ( "go.opentelemetry.io/otel/trace" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/coderd/httpapi" diff --git a/cli/exp_scaletest_dynamicparameters.go b/cli/exp_scaletest_dynamicparameters.go index ba34ff27ea..61510066e8 100644 --- a/cli/exp_scaletest_dynamicparameters.go +++ b/cli/exp_scaletest_dynamicparameters.go @@ -12,8 +12,9 @@ import ( "github.com/coder/coder/v2/scaletest/loadtestutil" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/serpent" "github.com/coder/coder/v2/scaletest/dynamicparameters" diff --git a/cli/exp_scaletest_notifications.go b/cli/exp_scaletest_notifications.go index 6d9987bf61..cc4612a40b 100644 --- a/cli/exp_scaletest_notifications.go +++ b/cli/exp_scaletest_notifications.go @@ -20,7 +20,7 @@ import ( "github.com/coder/coder/v2/scaletest/loadtestutil" - "cdr.dev/slog" + "cdr.dev/slog/v3" notificationsLib "github.com/coder/coder/v2/coderd/notifications" "github.com/coder/coder/v2/codersdk" diff --git a/cli/exp_scaletest_smtp.go b/cli/exp_scaletest_smtp.go index 3713005de5..e36a4e6419 100644 --- a/cli/exp_scaletest_smtp.go +++ b/cli/exp_scaletest_smtp.go @@ -9,8 +9,9 @@ import ( "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/scaletest/smtpmock" "github.com/coder/serpent" ) diff --git a/cli/exp_scaletest_taskstatus.go b/cli/exp_scaletest_taskstatus.go index c4ecad14d0..f4e8ca0a2c 100644 --- a/cli/exp_scaletest_taskstatus.go +++ b/cli/exp_scaletest_taskstatus.go @@ -16,8 +16,9 @@ import ( "github.com/coder/coder/v2/scaletest/loadtestutil" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/serpent" "github.com/coder/coder/v2/codersdk" diff --git a/cli/exp_scaletest_test.go b/cli/exp_scaletest_test.go index 0c5f525e9e..147db049d2 100644 --- a/cli/exp_scaletest_test.go +++ b/cli/exp_scaletest_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/cli/exptest/exptest_scaletest_test.go b/cli/exptest/exptest_scaletest_test.go index d2f5f3f608..2edce4e2ab 100644 --- a/cli/exptest/exptest_scaletest_test.go +++ b/cli/exptest/exptest_scaletest_test.go @@ -7,7 +7,8 @@ import ( "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/codersdk" diff --git a/cli/ping.go b/cli/ping.go index f97f9ec0ae..31a4d26f9a 100644 --- a/cli/ping.go +++ b/cli/ping.go @@ -14,8 +14,8 @@ import ( "tailscale.com/ipn/ipnstate" "tailscale.com/tailcfg" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" "github.com/briandowns/spinner" diff --git a/cli/portforward.go b/cli/portforward.go index 8c07eee2fe..a6285c1a44 100644 --- a/cli/portforward.go +++ b/cli/portforward.go @@ -15,8 +15,8 @@ import ( "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" "github.com/coder/coder/v2/agent/agentssh" "github.com/coder/coder/v2/cli/cliui" diff --git a/cli/resetpassword.go b/cli/resetpassword.go index f356b07b5e..b43ddde4e2 100644 --- a/cli/resetpassword.go +++ b/cli/resetpassword.go @@ -7,8 +7,9 @@ import ( "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/coderd/database/awsiamrds" "github.com/coder/coder/v2/codersdk" "github.com/coder/pretty" diff --git a/cli/server.go b/cli/server.go index 29bce5f53c..61fccf0120 100644 --- a/cli/server.go +++ b/cli/server.go @@ -54,8 +54,9 @@ import ( "gopkg.in/yaml.v3" "tailscale.com/tailcfg" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/coderd/pproflabel" "github.com/coder/pretty" "github.com/coder/quartz" diff --git a/cli/server_createadminuser.go b/cli/server_createadminuser.go index 40d65507dc..121f9b8671 100644 --- a/cli/server_createadminuser.go +++ b/cli/server_createadminuser.go @@ -9,8 +9,9 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/awsiamrds" diff --git a/cli/server_internal_test.go b/cli/server_internal_test.go index 263445ccab..fe12bceac8 100644 --- a/cli/server_internal_test.go +++ b/cli/server_internal_test.go @@ -11,8 +11,9 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/testutil" "github.com/coder/serpent" diff --git a/cli/server_regenerate_vapid_keypair.go b/cli/server_regenerate_vapid_keypair.go index c3748f1b2c..ce8954a33e 100644 --- a/cli/server_regenerate_vapid_keypair.go +++ b/cli/server_regenerate_vapid_keypair.go @@ -7,8 +7,8 @@ import ( "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/coderd/database" diff --git a/cli/server_test.go b/cli/server_test.go index d6278fc766..8df9354301 100644 --- a/cli/server_test.go +++ b/cli/server_test.go @@ -41,7 +41,8 @@ import ( "tailscale.com/derp/derphttp" "tailscale.com/types/key" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/cli" "github.com/coder/coder/v2/cli/clitest" diff --git a/cli/speedtest.go b/cli/speedtest.go index 29f991bbcc..6eb49df5d6 100644 --- a/cli/speedtest.go +++ b/cli/speedtest.go @@ -10,8 +10,9 @@ import ( tsspeedtest "tailscale.com/net/speedtest" "tailscale.com/wgengine/capture" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/codersdk/workspacesdk" "github.com/coder/serpent" diff --git a/cli/ssh.go b/cli/ssh.go index 37000da178..16b69d73ea 100644 --- a/cli/ssh.go +++ b/cli/ssh.go @@ -32,8 +32,9 @@ import ( "gvisor.dev/gvisor/pkg/tcpip/adapters/gonet" "tailscale.com/types/netlogtype" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/agent/agentssh" "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/cli/cliutil" diff --git a/cli/ssh_internal_test.go b/cli/ssh_internal_test.go index 3cf562ce82..3bc512ce76 100644 --- a/cli/ssh_internal_test.go +++ b/cli/ssh_internal_test.go @@ -17,8 +17,9 @@ import ( "golang.org/x/crypto/ssh" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/quartz" "github.com/coder/coder/v2/codersdk" diff --git a/cli/support.go b/cli/support.go index 9e55c1d6d9..4fd28d656d 100644 --- a/cli/support.go +++ b/cli/support.go @@ -19,8 +19,9 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/support" diff --git a/cli/sync_test.go b/cli/sync_test.go index 4ee9fa48c9..8865daaba3 100644 --- a/cli/sync_test.go +++ b/cli/sync_test.go @@ -12,7 +12,8 @@ import ( "github.com/stretchr/testify/require" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent/agentsocket" "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/testutil" diff --git a/cli/task_list_test.go b/cli/task_list_test.go index c9b91486bb..1b63a7a69e 100644 --- a/cli/task_list_test.go +++ b/cli/task_list_test.go @@ -12,8 +12,8 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/cli/vpndaemon_darwin.go b/cli/vpndaemon_darwin.go index 0e019a728a..b9cf7f0c5f 100644 --- a/cli/vpndaemon_darwin.go +++ b/cli/vpndaemon_darwin.go @@ -5,7 +5,8 @@ package cli import ( "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/vpn" "github.com/coder/serpent" ) diff --git a/cli/vpndaemon_windows.go b/cli/vpndaemon_windows.go index 6c2d147da2..e7a66a174c 100644 --- a/cli/vpndaemon_windows.go +++ b/cli/vpndaemon_windows.go @@ -5,8 +5,9 @@ package cli import ( "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/vpn" "github.com/coder/serpent" ) diff --git a/cli/vscodessh.go b/cli/vscodessh.go index 7792958a91..8cc5aee3dd 100644 --- a/cli/vscodessh.go +++ b/cli/vscodessh.go @@ -14,8 +14,8 @@ import ( "github.com/spf13/afero" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/cli/cliutil" diff --git a/coderd/agentapi/api.go b/coderd/agentapi/api.go index fd44873a8f..486136ab74 100644 --- a/coderd/agentapi/api.go +++ b/coderd/agentapi/api.go @@ -15,7 +15,8 @@ import ( "storj.io/drpc/drpcserver" "tailscale.com/tailcfg" - "cdr.dev/slog" + "cdr.dev/slog/v3" + agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/agentapi/resourcesmonitor" "github.com/coder/coder/v2/coderd/appearance" diff --git a/coderd/agentapi/apps.go b/coderd/agentapi/apps.go index 89c1a873d6..9369383836 100644 --- a/coderd/agentapi/apps.go +++ b/coderd/agentapi/apps.go @@ -6,7 +6,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/wspubsub" diff --git a/coderd/agentapi/boundary_logs.go b/coderd/agentapi/boundary_logs.go index 1f2cf99526..2fe23f2472 100644 --- a/coderd/agentapi/boundary_logs.go +++ b/coderd/agentapi/boundary_logs.go @@ -6,7 +6,7 @@ import ( "github.com/google/uuid" - "cdr.dev/slog" + "cdr.dev/slog/v3" agentproto "github.com/coder/coder/v2/agent/proto" ) diff --git a/coderd/agentapi/connectionlog.go b/coderd/agentapi/connectionlog.go index e38a312c4e..da1333b8b7 100644 --- a/coderd/agentapi/connectionlog.go +++ b/coderd/agentapi/connectionlog.go @@ -9,7 +9,8 @@ import ( "golang.org/x/xerrors" "google.golang.org/protobuf/types/known/emptypb" - "cdr.dev/slog" + "cdr.dev/slog/v3" + agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/connectionlog" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/agentapi/lifecycle.go b/coderd/agentapi/lifecycle.go index 6bb3fedc51..128a7c06eb 100644 --- a/coderd/agentapi/lifecycle.go +++ b/coderd/agentapi/lifecycle.go @@ -11,7 +11,8 @@ import ( "golang.org/x/xerrors" "google.golang.org/protobuf/types/known/timestamppb" - "cdr.dev/slog" + "cdr.dev/slog/v3" + agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/agentapi/logs.go b/coderd/agentapi/logs.go index ce772088c0..eb351bed2e 100644 --- a/coderd/agentapi/logs.go +++ b/coderd/agentapi/logs.go @@ -7,7 +7,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/agentapi/metadata.go b/coderd/agentapi/metadata.go index 1d4e23ab88..49c1b8510c 100644 --- a/coderd/agentapi/metadata.go +++ b/coderd/agentapi/metadata.go @@ -9,7 +9,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/agentapi/resources_monitoring.go b/coderd/agentapi/resources_monitoring.go index db0d523192..c4d3c5d62c 100644 --- a/coderd/agentapi/resources_monitoring.go +++ b/coderd/agentapi/resources_monitoring.go @@ -10,7 +10,7 @@ import ( "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/google/uuid" diff --git a/coderd/agentapi/stats.go b/coderd/agentapi/stats.go index 8da0d33930..e13824d619 100644 --- a/coderd/agentapi/stats.go +++ b/coderd/agentapi/stats.go @@ -7,7 +7,8 @@ import ( "golang.org/x/xerrors" "google.golang.org/protobuf/types/known/durationpb" - "cdr.dev/slog" + "cdr.dev/slog/v3" + agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/agentapi/subagent.go b/coderd/agentapi/subagent.go index 5972817708..bf32316ca2 100644 --- a/coderd/agentapi/subagent.go +++ b/coderd/agentapi/subagent.go @@ -13,7 +13,8 @@ import ( "github.com/sqlc-dev/pqtype" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/quartz" agentproto "github.com/coder/coder/v2/agent/proto" diff --git a/coderd/agentapi/subagent_test.go b/coderd/agentapi/subagent_test.go index 1b6eef936f..1918fb2ff7 100644 --- a/coderd/agentapi/subagent_test.go +++ b/coderd/agentapi/subagent_test.go @@ -13,7 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/agentapi" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/apikey.go b/coderd/apikey.go index f2aec89e57..1944898f0c 100644 --- a/coderd/apikey.go +++ b/coderd/apikey.go @@ -12,7 +12,7 @@ import ( "github.com/moby/moby/pkg/namesgenerator" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/apikey" "github.com/coder/coder/v2/coderd/audit" diff --git a/coderd/audit.go b/coderd/audit.go index 3a3237a9fe..b3e492f7e4 100644 --- a/coderd/audit.go +++ b/coderd/audit.go @@ -15,7 +15,8 @@ import ( "github.com/sqlc-dev/pqtype" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/coderd/audit/fields.go b/coderd/audit/fields.go index db08797304..a9944767c2 100644 --- a/coderd/audit/fields.go +++ b/coderd/audit/fields.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) type BackgroundSubsystem string diff --git a/coderd/audit/request.go b/coderd/audit/request.go index 20aa89f6a8..279d57737f 100644 --- a/coderd/audit/request.go +++ b/coderd/audit/request.go @@ -14,7 +14,7 @@ import ( "go.opentelemetry.io/otel/baggage" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/audit_test.go b/coderd/audit_test.go index 28bb05fbef..2bbda9f545 100644 --- a/coderd/audit_test.go +++ b/coderd/audit_test.go @@ -11,7 +11,8 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/authorize.go b/coderd/authorize.go index 575bb5e98b..f1290912f2 100644 --- a/coderd/authorize.go +++ b/coderd/authorize.go @@ -7,7 +7,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/httpmw" "github.com/coder/coder/v2/coderd/rbac" diff --git a/coderd/autobuild/lifecycle_executor.go b/coderd/autobuild/lifecycle_executor.go index 945b5f8c7c..794ff9fd55 100644 --- a/coderd/autobuild/lifecycle_executor.go +++ b/coderd/autobuild/lifecycle_executor.go @@ -18,7 +18,8 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/files" "github.com/coder/coder/v2/coderd/pproflabel" diff --git a/coderd/autobuild/lifecycle_executor_test.go b/coderd/autobuild/lifecycle_executor_test.go index 58e48f321a..46def42d90 100644 --- a/coderd/autobuild/lifecycle_executor_test.go +++ b/coderd/autobuild/lifecycle_executor_test.go @@ -18,8 +18,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/goleak" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/coderd/autobuild" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/coderd/coderd.go b/coderd/coderd.go index 2d0c222dc6..932f9c729e 100644 --- a/coderd/coderd.go +++ b/coderd/coderd.go @@ -48,7 +48,8 @@ import ( "github.com/coder/coder/v2/provisionerd/proto" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/quartz" "github.com/coder/serpent" diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go index ac362295f0..9cb3a5c912 100644 --- a/coderd/coderdtest/coderdtest.go +++ b/coderd/coderdtest/coderdtest.go @@ -50,9 +50,10 @@ import ( "tailscale.com/types/key" "tailscale.com/types/nettype" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/archive" "github.com/coder/coder/v2/coderd/files" "github.com/coder/coder/v2/coderd/provisionerdserver" diff --git a/coderd/coderdtest/oidctest/idp.go b/coderd/coderdtest/oidctest/idp.go index 8d9276d18a..8e80311be7 100644 --- a/coderd/coderdtest/oidctest/idp.go +++ b/coderd/coderdtest/oidctest/idp.go @@ -35,8 +35,9 @@ import ( "golang.org/x/oauth2" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd" "github.com/coder/coder/v2/coderd/externalauth" "github.com/coder/coder/v2/coderd/httpapi" @@ -1712,8 +1713,8 @@ func (f *FakeIDP) getClaims(m *syncmap.Map[string, jwt.MapClaims], key string) ( return v, true } -func slogRequestFields(r *http.Request) []any { - return []any{ +func slogRequestFields(r *http.Request) []slog.Field { + return []slog.Field{ slog.F("url", r.URL.String()), slog.F("host", r.Host), slog.F("method", r.Method), diff --git a/coderd/cryptokeys/cache.go b/coderd/cryptokeys/cache.go index 1f4a8fafbe..e72b8c6bc0 100644 --- a/coderd/cryptokeys/cache.go +++ b/coderd/cryptokeys/cache.go @@ -11,7 +11,8 @@ import ( "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/codersdk" diff --git a/coderd/cryptokeys/rotate.go b/coderd/cryptokeys/rotate.go index ad05a8cbc9..0d7807bf60 100644 --- a/coderd/cryptokeys/rotate.go +++ b/coderd/cryptokeys/rotate.go @@ -9,7 +9,8 @@ import ( "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/csp.go b/coderd/csp.go index 84e22daf9a..819df9faaa 100644 --- a/coderd/csp.go +++ b/coderd/csp.go @@ -7,7 +7,7 @@ import ( "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/codersdk" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) type cspViolation struct { @@ -39,7 +39,7 @@ func (api *API) logReportCSPViolations(rw http.ResponseWriter, r *http.Request) return } - fields := make([]any, 0, len(v.Report)) + fields := make([]slog.Field, 0, len(v.Report)) for k, v := range v.Report { fields = append(fields, slog.F(k, v)) } diff --git a/coderd/database/dbauthz/customroles_test.go b/coderd/database/dbauthz/customroles_test.go index 54541d4670..b54d176eb7 100644 --- a/coderd/database/dbauthz/customroles_test.go +++ b/coderd/database/dbauthz/customroles_test.go @@ -7,7 +7,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go index b5747fb970..78b136d992 100644 --- a/coderd/database/dbauthz/dbauthz.go +++ b/coderd/database/dbauthz/dbauthz.go @@ -15,8 +15,7 @@ import ( "github.com/open-policy-agent/opa/topdown" "golang.org/x/xerrors" - "cdr.dev/slog" - + slog "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/httpapi/httpapiconstraints" diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go index 11909b1a65..ad705b5dc8 100644 --- a/coderd/database/dbauthz/dbauthz_test.go +++ b/coderd/database/dbauthz/dbauthz_test.go @@ -18,8 +18,9 @@ import ( "go.uber.org/mock/gomock" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/coderd/database/dbauthz/groupsauth_test.go b/coderd/database/dbauthz/groupsauth_test.go index 79f936e103..ce789fed2e 100644 --- a/coderd/database/dbauthz/groupsauth_test.go +++ b/coderd/database/dbauthz/groupsauth_test.go @@ -8,7 +8,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/database/dbauthz/setup_test.go b/coderd/database/dbauthz/setup_test.go index 91fb68e1a1..909c89e159 100644 --- a/coderd/database/dbauthz/setup_test.go +++ b/coderd/database/dbauthz/setup_test.go @@ -20,7 +20,7 @@ import ( "go.uber.org/mock/gomock" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go index 6161299e00..38d999f112 100644 --- a/coderd/database/dbfake/dbfake.go +++ b/coderd/database/dbfake/dbfake.go @@ -12,8 +12,8 @@ import ( "github.com/sqlc-dev/pqtype" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" @@ -228,7 +228,7 @@ func (b WorkspaceBuildBuilder) doInTX() WorkspaceResponse { // If a task was requested, ensure it exists and is associated with this // workspace. if b.taskAppID != uuid.Nil { - b.logger.Debug(context.Background(), "creating or updating task", "task_id", b.taskSeed.ID) + b.logger.Debug(context.Background(), "creating or updating task", slog.F("task_id", b.taskSeed.ID)) b.taskSeed.OrganizationID = takeFirst(b.taskSeed.OrganizationID, b.ws.OrganizationID) b.taskSeed.OwnerID = takeFirst(b.taskSeed.OwnerID, b.ws.OwnerID) b.taskSeed.Name = takeFirst(b.taskSeed.Name, b.ws.Name) @@ -238,7 +238,9 @@ func (b WorkspaceBuildBuilder) doInTX() WorkspaceResponse { // Try to fetch existing task and update its workspace ID. if task, err := b.db.GetTaskByID(ownerCtx, b.taskSeed.ID); err == nil { if !task.WorkspaceID.Valid { - b.logger.Info(context.Background(), "updating task workspace id", "task_id", b.taskSeed.ID, "workspace_id", b.ws.ID) + b.logger.Info(context.Background(), "updating task workspace id", + slog.F("task_id", b.taskSeed.ID), + slog.F("workspace_id", b.ws.ID)) _, err = b.db.UpdateTaskWorkspaceID(ownerCtx, database.UpdateTaskWorkspaceIDParams{ ID: b.taskSeed.ID, WorkspaceID: uuid.NullUUID{UUID: b.ws.ID, Valid: true}, @@ -250,7 +252,7 @@ func (b WorkspaceBuildBuilder) doInTX() WorkspaceResponse { } else if errors.Is(err, sql.ErrNoRows) { task := dbgen.Task(b.t, b.db, b.taskSeed) b.taskSeed.ID = task.ID - b.logger.Info(context.Background(), "created new task", "task_id", b.taskSeed.ID) + b.logger.Info(context.Background(), "created new task", slog.F("task_id", b.taskSeed.ID)) } else { require.NoError(b.t, err, "get task by id") } diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go index d2f2bd94b2..277f84ba2a 100644 --- a/coderd/database/dbgen/dbgen.go +++ b/coderd/database/dbgen/dbgen.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/google/uuid" "github.com/sqlc-dev/pqtype" diff --git a/coderd/database/dbmetrics/dbmetrics.go b/coderd/database/dbmetrics/dbmetrics.go index fbf4a3cae6..22fa67adce 100644 --- a/coderd/database/dbmetrics/dbmetrics.go +++ b/coderd/database/dbmetrics/dbmetrics.go @@ -8,7 +8,8 @@ import ( "github.com/prometheus/client_golang/prometheus" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" ) diff --git a/coderd/database/dbmetrics/dbmetrics_test.go b/coderd/database/dbmetrics/dbmetrics_test.go index f804184c54..83ae412a79 100644 --- a/coderd/database/dbmetrics/dbmetrics_test.go +++ b/coderd/database/dbmetrics/dbmetrics_test.go @@ -8,8 +8,9 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/coderd/coderdtest/promhelp" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbmetrics" diff --git a/coderd/database/dbmetrics/querymetrics.go b/coderd/database/dbmetrics/querymetrics.go index 6a018f4190..8908910864 100644 --- a/coderd/database/dbmetrics/querymetrics.go +++ b/coderd/database/dbmetrics/querymetrics.go @@ -11,8 +11,11 @@ import ( "github.com/google/uuid" "github.com/prometheus/client_golang/prometheus" - "cdr.dev/slog" - + // the redundant alias `slog` works around the fact that github.com/dave/dst is bugged and doesn't correctly resolve + // the package name. We use github.com/dave/dst in scripts/dbgen/ to generate new stubs for database.Store methods. + // Without this workaround, dbgen will drop and re-add slog, possibly resolving to a different version (e.g. v1). + // It can also result in the imports being sorted incorrectly. + slog "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/rbac" "github.com/coder/coder/v2/coderd/rbac/policy" diff --git a/coderd/database/dbpurge/dbpurge.go b/coderd/database/dbpurge/dbpurge.go index 9587d74396..9b4ff9ced8 100644 --- a/coderd/database/dbpurge/dbpurge.go +++ b/coderd/database/dbpurge/dbpurge.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/database/dbpurge/dbpurge_test.go b/coderd/database/dbpurge/dbpurge_test.go index 96c79d4ae3..891115d4bb 100644 --- a/coderd/database/dbpurge/dbpurge_test.go +++ b/coderd/database/dbpurge/dbpurge_test.go @@ -19,8 +19,8 @@ import ( "go.uber.org/mock/gomock" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/coderdtest/promhelp" diff --git a/coderd/database/dbrollup/dbrollup.go b/coderd/database/dbrollup/dbrollup.go index c6b61c5875..6f75310e47 100644 --- a/coderd/database/dbrollup/dbrollup.go +++ b/coderd/database/dbrollup/dbrollup.go @@ -7,7 +7,7 @@ import ( "golang.org/x/sync/errgroup" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/database/dbrollup/dbrollup_test.go b/coderd/database/dbrollup/dbrollup_test.go index c0417cd631..f210139843 100644 --- a/coderd/database/dbrollup/dbrollup_test.go +++ b/coderd/database/dbrollup/dbrollup_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/goleak" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbgen" diff --git a/coderd/database/dbtestutil/cleaner.go b/coderd/database/dbtestutil/cleaner.go index 851f4488f8..2843b45334 100644 --- a/coderd/database/dbtestutil/cleaner.go +++ b/coderd/database/dbtestutil/cleaner.go @@ -13,8 +13,9 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/retry" ) diff --git a/coderd/database/dbtestutil/db.go b/coderd/database/dbtestutil/db.go index 1bc001c94a..13079c5d44 100644 --- a/coderd/database/dbtestutil/db.go +++ b/coderd/database/dbtestutil/db.go @@ -17,7 +17,8 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/pubsub" "github.com/coder/coder/v2/testutil" diff --git a/coderd/database/pubsub/latency.go b/coderd/database/pubsub/latency.go index 0797e6642b..b8c14eec4f 100644 --- a/coderd/database/pubsub/latency.go +++ b/coderd/database/pubsub/latency.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) // LatencyMeasurer is used to measure the send & receive latencies of the underlying Pubsub implementation. We use these diff --git a/coderd/database/pubsub/pubsub.go b/coderd/database/pubsub/pubsub.go index c4b454abdf..75f3e352a3 100644 --- a/coderd/database/pubsub/pubsub.go +++ b/coderd/database/pubsub/pubsub.go @@ -17,7 +17,7 @@ import ( "github.com/coder/coder/v2/coderd/database" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) // Listener represents a pubsub handler. diff --git a/coderd/database/pubsub/pubsub_linux_test.go b/coderd/database/pubsub/pubsub_linux_test.go index 05bd76232e..a8c0bf42ea 100644 --- a/coderd/database/pubsub/pubsub_linux_test.go +++ b/coderd/database/pubsub/pubsub_linux_test.go @@ -15,9 +15,10 @@ import ( "go.uber.org/mock/gomock" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/database/dbtestutil" "github.com/coder/coder/v2/coderd/database/pubsub" "github.com/coder/coder/v2/coderd/database/pubsub/psmock" diff --git a/coderd/database/pubsub/pubsub_test.go b/coderd/database/pubsub/pubsub_test.go index 79ce80ea54..d42718c519 100644 --- a/coderd/database/pubsub/pubsub_test.go +++ b/coderd/database/pubsub/pubsub_test.go @@ -10,8 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/database/dbtestutil" "github.com/coder/coder/v2/coderd/database/pubsub" "github.com/coder/coder/v2/testutil" diff --git a/coderd/database/pubsub/watchdog.go b/coderd/database/pubsub/watchdog.go index b79c8ca777..677c228473 100644 --- a/coderd/database/pubsub/watchdog.go +++ b/coderd/database/pubsub/watchdog.go @@ -7,7 +7,8 @@ import ( "sync" "time" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/quartz" ) diff --git a/coderd/database/pubsub/watchdog_test.go b/coderd/database/pubsub/watchdog_test.go index e1b6ceef27..9ffc3b2f1f 100644 --- a/coderd/database/pubsub/watchdog_test.go +++ b/coderd/database/pubsub/watchdog_test.go @@ -6,8 +6,9 @@ import ( "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/database/pubsub" "github.com/coder/coder/v2/testutil" "github.com/coder/quartz" diff --git a/coderd/database/querier_test.go b/coderd/database/querier_test.go index 82c118248c..74fed24c0e 100644 --- a/coderd/database/querier_test.go +++ b/coderd/database/querier_test.go @@ -18,7 +18,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/coderd/debug.go b/coderd/debug.go index 4c0eff7f33..cb7ee14936 100644 --- a/coderd/debug.go +++ b/coderd/debug.go @@ -13,7 +13,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/httpapi" diff --git a/coderd/debug_test.go b/coderd/debug_test.go index f7a0a180ec..80d5b804cc 100644 --- a/coderd/debug_test.go +++ b/coderd/debug_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/codersdk/healthsdk" diff --git a/coderd/devtunnel/tunnel.go b/coderd/devtunnel/tunnel.go index d1f3c75c3d..718132f3cf 100644 --- a/coderd/devtunnel/tunnel.go +++ b/coderd/devtunnel/tunnel.go @@ -14,7 +14,8 @@ import ( "github.com/tailscale/wireguard-go/device" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/cryptorand" "github.com/coder/pretty" diff --git a/coderd/files.go b/coderd/files.go index c54cd50a75..c30dc49b96 100644 --- a/coderd/files.go +++ b/coderd/files.go @@ -15,7 +15,8 @@ import ( "github.com/go-chi/chi/v5" "github.com/google/uuid" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/archive" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/files/cache_test.go b/coderd/files/cache_test.go index 72a3482eeb..ece4f40cde 100644 --- a/coderd/files/cache_test.go +++ b/coderd/files/cache_test.go @@ -14,7 +14,8 @@ import ( "go.uber.org/mock/gomock" "golang.org/x/sync/errgroup" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/coderdtest/promhelp" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/httpapi/websocket.go b/coderd/httpapi/websocket.go index 3a71c9c9ae..072b87bcbc 100644 --- a/coderd/httpapi/websocket.go +++ b/coderd/httpapi/websocket.go @@ -7,7 +7,8 @@ import ( "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/websocket" ) diff --git a/coderd/httpmw/apikey.go b/coderd/httpmw/apikey.go index 29296fea59..d0e326eb90 100644 --- a/coderd/httpmw/apikey.go +++ b/coderd/httpmw/apikey.go @@ -17,7 +17,8 @@ import ( "golang.org/x/oauth2" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/apikey" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/httpmw/clitelemetry.go b/coderd/httpmw/clitelemetry.go index 8e9a472b4c..ade5b668d2 100644 --- a/coderd/httpmw/clitelemetry.go +++ b/coderd/httpmw/clitelemetry.go @@ -10,7 +10,8 @@ import ( "golang.org/x/exp/maps" "tailscale.com/tstime/rate" - "cdr.dev/slog" + "cdr.dev/slog/v3" + clitelemetry "github.com/coder/coder/v2/cli/telemetry" "github.com/coder/coder/v2/coderd/telemetry" "github.com/coder/coder/v2/codersdk" diff --git a/coderd/httpmw/loggermw/logger.go b/coderd/httpmw/loggermw/logger.go index edd878efa9..324547cab6 100644 --- a/coderd/httpmw/loggermw/logger.go +++ b/coderd/httpmw/loggermw/logger.go @@ -11,7 +11,8 @@ import ( "github.com/go-chi/chi/v5" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/tracing" ) diff --git a/coderd/httpmw/loggermw/logger_full.go b/coderd/httpmw/loggermw/logger_full.go index e735bc102d..bfea76a3a9 100644 --- a/coderd/httpmw/loggermw/logger_full.go +++ b/coderd/httpmw/loggermw/logger_full.go @@ -7,7 +7,8 @@ import ( "sync" "time" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/rbac" ) diff --git a/coderd/httpmw/loggermw/logger_internal_test.go b/coderd/httpmw/loggermw/logger_internal_test.go index 5f22de7477..d114f5fe45 100644 --- a/coderd/httpmw/loggermw/logger_internal_test.go +++ b/coderd/httpmw/loggermw/logger_internal_test.go @@ -15,7 +15,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/rbac" "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/testutil" diff --git a/coderd/httpmw/loggermw/logger_slim.go b/coderd/httpmw/loggermw/logger_slim.go index 36470265e5..0970a644b5 100644 --- a/coderd/httpmw/loggermw/logger_slim.go +++ b/coderd/httpmw/loggermw/logger_slim.go @@ -6,7 +6,7 @@ import ( "context" "time" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) type RequestLogger interface { diff --git a/coderd/httpmw/loggermw/loggermock/loggermock.go b/coderd/httpmw/loggermw/loggermock/loggermock.go index 008f862107..77e6e337cb 100644 --- a/coderd/httpmw/loggermw/loggermock/loggermock.go +++ b/coderd/httpmw/loggermw/loggermock/loggermock.go @@ -13,7 +13,8 @@ import ( context "context" reflect "reflect" - slog "cdr.dev/slog" + slog "cdr.dev/slog/v3" + rbac "github.com/coder/coder/v2/coderd/rbac" gomock "go.uber.org/mock/gomock" ) diff --git a/coderd/httpmw/requestid.go b/coderd/httpmw/requestid.go index e1014a089c..15269f47f8 100644 --- a/coderd/httpmw/requestid.go +++ b/coderd/httpmw/requestid.go @@ -8,7 +8,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) type requestIDContextKey struct{} diff --git a/coderd/httpmw/taskparam.go b/coderd/httpmw/taskparam.go index 1e6051eb03..3ce285bbdc 100644 --- a/coderd/httpmw/taskparam.go +++ b/coderd/httpmw/taskparam.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/httpapi" diff --git a/coderd/httpmw/workspaceagentparam.go b/coderd/httpmw/workspaceagentparam.go index 434e057c0e..00f04770fe 100644 --- a/coderd/httpmw/workspaceagentparam.go +++ b/coderd/httpmw/workspaceagentparam.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi/v5" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/httpapi" diff --git a/coderd/httpmw/workspaceagentparam_test.go b/coderd/httpmw/workspaceagentparam_test.go index a9d6130966..5710cbd885 100644 --- a/coderd/httpmw/workspaceagentparam_test.go +++ b/coderd/httpmw/workspaceagentparam_test.go @@ -11,7 +11,8 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/httpmw/workspaceparam.go b/coderd/httpmw/workspaceparam.go index 0c4e4f7735..2a53f62e07 100644 --- a/coderd/httpmw/workspaceparam.go +++ b/coderd/httpmw/workspaceparam.go @@ -9,7 +9,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/google/uuid" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/httpapi" diff --git a/coderd/idpsync/group.go b/coderd/idpsync/group.go index 63ac0360f0..c50f53053f 100644 --- a/coderd/idpsync/group.go +++ b/coderd/idpsync/group.go @@ -10,7 +10,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/idpsync/group_test.go b/coderd/idpsync/group_test.go index 459a5dbcfa..6412027951 100644 --- a/coderd/idpsync/group_test.go +++ b/coderd/idpsync/group_test.go @@ -12,7 +12,8 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/xerrors" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/coderd/idpsync/idpsync.go b/coderd/idpsync/idpsync.go index c57eee123b..afc21218be 100644 --- a/coderd/idpsync/idpsync.go +++ b/coderd/idpsync/idpsync.go @@ -10,7 +10,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/runtimeconfig" diff --git a/coderd/idpsync/organization.go b/coderd/idpsync/organization.go index cfc6e819d7..60bb12bbee 100644 --- a/coderd/idpsync/organization.go +++ b/coderd/idpsync/organization.go @@ -9,7 +9,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/idpsync/organizations_test.go b/coderd/idpsync/organizations_test.go index c3f17cefeb..ab56975bbd 100644 --- a/coderd/idpsync/organizations_test.go +++ b/coderd/idpsync/organizations_test.go @@ -9,7 +9,8 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" "github.com/coder/coder/v2/coderd/database/dbfake" diff --git a/coderd/idpsync/role.go b/coderd/idpsync/role.go index 0f928b7be2..22e46b8dd4 100644 --- a/coderd/idpsync/role.go +++ b/coderd/idpsync/role.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/idpsync/role_test.go b/coderd/idpsync/role_test.go index db172e0ee4..cda69e22d6 100644 --- a/coderd/idpsync/role_test.go +++ b/coderd/idpsync/role_test.go @@ -11,7 +11,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbgen" diff --git a/coderd/inboxnotifications.go b/coderd/inboxnotifications.go index 4bb3f9ec95..2c29a119f1 100644 --- a/coderd/inboxnotifications.go +++ b/coderd/inboxnotifications.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/insights_test.go b/coderd/insights_test.go index f2db023ea1..2bd324b9b7 100644 --- a/coderd/insights_test.go +++ b/coderd/insights_test.go @@ -17,8 +17,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/agent/agenttest" agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/coderd/jobreaper/detector.go b/coderd/jobreaper/detector.go index ad5774ee6b..a075df3e4e 100644 --- a/coderd/jobreaper/detector.go +++ b/coderd/jobreaper/detector.go @@ -11,7 +11,8 @@ import ( "github.com/google/uuid" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtime" @@ -261,8 +262,8 @@ func reapJob(ctx context.Context, log slog.Logger, db database.Store, pub pubsub log.Warn( ctx, "forcefully terminating provisioner job", - "type", jobToReap.Type, - "threshold", jobToReap.Threshold, + slog.F("type", jobToReap.Type), + slog.F("threshold", jobToReap.Threshold), ) // First, get the latest logs from the build so we can make sure diff --git a/coderd/jobreaper/detector_test.go b/coderd/jobreaper/detector_test.go index 9d3b7054fc..a81e4ccba4 100644 --- a/coderd/jobreaper/detector_test.go +++ b/coderd/jobreaper/detector_test.go @@ -14,7 +14,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/goleak" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/mcp/mcp.go b/coderd/mcp/mcp.go index ed73bf5485..b80d1de4a4 100644 --- a/coderd/mcp/mcp.go +++ b/coderd/mcp/mcp.go @@ -12,7 +12,7 @@ import ( "github.com/mark3labs/mcp-go/server" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/codersdk" diff --git a/coderd/mcp_http.go b/coderd/mcp_http.go index b18387f86e..02cfc1958e 100644 --- a/coderd/mcp_http.go +++ b/coderd/mcp_http.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/httpmw" diff --git a/coderd/metricscache/metricscache.go b/coderd/metricscache/metricscache.go index 1302f181d1..fc876ba3aa 100644 --- a/coderd/metricscache/metricscache.go +++ b/coderd/metricscache/metricscache.go @@ -10,7 +10,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/metricscache/metricscache_test.go b/coderd/metricscache/metricscache_test.go index 7b7fa7f908..901330fce6 100644 --- a/coderd/metricscache/metricscache_test.go +++ b/coderd/metricscache/metricscache_test.go @@ -12,7 +12,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbgen" diff --git a/coderd/notifications.go b/coderd/notifications.go index e09dd2d69c..40ca249a3b 100644 --- a/coderd/notifications.go +++ b/coderd/notifications.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/notifications/dispatch/inbox.go b/coderd/notifications/dispatch/inbox.go index 63e21acb56..b49b44948a 100644 --- a/coderd/notifications/dispatch/inbox.go +++ b/coderd/notifications/dispatch/inbox.go @@ -7,7 +7,7 @@ import ( "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/google/uuid" diff --git a/coderd/notifications/dispatch/inbox_test.go b/coderd/notifications/dispatch/inbox_test.go index 744623ed2c..31de1d0944 100644 --- a/coderd/notifications/dispatch/inbox_test.go +++ b/coderd/notifications/dispatch/inbox_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/google/uuid" "github.com/stretchr/testify/require" diff --git a/coderd/notifications/dispatch/smtp.go b/coderd/notifications/dispatch/smtp.go index 69c3848ddd..54c39d6894 100644 --- a/coderd/notifications/dispatch/smtp.go +++ b/coderd/notifications/dispatch/smtp.go @@ -25,7 +25,7 @@ import ( "github.com/hashicorp/go-multierror" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/notifications/render" "github.com/coder/coder/v2/coderd/notifications/types" diff --git a/coderd/notifications/dispatch/smtp_test.go b/coderd/notifications/dispatch/smtp_test.go index c424d81d79..cbb22742d3 100644 --- a/coderd/notifications/dispatch/smtp_test.go +++ b/coderd/notifications/dispatch/smtp_test.go @@ -14,8 +14,9 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/goleak" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/serpent" "github.com/coder/coder/v2/coderd/notifications/dispatch" diff --git a/coderd/notifications/dispatch/webhook.go b/coderd/notifications/dispatch/webhook.go index 7265602e53..6e0c4dcd86 100644 --- a/coderd/notifications/dispatch/webhook.go +++ b/coderd/notifications/dispatch/webhook.go @@ -13,7 +13,7 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/notifications/types" markdown "github.com/coder/coder/v2/coderd/render" diff --git a/coderd/notifications/dispatch/webhook_test.go b/coderd/notifications/dispatch/webhook_test.go index 35443b9fbb..c161265c0b 100644 --- a/coderd/notifications/dispatch/webhook_test.go +++ b/coderd/notifications/dispatch/webhook_test.go @@ -14,8 +14,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/serpent" "github.com/coder/coder/v2/coderd/notifications/dispatch" diff --git a/coderd/notifications/enqueuer.go b/coderd/notifications/enqueuer.go index 6027c36b39..461067c2cd 100644 --- a/coderd/notifications/enqueuer.go +++ b/coderd/notifications/enqueuer.go @@ -11,7 +11,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/quartz" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/notifications/manager.go b/coderd/notifications/manager.go index 943306d443..f789d13780 100644 --- a/coderd/notifications/manager.go +++ b/coderd/notifications/manager.go @@ -10,7 +10,7 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/pubsub" diff --git a/coderd/notifications/notifications_test.go b/coderd/notifications/notifications_test.go index d395bd748c..a6a9a98ae2 100644 --- a/coderd/notifications/notifications_test.go +++ b/coderd/notifications/notifications_test.go @@ -34,8 +34,9 @@ import ( "go.uber.org/goleak" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/quartz" "github.com/coder/serpent" diff --git a/coderd/notifications/notifier.go b/coderd/notifications/notifier.go index b2713533ce..330c14437b 100644 --- a/coderd/notifications/notifier.go +++ b/coderd/notifications/notifier.go @@ -18,7 +18,7 @@ import ( "github.com/coder/coder/v2/codersdk" "github.com/coder/quartz" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" ) diff --git a/coderd/notifications/reports/generator.go b/coderd/notifications/reports/generator.go index 6b7dbd0c5b..2fe3352ddb 100644 --- a/coderd/notifications/reports/generator.go +++ b/coderd/notifications/reports/generator.go @@ -11,7 +11,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/quartz" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/notifications/reports/generator_internal_test.go b/coderd/notifications/reports/generator_internal_test.go index 6dcff17311..c82a7d8c7b 100644 --- a/coderd/notifications/reports/generator_internal_test.go +++ b/coderd/notifications/reports/generator_internal_test.go @@ -11,8 +11,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/quartz" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/coderd/oauth2provider/app_secrets.go b/coderd/oauth2provider/app_secrets.go index 3eff684123..aa3cd6617b 100644 --- a/coderd/oauth2provider/app_secrets.go +++ b/coderd/oauth2provider/app_secrets.go @@ -5,7 +5,7 @@ import ( "github.com/google/uuid" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/oauth2provider/apps.go b/coderd/oauth2provider/apps.go index 81ff8b0e24..c40e3a847d 100644 --- a/coderd/oauth2provider/apps.go +++ b/coderd/oauth2provider/apps.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "github.com/sqlc-dev/pqtype" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/oauth2provider/registration.go b/coderd/oauth2provider/registration.go index 807c39371d..b52a354d1e 100644 --- a/coderd/oauth2provider/registration.go +++ b/coderd/oauth2provider/registration.go @@ -14,7 +14,8 @@ import ( "github.com/sqlc-dev/pqtype" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/apikey" "github.com/coder/coder/v2/coderd/audit" diff --git a/coderd/oauth2provider/revoke.go b/coderd/oauth2provider/revoke.go index 19f3fb803a..2fcb0856ae 100644 --- a/coderd/oauth2provider/revoke.go +++ b/coderd/oauth2provider/revoke.go @@ -13,7 +13,8 @@ import ( "github.com/google/uuid" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/apikey" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/prebuilds/claim.go b/coderd/prebuilds/claim.go index b5155b8f2a..cf072dc82c 100644 --- a/coderd/prebuilds/claim.go +++ b/coderd/prebuilds/claim.go @@ -7,7 +7,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database/pubsub" "github.com/coder/coder/v2/codersdk/agentsdk" ) diff --git a/coderd/prebuilds/claim_test.go b/coderd/prebuilds/claim_test.go index 670bb64eec..5549920bf4 100644 --- a/coderd/prebuilds/claim_test.go +++ b/coderd/prebuilds/claim_test.go @@ -9,7 +9,8 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/xerrors" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/database/pubsub" "github.com/coder/coder/v2/coderd/prebuilds" "github.com/coder/coder/v2/codersdk/agentsdk" diff --git a/coderd/prebuilds/global_snapshot.go b/coderd/prebuilds/global_snapshot.go index cb91658707..a46c589bd5 100644 --- a/coderd/prebuilds/global_snapshot.go +++ b/coderd/prebuilds/global_snapshot.go @@ -6,7 +6,7 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/util/slice" diff --git a/coderd/prebuilds/preset_snapshot.go b/coderd/prebuilds/preset_snapshot.go index 04f4cd1a83..fc3244c31d 100644 --- a/coderd/prebuilds/preset_snapshot.go +++ b/coderd/prebuilds/preset_snapshot.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/quartz" diff --git a/coderd/prometheusmetrics/aggregator.go b/coderd/prometheusmetrics/aggregator.go index f11468a3d9..ba1e595804 100644 --- a/coderd/prometheusmetrics/aggregator.go +++ b/coderd/prometheusmetrics/aggregator.go @@ -11,7 +11,7 @@ import ( "github.com/prometheus/common/model" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/agentmetrics" diff --git a/coderd/prometheusmetrics/aggregator_internal_test.go b/coderd/prometheusmetrics/aggregator_internal_test.go index 0efb1cf530..bd723b0c70 100644 --- a/coderd/prometheusmetrics/aggregator_internal_test.go +++ b/coderd/prometheusmetrics/aggregator_internal_test.go @@ -7,7 +7,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/agentmetrics" "github.com/coder/coder/v2/testutil" diff --git a/coderd/prometheusmetrics/aggregator_test.go b/coderd/prometheusmetrics/aggregator_test.go index f3441eccdd..d69344fba8 100644 --- a/coderd/prometheusmetrics/aggregator_test.go +++ b/coderd/prometheusmetrics/aggregator_test.go @@ -14,7 +14,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/agentmetrics" agentproto "github.com/coder/coder/v2/agent/proto" diff --git a/coderd/prometheusmetrics/insights/metricscollector.go b/coderd/prometheusmetrics/insights/metricscollector.go index a095968526..a88456d3ff 100644 --- a/coderd/prometheusmetrics/insights/metricscollector.go +++ b/coderd/prometheusmetrics/insights/metricscollector.go @@ -11,7 +11,7 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/pproflabel" diff --git a/coderd/prometheusmetrics/insights/metricscollector_test.go b/coderd/prometheusmetrics/insights/metricscollector_test.go index 560a601992..c0ba76c5bd 100644 --- a/coderd/prometheusmetrics/insights/metricscollector_test.go +++ b/coderd/prometheusmetrics/insights/metricscollector_test.go @@ -16,8 +16,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/prometheusmetrics/prometheusmetrics.go b/coderd/prometheusmetrics/prometheusmetrics.go index 525ec66c5a..4b1b2d2d4a 100644 --- a/coderd/prometheusmetrics/prometheusmetrics.go +++ b/coderd/prometheusmetrics/prometheusmetrics.go @@ -15,7 +15,7 @@ import ( "golang.org/x/xerrors" "tailscale.com/tailcfg" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/agentmetrics" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/prometheusmetrics/prometheusmetrics_test.go b/coderd/prometheusmetrics/prometheusmetrics_test.go index d5d7242142..b629160ca4 100644 --- a/coderd/prometheusmetrics/prometheusmetrics_test.go +++ b/coderd/prometheusmetrics/prometheusmetrics_test.go @@ -18,8 +18,8 @@ import ( "github.com/stretchr/testify/require" "tailscale.com/tailcfg" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/agentmetrics" diff --git a/coderd/provisionerdserver/acquirer.go b/coderd/provisionerdserver/acquirer.go index a655edebfd..32deb1978a 100644 --- a/coderd/provisionerdserver/acquirer.go +++ b/coderd/provisionerdserver/acquirer.go @@ -13,7 +13,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/database/provisionerjobs" diff --git a/coderd/provisionerdserver/metrics.go b/coderd/provisionerdserver/metrics.go index 204bc2e717..1acc67a28d 100644 --- a/coderd/provisionerdserver/metrics.go +++ b/coderd/provisionerdserver/metrics.go @@ -6,7 +6,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) type Metrics struct { @@ -137,12 +137,12 @@ func (m *Metrics) UpdateWorkspaceTimingsMetrics( buildTime float64, ) { m.logger.Debug(ctx, "update workspace timings metrics", - "organizationName", organizationName, - "templateName", templateName, - "presetName", presetName, - "isPrebuild", flags.IsPrebuild, - "isClaim", flags.IsClaim, - "isWorkspaceFirstBuild", flags.IsFirstBuild) + slog.F("organization_name", organizationName), + slog.F("template_name", templateName), + slog.F("preset_name", presetName), + slog.F("is_prebuild", flags.IsPrebuild), + slog.F("is_claim", flags.IsClaim), + slog.F("is_workspace_first_build", flags.IsFirstBuild)) workspaceTimingType := getWorkspaceTimingType(flags) switch workspaceTimingType { diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go index 8cc84e6a45..b7e2d01fb3 100644 --- a/coderd/provisionerdserver/provisionerdserver.go +++ b/coderd/provisionerdserver/provisionerdserver.go @@ -27,7 +27,8 @@ import ( "golang.org/x/xerrors" protobuf "google.golang.org/protobuf/proto" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/apikey" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/provisionerdserver/provisionerdserver_test.go b/coderd/provisionerdserver/provisionerdserver_test.go index 4dc8621736..e280e3b9d1 100644 --- a/coderd/provisionerdserver/provisionerdserver_test.go +++ b/coderd/provisionerdserver/provisionerdserver_test.go @@ -25,7 +25,8 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "storj.io/drpc" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd" "github.com/coder/coder/v2/coderd/util/ptr" "github.com/coder/quartz" diff --git a/coderd/provisionerjobs.go b/coderd/provisionerjobs.go index 68f2207f2f..9af195882d 100644 --- a/coderd/provisionerjobs.go +++ b/coderd/provisionerjobs.go @@ -13,7 +13,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/tailnet.go b/coderd/tailnet.go index c83b26e001..7097967773 100644 --- a/coderd/tailnet.go +++ b/coderd/tailnet.go @@ -23,7 +23,7 @@ import ( "tailscale.com/derp" "tailscale.com/tailcfg" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/coderd/workspaceapps" diff --git a/coderd/taskname/taskname.go b/coderd/taskname/taskname.go index addba6fdc8..fca47c03f2 100644 --- a/coderd/taskname/taskname.go +++ b/coderd/taskname/taskname.go @@ -10,7 +10,7 @@ import ( "regexp" "strings" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/anthropics/anthropic-sdk-go" anthropicoption "github.com/anthropics/anthropic-sdk-go/option" diff --git a/coderd/telemetry/telemetry.go b/coderd/telemetry/telemetry.go index a89781c563..9ce3b02161 100644 --- a/coderd/telemetry/telemetry.go +++ b/coderd/telemetry/telemetry.go @@ -27,7 +27,8 @@ import ( "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/wrapperspb" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/buildinfo" clitelemetry "github.com/coder/coder/v2/cli/telemetry" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/templates.go b/coderd/templates.go index 39892aa5fe..dfea621316 100644 --- a/coderd/templates.go +++ b/coderd/templates.go @@ -14,7 +14,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database/db2sdk" "github.com/coder/coder/v2/coderd/audit" diff --git a/coderd/templateversions.go b/coderd/templateversions.go index 13dd93d528..0f8c9629b2 100644 --- a/coderd/templateversions.go +++ b/coderd/templateversions.go @@ -21,7 +21,8 @@ import ( "github.com/zclconf/go-cty/cty" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + archivefs "github.com/coder/coder/v2/archive/fs" "github.com/coder/coder/v2/coderd/dynamicparameters" "github.com/coder/preview" diff --git a/coderd/tracing/slog.go b/coderd/tracing/slog.go index 6b2841162a..8803e908c8 100644 --- a/coderd/tracing/slog.go +++ b/coderd/tracing/slog.go @@ -9,7 +9,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) type SlogSink struct{} diff --git a/coderd/tracing/slog_test.go b/coderd/tracing/slog_test.go index 90b7a5ca4a..8de4dcee63 100644 --- a/coderd/tracing/slog_test.go +++ b/coderd/tracing/slog_test.go @@ -12,7 +12,8 @@ import ( "github.com/stretchr/testify/require" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/tracing" ) diff --git a/coderd/updatecheck/updatecheck.go b/coderd/updatecheck/updatecheck.go index 67f4726201..209a2aef23 100644 --- a/coderd/updatecheck/updatecheck.go +++ b/coderd/updatecheck/updatecheck.go @@ -17,7 +17,7 @@ import ( "golang.org/x/mod/semver" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/updatecheck/updatecheck_test.go b/coderd/updatecheck/updatecheck_test.go index 2e616a550f..794c0bc8c7 100644 --- a/coderd/updatecheck/updatecheck_test.go +++ b/coderd/updatecheck/updatecheck_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/goleak" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/coderd/database/dbtestutil" "github.com/coder/coder/v2/coderd/updatecheck" diff --git a/coderd/userauth.go b/coderd/userauth.go index bab159b18c..2d386d775a 100644 --- a/coderd/userauth.go +++ b/coderd/userauth.go @@ -23,7 +23,7 @@ import ( "golang.org/x/oauth2" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/cryptokeys" "github.com/coder/coder/v2/coderd/idpsync" diff --git a/coderd/userauth_test.go b/coderd/userauth_test.go index 53db08aa11..b13813103e 100644 --- a/coderd/userauth_test.go +++ b/coderd/userauth_test.go @@ -27,8 +27,8 @@ import ( "golang.org/x/oauth2" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/coderd" "github.com/coder/coder/v2/coderd/audit" diff --git a/coderd/users.go b/coderd/users.go index 0e64757724..79c4943833 100644 --- a/coderd/users.go +++ b/coderd/users.go @@ -12,7 +12,7 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/webpush/webpush.go b/coderd/webpush/webpush.go index 0f54a269ca..b98321c0bc 100644 --- a/coderd/webpush/webpush.go +++ b/coderd/webpush/webpush.go @@ -15,7 +15,8 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/codersdk" diff --git a/coderd/webpush/webpush_test.go b/coderd/webpush/webpush_test.go index 0c01c55fca..01b94a894f 100644 --- a/coderd/webpush/webpush_test.go +++ b/coderd/webpush/webpush_test.go @@ -12,8 +12,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/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" diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go index 779a19ee00..fa65c08b2f 100644 --- a/coderd/workspaceagents.go +++ b/coderd/workspaceagents.go @@ -23,7 +23,8 @@ import ( "golang.org/x/xerrors" "tailscale.com/tailcfg" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/websocket" "github.com/coder/coder/v2/coderd/agentapi" @@ -1740,7 +1741,7 @@ func (api *API) watchWorkspaceAgentMetadata( return } - log.Debug(ctx, "received metadata update", "payload", payload) + log.Debug(ctx, "received metadata update", slog.F("payload", payload)) select { case prev := <-update: @@ -1770,7 +1771,7 @@ func (api *API) watchWorkspaceAgentMetadata( return } - log.Debug(ctx, "got initial metadata", "num", len(initialMD)) + log.Debug(ctx, "got initial metadata", slog.F("num", len(initialMD))) metadataMap := make(map[string]database.WorkspaceAgentMetadatum, len(initialMD)) for _, datum := range initialMD { @@ -1807,7 +1808,7 @@ func (api *API) watchWorkspaceAgentMetadata( lastSend = time.Now() values := maps.Values(metadataMap) - log.Debug(ctx, "sending metadata", "num", len(values)) + log.Debug(ctx, "sending metadata", slog.F("num", len(values))) _ = sendEvent(codersdk.ServerSentEvent{ Type: codersdk.ServerSentEventTypeData, @@ -1862,7 +1863,9 @@ func (api *API) watchWorkspaceAgentMetadata( // We want to block here to avoid constantly pinging the // database when the metadata isn't being processed. case fetchedMetadata <- md: - log.Debug(ctx, "fetched metadata update for keys", "keys", payload.Keys, "num", len(md)) + log.Debug(ctx, "fetched metadata update for keys", + slog.F("keys", payload.Keys), + slog.F("num", len(md))) } } } diff --git a/coderd/workspaceagents_internal_test.go b/coderd/workspaceagents_internal_test.go index 90f5d2ab70..f353c24beb 100644 --- a/coderd/workspaceagents_internal_test.go +++ b/coderd/workspaceagents_internal_test.go @@ -18,8 +18,9 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/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" diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go index d71fcd0985..4c831bb75b 100644 --- a/coderd/workspaceagents_test.go +++ b/coderd/workspaceagents_test.go @@ -27,8 +27,9 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "tailscale.com/tailcfg" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/quartz" "github.com/coder/websocket" diff --git a/coderd/workspaceagentsrpc.go b/coderd/workspaceagentsrpc.go index 3046a22d89..d0d4a9b21a 100644 --- a/coderd/workspaceagentsrpc.go +++ b/coderd/workspaceagentsrpc.go @@ -14,7 +14,8 @@ import ( "github.com/hashicorp/yamux" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/agentapi" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/workspaceapps/db.go b/coderd/workspaceapps/db.go index 4d77dc32b1..a1a7f11832 100644 --- a/coderd/workspaceapps/db.go +++ b/coderd/workspaceapps/db.go @@ -16,7 +16,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/connectionlog" "github.com/coder/coder/v2/coderd/cryptokeys" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/workspaceapps/errors.go b/coderd/workspaceapps/errors.go index f5cbdf1ef6..66cd0ff2a3 100644 --- a/coderd/workspaceapps/errors.go +++ b/coderd/workspaceapps/errors.go @@ -6,7 +6,8 @@ import ( "net/url" "path" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/site" ) diff --git a/coderd/workspaceapps/provider.go b/coderd/workspaceapps/provider.go index f18153aecc..989f34a2c1 100644 --- a/coderd/workspaceapps/provider.go +++ b/coderd/workspaceapps/provider.go @@ -6,7 +6,8 @@ import ( "net/url" "time" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/codersdk" ) diff --git a/coderd/workspaceapps/proxy.go b/coderd/workspaceapps/proxy.go index 8806841fb7..148e3a5880 100644 --- a/coderd/workspaceapps/proxy.go +++ b/coderd/workspaceapps/proxy.go @@ -18,7 +18,8 @@ import ( "github.com/google/uuid" "go.opentelemetry.io/otel/trace" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent/agentssh" "github.com/coder/coder/v2/coderd/cryptokeys" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/workspaceapps/stats.go b/coderd/workspaceapps/stats.go index 53f9109c25..6e9d49a898 100644 --- a/coderd/workspaceapps/stats.go +++ b/coderd/workspaceapps/stats.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtime" @@ -169,7 +169,7 @@ func (sc *StatsCollector) rollup(now time.Time) []StatsReport { for g, group := range sc.groupedStats { if len(group) == 0 { // Safety check, this should not happen. - sc.opts.Logger.Error(sc.ctx, "empty stats group", "group", g) + sc.opts.Logger.Error(sc.ctx, "empty stats group", slog.F("group", g)) delete(sc.groupedStats, g) continue } @@ -244,7 +244,7 @@ func (sc *StatsCollector) flush(ctx context.Context) (err error) { sc.opts.Logger.Debug(ctx, "flushing workspace app stats") defer func() { if err != nil { - sc.opts.Logger.Error(ctx, "failed to flush workspace app stats", "error", err) + sc.opts.Logger.Error(ctx, "failed to flush workspace app stats", slog.Error(err)) } else { sc.opts.Logger.Debug(ctx, "flushed workspace app stats") } diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go index c5f0b2f7f1..1110af6479 100644 --- a/coderd/workspacebuilds.go +++ b/coderd/workspacebuilds.go @@ -18,7 +18,7 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/workspacebuilds_test.go b/coderd/workspacebuilds_test.go index fd6f324c61..3c473d48b1 100644 --- a/coderd/workspacebuilds_test.go +++ b/coderd/workspacebuilds_test.go @@ -19,8 +19,9 @@ import ( "go.opentelemetry.io/otel/propagation" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/coderdtest/oidctest" diff --git a/coderd/workspaces.go b/coderd/workspaces.go index a769095e80..e4dd17f265 100644 --- a/coderd/workspaces.go +++ b/coderd/workspaces.go @@ -17,7 +17,7 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/audit" @@ -717,7 +717,7 @@ func createWorkspace( if err != nil { isExpectedError := errors.Is(err, prebuilds.ErrNoClaimablePrebuiltWorkspaces) || errors.Is(err, prebuilds.ErrAGPLDoesNotSupportPrebuiltWorkspaces) - fields := []any{ + fields := []slog.Field{ slog.Error(err), slog.F("workspace_name", req.Name), slog.F("template_version_preset_id", templateVersionPresetID), diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go index d27441993a..19b6e24ff8 100644 --- a/coderd/workspaces_test.go +++ b/coderd/workspaces_test.go @@ -17,7 +17,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/terraform-provider-coder/v2/provider" "github.com/coder/coder/v2/agent/agenttest" diff --git a/coderd/workspacestats/activitybump.go b/coderd/workspacestats/activitybump.go index 29c7dc3686..cf250bfc44 100644 --- a/coderd/workspacestats/activitybump.go +++ b/coderd/workspacestats/activitybump.go @@ -7,7 +7,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" ) diff --git a/coderd/workspacestats/batcher.go b/coderd/workspacestats/batcher.go index 46efc69170..2ea4e4d021 100644 --- a/coderd/workspacestats/batcher.go +++ b/coderd/workspacestats/batcher.go @@ -11,8 +11,9 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/workspacestats/batcher_internal_test.go b/coderd/workspacestats/batcher_internal_test.go index 59efb33bfa..15db0a3c13 100644 --- a/coderd/workspacestats/batcher_internal_test.go +++ b/coderd/workspacestats/batcher_internal_test.go @@ -7,8 +7,9 @@ import ( "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/codersdk" agentproto "github.com/coder/coder/v2/agent/proto" diff --git a/coderd/workspacestats/reporter.go b/coderd/workspacestats/reporter.go index 650c6b0bc7..b3c5f37a05 100644 --- a/coderd/workspacestats/reporter.go +++ b/coderd/workspacestats/reporter.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/workspacestats/tracker.go b/coderd/workspacestats/tracker.go index f55edde3b5..7b9f37dbe6 100644 --- a/coderd/workspacestats/tracker.go +++ b/coderd/workspacestats/tracker.go @@ -14,8 +14,8 @@ import ( "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" ) var DefaultFlushInterval = 60 * time.Second diff --git a/coderd/workspaceupdates.go b/coderd/workspaceupdates.go index f8d22af0ad..2367d51234 100644 --- a/coderd/workspaceupdates.go +++ b/coderd/workspaceupdates.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/codersdk/agentsdk/agentsdk.go b/codersdk/agentsdk/agentsdk.go index 50f3ecaae5..ab1f46f2c9 100644 --- a/codersdk/agentsdk/agentsdk.go +++ b/codersdk/agentsdk/agentsdk.go @@ -17,7 +17,8 @@ import ( "storj.io/drpc" "tailscale.com/tailcfg" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/retry" "github.com/coder/websocket" diff --git a/codersdk/agentsdk/agentsdk_test.go b/codersdk/agentsdk/agentsdk_test.go index b6646662a4..1b10bcdbed 100644 --- a/codersdk/agentsdk/agentsdk_test.go +++ b/codersdk/agentsdk/agentsdk_test.go @@ -12,7 +12,8 @@ import ( "github.com/stretchr/testify/require" "tailscale.com/tailcfg" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/codersdk/agentsdk" "github.com/coder/coder/v2/testutil" ) diff --git a/codersdk/agentsdk/logs.go b/codersdk/agentsdk/logs.go index 3820117773..f770498c3d 100644 --- a/codersdk/agentsdk/logs.go +++ b/codersdk/agentsdk/logs.go @@ -14,7 +14,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/codersdk" "github.com/coder/retry" diff --git a/codersdk/client.go b/codersdk/client.go index e1591f90fa..d6f4a17226 100644 --- a/codersdk/client.go +++ b/codersdk/client.go @@ -23,7 +23,7 @@ import ( "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/websocket" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) // These cookies are Coder-specific. If a new one is added or changed, the name @@ -255,7 +255,7 @@ func (c *Client) RequestWithoutSessionToken(ctx context.Context, method, path st } // Copy the request body so we can log it. - var reqLogFields []any + var reqLogFields []slog.Field c.mu.RLock() logBodies := c.logBodies c.mu.RUnlock() @@ -329,7 +329,7 @@ func (c *Client) RequestWithoutSessionToken(ctx context.Context, method, path st span.SetStatus(httpconv.ClientStatus(resp.StatusCode)) // Copy the response body so we can log it if it's a loggable mime type. - var respLogFields []any + var respLogFields []slog.Field if resp.Body != nil && logBodies { mimeType := parseMimeType(resp.Header.Get("Content-Type")) if _, ok := loggableMimeTypes[mimeType]; ok { diff --git a/codersdk/client_internal_test.go b/codersdk/client_internal_test.go index 415e88ac9c..4b30cede30 100644 --- a/codersdk/client_internal_test.go +++ b/codersdk/client_internal_test.go @@ -25,8 +25,8 @@ import ( semconv "go.opentelemetry.io/otel/semconv/v1.14.0" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" "github.com/coder/coder/v2/testutil" ) diff --git a/codersdk/workspaces.go b/codersdk/workspaces.go index 51a75e03e9..64df4155b3 100644 --- a/codersdk/workspaces.go +++ b/codersdk/workspaces.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/tracing" ) diff --git a/codersdk/workspacesdk/agentconn.go b/codersdk/workspacesdk/agentconn.go index 559dbb8ff0..92fb988d91 100644 --- a/codersdk/workspacesdk/agentconn.go +++ b/codersdk/workspacesdk/agentconn.go @@ -21,7 +21,7 @@ import ( "tailscale.com/ipn/ipnstate" "tailscale.com/net/speedtest" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" diff --git a/codersdk/workspacesdk/agentconnmock/agentconnmock.go b/codersdk/workspacesdk/agentconnmock/agentconnmock.go index f1e300dfe0..962522035f 100644 --- a/codersdk/workspacesdk/agentconnmock/agentconnmock.go +++ b/codersdk/workspacesdk/agentconnmock/agentconnmock.go @@ -16,7 +16,7 @@ import ( reflect "reflect" time "time" - slog "cdr.dev/slog" + slog "cdr.dev/slog/v3" codersdk "github.com/coder/coder/v2/codersdk" healthsdk "github.com/coder/coder/v2/codersdk/healthsdk" workspacesdk "github.com/coder/coder/v2/codersdk/workspacesdk" diff --git a/codersdk/workspacesdk/dialer.go b/codersdk/workspacesdk/dialer.go index 39d02931e6..cb2a9dcb9a 100644 --- a/codersdk/workspacesdk/dialer.go +++ b/codersdk/workspacesdk/dialer.go @@ -10,7 +10,8 @@ import ( "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/websocket" "github.com/coder/coder/v2/buildinfo" diff --git a/codersdk/workspacesdk/dialer_test.go b/codersdk/workspacesdk/dialer_test.go index 227299d43a..5ada9c5ce4 100644 --- a/codersdk/workspacesdk/dialer_test.go +++ b/codersdk/workspacesdk/dialer_test.go @@ -15,8 +15,9 @@ import ( "go.uber.org/mock/gomock" "tailscale.com/tailcfg" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/apiversion" "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/codersdk" diff --git a/codersdk/workspacesdk/workspacesdk.go b/codersdk/workspacesdk/workspacesdk.go index 29ddbd1f53..acf77dbdde 100644 --- a/codersdk/workspacesdk/workspacesdk.go +++ b/codersdk/workspacesdk/workspacesdk.go @@ -18,7 +18,7 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/quartz" "github.com/coder/websocket" diff --git a/codersdk/wsjson/decoder.go b/codersdk/wsjson/decoder.go index 9e05cb5b35..ad6e91e96d 100644 --- a/codersdk/wsjson/decoder.go +++ b/codersdk/wsjson/decoder.go @@ -5,7 +5,8 @@ import ( "encoding/json" "sync/atomic" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/websocket" ) diff --git a/codersdk/wsjson/stream.go b/codersdk/wsjson/stream.go index 8fb73adb77..4947c04fdb 100644 --- a/codersdk/wsjson/stream.go +++ b/codersdk/wsjson/stream.go @@ -1,7 +1,8 @@ package wsjson import ( - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/websocket" ) diff --git a/enterprise/aibridged/aibridged.go b/enterprise/aibridged/aibridged.go index 05ae57a37d..570ec38a78 100644 --- a/enterprise/aibridged/aibridged.go +++ b/enterprise/aibridged/aibridged.go @@ -11,7 +11,8 @@ import ( "go.opentelemetry.io/otel/trace" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/codersdk" "github.com/coder/retry" ) diff --git a/enterprise/aibridged/aibridged_test.go b/enterprise/aibridged/aibridged_test.go index 2d74054196..fbc0d90da6 100644 --- a/enterprise/aibridged/aibridged_test.go +++ b/enterprise/aibridged/aibridged_test.go @@ -15,7 +15,8 @@ import ( "golang.org/x/xerrors" "storj.io/drpc" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/aibridge" agplaibridge "github.com/coder/coder/v2/coderd/aibridge" "github.com/coder/coder/v2/codersdk" diff --git a/enterprise/aibridged/http.go b/enterprise/aibridged/http.go index 567ff44e38..e89c32f56e 100644 --- a/enterprise/aibridged/http.go +++ b/enterprise/aibridged/http.go @@ -7,7 +7,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/aibridge" agplaibridge "github.com/coder/coder/v2/coderd/aibridge" "github.com/coder/coder/v2/enterprise/aibridged/proto" diff --git a/enterprise/aibridged/mcp.go b/enterprise/aibridged/mcp.go index 23ca617b62..8639207a5e 100644 --- a/enterprise/aibridged/mcp.go +++ b/enterprise/aibridged/mcp.go @@ -9,7 +9,8 @@ import ( "go.opentelemetry.io/otel/trace" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/aibridge/mcp" "github.com/coder/coder/v2/enterprise/aibridged/proto" ) diff --git a/enterprise/aibridged/pool.go b/enterprise/aibridged/pool.go index 8459f867ad..e62af3a447 100644 --- a/enterprise/aibridged/pool.go +++ b/enterprise/aibridged/pool.go @@ -12,7 +12,8 @@ import ( "golang.org/x/xerrors" "tailscale.com/util/singleflight" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/aibridge" "github.com/coder/aibridge/mcp" "github.com/coder/aibridge/tracing" diff --git a/enterprise/aibridged/pool_test.go b/enterprise/aibridged/pool_test.go index 5a22a12d0b..ce7f1e21ae 100644 --- a/enterprise/aibridged/pool_test.go +++ b/enterprise/aibridged/pool_test.go @@ -11,7 +11,8 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/mock/gomock" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/aibridge/mcp" "github.com/coder/aibridge/mcpmock" "github.com/coder/coder/v2/enterprise/aibridged" diff --git a/enterprise/aibridgedserver/aibridgedserver.go b/enterprise/aibridgedserver/aibridgedserver.go index 156f3aa9d0..9daf93743a 100644 --- a/enterprise/aibridgedserver/aibridgedserver.go +++ b/enterprise/aibridgedserver/aibridgedserver.go @@ -14,7 +14,8 @@ import ( "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/structpb" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/apikey" "github.com/coder/coder/v2/coderd/database" diff --git a/enterprise/aibridgedserver/aibridgedserver_internal_test.go b/enterprise/aibridgedserver/aibridgedserver_internal_test.go index 28b9463e8b..8e007e2d15 100644 --- a/enterprise/aibridgedserver/aibridgedserver_internal_test.go +++ b/enterprise/aibridgedserver/aibridgedserver_internal_test.go @@ -11,8 +11,8 @@ import ( "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/structpb" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" ) func TestMarshalMetadata(t *testing.T) { diff --git a/enterprise/aibridgeproxyd/aibridgeproxyd.go b/enterprise/aibridgeproxyd/aibridgeproxyd.go index c51530826a..bb48c36df6 100644 --- a/enterprise/aibridgeproxyd/aibridgeproxyd.go +++ b/enterprise/aibridgeproxyd/aibridgeproxyd.go @@ -18,7 +18,7 @@ import ( "github.com/go-chi/chi/v5" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/aibridge" ) diff --git a/enterprise/aibridgeproxyd/aibridgeproxyd_test.go b/enterprise/aibridgeproxyd/aibridgeproxyd_test.go index 7bc5c1e780..a7f830f056 100644 --- a/enterprise/aibridgeproxyd/aibridgeproxyd_test.go +++ b/enterprise/aibridgeproxyd/aibridgeproxyd_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/xerrors" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/enterprise/aibridgeproxyd" "github.com/coder/coder/v2/testutil" diff --git a/enterprise/audit/backends/slog.go b/enterprise/audit/backends/slog.go index 7418070b49..6cf6bca7ef 100644 --- a/enterprise/audit/backends/slog.go +++ b/enterprise/audit/backends/slog.go @@ -7,7 +7,8 @@ import ( "github.com/fatih/structs" "github.com/sqlc-dev/pqtype" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/enterprise/audit" ) @@ -26,14 +27,12 @@ func (e *SlogExporter) ExportStruct(ctx context.Context, data any, message strin // pleasantly format the output. For example, the clean result of // (*NullString).Value() may be printed instead of {String: "foo", Valid: true}. sfs := structs.Fields(data) - var fields []any + var fields []slog.Field for _, sf := range sfs { fields = append(fields, e.fieldToSlog(sf)) } - for _, field := range extraFields { - fields = append(fields, field) - } + fields = append(fields, extraFields...) e.log.Info(ctx, message, fields...) return nil diff --git a/enterprise/audit/backends/slog_test.go b/enterprise/audit/backends/slog_test.go index 99be36b3f9..90953bdd77 100644 --- a/enterprise/audit/backends/slog_test.go +++ b/enterprise/audit/backends/slog_test.go @@ -16,8 +16,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogjson" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogjson" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/enterprise/audit" "github.com/coder/coder/v2/enterprise/audit/audittest" diff --git a/enterprise/cli/provisionerdaemonstart.go b/enterprise/cli/provisionerdaemonstart.go index b15e56d8ab..fe1d2d0c3a 100644 --- a/enterprise/cli/provisionerdaemonstart.go +++ b/enterprise/cli/provisionerdaemonstart.go @@ -17,8 +17,9 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + agpl "github.com/coder/coder/v2/cli" "github.com/coder/coder/v2/cli/clilog" "github.com/coder/coder/v2/cli/cliui" diff --git a/enterprise/cli/proxyserver.go b/enterprise/cli/proxyserver.go index 35f0986614..e40d0f5ce5 100644 --- a/enterprise/cli/proxyserver.go +++ b/enterprise/cli/proxyserver.go @@ -21,7 +21,8 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/cli" "github.com/coder/coder/v2/cli/clilog" "github.com/coder/coder/v2/cli/cliui" diff --git a/enterprise/cli/server_dbcrypt.go b/enterprise/cli/server_dbcrypt.go index 72ac6cc6e8..61c762076b 100644 --- a/enterprise/cli/server_dbcrypt.go +++ b/enterprise/cli/server_dbcrypt.go @@ -8,8 +8,9 @@ import ( "fmt" "strings" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/cli" "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/coderd/database/awsiamrds" diff --git a/enterprise/coderd/aibridged.go b/enterprise/coderd/aibridged.go index 2ff2de902b..0dd409a8fa 100644 --- a/enterprise/coderd/aibridged.go +++ b/enterprise/coderd/aibridged.go @@ -10,7 +10,7 @@ import ( "storj.io/drpc/drpcmux" "storj.io/drpc/drpcserver" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk/drpcsdk" diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go index 0beef07acb..fac795c8da 100644 --- a/enterprise/coderd/coderd.go +++ b/enterprise/coderd/coderd.go @@ -37,7 +37,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/prometheus/client_golang/prometheus" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd" agplaudit "github.com/coder/coder/v2/coderd/audit" diff --git a/enterprise/coderd/coderd_test.go b/enterprise/coderd/coderd_test.go index 6022bc8f37..cb84620be1 100644 --- a/enterprise/coderd/coderd_test.go +++ b/enterprise/coderd/coderd_test.go @@ -24,8 +24,8 @@ import ( "go.uber.org/goleak" "go.uber.org/mock/gomock" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/agent/agenttest" diff --git a/enterprise/coderd/coderdenttest/coderdenttest.go b/enterprise/coderd/coderdenttest/coderdenttest.go index 29758c3dbf..65cd253553 100644 --- a/enterprise/coderd/coderdenttest/coderdenttest.go +++ b/enterprise/coderd/coderdenttest/coderdenttest.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" diff --git a/enterprise/coderd/coderdenttest/proxytest.go b/enterprise/coderd/coderdenttest/proxytest.go index c4e5ed6019..60e612871f 100644 --- a/enterprise/coderd/coderdenttest/proxytest.go +++ b/enterprise/coderd/coderdenttest/proxytest.go @@ -17,7 +17,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/workspaceapps/appurl" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/enterprise/coderd" diff --git a/enterprise/coderd/connectionlog/connectionlog.go b/enterprise/coderd/connectionlog/connectionlog.go index e428a13baf..cb64169ee8 100644 --- a/enterprise/coderd/connectionlog/connectionlog.go +++ b/enterprise/coderd/connectionlog/connectionlog.go @@ -5,7 +5,8 @@ import ( "github.com/hashicorp/go-multierror" - "cdr.dev/slog" + "cdr.dev/slog/v3" + agpl "github.com/coder/coder/v2/coderd/connectionlog" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/enterprise/coderd/dormancy/dormantusersjob.go b/enterprise/coderd/dormancy/dormantusersjob.go index d331001a56..aa2ca665d0 100644 --- a/enterprise/coderd/dormancy/dormantusersjob.go +++ b/enterprise/coderd/dormancy/dormantusersjob.go @@ -8,7 +8,7 @@ import ( "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" diff --git a/enterprise/coderd/dormancy/dormantusersjob_test.go b/enterprise/coderd/dormancy/dormantusersjob_test.go index 885a112c61..9ee0861aaf 100644 --- a/enterprise/coderd/dormancy/dormantusersjob_test.go +++ b/enterprise/coderd/dormancy/dormantusersjob_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" diff --git a/enterprise/coderd/enidpsync/enidpsync.go b/enterprise/coderd/enidpsync/enidpsync.go index 2020a4300e..e7fcf5d7a6 100644 --- a/enterprise/coderd/enidpsync/enidpsync.go +++ b/enterprise/coderd/enidpsync/enidpsync.go @@ -1,7 +1,8 @@ package enidpsync import ( - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/entitlements" "github.com/coder/coder/v2/coderd/idpsync" "github.com/coder/coder/v2/coderd/runtimeconfig" diff --git a/enterprise/coderd/enidpsync/groups_test.go b/enterprise/coderd/enidpsync/groups_test.go index 652432c73f..fe1bf22bf9 100644 --- a/enterprise/coderd/enidpsync/groups_test.go +++ b/enterprise/coderd/enidpsync/groups_test.go @@ -6,7 +6,8 @@ import ( "github.com/golang-jwt/jwt/v4" "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/entitlements" "github.com/coder/coder/v2/coderd/idpsync" "github.com/coder/coder/v2/coderd/runtimeconfig" diff --git a/enterprise/coderd/enidpsync/organizations_test.go b/enterprise/coderd/enidpsync/organizations_test.go index c3bae7cd1d..7702d91a62 100644 --- a/enterprise/coderd/enidpsync/organizations_test.go +++ b/enterprise/coderd/enidpsync/organizations_test.go @@ -9,7 +9,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/enterprise/coderd/enidpsync/role.go b/enterprise/coderd/enidpsync/role.go index f258e47cf1..815633f8d3 100644 --- a/enterprise/coderd/enidpsync/role.go +++ b/enterprise/coderd/enidpsync/role.go @@ -9,7 +9,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/idpsync" "github.com/coder/coder/v2/coderd/runtimeconfig" diff --git a/enterprise/coderd/licenses.go b/enterprise/coderd/licenses.go index e46b6791cd..a2ec273a32 100644 --- a/enterprise/coderd/licenses.go +++ b/enterprise/coderd/licenses.go @@ -20,7 +20,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" diff --git a/enterprise/coderd/prebuilds/membership.go b/enterprise/coderd/prebuilds/membership.go index 9436f68737..8213983013 100644 --- a/enterprise/coderd/prebuilds/membership.go +++ b/enterprise/coderd/prebuilds/membership.go @@ -7,7 +7,7 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/quartz" diff --git a/enterprise/coderd/prebuilds/membership_test.go b/enterprise/coderd/prebuilds/membership_test.go index fe4ec26259..46120f556f 100644 --- a/enterprise/coderd/prebuilds/membership_test.go +++ b/enterprise/coderd/prebuilds/membership_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" diff --git a/enterprise/coderd/prebuilds/metricscollector.go b/enterprise/coderd/prebuilds/metricscollector.go index f3b808e4c8..3dba85b2d3 100644 --- a/enterprise/coderd/prebuilds/metricscollector.go +++ b/enterprise/coderd/prebuilds/metricscollector.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/enterprise/coderd/prebuilds/metricscollector_test.go b/enterprise/coderd/prebuilds/metricscollector_test.go index d45a175e17..4534e0ce6f 100644 --- a/enterprise/coderd/prebuilds/metricscollector_test.go +++ b/enterprise/coderd/prebuilds/metricscollector_test.go @@ -12,7 +12,8 @@ import ( "go.opentelemetry.io/otel/trace/noop" "tailscale.com/types/ptr" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/files" "github.com/coder/quartz" diff --git a/enterprise/coderd/prebuilds/reconcile.go b/enterprise/coderd/prebuilds/reconcile.go index 416ccfa394..8a2caad2dd 100644 --- a/enterprise/coderd/prebuilds/reconcile.go +++ b/enterprise/coderd/prebuilds/reconcile.go @@ -21,7 +21,7 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" @@ -540,7 +540,7 @@ func (c *StoreReconciler) ReconcilePreset(ctx context.Context, ps prebuilds.Pres return err } - fields := []any{ + fields := []slog.Field{ slog.F("desired", state.Desired), slog.F("actual", state.Actual), slog.F("extraneous", state.Extraneous), slog.F("starting", state.Starting), slog.F("stopping", state.Stopping), slog.F("deleting", state.Deleting), @@ -554,7 +554,7 @@ func (c *StoreReconciler) ReconcilePreset(ctx context.Context, ps prebuilds.Pres for _, action := range actions { err = c.executeReconciliationAction(ctx, logger, ps, action) if err != nil { - logger.Error(ctx, "failed to execute action", "type", action.ActionType, slog.Error(err)) + logger.Error(ctx, "failed to execute action", slog.F("type", action.ActionType), slog.Error(err)) multiErr.Errors = append(multiErr.Errors, err) } } @@ -645,7 +645,7 @@ func (c *StoreReconciler) executeReconciliationAction(ctx context.Context, logge // nolint:gocritic // ReconcilePreset needs Prebuilds Orchestrator permissions. prebuildsCtx := dbauthz.AsPrebuildsOrchestrator(ctx) - fields := []any{ + fields := []slog.Field{ slog.F("action_type", action.ActionType), slog.F("create_count", action.Create), slog.F("delete_count", len(action.DeleteIDs)), slog.F("to_delete", action.DeleteIDs), } diff --git a/enterprise/coderd/prebuilds/reconcile_test.go b/enterprise/coderd/prebuilds/reconcile_test.go index cdbac86f97..89118e2f13 100644 --- a/enterprise/coderd/prebuilds/reconcile_test.go +++ b/enterprise/coderd/prebuilds/reconcile_test.go @@ -17,8 +17,8 @@ import ( "golang.org/x/xerrors" "tailscale.com/types/ptr" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" diff --git a/enterprise/coderd/provisionerdaemons.go b/enterprise/coderd/provisionerdaemons.go index 0f6db2508a..39652d4bcd 100644 --- a/enterprise/coderd/provisionerdaemons.go +++ b/enterprise/coderd/provisionerdaemons.go @@ -18,7 +18,8 @@ import ( "storj.io/drpc/drpcmux" "storj.io/drpc/drpcserver" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/websocket" "github.com/coder/coder/v2/coderd/database" diff --git a/enterprise/coderd/provisionerdaemons_test.go b/enterprise/coderd/provisionerdaemons_test.go index 31f31285ee..cf8a98bdf6 100644 --- a/enterprise/coderd/provisionerdaemons_test.go +++ b/enterprise/coderd/provisionerdaemons_test.go @@ -14,7 +14,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/apiversion" "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/enterprise/coderd/proxyhealth/proxyhealth.go b/enterprise/coderd/proxyhealth/proxyhealth.go index ef72184136..09f5ca2e17 100644 --- a/enterprise/coderd/proxyhealth/proxyhealth.go +++ b/enterprise/coderd/proxyhealth/proxyhealth.go @@ -17,7 +17,8 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/prometheusmetrics" diff --git a/enterprise/coderd/schedule/template.go b/enterprise/coderd/schedule/template.go index 2d791926cf..938fea2717 100644 --- a/enterprise/coderd/schedule/template.go +++ b/enterprise/coderd/schedule/template.go @@ -6,7 +6,7 @@ import ( "sync/atomic" "time" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/dustin/go-humanize" "github.com/google/uuid" diff --git a/enterprise/coderd/schedule/template_test.go b/enterprise/coderd/schedule/template_test.go index 60aeb44840..51d9897a97 100644 --- a/enterprise/coderd/schedule/template_test.go +++ b/enterprise/coderd/schedule/template_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/enterprise/coderd/templates.go b/enterprise/coderd/templates.go index 5d0f4bab45..f8264e2e6f 100644 --- a/enterprise/coderd/templates.go +++ b/enterprise/coderd/templates.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" diff --git a/enterprise/coderd/templates_test.go b/enterprise/coderd/templates_test.go index cbb30be6e3..66737e2841 100644 --- a/enterprise/coderd/templates_test.go +++ b/enterprise/coderd/templates_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/enterprise/coderd/usage/publisher.go b/enterprise/coderd/usage/publisher.go index ce38f9a24a..6c2ec5f4cb 100644 --- a/enterprise/coderd/usage/publisher.go +++ b/enterprise/coderd/usage/publisher.go @@ -13,7 +13,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/enterprise/coderd/usage/publisher_test.go b/enterprise/coderd/usage/publisher_test.go index c104c9712e..57e099c47d 100644 --- a/enterprise/coderd/usage/publisher_test.go +++ b/enterprise/coderd/usage/publisher_test.go @@ -16,7 +16,8 @@ import ( "go.uber.org/goleak" "go.uber.org/mock/gomock" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/enterprise/coderd/workspaceproxy.go b/enterprise/coderd/workspaceproxy.go index 4f3ce12056..615fa4c706 100644 --- a/enterprise/coderd/workspaceproxy.go +++ b/enterprise/coderd/workspaceproxy.go @@ -13,7 +13,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + agpl "github.com/coder/coder/v2/coderd" "github.com/coder/coder/v2/coderd/apikey" "github.com/coder/coder/v2/coderd/audit" diff --git a/enterprise/coderd/workspaceproxy_test.go b/enterprise/coderd/workspaceproxy_test.go index e0f73a5c0d..ef6a303c61 100644 --- a/enterprise/coderd/workspaceproxy_test.go +++ b/enterprise/coderd/workspaceproxy_test.go @@ -17,7 +17,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/agent/agenttest" "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/enterprise/coderd/workspacequota.go b/enterprise/coderd/workspacequota.go index 29ab00e0cd..d71102808f 100644 --- a/enterprise/coderd/workspacequota.go +++ b/enterprise/coderd/workspacequota.go @@ -9,7 +9,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/google/uuid" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/httpapi" diff --git a/enterprise/coderd/workspaces_test.go b/enterprise/coderd/workspaces_test.go index cce911f944..665ac02df8 100644 --- a/enterprise/coderd/workspaces_test.go +++ b/enterprise/coderd/workspaces_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/trace/noop" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/autobuild" diff --git a/enterprise/dbcrypt/cliutil.go b/enterprise/dbcrypt/cliutil.go index a94760d3d6..cc87defcdb 100644 --- a/enterprise/dbcrypt/cliutil.go +++ b/enterprise/dbcrypt/cliutil.go @@ -6,7 +6,7 @@ import ( "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" ) diff --git a/enterprise/derpmesh/derpmesh.go b/enterprise/derpmesh/derpmesh.go index 053fa2a3f5..9a85190b06 100644 --- a/enterprise/derpmesh/derpmesh.go +++ b/enterprise/derpmesh/derpmesh.go @@ -12,7 +12,8 @@ import ( "tailscale.com/derp/derphttp" "tailscale.com/types/key" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/tailnet" ) diff --git a/enterprise/provisionerd/remoteprovisioners.go b/enterprise/provisionerd/remoteprovisioners.go index 1ae02f0031..e910ebc893 100644 --- a/enterprise/provisionerd/remoteprovisioners.go +++ b/enterprise/provisionerd/remoteprovisioners.go @@ -25,7 +25,8 @@ import ( "golang.org/x/xerrors" "storj.io/drpc/drpcconn" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/provisioner/echo" diff --git a/enterprise/provisionerd/remoteprovisioners_test.go b/enterprise/provisionerd/remoteprovisioners_test.go index ea4ad11eb1..904e95b81f 100644 --- a/enterprise/provisionerd/remoteprovisioners_test.go +++ b/enterprise/provisionerd/remoteprovisioners_test.go @@ -9,7 +9,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/goleak" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/enterprise/provisionerd" "github.com/coder/coder/v2/provisioner/echo" diff --git a/enterprise/replicasync/replicasync.go b/enterprise/replicasync/replicasync.go index 129e652c97..3642e5ab0f 100644 --- a/enterprise/replicasync/replicasync.go +++ b/enterprise/replicasync/replicasync.go @@ -16,7 +16,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/cli/cliutil" "github.com/coder/coder/v2/coderd/database" diff --git a/enterprise/tailnet/connio.go b/enterprise/tailnet/connio.go index df39b62271..5fe28dde18 100644 --- a/enterprise/tailnet/connio.go +++ b/enterprise/tailnet/connio.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" agpl "github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/tailnet/proto" diff --git a/enterprise/tailnet/handshaker.go b/enterprise/tailnet/handshaker.go index fc66262884..9918d9dea9 100644 --- a/enterprise/tailnet/handshaker.go +++ b/enterprise/tailnet/handshaker.go @@ -7,7 +7,8 @@ import ( "github.com/google/uuid" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database/pubsub" ) diff --git a/enterprise/tailnet/multiagent_test.go b/enterprise/tailnet/multiagent_test.go index c79f11153a..331133eb04 100644 --- a/enterprise/tailnet/multiagent_test.go +++ b/enterprise/tailnet/multiagent_test.go @@ -6,8 +6,9 @@ import ( "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/database/dbtestutil" "github.com/coder/coder/v2/enterprise/tailnet" agpl "github.com/coder/coder/v2/tailnet" diff --git a/enterprise/tailnet/pgcoord.go b/enterprise/tailnet/pgcoord.go index 54bb87f932..cb4e16970b 100644 --- a/enterprise/tailnet/pgcoord.go +++ b/enterprise/tailnet/pgcoord.go @@ -13,7 +13,8 @@ import ( "golang.org/x/xerrors" gProto "google.golang.org/protobuf/proto" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/pubsub" diff --git a/enterprise/tailnet/pgcoord_internal_test.go b/enterprise/tailnet/pgcoord_internal_test.go index 88dbe245f0..6355cf3cc8 100644 --- a/enterprise/tailnet/pgcoord_internal_test.go +++ b/enterprise/tailnet/pgcoord_internal_test.go @@ -17,8 +17,9 @@ import ( "golang.org/x/xerrors" gProto "google.golang.org/protobuf/proto" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/quartz" "github.com/coder/coder/v2/coderd/database" diff --git a/enterprise/tailnet/pgcoord_test.go b/enterprise/tailnet/pgcoord_test.go index eee64f75f4..24c455ba9b 100644 --- a/enterprise/tailnet/pgcoord_test.go +++ b/enterprise/tailnet/pgcoord_test.go @@ -16,8 +16,9 @@ import ( "golang.org/x/xerrors" gProto "google.golang.org/protobuf/proto" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbmock" "github.com/coder/coder/v2/coderd/database/dbtestutil" diff --git a/enterprise/tailnet/workspaceproxy.go b/enterprise/tailnet/workspaceproxy.go index de95c18577..b7d92b7651 100644 --- a/enterprise/tailnet/workspaceproxy.go +++ b/enterprise/tailnet/workspaceproxy.go @@ -6,7 +6,8 @@ import ( "github.com/google/uuid" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/apiversion" agpl "github.com/coder/coder/v2/tailnet" ) diff --git a/enterprise/wsproxy/tokenprovider.go b/enterprise/wsproxy/tokenprovider.go index 0f263157a5..7d4b5c43b1 100644 --- a/enterprise/wsproxy/tokenprovider.go +++ b/enterprise/wsproxy/tokenprovider.go @@ -5,7 +5,7 @@ import ( "net/http" "net/url" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/cryptokeys" "github.com/coder/coder/v2/coderd/jwtutils" diff --git a/enterprise/wsproxy/wsproxy.go b/enterprise/wsproxy/wsproxy.go index cfaa472242..308107392c 100644 --- a/enterprise/wsproxy/wsproxy.go +++ b/enterprise/wsproxy/wsproxy.go @@ -25,7 +25,8 @@ import ( "tailscale.com/derp/derphttp" "tailscale.com/types/key" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/cli/cliutil" "github.com/coder/coder/v2/coderd" diff --git a/enterprise/wsproxy/wsproxy_test.go b/enterprise/wsproxy/wsproxy_test.go index fcb6493ad1..1fb19f9766 100644 --- a/enterprise/wsproxy/wsproxy_test.go +++ b/enterprise/wsproxy/wsproxy_test.go @@ -22,8 +22,9 @@ import ( "tailscale.com/tailcfg" "tailscale.com/types/key" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/agent/agenttest" "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/enterprise/wsproxy/wsproxysdk/wsproxysdk.go b/enterprise/wsproxy/wsproxysdk/wsproxysdk.go index 443baa8159..975d4ff832 100644 --- a/enterprise/wsproxy/wsproxysdk/wsproxysdk.go +++ b/enterprise/wsproxy/wsproxysdk/wsproxysdk.go @@ -12,7 +12,8 @@ import ( "golang.org/x/xerrors" "tailscale.com/tailcfg" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/httpmw" "github.com/coder/coder/v2/coderd/workspaceapps" "github.com/coder/coder/v2/codersdk" diff --git a/go.mod b/go.mod index 8d0cce6b7b..a6a4394705 100644 --- a/go.mod +++ b/go.mod @@ -73,7 +73,7 @@ replace github.com/aquasecurity/trivy => github.com/coder/trivy v0.0.0-202508072 replace github.com/spf13/afero => github.com/aslilac/afero v0.0.0-20250403163713-f06e86036696 require ( - cdr.dev/slog v1.6.2-0.20251120224544-40ff19937ff2 + cdr.dev/slog/v3 v3.0.0-rc1 cloud.google.com/go/compute/metadata v0.9.0 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d github.com/adrg/xdg v0.5.0 @@ -100,10 +100,10 @@ require ( github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0 github.com/coder/quartz v0.3.0 github.com/coder/retry v1.5.1 - github.com/coder/serpent v0.12.0 + github.com/coder/serpent v0.13.0 github.com/coder/terraform-provider-coder/v2 v2.13.1 github.com/coder/websocket v1.8.13 - github.com/coder/wgtunnel v0.1.13-0.20240522110300-ade90dfb2da0 + github.com/coder/wgtunnel v0.2.0 github.com/coreos/go-oidc/v3 v3.17.0 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf github.com/creack/pty v1.1.21 @@ -221,8 +221,6 @@ require ( require ( cloud.google.com/go/auth v0.17.0 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect - cloud.google.com/go/logging v1.13.0 // indirect - cloud.google.com/go/longrunning v0.6.7 // indirect dario.cat/mergo v1.0.1 // indirect filippo.io/edwards25519 v1.1.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect @@ -460,7 +458,7 @@ require ( sigs.k8s.io/yaml v1.5.0 // indirect ) -require github.com/coder/clistat v1.1.2 +require github.com/coder/clistat v1.2.0 require github.com/SherClockHolmes/webpush-go v1.4.0 @@ -476,7 +474,7 @@ require ( github.com/anthropics/anthropic-sdk-go v1.19.0 github.com/brianvoe/gofakeit/v7 v7.14.0 github.com/coder/agentapi-sdk-go v0.0.0-20250505131810-560d1d88d225 - github.com/coder/aibridge v0.3.0 + github.com/coder/aibridge v0.3.1-0.20260105111716-7535a71e91a1 github.com/coder/aisdk-go v0.0.9 github.com/coder/boundary v0.0.1-alpha github.com/coder/preview v1.0.4 @@ -494,6 +492,8 @@ require ( cel.dev/expr v0.24.0 // indirect cloud.google.com/go v0.121.6 // indirect cloud.google.com/go/iam v1.5.2 // indirect + cloud.google.com/go/logging v1.13.0 // indirect + cloud.google.com/go/longrunning v0.6.7 // indirect cloud.google.com/go/monitoring v1.24.2 // indirect cloud.google.com/go/storage v1.56.0 // indirect git.sr.ht/~jackmordaunt/go-toast v1.1.2 // indirect diff --git a/go.sum b/go.sum index f0d349fa10..a30d3ac6ea 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -cdr.dev/slog v1.6.2-0.20251120224544-40ff19937ff2 h1:M4Z9eTbnHPdZI4GpBUNCae0lSgUucY+aW5j7+zB8lCk= -cdr.dev/slog v1.6.2-0.20251120224544-40ff19937ff2/go.mod h1:NaoTA7KwopCrnaSb0JXTC0PTp/O/Y83Lndnq0OEV3ZQ= +cdr.dev/slog/v3 v3.0.0-rc1 h1:EN7Zim6GvTpAeHQjI0ERDEfqKbTyXRvgH4UhlzLpvWM= +cdr.dev/slog/v3 v3.0.0-rc1/go.mod h1:iO/OALX1VxlI03mkodCGdVP7pXzd2bRMvu3ePvlJ9ak= cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY= cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= @@ -927,16 +927,16 @@ github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f h1:Y8xYupdHxryycyPlc9Y github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f/go.mod h1:HlzOvOjVBOfTGSRXRyY0OiCS/3J1akRGQQpRO/7zyF4= github.com/coder/agentapi-sdk-go v0.0.0-20250505131810-560d1d88d225 h1:tRIViZ5JRmzdOEo5wUWngaGEFBG8OaE1o2GIHN5ujJ8= github.com/coder/agentapi-sdk-go v0.0.0-20250505131810-560d1d88d225/go.mod h1:rNLVpYgEVeu1Zk29K64z6Od8RBP9DwqCu9OfCzh8MR4= -github.com/coder/aibridge v0.3.0 h1:z5coky9A5uXOr+zjgmsynal8PVYBMmxE9u1vcIzs4t8= -github.com/coder/aibridge v0.3.0/go.mod h1:ENnl6VhU8Qot5OuVYqs7V4vXII11oKBWgWKrgIJbRAs= +github.com/coder/aibridge v0.3.1-0.20260105111716-7535a71e91a1 h1:cr2K36NgU1fHKtjzfOCMVH1QBhW7AGUg4lq+GjvJ41I= +github.com/coder/aibridge v0.3.1-0.20260105111716-7535a71e91a1/go.mod h1:5Ztcl+9HF0tog85iEEuFdaBkBe8EkxJe5XjbMOFviQs= github.com/coder/aisdk-go v0.0.9 h1:Vzo/k2qwVGLTR10ESDeP2Ecek1SdPfZlEjtTfMveiVo= github.com/coder/aisdk-go v0.0.9/go.mod h1:KF6/Vkono0FJJOtWtveh5j7yfNrSctVTpwgweYWSp5M= github.com/coder/boundary v0.0.1-alpha h1:6shUQ2zkrWrfbgVcqWvpV2ibljOQvPvYqTctWBkKoUA= github.com/coder/boundary v0.0.1-alpha/go.mod h1:d1AMFw81rUgrGHuZzWdPNhkY0G8w7pvLNLYF0e3ceC4= github.com/coder/bubbletea v1.2.2-0.20241212190825-007a1cdb2c41 h1:SBN/DA63+ZHwuWwPHPYoCZ/KLAjHv5g4h2MS4f2/MTI= github.com/coder/bubbletea v1.2.2-0.20241212190825-007a1cdb2c41/go.mod h1:I9ULxr64UaOSUv7hcb3nX4kowodJCVS7vt7VVJk/kW4= -github.com/coder/clistat v1.1.2 h1:1WzCsEQ/VFBNyxu5ryy0Pdb6rrMh+byCp3aZMkn9k/E= -github.com/coder/clistat v1.1.2/go.mod h1:F+gLef+F9chVrleq808RBxdaoq52R4VLopuLdAsh8Y4= +github.com/coder/clistat v1.2.0 h1:37KJKqiCllJsRvWqTHf3qiLIXX0JB6oqE5oxcqgdLkY= +github.com/coder/clistat v1.2.0/go.mod h1:m7SC0uj88eEERgvF8Kn6+w6XF21BeSr+15f7GoLAw0A= github.com/coder/flog v1.1.0 h1:kbAes1ai8fIS5OeV+QAnKBQE22ty1jRF/mcAwHpLBa4= github.com/coder/flog v1.1.0/go.mod h1:UQlQvrkJBvnRGo69Le8E24Tcl5SJleAAR7gYEHzAmdQ= github.com/coder/glog v1.0.1-0.20220322161911-7365fe7f2cd1/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= @@ -956,8 +956,8 @@ github.com/coder/quartz v0.3.0 h1:bUoSEJ77NBfKtUqv6CPSC0AS8dsjqAqqAv7bN02m1mg= github.com/coder/quartz v0.3.0/go.mod h1:BgE7DOj/8NfvRgvKw0jPLDQH/2Lya2kxcTaNJ8X0rZk= github.com/coder/retry v1.5.1 h1:iWu8YnD8YqHs3XwqrqsjoBTAVqT9ml6z9ViJ2wlMiqc= github.com/coder/retry v1.5.1/go.mod h1:blHMk9vs6LkoRT9ZHyuZo360cufXEhrxqvEzeMtRGoY= -github.com/coder/serpent v0.12.0 h1:fUu3qVjeRvVy3DB/C2EFFvOctm+f2HKyckyfA86O63Q= -github.com/coder/serpent v0.12.0/go.mod h1:mPEpD8Cq106E0glBs5ROAAGoALLtD5HAAMVZmjf4zO0= +github.com/coder/serpent v0.13.0 h1:6EoWjpEypkb8cS6i0eCF4qoAv9vrEVaX26RW+3FMMvo= +github.com/coder/serpent v0.13.0/go.mod h1:7OIvFBYMd+OqarMy5einBl8AtRr8LliopVU7pyrwucY= github.com/coder/ssh v0.0.0-20231128192721-70855dedb788 h1:YoUSJ19E8AtuUFVYBpXuOD6a/zVP3rcxezNsoDseTUw= github.com/coder/ssh v0.0.0-20231128192721-70855dedb788/go.mod h1:aGQbuCLyhRLMzZF067xc84Lh7JDs1FKwCmF1Crl9dxQ= github.com/coder/tailscale v1.1.1-0.20250829055706-6eafe0f9199e h1:9RKGKzGLHtTvVBQublzDGtCtal3cXP13diCHoAIGPeI= @@ -970,8 +970,8 @@ github.com/coder/trivy v0.0.0-20250807211036-0bb0acd620a8 h1:VYB/6cIIKsVkwXOAWbq github.com/coder/trivy v0.0.0-20250807211036-0bb0acd620a8/go.mod h1:O73tP+UvJlI2GQZD060Jt0sf+6alKcGAgORh6sgB0+M= github.com/coder/websocket v1.8.13 h1:f3QZdXy7uGVz+4uCJy2nTZyM0yTBj8yANEHhqlXZ9FE= github.com/coder/websocket v1.8.13/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs= -github.com/coder/wgtunnel v0.1.13-0.20240522110300-ade90dfb2da0 h1:C2/eCr+r0a5Auuw3YOiSyLNHkdMtyCZHPFBx7syN4rk= -github.com/coder/wgtunnel v0.1.13-0.20240522110300-ade90dfb2da0/go.mod h1:qANbdpqyAGlo2bg+4gQKPj24H1ZWa3bQU2Q5/bV5B3Y= +github.com/coder/wgtunnel v0.2.0 h1:yy9dE9ntoNdx/q98CH9uV2cQk1UEKSwPgITy3Xx+Wiw= +github.com/coder/wgtunnel v0.2.0/go.mod h1:4Ne8vzzdHwkM9BnPW2zDvidvFi5IfEbkecx5JH+0zjY= github.com/coder/wireguard-go v0.0.0-20240522052547-769cdd7f7818 h1:bNhUTaKl3q0bFn78bBRq7iIwo72kNTvUD9Ll5TTzDDk= github.com/coder/wireguard-go v0.0.0-20240522052547-769cdd7f7818/go.mod h1:fAlLM6hUgnf4Sagxn2Uy5Us0PBgOYWz+63HwHUVGEbw= github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4= diff --git a/httpmw/recover.go b/httpmw/recover.go index a8d6020561..5de09899b5 100644 --- a/httpmw/recover.go +++ b/httpmw/recover.go @@ -5,7 +5,8 @@ import ( "net/http" "runtime/debug" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/tracing" ) diff --git a/provisioner/echo/serve.go b/provisioner/echo/serve.go index e4141572fc..ad06cc43bd 100644 --- a/provisioner/echo/serve.go +++ b/provisioner/echo/serve.go @@ -16,7 +16,7 @@ import ( "golang.org/x/xerrors" protobuf "google.golang.org/protobuf/proto" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/provisionersdk" "github.com/coder/coder/v2/provisionersdk/proto" diff --git a/provisioner/terraform/cleanup.go b/provisioner/terraform/cleanup.go index c6a51d907b..3874a33ba8 100644 --- a/provisioner/terraform/cleanup.go +++ b/provisioner/terraform/cleanup.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/afero" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) // CleanStaleTerraformPlugins browses the Terraform cache directory diff --git a/provisioner/terraform/cleanup_test.go b/provisioner/terraform/cleanup_test.go index 7d4dd897d8..49636f5dc0 100644 --- a/provisioner/terraform/cleanup_test.go +++ b/provisioner/terraform/cleanup_test.go @@ -17,7 +17,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/provisioner/terraform" "github.com/coder/coder/v2/testutil" ) diff --git a/provisioner/terraform/convertstate_test.go b/provisioner/terraform/convertstate_test.go index 895dd3bcdc..91da206aff 100644 --- a/provisioner/terraform/convertstate_test.go +++ b/provisioner/terraform/convertstate_test.go @@ -14,7 +14,8 @@ import ( tfjson "github.com/hashicorp/terraform-json" "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/provisioner/terraform" "github.com/coder/coder/v2/testutil" ) diff --git a/provisioner/terraform/executor.go b/provisioner/terraform/executor.go index a8d093aa9a..f8df501e4f 100644 --- a/provisioner/terraform/executor.go +++ b/provisioner/terraform/executor.go @@ -20,7 +20,8 @@ import ( "go.opentelemetry.io/otel/attribute" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/provisionersdk/tfpath" "github.com/coder/coder/v2/coderd/tracing" diff --git a/provisioner/terraform/install.go b/provisioner/terraform/install.go index 8f909fcb1f..d6a9e74d90 100644 --- a/provisioner/terraform/install.go +++ b/provisioner/terraform/install.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/hc-install/releases" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) var ( diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go index 0824bfb263..b1845f5253 100644 --- a/provisioner/terraform/provision.go +++ b/provisioner/terraform/provision.go @@ -17,7 +17,8 @@ import ( "github.com/spf13/afero" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/terraform-provider-coder/v2/provider" "github.com/coder/coder/v2/coderd/database" diff --git a/provisioner/terraform/provision_test.go b/provisioner/terraform/provision_test.go index 9a9e654718..adc1c32465 100644 --- a/provisioner/terraform/provision_test.go +++ b/provisioner/terraform/provision_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/provisioner/terraform" diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go index a65615e5f2..205df1779d 100644 --- a/provisioner/terraform/resources.go +++ b/provisioner/terraform/resources.go @@ -12,7 +12,7 @@ import ( "github.com/mitchellh/mapstructure" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/terraform-provider-coder/v2/provider" diff --git a/provisioner/terraform/resources_test.go b/provisioner/terraform/resources_test.go index 449df09cfa..7b177bccb9 100644 --- a/provisioner/terraform/resources_test.go +++ b/provisioner/terraform/resources_test.go @@ -18,8 +18,8 @@ import ( "github.com/stretchr/testify/require" protobuf "google.golang.org/protobuf/proto" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/testutil" diff --git a/provisioner/terraform/serve.go b/provisioner/terraform/serve.go index 32b5343f6f..009de40a9e 100644 --- a/provisioner/terraform/serve.go +++ b/provisioner/terraform/serve.go @@ -13,7 +13,8 @@ import ( "go.opentelemetry.io/otel/trace" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/provisionersdk/tfpath" "github.com/coder/coder/v2/coderd/database" diff --git a/provisioner/terraform/tfparse/tfparse.go b/provisioner/terraform/tfparse/tfparse.go index 74905afb64..453fa12bb3 100644 --- a/provisioner/terraform/tfparse/tfparse.go +++ b/provisioner/terraform/tfparse/tfparse.go @@ -24,7 +24,7 @@ import ( "golang.org/x/exp/maps" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) // NOTE: This is duplicated from coderd but we can't import it here without diff --git a/provisioner/terraform/tfparse/tfparse_test.go b/provisioner/terraform/tfparse/tfparse_test.go index 41182b9aa2..762e8edf15 100644 --- a/provisioner/terraform/tfparse/tfparse_test.go +++ b/provisioner/terraform/tfparse/tfparse_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" "github.com/coder/coder/v2/provisioner/terraform/tfparse" "github.com/coder/coder/v2/testutil" diff --git a/provisionerd/provisionerd.go b/provisionerd/provisionerd.go index 707c69cde8..47f9999db1 100644 --- a/provisionerd/provisionerd.go +++ b/provisionerd/provisionerd.go @@ -21,7 +21,8 @@ import ( "golang.org/x/xerrors" protobuf "google.golang.org/protobuf/proto" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/retry" @@ -366,7 +367,7 @@ func (p *Server) acquireAndRunOne(client proto.DRPCProvisionerDaemonClient) erro )) defer span.End() - fields := []any{ + fields := []slog.Field{ slog.F("initiator_username", job.UserName), slog.F("provisioner", job.Provisioner), slog.F("job_id", job.JobId), diff --git a/provisionerd/provisionerd_test.go b/provisionerd/provisionerd_test.go index d94aa17e6c..27ee862093 100644 --- a/provisionerd/provisionerd_test.go +++ b/provisionerd/provisionerd_test.go @@ -20,8 +20,9 @@ import ( "storj.io/drpc/drpcmux" "storj.io/drpc/drpcserver" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/provisionerd" "github.com/coder/coder/v2/provisionerd/proto" diff --git a/provisionerd/runner/apply.go b/provisionerd/runner/apply.go index 752d98024d..8f6e92a537 100644 --- a/provisionerd/runner/apply.go +++ b/provisionerd/runner/apply.go @@ -4,7 +4,8 @@ import ( "context" "time" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/provisionerd/proto" sdkproto "github.com/coder/coder/v2/provisionersdk/proto" ) diff --git a/provisionerd/runner/graph.go b/provisionerd/runner/graph.go index 53461f35f7..5459e30088 100644 --- a/provisionerd/runner/graph.go +++ b/provisionerd/runner/graph.go @@ -4,7 +4,8 @@ import ( "context" "time" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/provisionerd/proto" sdkproto "github.com/coder/coder/v2/provisionersdk/proto" diff --git a/provisionerd/runner/init.go b/provisionerd/runner/init.go index 975d37708e..63aab52da2 100644 --- a/provisionerd/runner/init.go +++ b/provisionerd/runner/init.go @@ -5,7 +5,8 @@ import ( "context" "time" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/provisionerd/proto" sdkproto "github.com/coder/coder/v2/provisionersdk/proto" diff --git a/provisionerd/runner/plan.go b/provisionerd/runner/plan.go index b623cc5209..8aba42e0cb 100644 --- a/provisionerd/runner/plan.go +++ b/provisionerd/runner/plan.go @@ -4,7 +4,8 @@ import ( "context" "time" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/provisionerd/proto" sdkproto "github.com/coder/coder/v2/provisionersdk/proto" diff --git a/provisionerd/runner/runner.go b/provisionerd/runner/runner.go index ac40407354..53db181601 100644 --- a/provisionerd/runner/runner.go +++ b/provisionerd/runner/runner.go @@ -19,7 +19,8 @@ import ( "go.opentelemetry.io/otel/trace" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + strings2 "github.com/coder/coder/v2/coderd/util/strings" "github.com/coder/coder/v2/coderd/tracing" @@ -1173,7 +1174,7 @@ func redactVariableValues(variableValues []*sdkproto.VariableValue) []*sdkproto. } // logProvisionerJobLog logs a message from the provisioner daemon at the appropriate level. -func (r *Runner) logProvisionerJobLog(ctx context.Context, logLevel sdkproto.LogLevel, msg string, fields ...any) { +func (r *Runner) logProvisionerJobLog(ctx context.Context, logLevel sdkproto.LogLevel, msg string, fields ...slog.Field) { switch logLevel { case sdkproto.LogLevel_TRACE: r.logger.Debug(ctx, msg, fields...) // There's no trace, so we'll just use debug. diff --git a/provisionersdk/archive.go b/provisionersdk/archive.go index bbae813db0..22e9a83564 100644 --- a/provisionersdk/archive.go +++ b/provisionersdk/archive.go @@ -10,7 +10,7 @@ import ( "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/util/xio" ) diff --git a/provisionersdk/archive_test.go b/provisionersdk/archive_test.go index 12362275a7..fcb2aaf8ae 100644 --- a/provisionersdk/archive_test.go +++ b/provisionersdk/archive_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/provisionersdk" ) diff --git a/provisionersdk/cleanup_test.go b/provisionersdk/cleanup_test.go index 3bc0064f88..40dd5a700b 100644 --- a/provisionersdk/cleanup_test.go +++ b/provisionersdk/cleanup_test.go @@ -10,7 +10,8 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/require" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/provisionersdk/tfpath" "github.com/coder/coder/v2/testutil" ) diff --git a/provisionersdk/serve.go b/provisionersdk/serve.go index 2deb8a0815..04ca0e1bda 100644 --- a/provisionersdk/serve.go +++ b/provisionersdk/serve.go @@ -14,7 +14,8 @@ import ( "storj.io/drpc/drpcmux" "storj.io/drpc/drpcserver" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/drpcsdk" diff --git a/provisionersdk/session.go b/provisionersdk/session.go index 13831ebf87..4b6575fa29 100644 --- a/provisionersdk/session.go +++ b/provisionersdk/session.go @@ -12,7 +12,8 @@ import ( "github.com/spf13/afero" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/provisionersdk/tfpath" diff --git a/provisionersdk/tfpath/tfpath.go b/provisionersdk/tfpath/tfpath.go index c9db7ee9a4..81187c7f1f 100644 --- a/provisionersdk/tfpath/tfpath.go +++ b/provisionersdk/tfpath/tfpath.go @@ -15,7 +15,7 @@ import ( "github.com/spf13/afero" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) type Layouter interface { diff --git a/provisionersdk/tfpath/x/tfpath.go b/provisionersdk/tfpath/x/tfpath.go index 50af1bbfe1..8f2a5d77e3 100644 --- a/provisionersdk/tfpath/x/tfpath.go +++ b/provisionersdk/tfpath/x/tfpath.go @@ -19,7 +19,8 @@ import ( "github.com/spf13/afero" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/provisionersdk/proto" "github.com/coder/coder/v2/provisionersdk/tfpath" ) diff --git a/scaletest/agentconn/run.go b/scaletest/agentconn/run.go index b0990d9cb1..7c99d31e19 100644 --- a/scaletest/agentconn/run.go +++ b/scaletest/agentconn/run.go @@ -13,8 +13,9 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/workspacesdk" diff --git a/scaletest/autostart/run.go b/scaletest/autostart/run.go index c37d843ad9..48333f260e 100644 --- a/scaletest/autostart/run.go +++ b/scaletest/autostart/run.go @@ -8,8 +8,9 @@ import ( "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/scaletest/createusers" diff --git a/scaletest/createusers/run.go b/scaletest/createusers/run.go index 956ef7d361..cc63091e05 100644 --- a/scaletest/createusers/run.go +++ b/scaletest/createusers/run.go @@ -8,8 +8,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" diff --git a/scaletest/createworkspaces/run.go b/scaletest/createworkspaces/run.go index 09903c06cf..6ca6738aa3 100644 --- a/scaletest/createworkspaces/run.go +++ b/scaletest/createworkspaces/run.go @@ -9,8 +9,8 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" diff --git a/scaletest/createworkspaces/run_test.go b/scaletest/createworkspaces/run_test.go index 1fbcb0cb97..8a66374809 100644 --- a/scaletest/createworkspaces/run_test.go +++ b/scaletest/createworkspaces/run_test.go @@ -11,8 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/httpapi" diff --git a/scaletest/dashboard/chromedp.go b/scaletest/dashboard/chromedp.go index f20a2f4fc8..a98fe97c32 100644 --- a/scaletest/dashboard/chromedp.go +++ b/scaletest/dashboard/chromedp.go @@ -15,7 +15,7 @@ import ( "github.com/coder/coder/v2/cryptorand" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) // Action is just a function that does something. diff --git a/scaletest/dashboard/config.go b/scaletest/dashboard/config.go index 91d9ae3a5a..812c713018 100644 --- a/scaletest/dashboard/config.go +++ b/scaletest/dashboard/config.go @@ -5,7 +5,7 @@ import ( "net/url" "time" - "cdr.dev/slog" + "cdr.dev/slog/v3" "golang.org/x/xerrors" ) diff --git a/scaletest/dashboard/run.go b/scaletest/dashboard/run.go index 5625e25a46..eca31f3a82 100644 --- a/scaletest/dashboard/run.go +++ b/scaletest/dashboard/run.go @@ -9,7 +9,8 @@ import ( "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/scaletest/harness" ) diff --git a/scaletest/dashboard/run_test.go b/scaletest/dashboard/run_test.go index bd25e0f60a..1aa345b47b 100644 --- a/scaletest/dashboard/run_test.go +++ b/scaletest/dashboard/run_test.go @@ -13,8 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/scaletest/dashboard" "github.com/coder/coder/v2/testutil" diff --git a/scaletest/dynamicparameters/run_test.go b/scaletest/dynamicparameters/run_test.go index 2c280e5f96..30612d492d 100644 --- a/scaletest/dynamicparameters/run_test.go +++ b/scaletest/dynamicparameters/run_test.go @@ -7,7 +7,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/scaletest/dynamicparameters" "github.com/coder/coder/v2/testutil" diff --git a/scaletest/dynamicparameters/template.go b/scaletest/dynamicparameters/template.go index dbe4b079b1..275881e26f 100644 --- a/scaletest/dynamicparameters/template.go +++ b/scaletest/dynamicparameters/template.go @@ -14,7 +14,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/cryptorand" "github.com/coder/coder/v2/scaletest/loadtestutil" diff --git a/scaletest/dynamicparameters/template_internal_test.go b/scaletest/dynamicparameters/template_internal_test.go index 6b1230eeae..5c3e34246c 100644 --- a/scaletest/dynamicparameters/template_internal_test.go +++ b/scaletest/dynamicparameters/template_internal_test.go @@ -10,7 +10,8 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/testutil" "github.com/coder/quartz" diff --git a/scaletest/notifications/run.go b/scaletest/notifications/run.go index 213875b85b..2e632925a1 100644 --- a/scaletest/notifications/run.go +++ b/scaletest/notifications/run.go @@ -15,8 +15,8 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" diff --git a/scaletest/prebuilds/run.go b/scaletest/prebuilds/run.go index 7a62e3638b..ee3c792e9a 100644 --- a/scaletest/prebuilds/run.go +++ b/scaletest/prebuilds/run.go @@ -12,8 +12,9 @@ import ( "github.com/google/uuid" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/scaletest/harness" diff --git a/scaletest/reconnectingpty/run.go b/scaletest/reconnectingpty/run.go index 8a33654d0e..49920ff5df 100644 --- a/scaletest/reconnectingpty/run.go +++ b/scaletest/reconnectingpty/run.go @@ -11,8 +11,9 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/workspacesdk" diff --git a/scaletest/smtpmock/server.go b/scaletest/smtpmock/server.go index 26f5b65ffb..17937a6bbb 100644 --- a/scaletest/smtpmock/server.go +++ b/scaletest/smtpmock/server.go @@ -20,7 +20,7 @@ import ( smtpmocklib "github.com/mocktools/go-smtp-mock/v2" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) // Server wraps the SMTP mock server and provides an HTTP API to retrieve emails. diff --git a/scaletest/smtpmock/server_test.go b/scaletest/smtpmock/server_test.go index 7136c5ab9e..e7df291393 100644 --- a/scaletest/smtpmock/server_test.go +++ b/scaletest/smtpmock/server_test.go @@ -13,7 +13,8 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/scaletest/smtpmock" "github.com/coder/coder/v2/testutil" ) diff --git a/scaletest/taskstatus/client.go b/scaletest/taskstatus/client.go index d60f20ab8b..27ef495d69 100644 --- a/scaletest/taskstatus/client.go +++ b/scaletest/taskstatus/client.go @@ -8,7 +8,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" "github.com/coder/quartz" diff --git a/scaletest/taskstatus/run.go b/scaletest/taskstatus/run.go index 87f0cbedd3..9baa3991e5 100644 --- a/scaletest/taskstatus/run.go +++ b/scaletest/taskstatus/run.go @@ -11,8 +11,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" diff --git a/scaletest/taskstatus/run_internal_test.go b/scaletest/taskstatus/run_internal_test.go index 7a82d4c6b2..0126e70e40 100644 --- a/scaletest/taskstatus/run_internal_test.go +++ b/scaletest/taskstatus/run_internal_test.go @@ -13,8 +13,9 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/quartz" "github.com/coder/coder/v2/codersdk" diff --git a/scaletest/workspacebuild/run.go b/scaletest/workspacebuild/run.go index fd3f1be54b..4a11454aae 100644 --- a/scaletest/workspacebuild/run.go +++ b/scaletest/workspacebuild/run.go @@ -10,8 +10,8 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" diff --git a/scaletest/workspacebuild/run_test.go b/scaletest/workspacebuild/run_test.go index 6a42d2fef0..145e0b2417 100644 --- a/scaletest/workspacebuild/run_test.go +++ b/scaletest/workspacebuild/run_test.go @@ -12,8 +12,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/codersdk" diff --git a/scaletest/workspacetraffic/run.go b/scaletest/workspacetraffic/run.go index 6b0819a06b..6fd239fb0e 100644 --- a/scaletest/workspacetraffic/run.go +++ b/scaletest/workspacetraffic/run.go @@ -13,8 +13,9 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/scaletest/harness" diff --git a/scaletest/workspaceupdates/run.go b/scaletest/workspaceupdates/run.go index fa05d290f0..8ec11e7feb 100644 --- a/scaletest/workspaceupdates/run.go +++ b/scaletest/workspaceupdates/run.go @@ -11,8 +11,9 @@ import ( "github.com/coder/websocket" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/workspacesdk" diff --git a/scripts/audittypegen/main.go b/scripts/audittypegen/main.go index 73ff662c5d..c98dde237f 100644 --- a/scripts/audittypegen/main.go +++ b/scripts/audittypegen/main.go @@ -12,8 +12,8 @@ import ( "golang.org/x/tools/go/packages" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" ) func main() { diff --git a/scripts/release/main.go b/scripts/release/main.go index 599fec4f1a..df38c48a78 100644 --- a/scripts/release/main.go +++ b/scripts/release/main.go @@ -19,8 +19,9 @@ import ( "golang.org/x/mod/semver" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/cli/cliui" "github.com/coder/serpent" ) @@ -129,7 +130,7 @@ func main() { if errors.Is(err, cliui.ErrCanceled) { os.Exit(1) } - r.logger.Error(context.Background(), "release command failed", "err", err) + r.logger.Error(context.Background(), "release command failed", slog.Error(err)) os.Exit(1) } } @@ -250,9 +251,9 @@ func (r *releaseCommand) promoteVersionToStable(ctx context.Context, inv *serpen if err != nil { return xerrors.Errorf("edit release failed: %w", err) } - logger.Info(ctx, "selected version promoted to stable", "url", newStable.GetHTMLURL()) + logger.Info(ctx, "selected version promoted to stable", slog.F("url", newStable.GetHTMLURL())) } else { - logger.Info(ctx, "dry-run: release not updated", "uncommitted_changes", cmp.Diff(newStable, updatedNewStable)) + logger.Info(ctx, "dry-run: release not updated", slog.F("uncommitted_changes", cmp.Diff(newStable, updatedNewStable))) } return nil @@ -367,7 +368,8 @@ func (r *releaseCommand) autoversionFile(ctx context.Context, file, channel, ver matchChannel := matches[1] match := matches[2] - logger := logger.With(slog.F("line_number", i+1), slog.F("match_channel", matchChannel), slog.F("match", match)) + logger := logger.With(slog.F("line_number", i+1), + slog.F("match_channel", matchChannel), slog.F("match", match)) logger.Debug(ctx, "autoversion pragma detected") @@ -379,7 +381,7 @@ func (r *releaseCommand) autoversionFile(ctx context.Context, file, channel, ver logger.Info(ctx, "autoversion pragma found with channel match") match = strings.Replace(match, "[version]", `(?P[0-9]+\.[0-9]+\.[0-9]+)`, 1) - logger.Debug(ctx, "compiling match regexp", "match", match) + logger.Debug(ctx, "compiling match regexp", slog.F("match", match)) matchRe, err = regexp.Compile(match) if err != nil { return xerrors.Errorf("regexp compile failed: %w", err) @@ -391,12 +393,15 @@ func (r *releaseCommand) autoversionFile(ctx context.Context, file, channel, ver if match := matchRe.FindStringSubmatchIndex(line); match != nil { vg := matchRe.SubexpIndex("version") if vg == -1 { - logger.Error(ctx, "version group not found in match", "num_subexp", matchRe.NumSubexp(), "subexp_names", matchRe.SubexpNames(), "match", match) + logger.Error(ctx, "version group not found in match", + slog.F("num_subexp", matchRe.NumSubexp()), + slog.F("subexp_names", matchRe.SubexpNames()), + slog.F("match", match)) return xerrors.Errorf("bug: version group not found in match") } start := match[vg*2] end := match[vg*2+1] - logger.Info(ctx, "updating version number", "line_number", i+1, "match_start", start, "match_end", end, "old_version", line[start:end]) + logger.Info(ctx, "updating version number", slog.F("line_number", i+1), slog.F("match_start", start), slog.F("match_end", end), slog.F("old_version", line[start:end])) lines[i] = line[:start] + version + line[end:] matchRe = nil break @@ -421,7 +426,7 @@ func (r *releaseCommand) autoversionFile(ctx context.Context, file, channel, ver } logger.Info(ctx, "file autoversioned") } else { - logger.Info(ctx, "dry-run: file not updated", "uncommitted_changes", diff) + logger.Info(ctx, "dry-run: file not updated", slog.F("uncommitted_changes", diff)) } return nil diff --git a/scripts/rules.go b/scripts/rules.go index cc196fe846..ce9b473985 100644 --- a/scripts/rules.go +++ b/scripts/rules.go @@ -393,7 +393,7 @@ func notImplementsFullResponseWriter(ctx *dsl.VarFilterContext) bool { // slogFieldNameSnakeCase is a lint rule that ensures naming consistency // of logged field names. func slogFieldNameSnakeCase(m dsl.Matcher) { - m.Import("cdr.dev/slog") + m.Import("cdr.dev/slog/v3") m.Match( `slog.F($name, $value)`, ). @@ -404,7 +404,7 @@ func slogFieldNameSnakeCase(m dsl.Matcher) { // slogUUIDFieldNameHasIDSuffix ensures that "uuid.UUID" field has ID prefix // in the field name. func slogUUIDFieldNameHasIDSuffix(m dsl.Matcher) { - m.Import("cdr.dev/slog") + m.Import("cdr.dev/slog/v3") m.Import("github.com/google/uuid") m.Match( `slog.F($name, $value)`, @@ -416,7 +416,7 @@ func slogUUIDFieldNameHasIDSuffix(m dsl.Matcher) { // slogMessageFormat ensures that the log message starts with lowercase, and does not // end with special character. func slogMessageFormat(m dsl.Matcher) { - m.Import("cdr.dev/slog") + m.Import("cdr.dev/slog/v3") m.Match( `logger.Error($ctx, $message, $*args)`, `logger.Warn($ctx, $message, $*args)`, @@ -454,7 +454,7 @@ func slogMessageFormat(m dsl.Matcher) { // slogMessageLength ensures that important log messages are meaningful, and must be at least 16 characters long. func slogMessageLength(m dsl.Matcher) { - m.Import("cdr.dev/slog") + m.Import("cdr.dev/slog/v3") m.Match( `logger.Error($ctx, $message, $*args)`, `logger.Warn($ctx, $message, $*args)`, @@ -484,7 +484,7 @@ func slogMessageLength(m dsl.Matcher) { // slogErr ensures that errors are logged with "slog.Error" instead of "slog.F" func slogError(m dsl.Matcher) { - m.Import("cdr.dev/slog") + m.Import("cdr.dev/slog/v3") m.Match( `slog.F($name, $value)`, ). diff --git a/scripts/testidp/main.go b/scripts/testidp/main.go index 64f2ddb30f..b20ac6dc20 100644 --- a/scripts/testidp/main.go +++ b/scripts/testidp/main.go @@ -14,8 +14,9 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/coderd/coderdtest/oidctest" "github.com/coder/coder/v2/codersdk" ) diff --git a/site/site.go b/site/site.go index 50b261ea72..41553e5025 100644 --- a/site/site.go +++ b/site/site.go @@ -34,7 +34,8 @@ import ( "golang.org/x/sync/singleflight" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/appearance" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/support/support.go b/support/support.go index 31080faaf0..00f71fef5c 100644 --- a/support/support.go +++ b/support/support.go @@ -16,8 +16,9 @@ import ( "tailscale.com/ipn/ipnstate" "tailscale.com/net/netcheck" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/coderd/healthcheck/derphealth" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" diff --git a/support/support_test.go b/support/support_test.go index aeec0a4431..0340d785a3 100644 --- a/support/support_test.go +++ b/support/support_test.go @@ -14,9 +14,10 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/goleak" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/sloghuman" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/agent/agenttest" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/tailnet/client.go b/tailnet/client.go index 7712ebc481..483026e2f3 100644 --- a/tailnet/client.go +++ b/tailnet/client.go @@ -7,7 +7,8 @@ import ( "github.com/hashicorp/yamux" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/tailnet/proto" ) diff --git a/tailnet/configmaps.go b/tailnet/configmaps.go index 26b6801130..eb3517f018 100644 --- a/tailnet/configmaps.go +++ b/tailnet/configmaps.go @@ -27,7 +27,8 @@ import ( "tailscale.com/wgengine/wgcfg" "tailscale.com/wgengine/wgcfg/nmcfg" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/tailnet/proto" "github.com/coder/quartz" ) diff --git a/tailnet/conn.go b/tailnet/conn.go index 709d5b2958..2c29212af7 100644 --- a/tailnet/conn.go +++ b/tailnet/conn.go @@ -41,7 +41,8 @@ import ( "tailscale.com/wgengine/netstack" "tailscale.com/wgengine/router" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/cryptorand" "github.com/coder/coder/v2/tailnet/proto" ) @@ -1004,7 +1005,7 @@ func (a addr) String() string { return a.ln.addr } // Logger converts the Tailscale logging function to use a slog-compatible // logger. func Logger(logger interface { - Debug(ctx context.Context, str string, args ...any) + Debug(ctx context.Context, str string, fields ...slog.Field) }, ) tslogger.Logf { return tslogger.Logf(func(format string, args ...any) { diff --git a/tailnet/conn_test.go b/tailnet/conn_test.go index cc6eb5ed65..f4c60c554d 100644 --- a/tailnet/conn_test.go +++ b/tailnet/conn_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/goleak" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/tailnet/proto" diff --git a/tailnet/controllers.go b/tailnet/controllers.go index f2fd12946c..c167f5c395 100644 --- a/tailnet/controllers.go +++ b/tailnet/controllers.go @@ -21,7 +21,8 @@ import ( "tailscale.com/tailcfg" "tailscale.com/util/dnsname" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/quartz" "github.com/coder/retry" diff --git a/tailnet/controllers_test.go b/tailnet/controllers_test.go index 63602ff4e8..120d141fe1 100644 --- a/tailnet/controllers_test.go +++ b/tailnet/controllers_test.go @@ -27,8 +27,9 @@ import ( "tailscale.com/types/key" "tailscale.com/util/dnsname" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/tailnet/proto" "github.com/coder/coder/v2/tailnet/tailnettest" diff --git a/tailnet/coordinator.go b/tailnet/coordinator.go index 38e4ebe90d..9fb852eca2 100644 --- a/tailnet/coordinator.go +++ b/tailnet/coordinator.go @@ -15,7 +15,8 @@ import ( "tailscale.com/tailcfg" "tailscale.com/types/key" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/tailnet/proto" ) @@ -164,7 +165,7 @@ func (c *coordinator) Coordinate( if xerrors.Is(err, ErrClosed) { logger.Debug(ctx, "coordinate failed: Coordinator is closed") } else { - logger.Critical(ctx, "coordinate failed: %s", err.Error()) + logger.Critical(ctx, "coordinate failed", slog.Error(err)) } } c.mu.Lock() @@ -476,7 +477,7 @@ func (c *core) lostPeer(p *peer, closeErr string) error { func (c *core) removePeerLocked(id uuid.UUID, kind proto.CoordinateResponse_PeerUpdate_Kind, reason, closeErr string) { p, ok := c.peers[id] if !ok { - c.logger.Critical(context.Background(), "removed non-existent peer %s", id) + c.logger.Critical(context.Background(), "removed non-existent peer", slog.F("peer_id", id)) return } c.updateTunnelPeersLocked(id, nil, kind, reason) diff --git a/tailnet/coordinator_test.go b/tailnet/coordinator_test.go index 3d2655a195..76fa6d4a09 100644 --- a/tailnet/coordinator_test.go +++ b/tailnet/coordinator_test.go @@ -8,8 +8,9 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" + "github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/tailnet/proto" "github.com/coder/coder/v2/tailnet/test" diff --git a/tailnet/derp.go b/tailnet/derp.go index 293bafcfe3..3bf67b17cd 100644 --- a/tailnet/derp.go +++ b/tailnet/derp.go @@ -13,7 +13,7 @@ import ( "tailscale.com/derp" "tailscale.com/tailcfg" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/websocket" ) diff --git a/tailnet/node.go b/tailnet/node.go index 1077a7d69c..532d15aad8 100644 --- a/tailnet/node.go +++ b/tailnet/node.go @@ -12,7 +12,8 @@ import ( "tailscale.com/types/key" "tailscale.com/wgengine" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database/dbtime" ) diff --git a/tailnet/peer.go b/tailnet/peer.go index ab7bd52e11..4e4638443f 100644 --- a/tailnet/peer.go +++ b/tailnet/peer.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/tailnet/proto" ) diff --git a/tailnet/service.go b/tailnet/service.go index c3a6b9f2b2..438d233db4 100644 --- a/tailnet/service.go +++ b/tailnet/service.go @@ -15,7 +15,8 @@ import ( "storj.io/drpc/drpcserver" "tailscale.com/tailcfg" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/apiversion" "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/tailnet/proto" diff --git a/tailnet/test/integration/integration.go b/tailnet/test/integration/integration.go index 5ca1ed9ffd..ede850f3ae 100644 --- a/tailnet/test/integration/integration.go +++ b/tailnet/test/integration/integration.go @@ -34,7 +34,8 @@ import ( "tailscale.com/types/key" "tailscale.com/wgengine/capture" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/httpmw/loggermw" "github.com/coder/coder/v2/coderd/tracing" diff --git a/tailnet/test/integration/network.go b/tailnet/test/integration/network.go index 30a20ed1f7..daa4b66fb0 100644 --- a/tailnet/test/integration/network.go +++ b/tailnet/test/integration/network.go @@ -17,7 +17,7 @@ import ( "golang.org/x/xerrors" "tailscale.com/tailcfg" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/cryptorand" ) diff --git a/tailnet/test/integration/suite.go b/tailnet/test/integration/suite.go index 9e04de03de..36003c951b 100644 --- a/tailnet/test/integration/suite.go +++ b/tailnet/test/integration/suite.go @@ -12,7 +12,8 @@ import ( "github.com/stretchr/testify/require" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/testutil" ) diff --git a/testutil/logger.go b/testutil/logger.go index 051d7c9daf..26cbde5655 100644 --- a/testutil/logger.go +++ b/testutil/logger.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/yamux" "golang.org/x/xerrors" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" ) // Logger returns a "standard" testing logger, with debug level and common flaky diff --git a/vpn/client.go b/vpn/client.go index 0411b209c2..bbaadf15bc 100644 --- a/vpn/client.go +++ b/vpn/client.go @@ -18,7 +18,8 @@ import ( "github.com/google/uuid" "github.com/tailscale/wireguard-go/tun" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/workspacesdk" "github.com/coder/coder/v2/tailnet" diff --git a/vpn/dylib/lib.go b/vpn/dylib/lib.go index 3677aee369..34bf19df43 100644 --- a/vpn/dylib/lib.go +++ b/vpn/dylib/lib.go @@ -9,7 +9,7 @@ import ( "golang.org/x/sys/unix" - "cdr.dev/slog" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/vpn" ) diff --git a/vpn/serdes.go b/vpn/serdes.go index f45af951b8..119b91ff4f 100644 --- a/vpn/serdes.go +++ b/vpn/serdes.go @@ -8,7 +8,7 @@ import ( "google.golang.org/protobuf/proto" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) // MaxLength is the largest possible CoderVPN Protocol message size. This is set diff --git a/vpn/speaker.go b/vpn/speaker.go index bbd242b23f..9ba0899af3 100644 --- a/vpn/speaker.go +++ b/vpn/speaker.go @@ -10,7 +10,7 @@ import ( "golang.org/x/xerrors" "google.golang.org/protobuf/proto" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) type SpeakerRole string diff --git a/vpn/speaker_internal_test.go b/vpn/speaker_internal_test.go index 433868851a..7bd8a64e5b 100644 --- a/vpn/speaker_internal_test.go +++ b/vpn/speaker_internal_test.go @@ -13,8 +13,8 @@ import ( "go.uber.org/goleak" "google.golang.org/protobuf/proto" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/slogtest" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/testutil" ) diff --git a/vpn/tun.go b/vpn/tun.go index 1c3ac8e014..28a99bb211 100644 --- a/vpn/tun.go +++ b/vpn/tun.go @@ -2,7 +2,7 @@ package vpn -import "cdr.dev/slog" +import "cdr.dev/slog/v3" // This is a no-op on every platform except Darwin and Windows. func GetNetworkingStack(_ *Tunnel, _ *StartRequest, _ slog.Logger) (NetworkStack, error) { diff --git a/vpn/tun_darwin.go b/vpn/tun_darwin.go index 6251a550d6..dc06b659db 100644 --- a/vpn/tun_darwin.go +++ b/vpn/tun_darwin.go @@ -9,7 +9,7 @@ import ( "golang.org/x/sys/unix" "golang.org/x/xerrors" - "cdr.dev/slog" + "cdr.dev/slog/v3" ) func GetNetworkingStack(t *Tunnel, req *StartRequest, _ slog.Logger) (NetworkStack, error) { diff --git a/vpn/tun_windows.go b/vpn/tun_windows.go index 52778a8a9d..7a9ff8220a 100644 --- a/vpn/tun_windows.go +++ b/vpn/tun_windows.go @@ -20,7 +20,8 @@ import ( "tailscale.com/util/winutil" "tailscale.com/wgengine/router" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/tailnet" "github.com/coder/retry" ) diff --git a/vpn/tunnel.go b/vpn/tunnel.go index 30ee56c239..1a0af979ac 100644 --- a/vpn/tunnel.go +++ b/vpn/tunnel.go @@ -26,7 +26,8 @@ import ( "tailscale.com/util/dnsname" "tailscale.com/wgengine/router" - "cdr.dev/slog" + "cdr.dev/slog/v3" + "github.com/coder/quartz" "github.com/coder/coder/v2/codersdk"