chore: move toplevel loki/mimir clients

internal/component/common/kubernetes/mimir_rule_group_diff.go

@@ -5,16 +5,16 @@ import (
 
 	"gopkg.in/yaml.v3" // Used for prometheus rulefmt compatibility instead of gopkg.in/yaml.v2
 
-	"github.com/grafana/alloy/internal/mimir/client"
+	"github.com/grafana/alloy/internal/component/mimir/mimirclient"
 )
 
 type MimirRuleGroupDiff struct {
 	Kind    RuleGroupDiffKind
-	Actual  client.MimirRuleGroup
-	Desired client.MimirRuleGroup
+	Actual  mimirclient.MimirRuleGroup
+	Desired mimirclient.MimirRuleGroup
 }
 
-type MimirRuleGroupsByNamespace map[string][]client.MimirRuleGroup
+type MimirRuleGroupsByNamespace map[string][]mimirclient.MimirRuleGroup
 type MimirRuleGroupDiffsByNamespace map[string][]MimirRuleGroupDiff
 
 func DiffMimirRuleGroupState(desired, actual MimirRuleGroupsByNamespace) MimirRuleGroupDiffsByNamespace {
@@ -48,7 +48,7 @@ func DiffMimirRuleGroupState(desired, actual MimirRuleGroupsByNamespace) MimirRu
 	return diff
 }
 
-func diffMimirRuleGroupNamespaceState(desired []client.MimirRuleGroup, actual []client.MimirRuleGroup) []MimirRuleGroupDiff {
+func diffMimirRuleGroupNamespaceState(desired []mimirclient.MimirRuleGroup, actual []mimirclient.MimirRuleGroup) []MimirRuleGroupDiff {
 	var diff []MimirRuleGroupDiff
 
 	seenGroups := map[string]bool{}
@@ -92,7 +92,7 @@ desiredGroups:
 	return diff
 }
 
-func equalMimirRuleGroups(a, b client.MimirRuleGroup) bool {
+func equalMimirRuleGroups(a, b mimirclient.MimirRuleGroup) bool {
 	aBuf, err := yaml.Marshal(a)
 	if err != nil {
 		return false

internal/component/common/kubernetes/mimir_rule_group_diff_test.go

@@ -4,14 +4,15 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/grafana/alloy/internal/mimir/client"
 	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/alloy/internal/component/mimir/mimirclient"
 )
 
-func parseMimirRuleGroups(t *testing.T, buf []byte) []client.MimirRuleGroup {
+func parseMimirRuleGroups(t *testing.T, buf []byte) []mimirclient.MimirRuleGroup {
 	t.Helper()
 
-	groups, errs := client.Parse(buf)
+	groups, errs := mimirclient.Parse(buf)
 	require.Empty(t, errs)
 
 	return groups.Groups
@@ -41,24 +42,24 @@ groups:
 
 	type testCase struct {
 		name     string
-		desired  map[string][]client.MimirRuleGroup
-		actual   map[string][]client.MimirRuleGroup
+		desired  map[string][]mimirclient.MimirRuleGroup
+		actual   map[string][]mimirclient.MimirRuleGroup
 		expected map[string][]MimirRuleGroupDiff
 	}
 
 	testCases := []testCase{
 		{
 			name:     "empty sets",
-			desired:  map[string][]client.MimirRuleGroup{},
-			actual:   map[string][]client.MimirRuleGroup{},
+			desired:  map[string][]mimirclient.MimirRuleGroup{},
+			actual:   map[string][]mimirclient.MimirRuleGroup{},
 			expected: map[string][]MimirRuleGroupDiff{},
 		},
 		{
 			name: "add rule group",
-			desired: map[string][]client.MimirRuleGroup{
+			desired: map[string][]mimirclient.MimirRuleGroup{
 				managedNamespace: ruleGroupsA,
 			},
-			actual: map[string][]client.MimirRuleGroup{},
+			actual: map[string][]mimirclient.MimirRuleGroup{},
 			expected: map[string][]MimirRuleGroupDiff{
 				managedNamespace: {
 					{
@@ -70,8 +71,8 @@ groups:
 		},
 		{
 			name:    "remove rule group",
-			desired: map[string][]client.MimirRuleGroup{},
-			actual: map[string][]client.MimirRuleGroup{
+			desired: map[string][]mimirclient.MimirRuleGroup{},
+			actual: map[string][]mimirclient.MimirRuleGroup{
 				managedNamespace: ruleGroupsA,
 			},
 			expected: map[string][]MimirRuleGroupDiff{
@@ -85,10 +86,10 @@ groups:
 		},
 		{
 			name: "update rule group",
-			desired: map[string][]client.MimirRuleGroup{
+			desired: map[string][]mimirclient.MimirRuleGroup{
 				managedNamespace: ruleGroupsA,
 			},
-			actual: map[string][]client.MimirRuleGroup{
+			actual: map[string][]mimirclient.MimirRuleGroup{
 				managedNamespace: ruleGroupsAModified,
 			},
 			expected: map[string][]MimirRuleGroupDiff{
@@ -103,10 +104,10 @@ groups:
 		},
 		{
 			name: "unchanged rule groups",
-			desired: map[string][]client.MimirRuleGroup{
+			desired: map[string][]mimirclient.MimirRuleGroup{
 				managedNamespace: ruleGroupsA,
 			},
-			actual: map[string][]client.MimirRuleGroup{
+			actual: map[string][]mimirclient.MimirRuleGroup{
 				managedNamespace: ruleGroupsA,
 			},
 			expected: map[string][]MimirRuleGroupDiff{},

internal/component/loki/rules/kubernetes/events_test.go

@@ -23,15 +23,15 @@ import (
 	"k8s.io/client-go/util/workqueue"
 
 	"github.com/grafana/alloy/internal/component/common/kubernetes"
-	lokiClient "github.com/grafana/alloy/internal/loki/client"
+	"github.com/grafana/alloy/internal/component/loki/rules/lokiclient"
 )
 
 type fakeLokiClient struct {
 	rulesMut sync.RWMutex
 	rules    map[string][]rulefmt.RuleGroup
 }
 
-var _ lokiClient.Interface = &fakeLokiClient{}
+var _ lokiclient.Interface = &fakeLokiClient{}
 
 func newFakeLokiClient() *fakeLokiClient {
 	return &fakeLokiClient{

internal/component/loki/rules/kubernetes/rules.go

@@ -9,8 +9,8 @@ import (
 	"github.com/go-kit/log"
 	"github.com/grafana/alloy/internal/component"
 	commonK8s "github.com/grafana/alloy/internal/component/common/kubernetes"
+	"github.com/grafana/alloy/internal/component/loki/rules/lokiclient"
 	"github.com/grafana/alloy/internal/featuregate"
-	lokiClient "github.com/grafana/alloy/internal/loki/client"
 	"github.com/grafana/alloy/internal/runtime/logging/level"
 	"github.com/grafana/alloy/internal/util"
 	"github.com/grafana/dskit/backoff"
@@ -48,7 +48,7 @@ type Component struct {
 	opts component.Options
 	args Arguments
 
-	lokiClient   lokiClient.Interface
+	lokiClient   lokiclient.Interface
 	k8sClient    kubernetes.Interface
 	promClient   promVersioned.Interface
 	ruleLister   promListers.PrometheusRuleLister
@@ -263,7 +263,7 @@ func (c *Component) init() error {
 
 	httpClient := c.args.HTTPClientConfig.Convert()
 
-	c.lokiClient, err = lokiClient.New(c.log, lokiClient.Config{
+	c.lokiClient, err = lokiclient.New(c.log, lokiclient.Config{
 		ID:               c.args.TenantID,
 		Address:          c.args.Address,
 		UseLegacyRoutes:  c.args.UseLegacyRoutes,

internal/loki/client/client.go → internal/component/loki/rules/lokiclient/client.go

@@ -1,4 +1,4 @@
-package client
+package lokiclient
 
 import (
 	"bufio"
@@ -12,7 +12,6 @@ import (
 	"strings"
 
 	log "github.com/go-kit/log"
-	"github.com/grafana/alloy/internal/loki/client/internal"
 	"github.com/grafana/alloy/internal/useragent"
 	"github.com/grafana/dskit/instrument"
 	"github.com/grafana/dskit/user"
@@ -50,7 +49,7 @@ type LokiClient struct {
 	id string
 
 	endpoint *url.URL
-	client   internal.Requester
+	client   Requester
 	apiPath  string
 	logger   log.Logger
 }
@@ -72,7 +71,7 @@ func New(logger log.Logger, cfg Config, timingHistogram *prometheus.HistogramVec
 	}
 
 	collector := instrument.NewHistogramCollector(timingHistogram)
-	timedClient := internal.NewTimedClient(client, collector)
+	timedClient := NewTimedClient(client, collector)
 
 	return &LokiClient{
 		id:       cfg.ID,
@@ -154,7 +153,7 @@ func buildRequest(op, p, m string, endpoint url.URL, payload []byte) (*http.Requ
 	if err != nil {
 		return nil, err
 	}
-	r = r.WithContext(context.WithValue(r.Context(), internal.OperationNameContextKey, op))
+	r = r.WithContext(context.WithValue(r.Context(), OperationNameContextKey, op))
 
 	return r, nil
 }

internal/loki/client/client_test.go → internal/component/loki/rules/lokiclient/client_test.go

@@ -1,4 +1,4 @@
-package client
+package lokiclient
 
 import (
 	"net/http"

internal/loki/client/rules.go → internal/component/loki/rules/lokiclient/rules.go

@@ -1,4 +1,4 @@
-package client
+package lokiclient
 
 import (
 	"context"

internal/loki/client/rules_test.go → internal/component/loki/rules/lokiclient/rules_test.go

@@ -1,4 +1,4 @@
-package client
+package lokiclient
 
 import (
 	"fmt"

internal/loki/client/internal/client.go → internal/component/loki/rules/lokiclient/timed_client.go

@@ -1,7 +1,6 @@
 // copied from https://github.com/weaveworks/common/blob/master/http/client/client.go
 // because it is not included in dskit
-
-package internal
+package lokiclient
 
 import (
 	"context"

internal/mimir/client/internal/client_test.go → internal/component/loki/rules/lokiclient/timed_client_test.go

@@ -1,7 +1,6 @@
-//copied from https://github.com/weaveworks/common/blob/master/http/client/client_test.go
+// copied from https://github.com/weaveworks/common/blob/master/http/client/client_test.go
 // because it is not included in dskit
-
-package internal
+package lokiclient
 
 import (
 	"context"

internal/mimir/client/client.go → internal/component/mimir/mimirclient/client.go

@@ -1,4 +1,4 @@
-package client
+package mimirclient
 
 import (
 	"bufio"
@@ -12,7 +12,6 @@ import (
 	"strings"
 
 	"github.com/go-kit/log"
-	"github.com/grafana/alloy/internal/mimir/client/internal"
 	"github.com/grafana/alloy/internal/useragent"
 	"github.com/grafana/dskit/instrument"
 	"github.com/grafana/dskit/user"
@@ -49,7 +48,7 @@ type MimirClient struct {
 	id string
 
 	endpoint *url.URL
-	client   internal.Requester
+	client   Requester
 	apiPath  string
 	logger   log.Logger
 }
@@ -74,7 +73,7 @@ func New(logger log.Logger, cfg Config, timingHistogram *prometheus.HistogramVec
 	}
 
 	collector := instrument.NewHistogramCollector(timingHistogram)
-	timedClient := internal.NewTimedClient(client, collector)
+	timedClient := NewTimedClient(client, collector)
 
 	return &MimirClient{
 		id:       cfg.ID,
@@ -155,7 +154,7 @@ func buildRequest(op, p, m string, endpoint url.URL, payload []byte) (*http.Requ
 	if err != nil {
 		return nil, err
 	}
-	r = r.WithContext(context.WithValue(r.Context(), internal.OperationNameContextKey, op))
+	r = r.WithContext(context.WithValue(r.Context(), OperationNameContextKey, op))
 
 	return r, nil
 }

internal/mimir/client/client_test.go → internal/component/mimir/mimirclient/client_test.go

@@ -1,4 +1,4 @@
-package client
+package mimirclient
 
 import (
 	"io"

internal/mimir/client/rules.go → internal/component/mimir/mimirclient/rules.go

@@ -1,4 +1,4 @@
-package client
+package mimirclient
 
 import (
 	"context"

internal/mimir/client/rules_test.go → internal/component/mimir/mimirclient/rules_test.go

@@ -1,4 +1,4 @@
-package client
+package mimirclient
 
 import (
 	"fmt"

internal/mimir/client/internal/client.go → internal/component/mimir/mimirclient/timed_client.go

@@ -1,7 +1,6 @@
 // copied from https://github.com/weaveworks/common/blob/master/http/client/client.go
 // because it is not included in dskit
-
-package internal
+package mimirclient
 
 import (
 	"context"

internal/loki/client/internal/client_test.go → internal/component/mimir/mimirclient/timed_client_test.go

@@ -1,7 +1,6 @@
-//copied from https://github.com/weaveworks/common/blob/master/http/client/client_test.go
+// copied from https://github.com/weaveworks/common/blob/master/http/client/client_test.go
 // because it is not included in dskit
-
-package internal
+package mimirclient
 
 import (
 	"context"

internal/mimir/client/types.go → internal/component/mimir/mimirclient/types.go

@@ -1,4 +1,4 @@
-package client
+package mimirclient
 
 import (
 	"bytes"

internal/mimir/client/types_test.go → internal/component/mimir/mimirclient/types_test.go

@@ -1,4 +1,4 @@
-package client
+package mimirclient
 
 import (
 	"testing"

internal/component/mimir/rules/kubernetes/events.go

@@ -20,7 +20,7 @@ import (
 	"sigs.k8s.io/yaml" // Used for CRD compatibility instead of gopkg.in/yaml.v2
 
 	"github.com/grafana/alloy/internal/component/common/kubernetes"
-	"github.com/grafana/alloy/internal/mimir/client"
+	"github.com/grafana/alloy/internal/component/mimir/mimirclient"
 	"github.com/grafana/alloy/internal/runtime/logging/level"
 )
 
@@ -35,7 +35,7 @@ type eventProcessor struct {
 	stopChan chan struct{}
 	health   healthReporter
 
-	mimirClient        client.Interface
+	mimirClient        mimirclient.Interface
 	namespaceLister    coreListers.NamespaceLister
 	ruleLister         promListers.PrometheusRuleLister
 	namespaceSelector  labels.Selector
@@ -65,7 +65,7 @@ func (e *eventProcessor) run(ctx context.Context) {
 
 		if err != nil {
 			retries := e.queue.NumRequeues(evt)
-			if retries < 5 && client.IsRecoverable(err) {
+			if retries < 5 && mimirclient.IsRecoverable(err) {
 				e.metrics.eventsRetried.WithLabelValues(string(evt.Typ)).Inc()
 				e.queue.AddRateLimited(evt)
 				level.Error(e.logger).Log(
@@ -297,13 +297,13 @@ func labelsSetPromQL(query, labelMatchType, name, value string) (string, error)
 	return expr.String(), nil
 }
 
-func convertCRDRuleGroupToRuleGroup(crd promv1.PrometheusRuleSpec) ([]client.MimirRuleGroup, error) {
+func convertCRDRuleGroupToRuleGroup(crd promv1.PrometheusRuleSpec) ([]mimirclient.MimirRuleGroup, error) {
 	buf, err := yaml.Marshal(crd)
 	if err != nil {
 		return nil, err
 	}
 
-	groups, errs := client.Parse(buf)
+	groups, errs := mimirclient.Parse(buf)
 	if len(errs) > 0 {
 		return nil, multierror.Append(nil, errs...)
 	}