-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into chore/ch-scripts
- Loading branch information
Showing
21 changed files
with
369 additions
and
146 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,59 @@ | ||
| package factory | ||
|
|
||
| import ( | ||
| sdklog "go.opentelemetry.io/otel/log" | ||
| "log/slog" | ||
|
|
||
| "github.com/prometheus/client_golang/prometheus" | ||
| sdkmetric "go.opentelemetry.io/otel/metric" | ||
| sdktrace "go.opentelemetry.io/otel/trace" | ||
| "go.uber.org/zap" | ||
| ) | ||
|
|
||
| type ProviderSettings struct { | ||
| // LoggerProvider is the otel logger. | ||
| LoggerProvider sdklog.LoggerProvider | ||
| // ZapLogger is the zap logger. | ||
| ZapLogger *zap.Logger | ||
| // SlogLogger is the slog logger. | ||
| Logger *slog.Logger | ||
| // MeterProvider is the meter provider. | ||
| MeterProvider sdkmetric.MeterProvider | ||
| // TracerProvider is the tracer provider. | ||
| TracerProvider sdktrace.TracerProvider | ||
| // PrometheusRegistry is the prometheus registry. | ||
| PrometheusRegisterer prometheus.Registerer | ||
| } | ||
|
|
||
| type ScopedProviderSettings interface { | ||
| Logger() sdklog.Logger | ||
| ZapLogger() *zap.Logger | ||
| Logger() *slog.Logger | ||
| Meter() sdkmetric.Meter | ||
| Tracer() sdktrace.Tracer | ||
| PrometheusRegisterer() prometheus.Registerer | ||
| } | ||
|
|
||
| type scoped struct { | ||
| logger sdklog.Logger | ||
| zapLogger *zap.Logger | ||
| meter sdkmetric.Meter | ||
| tracer sdktrace.Tracer | ||
| logger *slog.Logger | ||
| meter sdkmetric.Meter | ||
| tracer sdktrace.Tracer | ||
| prometheusRegisterer prometheus.Registerer | ||
| } | ||
|
|
||
| func NewScopedProviderSettings(settings ProviderSettings, pkgName string) *scoped { | ||
| return &scoped{ | ||
| logger: settings.LoggerProvider.Logger(pkgName), | ||
| zapLogger: settings.ZapLogger.Named(pkgName), | ||
| meter: settings.MeterProvider.Meter(pkgName), | ||
| tracer: settings.TracerProvider.Tracer(pkgName), | ||
| logger: settings.Logger.With("logger", pkgName), | ||
| meter: settings.MeterProvider.Meter(pkgName), | ||
| tracer: settings.TracerProvider.Tracer(pkgName), | ||
| prometheusRegisterer: settings.PrometheusRegisterer, | ||
| } | ||
| } | ||
|
|
||
| func (s *scoped) Logger() sdklog.Logger { | ||
| func (s *scoped) Logger() *slog.Logger { | ||
| return s.logger | ||
| } | ||
|
|
||
| func (s *scoped) ZapLogger() *zap.Logger { | ||
| return s.zapLogger | ||
| } | ||
|
|
||
| func (s *scoped) Meter() sdkmetric.Meter { | ||
| return s.meter | ||
| } | ||
|
|
||
| func (s *scoped) Tracer() sdktrace.Tracer { | ||
| return s.tracer | ||
| } | ||
|
|
||
| func (s *scoped) PrometheusRegisterer() prometheus.Registerer { | ||
| return s.prometheusRegisterer | ||
| } |
Oops, something went wrong.