From 81242580c9129b5752d353d964ed3f5ee3d084b3 Mon Sep 17 00:00:00 2001 From: Archimedes Trajano Date: Wed, 7 Aug 2024 23:42:58 -0400 Subject: [PATCH] lint fix --- caddyconfig/httploader.go | 5 +++-- modules/caddyhttp/reverseproxy/healthchecks.go | 12 ++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/caddyconfig/httploader.go b/caddyconfig/httploader.go index b029e19e93e..f2573bb39f8 100644 --- a/caddyconfig/httploader.go +++ b/caddyconfig/httploader.go @@ -25,9 +25,10 @@ import ( "os" "time" - "github.com/caddyserver/caddy/v2" "go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" + + "github.com/caddyserver/caddy/v2" ) func init() { @@ -102,7 +103,7 @@ func (hl HTTPLoader) LoadConfig(ctx caddy.Context) ([]byte, error) { // ctx, span := tr.Start(ctx, "httploader") // defer span.End() - + url := repl.ReplaceAll(hl.URL, "") req, err := http.NewRequestWithContext(ctx, method, url, nil) if err != nil { diff --git a/modules/caddyhttp/reverseproxy/healthchecks.go b/modules/caddyhttp/reverseproxy/healthchecks.go index abfac7b29a8..4d65bd27e33 100644 --- a/modules/caddyhttp/reverseproxy/healthchecks.go +++ b/modules/caddyhttp/reverseproxy/healthchecks.go @@ -20,12 +20,15 @@ import ( "io" "net" "net/http" + "net/http/httptrace" "net/url" "regexp" "runtime/debug" "strconv" "time" + "go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace" + "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" "go.opentelemetry.io/otel" "go.uber.org/zap" @@ -171,8 +174,13 @@ func (a *ActiveHealthChecks) Provision(ctx caddy.Context, h *Handler) error { } a.httpClient = &http.Client{ - Timeout: timeout, - Transport: h.Transport, + Timeout: timeout, + Transport: otelhttp.NewTransport( + h.Transport, + otelhttp.WithClientTrace(func(ctx context.Context) *httptrace.ClientTrace { + return otelhttptrace.NewClientTrace(ctx) + }), + ), CheckRedirect: func(req *http.Request, via []*http.Request) error { if !a.FollowRedirects { return http.ErrUseLastResponse