From ebe617b30c52774fccf9d36331cbff31e99aaf9e Mon Sep 17 00:00:00 2001 From: Michael Matloob Date: Mon, 28 Aug 2023 13:39:03 -0400 Subject: internal/source: inject *http.Client into source.NewClient This removes the dependency from package source onto ochttp. The users of source.NewClient that want an ochttp.Transport can set the transport on the *http.Client. For golang/go#61399 Change-Id: Ifb7126c482f664ee5a359f594d9324f0fd90f8b2 Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/523510 LUCI-TryBot-Result: Go LUCI Reviewed-by: Robert Findley TryBot-Result: Gopher Robot Run-TryBot: Michael Matloob kokoro-CI: kokoro --- devtools/cmd/seeddb/main.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'devtools/cmd') diff --git a/devtools/cmd/seeddb/main.go b/devtools/cmd/seeddb/main.go index 5fd7b065..e2002a30 100644 --- a/devtools/cmd/seeddb/main.go +++ b/devtools/cmd/seeddb/main.go @@ -18,6 +18,7 @@ import ( "time" _ "github.com/jackc/pgx/v4/stdlib" // for pgx driver + "go.opencensus.io/plugin/ochttp" "golang.org/x/pkgsite/internal" "golang.org/x/pkgsite/internal/config" "golang.org/x/pkgsite/internal/config/dynconfig" @@ -76,7 +77,10 @@ func run(ctx context.Context, db *database.DB, proxyURL string) error { return err } - sourceClient := source.NewClient(config.SourceTimeout) + sourceClient := source.NewClient(&http.Client{ + Transport: &ochttp.Transport{}, + Timeout: config.SourceTimeout, + }) seedModules, err := readSeedFile(ctx, *seedfile) if err != nil { return err -- cgit v1.3-5-g9baa