lazily set issue httpclient

flashlight.go

@@ -28,7 +28,6 @@ import (
 	"github.com/getlantern/flashlight/v7/email"
 	"github.com/getlantern/flashlight/v7/geolookup"
 	"github.com/getlantern/flashlight/v7/goroutines"
-	"github.com/getlantern/flashlight/v7/issue"
 	fops "github.com/getlantern/flashlight/v7/ops"
 	"github.com/getlantern/flashlight/v7/otel"
 	"github.com/getlantern/flashlight/v7/proxied"
@@ -196,7 +195,6 @@ func New(
 		log.Errorf("Unable to configure fronted: %v", err)
 	}
 	proxied.SetFronted(f.fronted)
-	issue.SetHTTPClient(proxied.DirectThenFrontedClient(30 * time.Second))
 
 	var grabber dnsgrab.Server
 	var grabberErr error

issue/issue.go

@@ -12,14 +12,14 @@ import (
 	"github.com/getlantern/flashlight/v7/common"
 	"github.com/getlantern/flashlight/v7/geolookup"
 	"github.com/getlantern/flashlight/v7/logging"
+	"github.com/getlantern/flashlight/v7/proxied"
 	"github.com/getlantern/flashlight/v7/util"
 	"github.com/getlantern/golog"
 )
 
 var (
 	log        = golog.LoggerFor("flashlight.issue")
 	maxLogSize = 10247680
-	httpClient *http.Client
 )
 
 const (
@@ -76,10 +76,7 @@ func sendReport(
 	osVersion string,
 	attachments []*Attachment,
 ) error {
-	if httpClient == nil {
-		log.Errorf("httpClient is nil, using default client")
-		httpClient = http.DefaultClient
-	}
+	httpClient := proxied.DirectThenFrontedClient(30 * time.Second)
 	r := &Request{}
 
 	r.Type = Request_ISSUE_TYPE(issueType)
@@ -155,7 +152,3 @@ func sendReport(
 	log.Debugf("issue report sent: %v", resp)
 	return nil
 }
-
-func SetHTTPClient(client *http.Client) {
-	httpClient = client
-}