refactor(pyroscope): extract DebugInfoClient to leaf package

Moves the struct + Upload method out of package write into a new
write/debuginfoclient package, breaking the cycle that prevented
reporter tests from reusing the production type. Reporter tests now
use debuginfoclient.Client instead of a duplicated test stub.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: korniltsev-grafanista

internal/component/pyroscope/ebpf/reporter/parca/reporter/pyroscope_uploader_test.go

@@ -5,20 +5,19 @@ package reporter
 import (
 	"bytes"
 	"context"
-	"fmt"
 	"io"
 	"math/rand"
 	"net/http"
 	"net/http/httptest"
 	"os"
-	"strings"
 	"sync"
 	"testing"
 	"time"
 
 	"connectrpc.com/connect"
 	"github.com/go-kit/log"
 	"github.com/gorilla/mux"
+	"github.com/grafana/alloy/internal/component/pyroscope/write/debuginfoclient"
 	debuginfov1alpha1 "github.com/grafana/pyroscope/api/gen/proto/go/debuginfo/v1alpha1"
 	"github.com/grafana/pyroscope/api/gen/proto/go/debuginfo/v1alpha1/debuginfov1alpha1connect"
 	"github.com/prometheus/client_golang/prometheus"
@@ -85,33 +84,6 @@ type uploadResult struct {
 	data    []byte
 }
 
-// TODO remove this, do not mERGE
-// testDebugInfoClient implements DebugInfoClient by embedding a connect client
-// and doing the HTTP POST upload via an httpClient + baseURL.
-type testDebugInfoClient struct {
-	debuginfov1alpha1connect.DebuginfoServiceClient
-	httpClient *http.Client
-	baseURL    string
-}
-
-func (c *testDebugInfoClient) Upload(ctx context.Context, buildID string, body io.Reader) error {
-	uploadURL := strings.TrimRight(c.baseURL, "/") + "/debuginfo.v1alpha1.DebuginfoService/Upload/" + buildID
-	req, err := http.NewRequestWithContext(ctx, "POST", uploadURL, body)
-	if err != nil {
-		return err
-	}
-	resp, err := c.httpClient.Do(req)
-	if err != nil {
-		return err
-	}
-	io.Copy(io.Discard, resp.Body)
-	resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("upload: HTTP %d", resp.StatusCode)
-	}
-	return nil
-}
-
 type mockDebuginfoHandler struct {
 	shouldInitiateFunc func(ctx context.Context, req *connect.Request[debuginfov1alpha1.ShouldInitiateUploadRequest]) (*connect.Response[debuginfov1alpha1.ShouldInitiateUploadResponse], error)
 	uploadFinishedFunc func(ctx context.Context, req *connect.Request[debuginfov1alpha1.UploadFinishedRequest]) (*connect.Response[debuginfov1alpha1.UploadFinishedResponse], error)
@@ -132,10 +104,11 @@ func startMockServer(t *testing.T, handler *mockDebuginfoHandler, uploadHandler
 	router.Handle("/debuginfo.v1alpha1.DebuginfoService/Upload/{gnu_build_id}", uploadHandler).Methods("POST")
 	server := httptest.NewServer(router)
 	t.Cleanup(server.Close)
-	return &testDebugInfoClient{
+	return &debuginfoclient.Client{
 		DebuginfoServiceClient: debuginfov1alpha1connect.NewDebuginfoServiceClient(server.Client(), server.URL),
-		httpClient:             server.Client(),
-		baseURL:                server.URL,
+		HTTPClient:             server.Client(),
+		BaseURL:                server.URL,
+		UploadTimeout:          time.Minute,
 	}
 }
 

internal/component/pyroscope/receive_http/debuginfo_test.go

@@ -18,8 +18,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/alloy/internal/component/pyroscope"
-	"github.com/grafana/alloy/internal/component/pyroscope/write"
 	"github.com/grafana/alloy/internal/component/pyroscope/write/debuginfo"
+	"github.com/grafana/alloy/internal/component/pyroscope/write/debuginfoclient"
 )
 
 type downstreamResult struct {
@@ -68,7 +68,7 @@ func startMockDownstream(t *testing.T, shouldUpload bool, resultCh chan<- downst
 	t.Cleanup(server.Close)
 
 	connectClient := debuginfov1alpha1connect.NewDebuginfoServiceClient(server.Client(), server.URL)
-	return &write.DebugInfoClient{
+	return &debuginfoclient.Client{
 		DebuginfoServiceClient: connectClient,
 		HTTPClient:             server.Client(),
 		BaseURL:                server.URL,

internal/component/pyroscope/write/debuginfoclient/client.go

@@ -0,0 +1,41 @@
+package debuginfoclient
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strings"
+	"time"
+
+	"github.com/grafana/pyroscope/api/gen/proto/go/debuginfo/v1alpha1/debuginfov1alpha1connect"
+)
+
+type Client struct {
+	debuginfov1alpha1connect.DebuginfoServiceClient
+	HTTPClient    *http.Client
+	BaseURL       string
+	UploadTimeout time.Duration
+}
+
+func (c *Client) Upload(ctx context.Context, buildID string, body io.Reader) error {
+	ctx, cancel := context.WithTimeout(ctx, c.UploadTimeout)
+	defer cancel()
+	t1 := time.Now()
+	uploadURL := strings.TrimRight(c.BaseURL, "/") + "/debuginfo.v1alpha1.DebuginfoService/Upload/" + url.PathEscape(buildID)
+	req, err := http.NewRequestWithContext(ctx, "POST", uploadURL, body)
+	if err != nil {
+		return err
+	}
+	resp, err := c.HTTPClient.Do(req)
+	if err != nil {
+		return err
+	}
+	_, _ = io.Copy(io.Discard, resp.Body)
+	_ = resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("upload: HTTP %d (duration %s)", resp.StatusCode, time.Since(t1))
+	}
+	return nil
+}

internal/component/pyroscope/write/write.go

@@ -21,6 +21,7 @@ import (
 	"github.com/grafana/alloy/internal/component/pyroscope"
 	"github.com/grafana/alloy/internal/component/pyroscope/util"
 	"github.com/grafana/alloy/internal/component/pyroscope/write/debuginfo"
+	"github.com/grafana/alloy/internal/component/pyroscope/write/debuginfoclient"
 	"github.com/grafana/alloy/internal/component/pyroscope/write/promhttp2"
 	"github.com/grafana/dskit/backoff"
 	"github.com/grafana/pyroscope/api/gen/proto/go/debuginfo/v1alpha1/debuginfov1alpha1connect"
@@ -277,7 +278,7 @@ func newFanOut(logger log.Logger, tracer trace.Tracer, config Arguments, metrics
 		endpointDataPath := filepath.Join(dataPath, fmt.Sprintf("endpoint-%d", i))
 
 		debugInfoConnect := debuginfov1alpha1connect.NewDebuginfoServiceClient(httpClient, endpoint.URL, WithUserAgent(userAgent))
-		dic := &DebugInfoClient{
+		dic := &debuginfoclient.Client{
 			DebuginfoServiceClient: debugInfoConnect,
 			HTTPClient:             httpClient,
 			BaseURL:                endpoint.URL,
@@ -752,34 +753,6 @@ func validateLabels(lbls labels.Labels) error {
 	return err
 }
 
-type DebugInfoClient struct {
-	debuginfov1alpha1connect.DebuginfoServiceClient
-	HTTPClient    *http.Client
-	BaseURL       string
-	UploadTimeout time.Duration
-}
-
-func (c *DebugInfoClient) Upload(ctx context.Context, buildID string, body io.Reader) error {
-	ctx, cancel := context.WithTimeout(ctx, c.UploadTimeout)
-	defer cancel()
-	t1 := time.Now()
-	uploadURL := strings.TrimRight(c.BaseURL, "/") + "/debuginfo.v1alpha1.DebuginfoService/Upload/" + url.PathEscape(buildID)
-	req, err := http.NewRequestWithContext(ctx, "POST", uploadURL, body)
-	if err != nil {
-		return err
-	}
-	resp, err := c.HTTPClient.Do(req)
-	if err != nil {
-		return err
-	}
-	_, _ = io.Copy(io.Discard, resp.Body)
-	_ = resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("upload: HTTP %d (duration %s)", resp.StatusCode, time.Since(t1))
-	}
-	return nil
-}
-
 func configureTracing(config Arguments, httpClient *http.Client) {
 	if config.Tracing.JaegerPropagator || config.Tracing.TraceContextPropagator {
 		var propagators []propagation.TextMapPropagator