Takes the 6 dependency updates from Bernard (MR !2) and replaces the otel/log/global API, deprecated in otel v1.47.0, with otel.GetLoggerProvider.
Checked locally: make lint reports 0 issues, go test -race ./... passes.
Takes the 6 dependency updates from Bernard (MR !2) and replaces the otel/log/global API, deprecated in otel v1.47.0, with otel.GetLoggerProvider.
Checked locally: make lint reports 0 issues, go test -race ./... passes.
| @@ -4,8 +4,8 @@ go 1.27 | |||
| 4 | 4 | ||
| 5 | 5 | require ( | |
| 6 | 6 | github.com/rs/zerolog v1.35.1 | |
| 7 | - | go.opentelemetry.io/otel v1.46.0 | |
| 8 | - | go.opentelemetry.io/otel/log v0.22.0 | |
| 7 | + | go.opentelemetry.io/otel v1.47.0 | |
| 8 | + | go.opentelemetry.io/otel/log v1.47.0 | |
| 9 | 9 | gopkg.in/natefinch/lumberjack.v2 v2.2.1 | |
| 10 | 10 | ) | |
| 11 | 11 | ||
| @@ -13,10 +13,10 @@ require ( | |||
| 13 | 13 | github.com/cespare/xxhash/v2 v2.3.0 // indirect | |
| 14 | 14 | github.com/go-logr/logr v1.4.4 // indirect | |
| 15 | 15 | github.com/go-logr/stdr v1.2.2 // indirect | |
| 16 | - | github.com/mattn/go-colorable v0.1.15 // indirect | |
| 17 | - | github.com/mattn/go-isatty v0.0.22 // indirect | |
| 16 | + | github.com/mattn/go-colorable v0.1.16 // indirect | |
| 17 | + | github.com/mattn/go-isatty v0.0.24 // indirect | |
| 18 | 18 | go.opentelemetry.io/auto/sdk v1.2.1 // indirect | |
| 19 | - | go.opentelemetry.io/otel/metric v1.46.0 // indirect | |
| 20 | - | go.opentelemetry.io/otel/trace v1.46.0 // indirect | |
| 21 | - | golang.org/x/sys v0.45.0 // indirect | |
| 19 | + | go.opentelemetry.io/otel/metric v1.47.0 // indirect | |
| 20 | + | go.opentelemetry.io/otel/trace v1.47.0 // indirect | |
| 21 | + | golang.org/x/sys v0.49.0 // indirect | |
| 22 | 22 | ) | |
| @@ -4,8 +4,8 @@ go 1.27 | |||||
| 4 | 4 | ||||
| 5 | require ( | 5 | require ( | ||
| 6 | github.com/rs/zerolog v1.35.1 | 6 | github.com/rs/zerolog v1.35.1 | ||
| 7 | - | go.opentelemetry.io/otel v1.46.0 | 7 | + | go.opentelemetry.io/otel v1.47.0 |
| 8 | - | go.opentelemetry.io/otel/log v0.22.0 | 8 | + | go.opentelemetry.io/otel/log v1.47.0 |
| 9 | gopkg.in/natefinch/lumberjack.v2 v2.2.1 | 9 | gopkg.in/natefinch/lumberjack.v2 v2.2.1 | ||
| 10 | ) | 10 | ) | ||
| 11 | 11 | ||||
| @@ -13,10 +13,10 @@ require ( | |||||
| 13 | github.com/cespare/xxhash/v2 v2.3.0 // indirect | 13 | github.com/cespare/xxhash/v2 v2.3.0 // indirect | ||
| 14 | github.com/go-logr/logr v1.4.4 // indirect | 14 | github.com/go-logr/logr v1.4.4 // indirect | ||
| 15 | github.com/go-logr/stdr v1.2.2 // indirect | 15 | github.com/go-logr/stdr v1.2.2 // indirect | ||
| 16 | - | github.com/mattn/go-colorable v0.1.15 // indirect | 16 | + | github.com/mattn/go-colorable v0.1.16 // indirect |
| 17 | - | github.com/mattn/go-isatty v0.0.22 // indirect | 17 | + | github.com/mattn/go-isatty v0.0.24 // indirect |
| 18 | go.opentelemetry.io/auto/sdk v1.2.1 // indirect | 18 | go.opentelemetry.io/auto/sdk v1.2.1 // indirect | ||
| 19 | - | go.opentelemetry.io/otel/metric v1.46.0 // indirect | 19 | + | go.opentelemetry.io/otel/metric v1.47.0 // indirect |
| 20 | - | go.opentelemetry.io/otel/trace v1.46.0 // indirect | 20 | + | go.opentelemetry.io/otel/trace v1.47.0 // indirect |
| 21 | - | golang.org/x/sys v0.45.0 // indirect | 21 | + | golang.org/x/sys v0.49.0 // indirect |
| 22 | ) | 22 | ) | ||
| @@ -4,9 +4,9 @@ import ( | |||
| 4 | 4 | "context" | |
| 5 | 5 | ||
| 6 | 6 | "github.com/rs/zerolog" | |
| 7 | + | otelapi "go.opentelemetry.io/otel" | |
| 7 | 8 | "go.opentelemetry.io/otel/attribute" | |
| 8 | 9 | "go.opentelemetry.io/otel/log" | |
| 9 | - | "go.opentelemetry.io/otel/log/global" | |
| 10 | 10 | ) | |
| 11 | 11 | ||
| 12 | 12 | // Hook is a zerolog.Hook that bridges logs to OpenTelemetry. | |
| @@ -18,7 +18,7 @@ type Hook struct { | |||
| 18 | 18 | // Uses the global logger provider. | |
| 19 | 19 | func NewHook(serviceName string) *Hook { | |
| 20 | 20 | return &Hook{ | |
| 21 | - | logger: global.GetLoggerProvider().Logger(serviceName), | |
| 21 | + | logger: otelapi.GetLoggerProvider().Logger(serviceName), | |
| 22 | 22 | } | |
| 23 | 23 | } | |
| 24 | 24 | ||
| @@ -4,9 +4,9 @@ import ( | |||||
| 4 | "context" | 4 | "context" | ||
| 5 | 5 | ||||
| 6 | "github.com/rs/zerolog" | 6 | "github.com/rs/zerolog" | ||
| 7 | + | otelapi "go.opentelemetry.io/otel" | |||
| 7 | "go.opentelemetry.io/otel/attribute" | 8 | "go.opentelemetry.io/otel/attribute" | ||
| 8 | "go.opentelemetry.io/otel/log" | 9 | "go.opentelemetry.io/otel/log" | ||
| 9 | - | "go.opentelemetry.io/otel/log/global" | |||
| 10 | ) | 10 | ) | ||
| 11 | 11 | ||||
| 12 | // Hook is a zerolog.Hook that bridges logs to OpenTelemetry. | 12 | // Hook is a zerolog.Hook that bridges logs to OpenTelemetry. | ||
| @@ -18,7 +18,7 @@ type Hook struct { | |||||
| 18 | // Uses the global logger provider. | 18 | // Uses the global logger provider. | ||
| 19 | func NewHook(serviceName string) *Hook { | 19 | func NewHook(serviceName string) *Hook { | ||
| 20 | return &Hook{ | 20 | return &Hook{ | ||
| 21 | - | logger: global.GetLoggerProvider().Logger(serviceName), | 21 | + | logger: otelapi.GetLoggerProvider().Logger(serviceName), |
| 22 | } | 22 | } | ||
| 23 | } | 23 | } | ||
| 24 | 24 | ||||
no comments yet.