Add HTTP client update function to tracing library

dmcgowan · dmcgowan · commit f8f659e66c6e · 2023-12-06T11:46:12.000-08:00
Signed-off-by: Derek McGowan <derek@mcg.dev> (cherry picked from commit 8203bb9) Signed-off-by: Derek McGowan <derek@mcg.dev>
diff --git a/remotes/docker/resolver.go b/remotes/docker/resolver.go
@@ -39,7 +39,6 @@ import (
 	"github.com/containerd/containerd/version"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
-	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 )
 
 var (
@@ -586,12 +585,9 @@ func (r *request) do(ctx context.Context) (*http.Response, error) {
 			return nil
 		}
 	}
-	client.Transport = otelhttp.NewTransport(
-		client.Transport,
-		otelhttp.WithSpanNameFormatter(func(operation string, r *http.Request) string {
-			return tracing.Name("remotes.docker.resolver", "HTTPRequest")
-		}),
-	)
+
+	tracing.UpdateHTTPClient(client, tracing.Name("remotes.docker.resolver", "HTTPRequest"))
+
 	resp, err := client.Do(req)
 	if err != nil {
 		return nil, fmt.Errorf("failed to do request: %w", err)
diff --git a/tracing/tracing.go b/tracing/tracing.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"net/http"
 
+	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
@@ -47,6 +48,16 @@ func WithHTTPRequest(_ *http.Request) SpanOpt {
 	}
 }
 
+// UpdateHTTPClient updates the http client with the necessary otel transport
+func UpdateHTTPClient(client *http.Client, name string) {
+	client.Transport = otelhttp.NewTransport(
+		client.Transport,
+		otelhttp.WithSpanNameFormatter(func(operation string, r *http.Request) string {
+			return name
+		}),
+	)
+}
+
 // StartSpan starts child span in a context.
 func StartSpan(ctx context.Context, opName string, opts ...SpanOpt) (context.Context, *Span) {
 	config := StartConfig{}
