Improve logging

cli/log.go

@@ -3,7 +3,7 @@ package main
 import (
 	"net/http"
 
-	"golang.org/x/exp/slog"
+	"log/slog"
 )
 
 type LogRoundTripper struct {

cli/login.go

@@ -5,10 +5,11 @@ import (
 	"fmt"
 	"os"
 
+	"log/slog"
+
 	"github.com/pkg/browser"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"golang.org/x/exp/slog"
 )
 
 var (

cli/main.go

@@ -7,8 +7,9 @@ import (
 	"strings"
 	"syscall"
 
+	"log/slog"
+
 	"github.com/spf13/cobra"
-	"golang.org/x/exp/slog"
 )
 
 const (

cli/oauth2.go

@@ -9,6 +9,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"log/slog"
 	"net"
 	"net/http"
 	"net/url"
@@ -165,9 +166,14 @@ var ErrNoPortsAvailable = errors.New("no ports available")
 func findFirstFreePort(ctx context.Context, broadcastAddr string, ports []string) (net.Listener, error) {
 	var lc net.ListenConfig
 	for _, port := range ports {
-		sock, err := lc.Listen(ctx, "tcp4", net.JoinHostPort(broadcastAddr, port))
+		addr := net.JoinHostPort(broadcastAddr, port)
+		slog.Debug("opening connection", slog.String("addr", addr))
+		sock, err := lc.Listen(ctx, "tcp4", addr)
 		if err == nil {
+			slog.Debug("listening", slog.String("addr", addr))
 			return sock, nil
+		} else {
+			slog.Debug("could not listen, trying a different addr", slog.String("addr", addr), slog.String("error", err.Error()))
 		}
 	}
 

internal/api/http.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"strings"
 
-	"golang.org/x/exp/slog"
+	"log/slog"
 )
 
 // RequestAttrs returns attributes to be used with slog for the given request.

internal/api/json.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"golang.org/x/exp/slog"
+	"log/slog"
 )
 
 func ServeJSON[T any](w http.ResponseWriter, data T) {

internal/api/serverless_functions.go

@@ -6,8 +6,9 @@ import (
 	"net/http"
 	"strings"
 
+	"log/slog"
+
 	"github.com/okta/okta-sdk-golang/v2/okta"
-	"golang.org/x/exp/slog"
 )
 
 type Application struct {

lambda/list_applications/main.go

@@ -5,10 +5,11 @@ import (
 	"net/url"
 	"os"
 
+	"log/slog"
+
 	"github.com/aws/aws-lambda-go/lambda"
 	"github.com/riotgames/key-conjurer/internal"
 	"github.com/riotgames/key-conjurer/internal/api"
-	"golang.org/x/exp/slog"
 )
 
 func main() {