diff options
| author | Michael Matloob <matloob@golang.org> | 2023-08-28 13:39:03 -0400 |
|---|---|---|
| committer | Michael Matloob <matloob@golang.org> | 2023-08-29 23:29:11 +0000 |
| commit | ebe617b30c52774fccf9d36331cbff31e99aaf9e (patch) | |
| tree | 9b413e7ec61ce6a08e169d8ab95eb3bca1b1effc /cmd/worker | |
| parent | 6b2c42d38504a02ea8b77abc7c592b64aa39109d (diff) | |
| download | go-x-pkgsite-ebe617b30c52774fccf9d36331cbff31e99aaf9e.tar.xz | |
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 <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Robert Findley <rfindley@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Michael Matloob <matloob@golang.org>
kokoro-CI: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'cmd/worker')
| -rw-r--r-- | cmd/worker/main.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmd/worker/main.go b/cmd/worker/main.go index 495d1b37..df8fed0e 100644 --- a/cmd/worker/main.go +++ b/cmd/worker/main.go @@ -17,6 +17,7 @@ import ( "github.com/go-redis/redis/v8" "github.com/google/safehtml/template" _ "github.com/jackc/pgx/v4/stdlib" // for pgx driver + "go.opencensus.io/plugin/ochttp" "golang.org/x/pkgsite/cmd/internal/cmdconfig" "golang.org/x/pkgsite/internal/config" "golang.org/x/pkgsite/internal/config/serverconfig" @@ -75,7 +76,10 @@ func main() { if err != nil { log.Fatal(ctx, err) } - sourceClient := source.NewClient(config.SourceTimeout) + sourceClient := source.NewClient(&http.Client{ + Transport: &ochttp.Transport{}, + Timeout: config.SourceTimeout, + }) expg := cmdconfig.ExperimentGetter(ctx, cfg) fetchQueue, err := gcpqueue.New(ctx, cfg, queueName, *workers, expg, func(ctx context.Context, modulePath, version string) (int, error) { |