diff --git a/cmd/shell.go b/cmd/shell.go index ef4105500..614c03725 100644 --- a/cmd/shell.go +++ b/cmd/shell.go @@ -314,20 +314,15 @@ func NewOpenTelemetry(config OpenTelemetryConfig, logger blog.Logger) func(ctx c otel.SetLogger(stdr.New(logOutput{logger})) otel.SetErrorHandler(otel.ErrorHandlerFunc(func(err error) { logger.Errf("OpenTelemetry error: %v", err) })) - r, err := resource.Merge( - resource.Default(), - resource.NewWithAttributes( - semconv.SchemaURL, - semconv.ServiceNameKey.String(core.Command()), - semconv.ServiceVersionKey.String(core.GetBuildID()), - ), + resources := resource.NewWithAttributes( + semconv.SchemaURL, + semconv.ServiceName(core.Command()), + semconv.ServiceVersion(core.GetBuildID()), + semconv.ProcessPID(os.Getpid()), ) - if err != nil { - FailOnError(err, "Could not create OpenTelemetry resource") - } opts := []trace.TracerProviderOption{ - trace.WithResource(r), + trace.WithResource(resources), // Use a ParentBased sampler to respect the sample decisions on incoming // traces, and TraceIDRatioBased to randomly sample new traces. trace.WithSampler(trace.ParentBased(trace.TraceIDRatioBased(config.SampleRatio))),