otel: use context when initializing the tracer and meter provider

docker · Mar 8, 2024 · 4fceb95 · 4fceb95
1 parent 0f9e229
commit 4fceb95
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/cli/command/telemetry.go b/cli/command/telemetry.go
@@ -42,20 +42,20 @@ type TelemetryClient interface {
 	// TracerProvider returns a TracerProvider. This TracerProvider will be configured
 	// with the default tracing components for a CLI program along with any options given
 	// for the SDK.
-	TracerProvider(opts ...sdktrace.TracerProviderOption) TracerProvider
+	TracerProvider(ctx context.Context, opts ...sdktrace.TracerProviderOption) TracerProvider
 
 	// MeterProvider returns a MeterProvider. This MeterProvider will be configured
 	// with the default metric components for a CLI program along with any options given
 	// for the SDK.
-	MeterProvider(opts ...sdkmetric.Option) MeterProvider
+	MeterProvider(ctx context.Context, opts ...sdkmetric.Option) MeterProvider
 }
 
 func (cli *DockerCli) Resource() *resource.Resource {
 	return cli.res.Get()
 }
 
-func (cli *DockerCli) TracerProvider(opts ...sdktrace.TracerProviderOption) TracerProvider {
-	exp, err := dockerSpanExporter(cli)
+func (cli *DockerCli) TracerProvider(ctx context.Context, opts ...sdktrace.TracerProviderOption) TracerProvider {
+	exp, err := dockerSpanExporter(ctx, cli)
 	if err != nil {
 		otel.Handle(err)
 	}
@@ -66,8 +66,8 @@ func (cli *DockerCli) TracerProvider(opts ...sdktrace.TracerProviderOption) Trac
 	return sdktrace.NewTracerProvider(append(defaultOpts, opts...)...)
 }
 
-func (cli *DockerCli) MeterProvider(opts ...sdkmetric.Option) MeterProvider {
-	exp, err := dockerMetricExporter(cli)
+func (cli *DockerCli) MeterProvider(ctx context.Context, opts ...sdkmetric.Option) MeterProvider {
+	exp, err := dockerMetricExporter(ctx, cli)
 	if err != nil {
 		otel.Handle(err)
 	}

diff --git a/cli/command/telemetry_docker.go b/cli/command/telemetry_docker.go
@@ -80,7 +80,7 @@ func dockerExporterOtlpEndpoint(cli Cli) (endpoint string, secure bool, err erro
 	return endpoint, secure, nil
 }
 
-func dockerSpanExporter(cli Cli) (sdktrace.SpanExporter, error) {
+func dockerSpanExporter(ctx context.Context, cli Cli) (sdktrace.SpanExporter, error) {
 	endpoint, secure, err := dockerExporterOtlpEndpoint(cli)
 	if err != nil {
 		return nil, err
@@ -93,14 +93,14 @@ func dockerSpanExporter(cli Cli) (sdktrace.SpanExporter, error) {
 		opts = append(opts, otlptracegrpc.WithInsecure())
 	}
 
-	exp, err := otlptracegrpc.New(context.Background(), opts...)
+	exp, err := otlptracegrpc.New(ctx, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return exp, nil
 }
 
-func dockerMetricExporter(cli Cli) (sdkmetric.Exporter, error) {
+func dockerMetricExporter(ctx context.Context, cli Cli) (sdkmetric.Exporter, error) {
 	endpoint, secure, err := dockerExporterOtlpEndpoint(cli)
 	if err != nil {
 		return nil, err
@@ -113,7 +113,7 @@ func dockerMetricExporter(cli Cli) (sdkmetric.Exporter, error) {
 		opts = append(opts, otlpmetricgrpc.WithInsecure())
 	}
 
-	exp, err := otlpmetricgrpc.New(context.Background(), opts...)
+	exp, err := otlpmetricgrpc.New(ctx, opts...)
 	if err != nil {
 		return nil, err
 	}