fixup! Removed the prometheus/prometheus go library

pkg/remote/client.go

@@ -16,10 +16,9 @@ import (
 )
 
 type HTTPConfig struct {
-	UserAgent string
 	Timeout   time.Duration
-	TLSConfig tls.Config
-	BasicAuth BasicAuth
+	TLSConfig *tls.Config
+	BasicAuth *BasicAuth
 	Headers   http.Header
 }
 
@@ -44,17 +43,23 @@ func NewWriteClient(endpoint string, cfg *HTTPConfig) (*WriteClient, error) {
 	if err != nil {
 		return nil, err
 	}
-	return &WriteClient{
+	wc := &WriteClient{
 		hc: &http.Client{
 			Timeout: cfg.Timeout,
 		},
 		url: u,
 		cfg: cfg,
-	}, nil
+	}
+	if cfg.TLSConfig != nil {
+		wc.hc.Transport = &http.Transport{
+			TLSClientConfig: cfg.TLSConfig,
+		}
+	}
+	return wc, nil
 }
 
 // Store sends a batch of samples to the HTTP endpoint,
-// the request is the proto marshalled and encoded.
+// the request is the proto marshaled and encoded.
 func (c *WriteClient) Store(ctx context.Context, series []*prompb.TimeSeries) error {
 	b, err := c.requestBody(series)
 	if err != nil {
@@ -65,6 +70,9 @@ func (c *WriteClient) Store(ctx context.Context, series []*prompb.TimeSeries) er
 	if err != nil {
 		return fmt.Errorf("create new HTTP request failed: %w", err)
 	}
+	if c.cfg.BasicAuth != nil {
+		req.SetBasicAuth(c.cfg.BasicAuth.User, c.cfg.BasicAuth.Password)
+	}
 
 	req.Header.Set("User-Agent", "k6-prometheus-rw-output")
 

pkg/remote/client_test.go

@@ -65,6 +65,7 @@ func TestClientStore(t *testing.T) {
 	c := &WriteClient{
 		hc:  ts.Client(),
 		url: u,
+		cfg: &HTTPConfig{},
 	}
 	data := &prompb.TimeSeries{
 		Labels: []*prompb.Label{
@@ -98,6 +99,34 @@ func TestClientStoreHTTPError(t *testing.T) {
 	c := &WriteClient{
 		hc:  ts.Client(),
 		url: u,
+		cfg: &HTTPConfig{},
+	}
+	assert.Error(t, c.Store(context.Background(), nil))
+}
+
+func TestClientStoreHTTPBasic(t *testing.T) {
+	t.Parallel()
+	h := func(w http.ResponseWriter, r *http.Request) {
+		u, pwd, ok := r.BasicAuth()
+		require.True(t, ok)
+		assert.Equal(t, "usertest", u)
+		assert.Equal(t, "pwdtest", pwd)
+	}
+	ts := httptest.NewServer(http.HandlerFunc(h))
+	defer ts.Close()
+
+	u, err := url.Parse(ts.URL)
+	require.NoError(t, err)
+
+	c := &WriteClient{
+		hc:  ts.Client(),
+		url: u,
+		cfg: &HTTPConfig{
+			BasicAuth: &BasicAuth{
+				User:     "usertest",
+				Password: "pwdtest",
+			},
+		},
 	}
 	assert.Error(t, c.Store(context.Background(), nil))
 }

pkg/remotewrite/config.go

@@ -52,13 +52,13 @@ func (conf Config) RemoteConfig() (*remote.HTTPConfig, error) {
 		Timeout: defaultTimeout,
 	}
 
-	hc.TLSConfig = tls.Config{
+	hc.TLSConfig = &tls.Config{
 		InsecureSkipVerify: conf.InsecureSkipTLSVerify.Bool,
 	}
 
 	// if at least valid user was configured, use basic auth
 	if conf.User.Valid {
-		hc.BasicAuth = remote.BasicAuth{
+		hc.BasicAuth = &remote.BasicAuth{
 			User:     conf.User.String,
 			Password: conf.Password.String,
 		}

pkg/remotewrite/config_test.go

@@ -103,10 +103,10 @@ func TestConstructRemoteConfig(t *testing.T) {
 	headers.Set("X-MYCUSTOM-HEADER", "val1")
 	exprcc := &remote.HTTPConfig{
 		Timeout: 5 * time.Second,
-		TLSConfig: tls.Config{
+		TLSConfig: &tls.Config{
 			InsecureSkipVerify: true,
 		},
-		BasicAuth: remote.BasicAuth{
+		BasicAuth: &remote.BasicAuth{
 			User:     "myuser",
 			Password: "mypass",
 		},