x/spend-sparrow
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix(observabillity): set service.name resource on metrics and traces #188

Merged
tim merged 1 commits from fix-servicename into prod 2025-06-17 11:25:45 +00:00
Conversation 0 Commits 1 Files Changed 1 +11 -8
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
internal/otel.go
View File

@@ -59,7 +59,7 @@ func setupOTelSDK(ctx context.Context) (func(context.Context) error, error) {
} }
// Set up trace provider. // Set up trace provider.
tracerProvider, err := newTracerProvider(ctx) tracerProvider, err := newTracerProvider(ctx, resources)
if err != nil { if err != nil {
handleErr(ctx, err) handleErr(ctx, err)
return nil, err return nil, err
@@ -68,7 +68,7 @@ func setupOTelSDK(ctx context.Context) (func(context.Context) error, error) {
otel.SetTracerProvider(tracerProvider) otel.SetTracerProvider(tracerProvider)
// Set up meter provider. // Set up meter provider.
meterProvider, err := newMeterProvider(ctx) meterProvider, err := newMeterProvider(ctx, resources)
if err != nil { if err != nil {
handleErr(ctx, err) handleErr(ctx, err)
return nil, err return nil, err
@@ -95,7 +95,7 @@ func newPropagator() propagation.TextMapPropagator {
) )
} }
func newTracerProvider(ctx context.Context) (*trace.TracerProvider, error) { func newTracerProvider(ctx context.Context, resource *resource.Resource) (*trace.TracerProvider, error) {
exp, err := otlptracegrpc.New( exp, err := otlptracegrpc.New(
ctx, ctx,
otlptracegrpc.WithEndpoint(otelEndpoint), otlptracegrpc.WithEndpoint(otelEndpoint),
@@ -105,10 +105,13 @@ func newTracerProvider(ctx context.Context) (*trace.TracerProvider, error) {
return nil, err return nil, err
} }
return trace.NewTracerProvider(trace.WithBatcher(exp)), nil return trace.NewTracerProvider(
trace.WithBatcher(exp),
trace.WithResource(resource),
), nil
} }
func newMeterProvider(ctx context.Context) (*metric.MeterProvider, error) { func newMeterProvider(ctx context.Context, resource *resource.Resource) (*metric.MeterProvider, error) {
exp, err := otlpmetricgrpc.New( exp, err := otlpmetricgrpc.New(
ctx, ctx,
otlpmetricgrpc.WithInsecure(), otlpmetricgrpc.WithInsecure(),
@@ -118,9 +121,9 @@ func newMeterProvider(ctx context.Context) (*metric.MeterProvider, error) {
} }
return metric.NewMeterProvider( return metric.NewMeterProvider(
metric.WithReader( metric.WithReader(metric.NewPeriodicReader(exp, metric.WithInterval(15*time.Second))),
metric.NewPeriodicReader( metric.WithResource(resource),
exp, metric.WithInterval(15*time.Second)))), nil ), nil
} }
func newLoggerProvider(ctx context.Context, resource *resource.Resource) (*log.LoggerProvider, error) { func newLoggerProvider(ctx context.Context, resource *resource.Resource) (*log.LoggerProvider, error) {