migrate to slog & go 1.21

disgoorg · Aug 8, 2023 · a06f865 · a06f865
1 parent 864959c
commit a06f865
Show file tree

Hide file tree

Showing 69 changed files with 387 additions and 345 deletions.
diff --git a/_examples/application_commands/gateway/example.go b/_examples/application_commands/gateway/example.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"log/slog"
 	"os"
 	"os/signal"
 	"syscall"
@@ -40,9 +41,8 @@ var (
 )
 
 func main() {
-	log.SetLevel(log.LevelInfo)
-	log.Info("starting example...")
-	log.Info("disgo version: ", disgo.Version)
+	slog.Info("starting example...")
+	slog.Info("disgo version", slog.String("version", disgo.Version))
 
 	client, err := disgo.New(token,
 		bot.WithDefaultGateway(),

diff --git a/_examples/application_commands/http/example.go b/_examples/application_commands/http/example.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"log/slog"
 	"os"
 	"os/signal"
 	"syscall"
@@ -43,9 +44,8 @@ var (
 )
 
 func main() {
-	log.SetLevel(log.LevelDebug)
-	log.Info("starting example...")
-	log.Info("disgo version: ", disgo.Version)
+	slog.Info("starting example...")
+	slog.Info("disgo version", slog.String("version", disgo.Version))
 
 	// use custom ed25519 verify implementation
 	httpserver.Verify = func(publicKey httpserver.PublicKey, message, sig []byte) bool {

diff --git a/_examples/application_commands/localization/example.go b/_examples/application_commands/localization/example.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"log/slog"
 	"os"
 	"os/signal"
 	"syscall"
@@ -64,9 +65,8 @@ var (
 )
 
 func main() {
-	log.SetLevel(log.LevelTrace)
-	log.Info("starting example...")
-	log.Infof("disgo version: %s", disgo.Version)
+	slog.Info("starting example...")
+	slog.Info("disgo version", slog.String("version", disgo.Version))
 
 	client, err := disgo.New(token,
 		bot.WithDefaultGateway(),

diff --git a/_examples/auto_moderation/example.go b/_examples/auto_moderation/example.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/disgoorg/json"
-	"github.com/disgoorg/log"
 	"github.com/disgoorg/snowflake/v2"
+	"log/slog"
 
 	"github.com/disgoorg/disgo"
 	"github.com/disgoorg/disgo/bot"

diff --git a/_examples/components/example.go b/_examples/components/example.go
@@ -10,7 +10,7 @@ import (
 	"github.com/disgoorg/disgo/bot"
 	"github.com/disgoorg/disgo/events"
 
-	"github.com/disgoorg/log"
+	"log/slog"
 
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/gateway"

diff --git a/_examples/custom_cache/example.go b/_examples/custom_cache/example.go
@@ -8,8 +8,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/disgoorg/log"
 	"github.com/disgoorg/snowflake/v2"
+	"log/slog"
 
 	"github.com/disgoorg/disgo"
 	"github.com/disgoorg/disgo/bot"

diff --git a/_examples/echo/echo.go b/_examples/echo/echo.go
@@ -10,8 +10,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/disgoorg/log"
 	"github.com/disgoorg/snowflake/v2"
+	"log/slog"
 
 	"github.com/disgoorg/disgo"
 	"github.com/disgoorg/disgo/bot"

diff --git a/_examples/guild_scheduled_events/example.go b/_examples/guild_scheduled_events/example.go
@@ -7,7 +7,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/disgoorg/log"
+	"log/slog"
 
 	"github.com/disgoorg/disgo"
 	"github.com/disgoorg/disgo/bot"

diff --git a/_examples/handler/example.go b/_examples/handler/example.go
@@ -6,8 +6,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/disgoorg/log"
 	"github.com/disgoorg/snowflake/v2"
+	"log/slog"
 
 	"github.com/disgoorg/disgo"
 	"github.com/disgoorg/disgo/bot"

diff --git a/_examples/listening_events/example.go b/_examples/listening_events/example.go
@@ -6,8 +6,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/disgoorg/log"
 	"github.com/disgoorg/snowflake/v2"
+	"log/slog"
 
 	"github.com/disgoorg/disgo"
 	"github.com/disgoorg/disgo/bot"

diff --git a/_examples/message_collector/example.go b/_examples/message_collector/example.go
@@ -11,7 +11,7 @@ import (
 	"github.com/disgoorg/disgo"
 	"github.com/disgoorg/disgo/bot"
 
-	"github.com/disgoorg/log"
+	"log/slog"
 
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/events"

diff --git a/_examples/oauth2/example.go b/_examples/oauth2/example.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/disgoorg/json"
-	"github.com/disgoorg/log"
 	"github.com/disgoorg/snowflake/v2"
+	"log/slog"
 
 	"github.com/disgoorg/disgo"
 	"github.com/disgoorg/disgo/discord"

diff --git a/_examples/pagination/examplebot.go b/_examples/pagination/examplebot.go
@@ -4,7 +4,7 @@ import (
 	_ "embed"
 	"os"
 
-	"github.com/disgoorg/log"
+	"log/slog"
 
 	"github.com/disgoorg/disgo"
 	"github.com/disgoorg/disgo/rest"

diff --git a/_examples/ping_pong/example.go b/_examples/ping_pong/example.go
@@ -6,7 +6,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/disgoorg/log"
+	"log/slog"
 
 	"github.com/disgoorg/disgo"
 	"github.com/disgoorg/disgo/bot"

diff --git a/_examples/proxy/example.go b/_examples/proxy/example.go
@@ -6,8 +6,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/disgoorg/log"
 	"github.com/disgoorg/snowflake/v2"
+	"log/slog"
 
 	"github.com/disgoorg/disgo"
 	"github.com/disgoorg/disgo/bot"

diff --git a/_examples/sharding/example.go b/_examples/sharding/example.go
@@ -6,7 +6,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/disgoorg/log"
+	"log/slog"
 
 	"github.com/disgoorg/disgo"
 	"github.com/disgoorg/disgo/bot"

diff --git a/_examples/test/commands.go b/_examples/test/commands.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/disgoorg/log"
+	"log/slog"
 
 	"github.com/disgoorg/disgo/bot"
 	"github.com/disgoorg/disgo/discord"

diff --git a/_examples/test/examplebot.go b/_examples/test/examplebot.go
@@ -7,8 +7,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/disgoorg/log"
 	"github.com/disgoorg/snowflake/v2"
+	"log/slog"
 
 	"github.com/disgoorg/disgo"
 	"github.com/disgoorg/disgo/bot"

diff --git a/_examples/test/listeners.go b/_examples/test/listeners.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/disgoorg/log"
+	"log/slog"
 
 	"github.com/disgoorg/disgo/bot"
 	"github.com/disgoorg/disgo/discord"

diff --git a/_examples/threads/example.go b/_examples/threads/example.go
@@ -6,7 +6,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/disgoorg/log"
+	"log/slog"
 
 	"github.com/disgoorg/disgo"
 	"github.com/disgoorg/disgo/bot"

diff --git a/_examples/verified_roles/main.go b/_examples/verified_roles/main.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 
 	"github.com/disgoorg/json"
-	"github.com/disgoorg/log"
+	"log/slog"
 
 	"github.com/disgoorg/disgo"
 	"github.com/disgoorg/disgo/bot"

diff --git a/_examples/voice/voice.go b/_examples/voice/voice.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/disgoorg/disgo/voice"
 
-	"github.com/disgoorg/log"
 	"github.com/disgoorg/snowflake/v2"
+	"log/slog"
 
 	"github.com/disgoorg/disgo"
 	"github.com/disgoorg/disgo/bot"

diff --git a/_examples/webhook/example.go b/_examples/webhook/example.go
@@ -6,8 +6,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/disgoorg/log"
 	"github.com/disgoorg/snowflake/v2"
+	"log/slog"
 
 	"github.com/disgoorg/disgo"
 	"github.com/disgoorg/disgo/discord"

diff --git a/bot/client.go b/bot/client.go
@@ -2,9 +2,7 @@ package bot
 
 import (
 	"context"
-
-	"github.com/disgoorg/log"
-	"github.com/disgoorg/snowflake/v2"
+	"log/slog"
 
 	"github.com/disgoorg/disgo/cache"
 	"github.com/disgoorg/disgo/discord"
@@ -13,6 +11,7 @@ import (
 	"github.com/disgoorg/disgo/rest"
 	"github.com/disgoorg/disgo/sharding"
 	"github.com/disgoorg/disgo/voice"
+	"github.com/disgoorg/snowflake/v2"
 )
 
 var _ Client = (*clientImpl)(nil)
@@ -22,7 +21,7 @@ var _ Client = (*clientImpl)(nil)
 // Create a new client with disgo.New.
 type Client interface {
 	// Logger returns the logger for the client.
-	Logger() log.Logger
+	Logger() *slog.Logger
 
 	// Close will clean up all disgo internals and close the discord gracefully.
 	Close(ctx context.Context)
@@ -116,7 +115,7 @@ type clientImpl struct {
 	token         string
 	applicationID snowflake.ID
 
-	logger log.Logger
+	logger *slog.Logger
 
 	restServices rest.Rest
 
@@ -134,7 +133,7 @@ type clientImpl struct {
 	memberChunkingManager MemberChunkingManager
 }
 
-func (c *clientImpl) Logger() log.Logger {
+func (c *clientImpl) Logger() *slog.Logger {
 	return c.logger
 }