refactor: Using LogAttrs

ViBiOh · ViBiOh · commit 2a71f0ca0240 · 2024-01-21T21:47:21.000+01:00
Signed-off-by: Vincent Boutour &lt;bob@vibioh.fr&gt;
diff --git a/cmd/exas/api.go b/cmd/exas/api.go
@@ -80,7 +80,7 @@ func main() {
 
 	amqpClient, err := amqp.New(amqpConfig, telemetryService.MeterProvider(), telemetryService.TracerProvider())
 	if err != nil && !errors.Is(err, amqp.ErrNoConfig) {
-		slog.ErrorContext(ctx, "create amqp", "error", err)
+		slog.LogAttrs(ctx, slog.LevelError, "create amqp", slog.Any("error", err))
 		os.Exit(1)
 	} else if amqpClient != nil {
 		defer amqpClient.Close()
diff --git a/pkg/exas/exas.go b/pkg/exas/exas.go
@@ -69,7 +69,7 @@ func New(config *Config, geocodeService geocode.Service, amqpClient *amqp.Client
 
 		service.metric, err = meter.Int64Counter("exas.item")
 		if err != nil {
-			slog.Error("create counter", "error", err)
+			slog.LogAttrs(context.Background(), slog.LevelError, "create counter", slog.Any("error", err))
 		}
 	}
 
diff --git a/pkg/exas/util.go b/pkg/exas/util.go
@@ -8,6 +8,6 @@ import (
 
 func closeWithLog(ctx context.Context, closer io.Closer, fn, item string) {
 	if err := closer.Close(); err != nil {
-		slog.ErrorContext(ctx, "close", "error", err, "fn", fn, "item", item)
+		slog.LogAttrs(ctx, slog.LevelError, "close", slog.String("fn", fn), slog.String("item", item), slog.Any("error", err))
 	}
 }
diff --git a/pkg/geocode/geocode.go b/pkg/geocode/geocode.go
@@ -72,7 +72,7 @@ func New(config *Config, meterProvider metric.MeterProvider, tracerProvider trac
 
 		service.metric, err = meter.Int64Counter("exas.geocode")
 		if err != nil {
-			slog.Error("create geocode counter", "error", err)
+			slog.LogAttrs(context.Background(), slog.LevelError, "create geocode counter", slog.Any("error", err))
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func New(config Config, geocodeService geocode.Service, amqpClient amqp.Client`
`69`	`69`
`70`	`70`	`service.metric, err = meter.Int64Counter("exas.item")`
`71`	`71`	`if err != nil {`
`72`		`- slog.Error("create counter", "error", err)`
	`72`	`+ slog.LogAttrs(context.Background(), slog.LevelError, "create counter", slog.Any("error", err))`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@ import (`
`8`	`8`
`9`	`9`	`func closeWithLog(ctx context.Context, closer io.Closer, fn, item string) {`
`10`	`10`	`if err := closer.Close(); err != nil {`
`11`		`- slog.ErrorContext(ctx, "close", "error", err, "fn", fn, "item", item)`
	`11`	`+ slog.LogAttrs(ctx, slog.LevelError, "close", slog.String("fn", fn), slog.String("item", item), slog.Any("error", err))`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ func New(config *Config, meterProvider metric.MeterProvider, tracerProvider trac`
`72`	`72`
`73`	`73`	`service.metric, err = meter.Int64Counter("exas.geocode")`
`74`	`74`	`if err != nil {`
`75`		`- slog.Error("create geocode counter", "error", err)`
	`75`	`+ slog.LogAttrs(context.Background(), slog.LevelError, "create geocode counter", slog.Any("error", err))`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`