github/wonderwall
1
0
Fork 0
mirror of https://github.com/nais/wonderwall.git synced 2026-05-09 01:47:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(otel): remove unneeded meter provider

Browse Source
This commit is contained in:
Trong Huu Nguyen
2023-11-24 14:21:34 +01:00
parent 894cc35e47
commit 14735484c3
2 changed files with 3 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/wonderwall/main.go
View File

@@ -56,7 +56,7 @@ func run() error {
otelServiceName := envOrDefault("OTEL_SERVICE_NAME", "wonderwall") + "-" +
envOrDefault("CLUSTERNAME", "unknown-cluster")
otelShutdown, err := otel.SetupOTelSDK(ctx, otelServiceName, "")
otelShutdown, err := otel.Setup(ctx, otelServiceName, "")
if err != nil {
return err
}

29
pkg/otel/otel.go
View File

@@ -5,18 +5,15 @@ import (
"errors"
"time"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/exporters/stdout/stdoutmetric"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
"go.opentelemetry.io/otel/propagation"
"go.opentelemetry.io/otel/sdk/metric"
"go.opentelemetry.io/otel/sdk/resource"
"go.opentelemetry.io/otel/sdk/trace"
"go.opentelemetry.io/otel/semconv/v1.21.0"
)
func SetupOTelSDK(ctx context.Context, serviceName, serviceVersion string) (shutdown func(context.Context) error, err error) {
func Setup(ctx context.Context, serviceName, serviceVersion string) (shutdown func(context.Context) error, err error) {
var shutdownFuncs []func(context.Context) error
shutdown = func(ctx context.Context) error {
@@ -48,14 +45,6 @@ func SetupOTelSDK(ctx context.Context, serviceName, serviceVersion string) (shut
shutdownFuncs = append(shutdownFuncs, tracerProvider.Shutdown)
otel.SetTracerProvider(tracerProvider)
meterProvider, err := newMeterProvider(res)
if err != nil {
handleErr(err)
return
}
shutdownFuncs = append(shutdownFuncs, meterProvider.Shutdown)
otel.SetMeterProvider(meterProvider)
return
}
@@ -87,17 +76,3 @@ func newTraceProvider(ctx context.Context, res *resource.Resource) (*trace.Trace
)
return traceProvider, nil
}
func newMeterProvider(res *resource.Resource) (*metric.MeterProvider, error) {
metricExporter, err := stdoutmetric.New()
if err != nil {
return nil, err
}
meterProvider := metric.NewMeterProvider(
metric.WithResource(res),
metric.WithReader(metric.NewPeriodicReader(metricExporter,
metric.WithInterval(1*time.Minute))),
)
return meterProvider, nil
}