From 6d9a4fc5cb77ddcf1b63f04988e9ac79b9331b10 Mon Sep 17 00:00:00 2001
From: iamrajiv <rajivperfect007@gmail.com>
Date: Sat, 2 Aug 2025 12:31:03 +0530
Subject: [PATCH 01/24] add echo

---
 internal/component/all/all.go              |   1 +
 internal/component/prometheus/echo/echo.go | 279 +++++++++++++++++++++
 2 files changed, 280 insertions(+)
 create mode 100644 internal/component/prometheus/echo/echo.go

diff --git a/internal/component/all/all.go b/internal/component/all/all.go
index 3f739dbe63f..5cb6351cb08 100644
--- a/internal/component/all/all.go
+++ b/internal/component/all/all.go
@@ -161,6 +161,7 @@ import (
 	_ "github.com/grafana/alloy/internal/component/prometheus/operator/scrapeconfigs"        // Import prometheus.operator.scrapeconfigs
 	_ "github.com/grafana/alloy/internal/component/prometheus/operator/servicemonitors"      // Import prometheus.operator.servicemonitors
 	_ "github.com/grafana/alloy/internal/component/prometheus/receive_http"                  // Import prometheus.receive_http
+	_ "github.com/grafana/alloy/internal/component/prometheus/echo"                          // Import prometheus.echo
 	_ "github.com/grafana/alloy/internal/component/prometheus/relabel"                       // Import prometheus.relabel
 	_ "github.com/grafana/alloy/internal/component/prometheus/remotewrite"                   // Import prometheus.remote_write
 	_ "github.com/grafana/alloy/internal/component/prometheus/scrape"                        // Import prometheus.scrape
diff --git a/internal/component/prometheus/echo/echo.go b/internal/component/prometheus/echo/echo.go
new file mode 100644
index 00000000000..bfc76a71f3a
--- /dev/null
+++ b/internal/component/prometheus/echo/echo.go
@@ -0,0 +1,279 @@
+package echo
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/go-kit/log"
+	"github.com/grafana/alloy/internal/component"
+	"github.com/grafana/alloy/internal/featuregate"
+	"github.com/grafana/alloy/internal/runtime/logging/level"
+	"github.com/prometheus/common/model"
+	"github.com/prometheus/prometheus/model/exemplar"
+	"github.com/prometheus/prometheus/model/histogram"
+	"github.com/prometheus/prometheus/model/labels"
+	"github.com/prometheus/prometheus/model/metadata"
+	"github.com/prometheus/prometheus/storage"
+)
+
+func init() {
+	component.Register(component.Registration{
+		Name:      "prometheus.echo",
+		Stability: featuregate.StabilityGenerallyAvailable,
+		Args:      Arguments{},
+		Exports:   Exports{},
+		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
+			return New(opts, args.(Arguments))
+		},
+	})
+}
+
+type Arguments struct{}
+
+type Exports struct {
+	Receiver storage.Appendable `alloy:"receiver,attr"`
+}
+
+var DefaultArguments = Arguments{}
+
+func (args *Arguments) SetToDefault() {
+	*args = DefaultArguments
+}
+
+var (
+	_ component.Component = (*Component)(nil)
+	_ storage.Appendable  = (*Component)(nil)
+)
+
+type Component struct {
+	opts component.Options
+	mut  sync.RWMutex
+	args Arguments
+}
+
+func New(o component.Options, args Arguments) (*Component, error) {
+	c := &Component{
+		opts: o,
+	}
+	if err := c.Update(args); err != nil {
+		return nil, err
+	}
+	if o.OnStateChange != nil {
+		o.OnStateChange(Exports{Receiver: c})
+	}
+	return c, nil
+}
+
+func (c *Component) Run(ctx context.Context) error {
+	<-ctx.Done()
+	return nil
+}
+
+func (c *Component) Update(args component.Arguments) error {
+	newArgs := args.(Arguments)
+	c.mut.Lock()
+	defer c.mut.Unlock()
+	c.args = newArgs
+	return nil
+}
+
+func (c *Component) Appender(ctx context.Context) storage.Appender {
+	return &echoAppender{
+		logger:      c.opts.Logger,
+		componentID: c.opts.ID,
+	}
+}
+
+type echoAppender struct {
+	logger      log.Logger
+	componentID string
+	metrics     []metricData
+	mut         sync.Mutex
+}
+
+type metricData struct {
+	labels       labels.Labels
+	timestamp    int64
+	value        float64
+	histogram    *histogram.Histogram
+	fHistogram   *histogram.FloatHistogram
+	exemplar     *exemplar.Exemplar
+	metadata     *metadata.Metadata
+	isZeroSample bool
+	ct           int64
+}
+
+func (a *echoAppender) Append(ref storage.SeriesRef, l labels.Labels, t int64, v float64) (storage.SeriesRef, error) {
+	a.mut.Lock()
+	defer a.mut.Unlock()
+	a.metrics = append(a.metrics, metricData{
+		labels:    l.Copy(),
+		timestamp: t,
+		value:     v,
+	})
+	if ref == 0 {
+		ref = storage.SeriesRef(len(a.metrics))
+	}
+	return ref, nil
+}
+
+func (a *echoAppender) AppendExemplar(ref storage.SeriesRef, l labels.Labels, e exemplar.Exemplar) (storage.SeriesRef, error) {
+	a.mut.Lock()
+	defer a.mut.Unlock()
+	for i := len(a.metrics) - 1; i >= 0; i-- {
+		if labels.Equal(a.metrics[i].labels, l) {
+			a.metrics[i].exemplar = &e
+			break
+		}
+	}
+	if ref == 0 {
+		ref = storage.SeriesRef(1)
+	}
+	return ref, nil
+}
+
+func (a *echoAppender) AppendHistogram(ref storage.SeriesRef, l labels.Labels, t int64, h *histogram.Histogram, fh *histogram.FloatHistogram) (storage.SeriesRef, error) {
+	a.mut.Lock()
+	defer a.mut.Unlock()
+	a.metrics = append(a.metrics, metricData{
+		labels:     l.Copy(),
+		timestamp:  t,
+		histogram:  h,
+		fHistogram: fh,
+	})
+	if ref == 0 {
+		ref = storage.SeriesRef(len(a.metrics))
+	}
+	return ref, nil
+}
+
+func (a *echoAppender) UpdateMetadata(ref storage.SeriesRef, l labels.Labels, m metadata.Metadata) (storage.SeriesRef, error) {
+	a.mut.Lock()
+	defer a.mut.Unlock()
+	for i := range a.metrics {
+		if labels.Equal(a.metrics[i].labels, l) {
+			a.metrics[i].metadata = &m
+		}
+	}
+	if ref == 0 {
+		ref = storage.SeriesRef(1)
+	}
+	return ref, nil
+}
+
+func (a *echoAppender) AppendCTZeroSample(ref storage.SeriesRef, l labels.Labels, t, ct int64) (storage.SeriesRef, error) {
+	a.mut.Lock()
+	defer a.mut.Unlock()
+	a.metrics = append(a.metrics, metricData{
+		labels:       l.Copy(),
+		timestamp:    t,
+		value:        0,
+		isZeroSample: true,
+		ct:           ct,
+	})
+	if ref == 0 {
+		ref = storage.SeriesRef(len(a.metrics))
+	}
+	return ref, nil
+}
+
+func (a *echoAppender) AppendHistogramCTZeroSample(ref storage.SeriesRef, l labels.Labels, t, ct int64, h *histogram.Histogram, fh *histogram.FloatHistogram) (storage.SeriesRef, error) {
+	a.mut.Lock()
+	defer a.mut.Unlock()
+	a.metrics = append(a.metrics, metricData{
+		labels:       l.Copy(),
+		timestamp:    t,
+		histogram:    h,
+		fHistogram:   fh,
+		isZeroSample: true,
+		ct:           ct,
+	})
+	if ref == 0 {
+		ref = storage.SeriesRef(len(a.metrics))
+	}
+	return ref, nil
+}
+
+func (a *echoAppender) Commit() error {
+	a.mut.Lock()
+	defer a.mut.Unlock()
+	metricGroups := make(map[string][]metricData)
+	for _, m := range a.metrics {
+		name := m.labels.Get(model.MetricNameLabel)
+		if name == "" {
+			name = "{no_metric_name}"
+		}
+		metricGroups[name] = append(metricGroups[name], m)
+	}
+	var output strings.Builder
+	output.WriteString(fmt.Sprintf("# Prometheus metrics received by %s\n", a.componentID))
+	output.WriteString(fmt.Sprintf("# Timestamp: %s\n", time.Now().Format(time.RFC3339)))
+	for metricName, metrics := range metricGroups {
+		if len(metrics) == 0 {
+			continue
+		}
+		if metrics[0].metadata != nil {
+			if metrics[0].metadata.Help != "" {
+				output.WriteString(fmt.Sprintf("# HELP %s %s\n", metricName, metrics[0].metadata.Help))
+			}
+			if metrics[0].metadata.Type != "" {
+				output.WriteString(fmt.Sprintf("# TYPE %s %s\n", metricName, metrics[0].metadata.Type))
+			}
+		}
+		for _, m := range metrics {
+			output.WriteString(formatMetric(m))
+		}
+	}
+	level.Info(a.logger).Log("component", a.componentID, "metrics", output.String())
+	a.metrics = a.metrics[:0]
+	return nil
+}
+
+func (a *echoAppender) Rollback() error {
+	a.mut.Lock()
+	defer a.mut.Unlock()
+	a.metrics = a.metrics[:0]
+	return nil
+}
+
+func formatMetric(m metricData) string {
+	var output strings.Builder
+	metricName := m.labels.Get(model.MetricNameLabel)
+	if metricName == "" {
+		metricName = "{no_metric_name}"
+	}
+	output.WriteString(metricName)
+	labelPairs := make([]string, 0, len(m.labels)-1)
+	for _, l := range m.labels {
+		if l.Name != model.MetricNameLabel {
+			labelPairs = append(labelPairs, fmt.Sprintf("%s=%q", l.Name, l.Value))
+		}
+	}
+	if len(labelPairs) > 0 {
+		output.WriteString("{")
+		output.WriteString(strings.Join(labelPairs, ","))
+		output.WriteString("}")
+	}
+	if m.histogram != nil || m.fHistogram != nil {
+		output.WriteString(" {histogram}")
+	} else {
+		output.WriteString(fmt.Sprintf(" %g", m.value))
+	}
+	if m.timestamp > 0 {
+		output.WriteString(fmt.Sprintf(" %d", m.timestamp))
+	}
+	if m.exemplar != nil {
+		output.WriteString(fmt.Sprintf(" # {%s} %g", m.exemplar.Labels, m.exemplar.Value))
+	}
+	if m.isZeroSample && m.ct > 0 {
+		output.WriteString(fmt.Sprintf(" # CreatedTimestamp: %d", m.ct))
+	}
+	output.WriteString("\n")
+	return output.String()
+}
+
+func (a *echoAppender) SetOptions(opts *storage.AppendOptions) {
+}

From f2347b752e41c9ef7085d84f1da019f41495dc5b Mon Sep 17 00:00:00 2001
From: iamrajiv <rajivperfect007@gmail.com>
Date: Sat, 2 Aug 2025 12:31:09 +0530
Subject: [PATCH 02/24] add test

---
 .../component/prometheus/echo/echo_test.go    | 143 ++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100644 internal/component/prometheus/echo/echo_test.go

diff --git a/internal/component/prometheus/echo/echo_test.go b/internal/component/prometheus/echo/echo_test.go
new file mode 100644
index 00000000000..42998d6e408
--- /dev/null
+++ b/internal/component/prometheus/echo/echo_test.go
@@ -0,0 +1,143 @@
+package echo
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/go-kit/log"
+	"github.com/grafana/alloy/internal/component"
+	"github.com/grafana/alloy/internal/runtime/componenttest"
+	"github.com/prometheus/prometheus/model/labels"
+	"github.com/prometheus/prometheus/storage"
+	"github.com/stretchr/testify/require"
+)
+
+func TestArgumentsDefaults(t *testing.T) {
+	args := Arguments{}
+	args.SetToDefault()
+	require.Equal(t, DefaultArguments, args)
+}
+
+func TestComponent_Creation(t *testing.T) {
+	ctx := componenttest.TestContext(t)
+
+	comp, err := New(component.Options{
+		ID:     "test",
+		Logger: log.NewNopLogger(),
+	}, Arguments{})
+	require.NoError(t, err)
+	require.NotNil(t, comp)
+
+	ctx, cancel := context.WithTimeout(ctx, time.Second)
+	defer cancel()
+
+	go func() {
+		err := comp.Run(ctx)
+		require.NoError(t, err)
+	}()
+
+	time.Sleep(100 * time.Millisecond)
+}
+
+func TestComponent_ExportsReceiver(t *testing.T) {
+	var exports component.Exports
+
+	comp, err := New(component.Options{
+		ID:     "test",
+		Logger: log.NewNopLogger(),
+		OnStateChange: func(e component.Exports) {
+			exports = e
+		},
+	}, Arguments{})
+	require.NoError(t, err)
+	require.NotNil(t, comp)
+
+	echoExports, ok := exports.(Exports)
+	require.True(t, ok)
+	require.NotNil(t, echoExports.Receiver)
+
+	require.Equal(t, comp, echoExports.Receiver)
+}
+
+func TestAppender_BasicMetrics(t *testing.T) {
+	comp, err := New(component.Options{
+		ID:     "test",
+		Logger: log.NewNopLogger(),
+	}, Arguments{})
+	require.NoError(t, err)
+
+	ctx := context.Background()
+	appender := comp.Appender(ctx)
+	require.NotNil(t, appender)
+
+	lbls := labels.FromStrings("__name__", "test_metric", "job", "test")
+
+	ref, err := appender.Append(0, lbls, time.Now().Unix(), 42.0)
+	require.NoError(t, err)
+	require.NotEqual(t, storage.SeriesRef(0), ref)
+
+	err = appender.Commit()
+	require.NoError(t, err)
+}
+
+func TestAppender_Rollback(t *testing.T) {
+	comp, err := New(component.Options{
+		ID:     "test",
+		Logger: log.NewNopLogger(),
+	}, Arguments{})
+	require.NoError(t, err)
+
+	ctx := context.Background()
+	appender := comp.Appender(ctx)
+	require.NotNil(t, appender)
+
+	lbls := labels.FromStrings("__name__", "test_metric", "job", "test")
+
+	_, err = appender.Append(0, lbls, time.Now().Unix(), 42.0)
+	require.NoError(t, err)
+
+	err = appender.Rollback()
+	require.NoError(t, err)
+}
+
+func TestAppender_MultipleMetrics(t *testing.T) {
+	comp, err := New(component.Options{
+		ID:     "test",
+		Logger: log.NewNopLogger(),
+	}, Arguments{})
+	require.NoError(t, err)
+
+	ctx := context.Background()
+	appender := comp.Appender(ctx)
+	require.NotNil(t, appender)
+
+	metrics := []struct {
+		name  string
+		value float64
+	}{
+		{"metric_one", 1.0},
+		{"metric_two", 2.0},
+		{"metric_three", 3.0},
+	}
+
+	for _, metric := range metrics {
+		lbls := labels.FromStrings("__name__", metric.name, "job", "test")
+		_, err = appender.Append(0, lbls, time.Now().Unix(), metric.value)
+		require.NoError(t, err)
+	}
+
+	err = appender.Commit()
+	require.NoError(t, err)
+}
+
+func TestComponent_Update(t *testing.T) {
+	comp, err := New(component.Options{
+		ID:     "test",
+		Logger: log.NewNopLogger(),
+	}, Arguments{})
+	require.NoError(t, err)
+
+	err = comp.Update(Arguments{})
+	require.NoError(t, err)
+}

From a253d8e0694e8626b3dc6ddd44b320ac346a5623 Mon Sep 17 00:00:00 2001
From: iamrajiv <rajivperfect007@gmail.com>
Date: Sat, 2 Aug 2025 12:34:10 +0530
Subject: [PATCH 03/24] add changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81a10cd3b14..2b374eff6a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -289,6 +289,8 @@ v1.11.0
 
 ### Features
 
+- Add `prometheus.echo` component for local inspection of Prometheus metrics. The component writes received metrics to stdout in Prometheus exposition format, enabling easier debugging and testing of metrics flow. (@iamrajiv)
+
 - Add the `otelcol.receiver.fluentforward` receiver to receive logs via Fluent Forward Protocol. (@rucciva)
 - Add the `prometheus.enrich` component to enrich metrics using labels from `discovery.*` components. (@ArkovKonstantin)
 

From 1e44b4e654d9e04efe8bbe3128ebdf277c4033f6 Mon Sep 17 00:00:00 2001
From: iamrajiv <rajivperfect007@gmail.com>
Date: Mon, 4 Aug 2025 22:37:40 +0530
Subject: [PATCH 04/24] use prometheus expfmt encoder

---
 internal/component/prometheus/echo/echo.go    | 464 ++++++++++++++----
 .../component/prometheus/echo/echo_test.go    |  82 ++++
 2 files changed, 439 insertions(+), 107 deletions(-)

diff --git a/internal/component/prometheus/echo/echo.go b/internal/component/prometheus/echo/echo.go
index bfc76a71f3a..ce7aa07f456 100644
--- a/internal/component/prometheus/echo/echo.go
+++ b/internal/component/prometheus/echo/echo.go
@@ -1,9 +1,9 @@
 package echo
 
 import (
+	"bytes"
 	"context"
-	"fmt"
-	"strings"
+	"sort"
 	"sync"
 	"time"
 
@@ -11,12 +11,16 @@ import (
 	"github.com/grafana/alloy/internal/component"
 	"github.com/grafana/alloy/internal/featuregate"
 	"github.com/grafana/alloy/internal/runtime/logging/level"
+	dto "github.com/prometheus/client_model/go"
+	"github.com/prometheus/common/expfmt"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/exemplar"
 	"github.com/prometheus/prometheus/model/histogram"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/metadata"
 	"github.com/prometheus/prometheus/storage"
+	"google.golang.org/protobuf/types/known/timestamppb"
+	"k8s.io/utils/ptr"
 )
 
 func init() {
@@ -31,13 +35,17 @@ func init() {
 	})
 }
 
-type Arguments struct{}
+type Arguments struct {
+	Format string `alloy:"format,attr,optional"`
+}
 
 type Exports struct {
 	Receiver storage.Appendable `alloy:"receiver,attr"`
 }
 
-var DefaultArguments = Arguments{}
+var DefaultArguments = Arguments{
+	Format: "text",
+}
 
 func (args *Arguments) SetToDefault() {
 	*args = DefaultArguments
@@ -81,41 +89,64 @@ func (c *Component) Update(args component.Arguments) error {
 }
 
 func (c *Component) Appender(ctx context.Context) storage.Appender {
+	c.mut.RLock()
+	format := c.args.Format
+	c.mut.RUnlock()
+
 	return &echoAppender{
 		logger:      c.opts.Logger,
 		componentID: c.opts.ID,
+		format:      format,
+		samples:     make(map[string]sample),
+		exemplars:   make(map[string]seriesExemplar),
+		histograms:  make(map[string]seriesHistogram),
+		metadata:    make(map[string]metadata.Metadata),
 	}
 }
 
 type echoAppender struct {
 	logger      log.Logger
 	componentID string
-	metrics     []metricData
+	format      string
 	mut         sync.Mutex
+
+	samples    map[string]sample
+	exemplars  map[string]seriesExemplar
+	histograms map[string]seriesHistogram
+	metadata   map[string]metadata.Metadata
 }
 
-type metricData struct {
-	labels       labels.Labels
-	timestamp    int64
-	value        float64
-	histogram    *histogram.Histogram
-	fHistogram   *histogram.FloatHistogram
-	exemplar     *exemplar.Exemplar
-	metadata     *metadata.Metadata
-	isZeroSample bool
-	ct           int64
+type sample struct {
+	Labels         labels.Labels
+	Timestamp      int64
+	Value          float64
+	PrintTimestamp bool
+}
+
+type seriesExemplar struct {
+	Labels   labels.Labels
+	Exemplar exemplar.Exemplar
+}
+
+type seriesHistogram struct {
+	Labels    labels.Labels
+	Histogram histogram.Histogram
 }
 
 func (a *echoAppender) Append(ref storage.SeriesRef, l labels.Labels, t int64, v float64) (storage.SeriesRef, error) {
 	a.mut.Lock()
 	defer a.mut.Unlock()
-	a.metrics = append(a.metrics, metricData{
-		labels:    l.Copy(),
-		timestamp: t,
-		value:     v,
-	})
+
+	key := l.String()
+	a.samples[key] = sample{
+		Labels:         l.Copy(),
+		Timestamp:      t,
+		Value:          v,
+		PrintTimestamp: t > 0,
+	}
+
 	if ref == 0 {
-		ref = storage.SeriesRef(len(a.metrics))
+		ref = storage.SeriesRef(len(a.samples))
 	}
 	return ref, nil
 }
@@ -123,12 +154,13 @@ func (a *echoAppender) Append(ref storage.SeriesRef, l labels.Labels, t int64, v
 func (a *echoAppender) AppendExemplar(ref storage.SeriesRef, l labels.Labels, e exemplar.Exemplar) (storage.SeriesRef, error) {
 	a.mut.Lock()
 	defer a.mut.Unlock()
-	for i := len(a.metrics) - 1; i >= 0; i-- {
-		if labels.Equal(a.metrics[i].labels, l) {
-			a.metrics[i].exemplar = &e
-			break
-		}
+
+	key := l.String()
+	a.exemplars[key] = seriesExemplar{
+		Labels:   l.Copy(),
+		Exemplar: e,
 	}
+
 	if ref == 0 {
 		ref = storage.SeriesRef(1)
 	}
@@ -138,14 +170,17 @@ func (a *echoAppender) AppendExemplar(ref storage.SeriesRef, l labels.Labels, e
 func (a *echoAppender) AppendHistogram(ref storage.SeriesRef, l labels.Labels, t int64, h *histogram.Histogram, fh *histogram.FloatHistogram) (storage.SeriesRef, error) {
 	a.mut.Lock()
 	defer a.mut.Unlock()
-	a.metrics = append(a.metrics, metricData{
-		labels:     l.Copy(),
-		timestamp:  t,
-		histogram:  h,
-		fHistogram: fh,
-	})
+
+	key := l.String()
+	if h != nil {
+		a.histograms[key] = seriesHistogram{
+			Labels:    l.Copy(),
+			Histogram: *h,
+		}
+	}
+
 	if ref == 0 {
-		ref = storage.SeriesRef(len(a.metrics))
+		ref = storage.SeriesRef(len(a.histograms))
 	}
 	return ref, nil
 }
@@ -153,11 +188,12 @@ func (a *echoAppender) AppendHistogram(ref storage.SeriesRef, l labels.Labels, t
 func (a *echoAppender) UpdateMetadata(ref storage.SeriesRef, l labels.Labels, m metadata.Metadata) (storage.SeriesRef, error) {
 	a.mut.Lock()
 	defer a.mut.Unlock()
-	for i := range a.metrics {
-		if labels.Equal(a.metrics[i].labels, l) {
-			a.metrics[i].metadata = &m
-		}
+
+	metricName := l.Get(model.MetricNameLabel)
+	if metricName != "" {
+		a.metadata[metricName] = m
 	}
+
 	if ref == 0 {
 		ref = storage.SeriesRef(1)
 	}
@@ -167,15 +203,17 @@ func (a *echoAppender) UpdateMetadata(ref storage.SeriesRef, l labels.Labels, m
 func (a *echoAppender) AppendCTZeroSample(ref storage.SeriesRef, l labels.Labels, t, ct int64) (storage.SeriesRef, error) {
 	a.mut.Lock()
 	defer a.mut.Unlock()
-	a.metrics = append(a.metrics, metricData{
-		labels:       l.Copy(),
-		timestamp:    t,
-		value:        0,
-		isZeroSample: true,
-		ct:           ct,
-	})
+
+	key := l.String()
+	a.samples[key] = sample{
+		Labels:         l.Copy(),
+		Timestamp:      t,
+		Value:          0,
+		PrintTimestamp: t > 0,
+	}
+
 	if ref == 0 {
-		ref = storage.SeriesRef(len(a.metrics))
+		ref = storage.SeriesRef(len(a.samples))
 	}
 	return ref, nil
 }
@@ -183,16 +221,17 @@ func (a *echoAppender) AppendCTZeroSample(ref storage.SeriesRef, l labels.Labels
 func (a *echoAppender) AppendHistogramCTZeroSample(ref storage.SeriesRef, l labels.Labels, t, ct int64, h *histogram.Histogram, fh *histogram.FloatHistogram) (storage.SeriesRef, error) {
 	a.mut.Lock()
 	defer a.mut.Unlock()
-	a.metrics = append(a.metrics, metricData{
-		labels:       l.Copy(),
-		timestamp:    t,
-		histogram:    h,
-		fHistogram:   fh,
-		isZeroSample: true,
-		ct:           ct,
-	})
+
+	key := l.String()
+	if h != nil {
+		a.histograms[key] = seriesHistogram{
+			Labels:    l.Copy(),
+			Histogram: *h,
+		}
+	}
+
 	if ref == 0 {
-		ref = storage.SeriesRef(len(a.metrics))
+		ref = storage.SeriesRef(len(a.histograms))
 	}
 	return ref, nil
 }
@@ -200,80 +239,291 @@ func (a *echoAppender) AppendHistogramCTZeroSample(ref storage.SeriesRef, l labe
 func (a *echoAppender) Commit() error {
 	a.mut.Lock()
 	defer a.mut.Unlock()
-	metricGroups := make(map[string][]metricData)
-	for _, m := range a.metrics {
-		name := m.labels.Get(model.MetricNameLabel)
-		if name == "" {
-			name = "{no_metric_name}"
-		}
-		metricGroups[name] = append(metricGroups[name], m)
+
+	families := a.buildMetricFamilies()
+
+	var buf bytes.Buffer
+	var expFormat expfmt.Format
+
+	switch a.format {
+	case "openmetrics":
+		expFormat = expfmt.NewFormat(expfmt.TypeOpenMetrics)
+	case "text", "":
+		expFormat = expfmt.NewFormat(expfmt.TypeTextPlain)
+	default:
+		level.Warn(a.logger).Log("component", a.componentID, "msg", "unknown format, using text", "format", a.format)
+		expFormat = expfmt.NewFormat(expfmt.TypeTextPlain)
 	}
-	var output strings.Builder
-	output.WriteString(fmt.Sprintf("# Prometheus metrics received by %s\n", a.componentID))
-	output.WriteString(fmt.Sprintf("# Timestamp: %s\n", time.Now().Format(time.RFC3339)))
-	for metricName, metrics := range metricGroups {
-		if len(metrics) == 0 {
+
+	encoder := expfmt.NewEncoder(&buf, expFormat)
+
+	for _, family := range families {
+		if err := encoder.Encode(family); err != nil {
+			level.Error(a.logger).Log("component", a.componentID, "error", "failed to encode metric family", "family", family.GetName(), "err", err)
 			continue
 		}
-		if metrics[0].metadata != nil {
-			if metrics[0].metadata.Help != "" {
-				output.WriteString(fmt.Sprintf("# HELP %s %s\n", metricName, metrics[0].metadata.Help))
-			}
-			if metrics[0].metadata.Type != "" {
-				output.WriteString(fmt.Sprintf("# TYPE %s %s\n", metricName, metrics[0].metadata.Type))
-			}
-		}
-		for _, m := range metrics {
-			output.WriteString(formatMetric(m))
-		}
 	}
-	level.Info(a.logger).Log("component", a.componentID, "metrics", output.String())
-	a.metrics = a.metrics[:0]
+
+	level.Info(a.logger).Log("component", a.componentID, "metrics", buf.String())
+
+	a.clearStorage()
+
 	return nil
 }
 
 func (a *echoAppender) Rollback() error {
 	a.mut.Lock()
 	defer a.mut.Unlock()
-	a.metrics = a.metrics[:0]
+
+	a.clearStorage()
+
 	return nil
 }
 
-func formatMetric(m metricData) string {
-	var output strings.Builder
-	metricName := m.labels.Get(model.MetricNameLabel)
-	if metricName == "" {
-		metricName = "{no_metric_name}"
+func (a *echoAppender) SetOptions(opts *storage.AppendOptions) {
+}
+
+func (a *echoAppender) clearStorage() {
+	for k := range a.samples {
+		delete(a.samples, k)
+	}
+	for k := range a.exemplars {
+		delete(a.exemplars, k)
+	}
+	for k := range a.histograms {
+		delete(a.histograms, k)
+	}
+	for k := range a.metadata {
+		delete(a.metadata, k)
+	}
+}
+
+func (a *echoAppender) buildMetricFamilies() []*dto.MetricFamily {
+	b := builder{
+		samples:    a.samples,
+		exemplars:  a.exemplars,
+		metadata:   a.metadata,
+		histograms: a.histograms,
+
+		familyLookup: make(map[string]*dto.MetricFamily),
 	}
-	output.WriteString(metricName)
-	labelPairs := make([]string, 0, len(m.labels)-1)
-	for _, l := range m.labels {
-		if l.Name != model.MetricNameLabel {
-			labelPairs = append(labelPairs, fmt.Sprintf("%s=%q", l.Name, l.Value))
+	return b.build()
+}
+
+type builder struct {
+	samples    map[string]sample
+	exemplars  map[string]seriesExemplar
+	metadata   map[string]metadata.Metadata
+	histograms map[string]seriesHistogram
+
+	families     []*dto.MetricFamily
+	familyLookup map[string]*dto.MetricFamily
+}
+
+func (b *builder) build() []*dto.MetricFamily {
+	b.buildFamiliesFromMetadata()
+	b.buildMetricsFromSamples()
+	b.buildHistograms()
+	b.assignExemplars()
+	b.sortFamilies()
+
+	return b.families
+}
+
+func (b *builder) buildFamiliesFromMetadata() {
+	for metricName, md := range b.metadata {
+		family := &dto.MetricFamily{
+			Name: ptr.To(metricName),
+			Help: ptr.To(md.Help),
 		}
+
+		family.Type = ptr.To(dto.MetricType_UNTYPED)
+
+		b.families = append(b.families, family)
+		b.familyLookup[metricName] = family
 	}
-	if len(labelPairs) > 0 {
-		output.WriteString("{")
-		output.WriteString(strings.Join(labelPairs, ","))
-		output.WriteString("}")
+}
+
+func (b *builder) buildMetricsFromSamples() {
+	for _, sample := range b.samples {
+		metricName := sample.Labels.Get(model.MetricNameLabel)
+		if metricName == "" {
+			continue
+		}
+
+		family := b.getOrCreateFamily(metricName)
+		metric := &dto.Metric{}
+
+		for _, label := range sample.Labels {
+			if label.Name != model.MetricNameLabel {
+				metric.Label = append(metric.Label, &dto.LabelPair{
+					Name:  ptr.To(string(label.Name)),
+					Value: ptr.To(string(label.Value)),
+				})
+			}
+		}
+
+		switch family.GetType() {
+		case dto.MetricType_COUNTER:
+			metric.Counter = &dto.Counter{Value: ptr.To(sample.Value)}
+		case dto.MetricType_GAUGE:
+			metric.Gauge = &dto.Gauge{Value: ptr.To(sample.Value)}
+		default:
+			metric.Untyped = &dto.Untyped{Value: ptr.To(sample.Value)}
+		}
+
+		if sample.PrintTimestamp {
+			metric.TimestampMs = ptr.To(sample.Timestamp)
+		}
+
+		family.Metric = append(family.Metric, metric)
 	}
-	if m.histogram != nil || m.fHistogram != nil {
-		output.WriteString(" {histogram}")
-	} else {
-		output.WriteString(fmt.Sprintf(" %g", m.value))
+}
+
+func (b *builder) buildHistograms() {
+	for _, hist := range b.histograms {
+		metricName := hist.Labels.Get(model.MetricNameLabel)
+		if metricName == "" {
+			continue
+		}
+
+		family := b.getOrCreateFamily(metricName)
+		family.Type = ptr.To(dto.MetricType_HISTOGRAM)
+
+		metric := &dto.Metric{}
+
+		for _, label := range hist.Labels {
+			if label.Name != model.MetricNameLabel {
+				metric.Label = append(metric.Label, &dto.LabelPair{
+					Name:  ptr.To(string(label.Name)),
+					Value: ptr.To(string(label.Value)),
+				})
+			}
+		}
+
+		metric.Histogram = &dto.Histogram{
+			SampleCount: ptr.To(hist.Histogram.Count),
+			SampleSum:   ptr.To(hist.Histogram.Sum),
+		}
+
+		family.Metric = append(family.Metric, metric)
 	}
-	if m.timestamp > 0 {
-		output.WriteString(fmt.Sprintf(" %d", m.timestamp))
+}
+
+func (b *builder) assignExemplars() {
+	for _, ex := range b.exemplars {
+		metricName := ex.Labels.Get(model.MetricNameLabel)
+		if metricName == "" {
+			continue
+		}
+
+		family := b.familyLookup[metricName]
+		if family == nil {
+			continue
+		}
+
+		for _, metric := range family.Metric {
+			if b.labelsMatch(ex.Labels, metric.Label) {
+				exemplar := &dto.Exemplar{
+					Value: ptr.To(ex.Exemplar.Value),
+				}
+
+				if ex.Exemplar.HasTs {
+					ts := ex.Exemplar.Ts / 1000
+					exemplar.Timestamp = timestamppb.New(time.Unix(ts, (ex.Exemplar.Ts%1000)*1e6))
+				}
+
+				for _, label := range ex.Exemplar.Labels {
+					exemplar.Label = append(exemplar.Label, &dto.LabelPair{
+						Name:  ptr.To(string(label.Name)),
+						Value: ptr.To(string(label.Value)),
+					})
+				}
+
+				if metric.Counter != nil {
+					metric.Counter.Exemplar = exemplar
+				} else if metric.Histogram != nil {
+					metric.Histogram.Bucket = append(metric.Histogram.Bucket, &dto.Bucket{
+						Exemplar: exemplar,
+					})
+				}
+				break
+			}
+		}
 	}
-	if m.exemplar != nil {
-		output.WriteString(fmt.Sprintf(" # {%s} %g", m.exemplar.Labels, m.exemplar.Value))
+}
+
+func (b *builder) getOrCreateFamily(metricName string) *dto.MetricFamily {
+	if family, exists := b.familyLookup[metricName]; exists {
+		return family
 	}
-	if m.isZeroSample && m.ct > 0 {
-		output.WriteString(fmt.Sprintf(" # CreatedTimestamp: %d", m.ct))
+
+	family := &dto.MetricFamily{
+		Name: ptr.To(metricName),
+		Type: ptr.To(dto.MetricType_UNTYPED),
 	}
-	output.WriteString("\n")
-	return output.String()
+
+	b.families = append(b.families, family)
+	b.familyLookup[metricName] = family
+	return family
 }
 
-func (a *echoAppender) SetOptions(opts *storage.AppendOptions) {
+func (b *builder) labelsMatch(seriesLabels labels.Labels, metricLabels []*dto.LabelPair) bool {
+	if len(seriesLabels) != len(metricLabels)+1 {
+		return false
+	}
+
+	for _, seriesLabel := range seriesLabels {
+		if seriesLabel.Name == model.MetricNameLabel {
+			continue
+		}
+
+		found := false
+		for _, metricLabel := range metricLabels {
+			if string(seriesLabel.Name) == metricLabel.GetName() && string(seriesLabel.Value) == metricLabel.GetValue() {
+				found = true
+				break
+			}
+		}
+		if !found {
+			return false
+		}
+	}
+
+	return true
+}
+
+func (b *builder) sortFamilies() {
+	sort.Slice(b.families, func(i, j int) bool {
+		return b.families[i].GetName() < b.families[j].GetName()
+	})
+
+	for _, family := range b.families {
+		sort.Slice(family.Metric, func(i, j int) bool {
+			return b.compareMetrics(family.Metric[i], family.Metric[j])
+		})
+	}
+}
+
+func (b *builder) compareMetrics(a, bb *dto.Metric) bool {
+	aLabels := make([]string, 0, len(a.Label))
+	bLabels := make([]string, 0, len(bb.Label))
+
+	for _, label := range a.Label {
+		aLabels = append(aLabels, label.GetName()+"="+label.GetValue())
+	}
+	for _, label := range bb.Label {
+		bLabels = append(bLabels, label.GetName()+"="+label.GetValue())
+	}
+
+	sort.Strings(aLabels)
+	sort.Strings(bLabels)
+
+	for i := 0; i < len(aLabels) && i < len(bLabels); i++ {
+		if aLabels[i] != bLabels[i] {
+			return aLabels[i] < bLabels[i]
+		}
+	}
+
+	return len(aLabels) < len(bLabels)
 }
diff --git a/internal/component/prometheus/echo/echo_test.go b/internal/component/prometheus/echo/echo_test.go
index 42998d6e408..2e93f567e83 100644
--- a/internal/component/prometheus/echo/echo_test.go
+++ b/internal/component/prometheus/echo/echo_test.go
@@ -141,3 +141,85 @@ func TestComponent_Update(t *testing.T) {
 	err = comp.Update(Arguments{})
 	require.NoError(t, err)
 }
+
+func TestAppender_WithExpfmtEncoding(t *testing.T) {
+	var loggedOutput string
+
+	logger := log.LoggerFunc(func(keyvals ...interface{}) error {
+		for i := 0; i < len(keyvals); i += 2 {
+			if keyvals[i] == "metrics" && i+1 < len(keyvals) {
+				loggedOutput = keyvals[i+1].(string)
+			}
+		}
+		return nil
+	})
+
+	comp, err := New(component.Options{
+		ID:     "test",
+		Logger: logger,
+	}, Arguments{})
+	require.NoError(t, err)
+
+	ctx := context.Background()
+	appender := comp.Appender(ctx)
+
+	lbls := labels.FromStrings("__name__", "test_metric", "job", "test_job", "instance", "localhost:8080")
+	_, err = appender.Append(0, lbls, time.Now().Unix(), 42.0)
+	require.NoError(t, err)
+
+	err = appender.Commit()
+	require.NoError(t, err)
+
+	require.NotEmpty(t, loggedOutput)
+	require.Contains(t, loggedOutput, "test_metric")
+	require.Contains(t, loggedOutput, "job=\"test_job\"")
+	require.Contains(t, loggedOutput, "instance=\"localhost:8080\"")
+	require.Contains(t, loggedOutput, "42")
+
+	require.NotContains(t, loggedOutput, "Prometheus metrics received by")
+	require.NotContains(t, loggedOutput, "Timestamp:")
+}
+
+func TestAppender_WithOpenMetricsFormat(t *testing.T) {
+	var loggedOutput string
+
+	logger := log.LoggerFunc(func(keyvals ...interface{}) error {
+		for i := 0; i < len(keyvals); i += 2 {
+			if keyvals[i] == "metrics" && i+1 < len(keyvals) {
+				loggedOutput = keyvals[i+1].(string)
+			}
+		}
+		return nil
+	})
+
+	args := Arguments{Format: "openmetrics"}
+
+	comp, err := New(component.Options{
+		ID:     "test",
+		Logger: logger,
+	}, args)
+	require.NoError(t, err)
+
+	ctx := context.Background()
+	appender := comp.Appender(ctx)
+
+	lbls := labels.FromStrings("__name__", "test_metric", "job", "test_job")
+	_, err = appender.Append(0, lbls, time.Now().Unix(), 42.0)
+	require.NoError(t, err)
+
+	err = appender.Commit()
+	require.NoError(t, err)
+
+	require.NotEmpty(t, loggedOutput)
+	require.Contains(t, loggedOutput, "test_metric")
+	require.Contains(t, loggedOutput, "job=\"test_job\"")
+
+	t.Logf("OpenMetrics output: %s", loggedOutput)
+}
+
+func TestArguments_Defaults(t *testing.T) {
+	args := Arguments{}
+	args.SetToDefault()
+
+	require.Equal(t, "text", args.Format)
+}

From df366c9c1b99bb2229f6b1b63f38e03c4508e4e2 Mon Sep 17 00:00:00 2001
From: iamrajiv <rajivperfect007@gmail.com>
Date: Wed, 8 Oct 2025 00:54:29 +0530
Subject: [PATCH 05/24] add doc

---
 .../components/prometheus/prometheus.echo.md  | 124 ++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 docs/sources/reference/components/prometheus/prometheus.echo.md

diff --git a/docs/sources/reference/components/prometheus/prometheus.echo.md b/docs/sources/reference/components/prometheus/prometheus.echo.md
new file mode 100644
index 00000000000..a65a63d201d
--- /dev/null
+++ b/docs/sources/reference/components/prometheus/prometheus.echo.md
@@ -0,0 +1,124 @@
+---
+canonical: https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.echo/
+aliases:
+  - ../prometheus.echo/ # /docs/alloy/latest/reference/components/prometheus.echo/
+description: Learn about prometheus.echo
+labels:
+  stage: general-availability
+  products:
+    - oss
+title: prometheus.echo
+---
+
+# `prometheus.echo`
+
+The `prometheus.echo` component receives Prometheus metrics and writes them to stdout in Prometheus exposition format.
+This component is useful for debugging and testing the flow of metrics through a pipeline, allowing you to see exactly what metrics are being received at a particular point in your configuration.
+
+## Usage
+
+```alloy
+prometheus.echo "<LABEL>" {
+}
+```
+
+## Arguments
+
+You can use the following arguments with `prometheus.echo`:
+
+| Name     | Type     | Description                                                      | Default | Required |
+| -------- | -------- | ---------------------------------------------------------------- | ------- | -------- |
+| `format` | `string` | The output format for metrics. Must be `text` or `openmetrics`. | `text`  | no       |
+
+The `format` argument controls how metrics are encoded when written to stdout:
+
+* `text` - Uses the Prometheus text exposition format (default).
+* `openmetrics` - Uses the OpenMetrics text format.
+
+## Blocks
+
+The `prometheus.echo` component doesn't support any blocks. You can configure this component with arguments.
+
+## Exported fields
+
+The following fields are exported and can be referenced by other components:
+
+| Name       | Type                    | Description                              |
+| ---------- | ----------------------- | ---------------------------------------- |
+| `receiver` | `prometheus.Appendable` | A value that other components can use to send metrics to. |
+
+## Component health
+
+`prometheus.echo` is only reported as unhealthy if given an invalid configuration.
+In those cases, exported fields retain their last healthy values.
+
+## Debug information
+
+`prometheus.echo` doesn't expose any component-specific debug information.
+
+## Debug metrics
+
+`prometheus.echo` doesn't expose any component-specific debug metrics.
+
+## Example
+
+This example creates a metrics generation and inspection pipeline:
+
+```alloy
+prometheus.exporter.unix "default" {
+}
+
+prometheus.scrape "demo" {
+  targets    = prometheus.exporter.unix.default.targets
+  forward_to = [prometheus.echo.debug.receiver]
+}
+
+prometheus.echo "debug" {
+  format = "text"
+}
+```
+
+In this example:
+
+1. The `prometheus.exporter.unix` component exposes system metrics.
+2. The `prometheus.scrape` component scrapes those metrics.
+3. The `prometheus.echo` component receives the scraped metrics and writes them to stdout in Prometheus text format.
+
+When you run this configuration, you'll see the metrics being written to Alloy's stdout, which is useful for:
+
+* Debugging metric collection issues
+* Verifying metric labels and values
+* Testing metric transformations
+* Understanding the structure of metrics in your pipeline
+
+### Example with OpenMetrics format
+
+```alloy
+prometheus.scrape "demo" {
+  targets = [
+    {"__address__" = "localhost:9090"},
+  ]
+  forward_to = [prometheus.echo.debug.receiver]
+}
+
+prometheus.echo "debug" {
+  format = "openmetrics"
+}
+```
+
+This example outputs metrics using the OpenMetrics format instead of the traditional Prometheus text format.
+
+<!-- START GENERATED COMPATIBLE COMPONENTS -->
+
+## Compatible components
+
+`prometheus.echo` can accept arguments from the following components:
+
+- Components that export [Targets](../../../compatibility/#targets-exporters)
+
+
+## Has exports
+
+- [Prometheus `MetricsReceiver`](../../../compatibility/#prometheus-metricsreceiver-consumers)
+
+<!-- END GENERATED COMPATIBLE COMPONENTS -->

From ad2d3a74868105280f273d48306bcf591f6d1598 Mon Sep 17 00:00:00 2001
From: Rajiv Singh <rajivperfect007@gmail.com>
Date: Thu, 9 Oct 2025 03:04:25 +0530
Subject: [PATCH 06/24] Update
 docs/sources/reference/components/prometheus/prometheus.echo.md

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
---
 docs/sources/reference/components/prometheus/prometheus.echo.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/sources/reference/components/prometheus/prometheus.echo.md b/docs/sources/reference/components/prometheus/prometheus.echo.md
index a65a63d201d..4ba6d010831 100644
--- a/docs/sources/reference/components/prometheus/prometheus.echo.md
+++ b/docs/sources/reference/components/prometheus/prometheus.echo.md
@@ -1,7 +1,5 @@
 ---
 canonical: https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.echo/
-aliases:
-  - ../prometheus.echo/ # /docs/alloy/latest/reference/components/prometheus.echo/
 description: Learn about prometheus.echo
 labels:
   stage: general-availability

From 1622764a6f608b3196b4d40211a2bcb9cad1ccb5 Mon Sep 17 00:00:00 2001
From: Rajiv Singh <rajivperfect007@gmail.com>
Date: Thu, 9 Oct 2025 03:04:33 +0530
Subject: [PATCH 07/24] Update
 docs/sources/reference/components/prometheus/prometheus.echo.md

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
---
 .../reference/components/prometheus/prometheus.echo.md        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/sources/reference/components/prometheus/prometheus.echo.md b/docs/sources/reference/components/prometheus/prometheus.echo.md
index 4ba6d010831..e61e571e1c4 100644
--- a/docs/sources/reference/components/prometheus/prometheus.echo.md
+++ b/docs/sources/reference/components/prometheus/prometheus.echo.md
@@ -24,8 +24,8 @@ prometheus.echo "<LABEL>" {
 
 You can use the following arguments with `prometheus.echo`:
 
-| Name     | Type     | Description                                                      | Default | Required |
-| -------- | -------- | ---------------------------------------------------------------- | ------- | -------- |
+| Name     | Type     | Description                                                     | Default | Required |
+| -------- | -------- | --------------------------------------------------------------- | ------- | -------- |
 | `format` | `string` | The output format for metrics. Must be `text` or `openmetrics`. | `text`  | no       |
 
 The `format` argument controls how metrics are encoded when written to stdout:

From 9d0b21e048faed1e049de7701e598f7d8000a2f1 Mon Sep 17 00:00:00 2001
From: Rajiv Singh <rajivperfect007@gmail.com>
Date: Thu, 9 Oct 2025 03:04:41 +0530
Subject: [PATCH 08/24] Update
 docs/sources/reference/components/prometheus/prometheus.echo.md

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
---
 .../reference/components/prometheus/prometheus.echo.md        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/sources/reference/components/prometheus/prometheus.echo.md b/docs/sources/reference/components/prometheus/prometheus.echo.md
index e61e571e1c4..700171e81b3 100644
--- a/docs/sources/reference/components/prometheus/prometheus.echo.md
+++ b/docs/sources/reference/components/prometheus/prometheus.echo.md
@@ -79,8 +79,8 @@ prometheus.echo "debug" {
 In this example:
 
 1. The `prometheus.exporter.unix` component exposes system metrics.
-2. The `prometheus.scrape` component scrapes those metrics.
-3. The `prometheus.echo` component receives the scraped metrics and writes them to stdout in Prometheus text format.
+1. The `prometheus.scrape` component scrapes those metrics.
+1. The `prometheus.echo` component receives the scraped metrics and writes them to stdout in Prometheus text format.
 
 When you run this configuration, you'll see the metrics being written to Alloy's stdout, which is useful for:
 

From 9a983e71c19fc5f66965c3be42c933de305a624a Mon Sep 17 00:00:00 2001
From: Rajiv Singh <rajivperfect007@gmail.com>
Date: Thu, 9 Oct 2025 03:04:56 +0530
Subject: [PATCH 09/24] Update
 docs/sources/reference/components/prometheus/prometheus.echo.md

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
---
 docs/sources/reference/components/prometheus/prometheus.echo.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/reference/components/prometheus/prometheus.echo.md b/docs/sources/reference/components/prometheus/prometheus.echo.md
index 700171e81b3..35c14d4703b 100644
--- a/docs/sources/reference/components/prometheus/prometheus.echo.md
+++ b/docs/sources/reference/components/prometheus/prometheus.echo.md
@@ -82,7 +82,7 @@ In this example:
 1. The `prometheus.scrape` component scrapes those metrics.
 1. The `prometheus.echo` component receives the scraped metrics and writes them to stdout in Prometheus text format.
 
-When you run this configuration, you'll see the metrics being written to Alloy's stdout, which is useful for:
+When you run this configuration, you'll see the metrics being written to stdout, which is useful to:
 
 * Debugging metric collection issues
 * Verifying metric labels and values

From db423cbe90c42202bce47b18927a06ca8995b3ba Mon Sep 17 00:00:00 2001
From: Rajiv Singh <rajivperfect007@gmail.com>
Date: Thu, 9 Oct 2025 03:05:03 +0530
Subject: [PATCH 10/24] Update
 docs/sources/reference/components/prometheus/prometheus.echo.md

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
---
 docs/sources/reference/components/prometheus/prometheus.echo.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/sources/reference/components/prometheus/prometheus.echo.md b/docs/sources/reference/components/prometheus/prometheus.echo.md
index 35c14d4703b..583a77dfa74 100644
--- a/docs/sources/reference/components/prometheus/prometheus.echo.md
+++ b/docs/sources/reference/components/prometheus/prometheus.echo.md
@@ -114,7 +114,6 @@ This example outputs metrics using the OpenMetrics format instead of the traditi
 
 - Components that export [Targets](../../../compatibility/#targets-exporters)
 
-
 ## Has exports
 
 - [Prometheus `MetricsReceiver`](../../../compatibility/#prometheus-metricsreceiver-consumers)

From 5e42d55cdfe714487526f94d2c33a9e84d90706e Mon Sep 17 00:00:00 2001
From: Rajiv Singh <rajivperfect007@gmail.com>
Date: Thu, 9 Oct 2025 03:05:12 +0530
Subject: [PATCH 11/24] Update
 docs/sources/reference/components/prometheus/prometheus.echo.md

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
---
 .../reference/components/prometheus/prometheus.echo.md    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/sources/reference/components/prometheus/prometheus.echo.md b/docs/sources/reference/components/prometheus/prometheus.echo.md
index 583a77dfa74..31fa21c739d 100644
--- a/docs/sources/reference/components/prometheus/prometheus.echo.md
+++ b/docs/sources/reference/components/prometheus/prometheus.echo.md
@@ -84,10 +84,10 @@ In this example:
 
 When you run this configuration, you'll see the metrics being written to stdout, which is useful to:
 
-* Debugging metric collection issues
-* Verifying metric labels and values
-* Testing metric transformations
-* Understanding the structure of metrics in your pipeline
+* Debug metric collection issues
+* Verify metric labels and values
+* Test metric transformations
+* Understand the structure of metrics in your pipeline
 
 ### Example with OpenMetrics format
 

From a3d03887895312a2de5373a419e1b332e3a56e65 Mon Sep 17 00:00:00 2001
From: Rajiv Singh <rajivperfect007@gmail.com>
Date: Thu, 9 Oct 2025 03:05:25 +0530
Subject: [PATCH 12/24] Update
 docs/sources/reference/components/prometheus/prometheus.echo.md

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
---
 .../reference/components/prometheus/prometheus.echo.md      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/sources/reference/components/prometheus/prometheus.echo.md b/docs/sources/reference/components/prometheus/prometheus.echo.md
index 31fa21c739d..15fdeeccf3c 100644
--- a/docs/sources/reference/components/prometheus/prometheus.echo.md
+++ b/docs/sources/reference/components/prometheus/prometheus.echo.md
@@ -41,9 +41,9 @@ The `prometheus.echo` component doesn't support any blocks. You can configure th
 
 The following fields are exported and can be referenced by other components:
 
-| Name       | Type                    | Description                              |
-| ---------- | ----------------------- | ---------------------------------------- |
-| `receiver` | `prometheus.Appendable` | A value that other components can use to send metrics to. |
+| Name       | Type              | Description                                               |
+| ---------- | ----------------- | --------------------------------------------------------- |
+| `receiver` | `MetricsReceiver` | A value that other components can use to send metrics to. |
 
 ## Component health
 

From f1b5fed0c823eb4696b80d639984d8b8c3f2c9d8 Mon Sep 17 00:00:00 2001
From: Sam DeHaan <sam.dehaan@grafana.com>
Date: Mon, 8 Dec 2025 13:48:50 -0500
Subject: [PATCH 13/24] Fix build issues

---
 internal/component/prometheus/echo/echo.go | 32 ++++++++++------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/internal/component/prometheus/echo/echo.go b/internal/component/prometheus/echo/echo.go
index ce7aa07f456..3edddbb7230 100644
--- a/internal/component/prometheus/echo/echo.go
+++ b/internal/component/prometheus/echo/echo.go
@@ -3,6 +3,7 @@ package echo
 import (
 	"bytes"
 	"context"
+	"errors"
 	"sort"
 	"sync"
 	"time"
@@ -354,14 +355,14 @@ func (b *builder) buildMetricsFromSamples() {
 		family := b.getOrCreateFamily(metricName)
 		metric := &dto.Metric{}
 
-		for _, label := range sample.Labels {
+		sample.Labels.Range(func(label labels.Label) {
 			if label.Name != model.MetricNameLabel {
 				metric.Label = append(metric.Label, &dto.LabelPair{
 					Name:  ptr.To(string(label.Name)),
 					Value: ptr.To(string(label.Value)),
 				})
 			}
-		}
+		})
 
 		switch family.GetType() {
 		case dto.MetricType_COUNTER:
@@ -392,14 +393,14 @@ func (b *builder) buildHistograms() {
 
 		metric := &dto.Metric{}
 
-		for _, label := range hist.Labels {
+		hist.Labels.Range(func(label labels.Label) {
 			if label.Name != model.MetricNameLabel {
 				metric.Label = append(metric.Label, &dto.LabelPair{
 					Name:  ptr.To(string(label.Name)),
 					Value: ptr.To(string(label.Value)),
 				})
 			}
-		}
+		})
 
 		metric.Histogram = &dto.Histogram{
 			SampleCount: ptr.To(hist.Histogram.Count),
@@ -433,12 +434,12 @@ func (b *builder) assignExemplars() {
 					exemplar.Timestamp = timestamppb.New(time.Unix(ts, (ex.Exemplar.Ts%1000)*1e6))
 				}
 
-				for _, label := range ex.Exemplar.Labels {
+				ex.Exemplar.Labels.Range(func(label labels.Label) {
 					exemplar.Label = append(exemplar.Label, &dto.LabelPair{
 						Name:  ptr.To(string(label.Name)),
 						Value: ptr.To(string(label.Value)),
 					})
-				}
+				})
 
 				if metric.Counter != nil {
 					metric.Counter.Exemplar = exemplar
@@ -469,28 +470,25 @@ func (b *builder) getOrCreateFamily(metricName string) *dto.MetricFamily {
 }
 
 func (b *builder) labelsMatch(seriesLabels labels.Labels, metricLabels []*dto.LabelPair) bool {
-	if len(seriesLabels) != len(metricLabels)+1 {
+	if seriesLabels.Len() != len(metricLabels)+1 {
 		return false
 	}
 
-	for _, seriesLabel := range seriesLabels {
+	foundErr := seriesLabels.Validate(func(seriesLabel labels.Label) error {
 		if seriesLabel.Name == model.MetricNameLabel {
-			continue
+			return nil
 		}
 
-		found := false
 		for _, metricLabel := range metricLabels {
 			if string(seriesLabel.Name) == metricLabel.GetName() && string(seriesLabel.Value) == metricLabel.GetValue() {
-				found = true
-				break
+				return nil
 			}
 		}
-		if !found {
-			return false
-		}
-	}
 
-	return true
+		return errors.New("label not found")
+	})
+
+	return foundErr == nil
 }
 
 func (b *builder) sortFamilies() {

From 53d52d351277be690f6ed40e82ff3b02d9010ca1 Mon Sep 17 00:00:00 2001
From: Sam DeHaan <sam.dehaan@grafana.com>
Date: Mon, 8 Dec 2025 23:53:55 -0500
Subject: [PATCH 14/24] Appease linter and regenerate things

---
 .github/ISSUE_TEMPLATE/blank.yaml                  |  1 +
 .github/ISSUE_TEMPLATE/bug_report.yaml             |  1 +
 .github/ISSUE_TEMPLATE/docs.yaml                   |  1 +
 .github/ISSUE_TEMPLATE/feature_request.yaml        |  1 +
 .github/ISSUE_TEMPLATE/proposal.yaml               |  1 +
 docs/sources/reference/compatibility/_index.md     |  1 +
 .../components/prometheus/prometheus.echo.md       | 11 ++++++-----
 internal/component/all/all.go                      |  2 +-
 internal/component/prometheus/echo/echo.go         | 14 +++++++-------
 9 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/blank.yaml b/.github/ISSUE_TEMPLATE/blank.yaml
index 9a3b2920320..003463ae736 100644
--- a/.github/ISSUE_TEMPLATE/blank.yaml
+++ b/.github/ISSUE_TEMPLATE/blank.yaml
@@ -144,6 +144,7 @@ body:
       - otelcol.receiver.vcenter
       - otelcol.receiver.zipkin
       - otelcol.storage.file
+      - prometheus.echo
       - prometheus.enrich
       - prometheus.exporter.apache
       - prometheus.exporter.azure
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index a91fc4e793a..407a881000a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -144,6 +144,7 @@ body:
       - otelcol.receiver.vcenter
       - otelcol.receiver.zipkin
       - otelcol.storage.file
+      - prometheus.echo
       - prometheus.enrich
       - prometheus.exporter.apache
       - prometheus.exporter.azure
diff --git a/.github/ISSUE_TEMPLATE/docs.yaml b/.github/ISSUE_TEMPLATE/docs.yaml
index 5b927b7ab5d..979dd4fb0c2 100644
--- a/.github/ISSUE_TEMPLATE/docs.yaml
+++ b/.github/ISSUE_TEMPLATE/docs.yaml
@@ -147,6 +147,7 @@ body:
       - otelcol.receiver.vcenter
       - otelcol.receiver.zipkin
       - otelcol.storage.file
+      - prometheus.echo
       - prometheus.enrich
       - prometheus.exporter.apache
       - prometheus.exporter.azure
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index ab8c4e54da5..aa3361d08ae 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -144,6 +144,7 @@ body:
       - otelcol.receiver.vcenter
       - otelcol.receiver.zipkin
       - otelcol.storage.file
+      - prometheus.echo
       - prometheus.enrich
       - prometheus.exporter.apache
       - prometheus.exporter.azure
diff --git a/.github/ISSUE_TEMPLATE/proposal.yaml b/.github/ISSUE_TEMPLATE/proposal.yaml
index 91a85c121a9..2c953a2550d 100644
--- a/.github/ISSUE_TEMPLATE/proposal.yaml
+++ b/.github/ISSUE_TEMPLATE/proposal.yaml
@@ -144,6 +144,7 @@ body:
       - otelcol.receiver.vcenter
       - otelcol.receiver.zipkin
       - otelcol.storage.file
+      - prometheus.echo
       - prometheus.enrich
       - prometheus.exporter.apache
       - prometheus.exporter.azure
diff --git a/docs/sources/reference/compatibility/_index.md b/docs/sources/reference/compatibility/_index.md
index 55ae1649ab0..dc2ecf0713c 100644
--- a/docs/sources/reference/compatibility/_index.md
+++ b/docs/sources/reference/compatibility/_index.md
@@ -187,6 +187,7 @@ The following components, grouped by namespace, _export_ Prometheus `MetricsRece
 {{< /collapse >}}
 
 {{< collapse title="prometheus" >}}
+- [prometheus.echo](../components/prometheus/prometheus.echo)
 - [prometheus.enrich](../components/prometheus/prometheus.enrich)
 - [prometheus.relabel](../components/prometheus/prometheus.relabel)
 - [prometheus.remote_write](../components/prometheus/prometheus.remote_write)
diff --git a/docs/sources/reference/components/prometheus/prometheus.echo.md b/docs/sources/reference/components/prometheus/prometheus.echo.md
index 15fdeeccf3c..f866f99e178 100644
--- a/docs/sources/reference/components/prometheus/prometheus.echo.md
+++ b/docs/sources/reference/components/prometheus/prometheus.echo.md
@@ -110,12 +110,13 @@ This example outputs metrics using the OpenMetrics format instead of the traditi
 
 ## Compatible components
 
-`prometheus.echo` can accept arguments from the following components:
+`prometheus.echo` has exports that can be consumed by the following components:
 
-- Components that export [Targets](../../../compatibility/#targets-exporters)
+- Components that consume [Prometheus `MetricsReceiver`](../../../compatibility/#prometheus-metricsreceiver-consumers)
 
-## Has exports
-
-- [Prometheus `MetricsReceiver`](../../../compatibility/#prometheus-metricsreceiver-consumers)
+{{< admonition type="note" >}}
+Connecting some components may not be sensible or components may require further configuration to make the connection work correctly.
+Refer to the linked documentation for more details.
+{{< /admonition >}}
 
 <!-- END GENERATED COMPATIBLE COMPONENTS -->
diff --git a/internal/component/all/all.go b/internal/component/all/all.go
index 5cb6351cb08..8ab87472d77 100644
--- a/internal/component/all/all.go
+++ b/internal/component/all/all.go
@@ -127,6 +127,7 @@ import (
 	_ "github.com/grafana/alloy/internal/component/otelcol/receiver/vcenter"                 // Import otelcol.receiver.vcenter
 	_ "github.com/grafana/alloy/internal/component/otelcol/receiver/zipkin"                  // Import otelcol.receiver.zipkin
 	_ "github.com/grafana/alloy/internal/component/otelcol/storage/file"                     // Import otelcol.storage.file
+	_ "github.com/grafana/alloy/internal/component/prometheus/echo"                          // Import prometheus.echo
 	_ "github.com/grafana/alloy/internal/component/prometheus/enrich"                        // Import prometheus.enrich
 	_ "github.com/grafana/alloy/internal/component/prometheus/exporter/apache"               // Import prometheus.exporter.apache
 	_ "github.com/grafana/alloy/internal/component/prometheus/exporter/azure"                // Import prometheus.exporter.azure
@@ -161,7 +162,6 @@ import (
 	_ "github.com/grafana/alloy/internal/component/prometheus/operator/scrapeconfigs"        // Import prometheus.operator.scrapeconfigs
 	_ "github.com/grafana/alloy/internal/component/prometheus/operator/servicemonitors"      // Import prometheus.operator.servicemonitors
 	_ "github.com/grafana/alloy/internal/component/prometheus/receive_http"                  // Import prometheus.receive_http
-	_ "github.com/grafana/alloy/internal/component/prometheus/echo"                          // Import prometheus.echo
 	_ "github.com/grafana/alloy/internal/component/prometheus/relabel"                       // Import prometheus.relabel
 	_ "github.com/grafana/alloy/internal/component/prometheus/remotewrite"                   // Import prometheus.remote_write
 	_ "github.com/grafana/alloy/internal/component/prometheus/scrape"                        // Import prometheus.scrape
diff --git a/internal/component/prometheus/echo/echo.go b/internal/component/prometheus/echo/echo.go
index 3edddbb7230..e65e582057b 100644
--- a/internal/component/prometheus/echo/echo.go
+++ b/internal/component/prometheus/echo/echo.go
@@ -358,8 +358,8 @@ func (b *builder) buildMetricsFromSamples() {
 		sample.Labels.Range(func(label labels.Label) {
 			if label.Name != model.MetricNameLabel {
 				metric.Label = append(metric.Label, &dto.LabelPair{
-					Name:  ptr.To(string(label.Name)),
-					Value: ptr.To(string(label.Value)),
+					Name:  ptr.To(label.Name),
+					Value: ptr.To(label.Value),
 				})
 			}
 		})
@@ -396,8 +396,8 @@ func (b *builder) buildHistograms() {
 		hist.Labels.Range(func(label labels.Label) {
 			if label.Name != model.MetricNameLabel {
 				metric.Label = append(metric.Label, &dto.LabelPair{
-					Name:  ptr.To(string(label.Name)),
-					Value: ptr.To(string(label.Value)),
+					Name:  ptr.To(label.Name),
+					Value: ptr.To(label.Value),
 				})
 			}
 		})
@@ -436,8 +436,8 @@ func (b *builder) assignExemplars() {
 
 				ex.Exemplar.Labels.Range(func(label labels.Label) {
 					exemplar.Label = append(exemplar.Label, &dto.LabelPair{
-						Name:  ptr.To(string(label.Name)),
-						Value: ptr.To(string(label.Value)),
+						Name:  ptr.To(label.Name),
+						Value: ptr.To(label.Value),
 					})
 				})
 
@@ -480,7 +480,7 @@ func (b *builder) labelsMatch(seriesLabels labels.Labels, metricLabels []*dto.La
 		}
 
 		for _, metricLabel := range metricLabels {
-			if string(seriesLabel.Name) == metricLabel.GetName() && string(seriesLabel.Value) == metricLabel.GetValue() {
+			if seriesLabel.Name == metricLabel.GetName() && seriesLabel.Value == metricLabel.GetValue() {
 				return nil
 			}
 		}

From 42a04f48a01bc3965b8c273cdcb23c401f684f1a Mon Sep 17 00:00:00 2001
From: Karl Persson <23356117+kalleep@users.noreply.github.com>
Date: Tue, 9 Dec 2025 09:20:23 +0100
Subject: [PATCH 15/24] update to go v1.25.5 (#5027)

---
 .github/workflows/build.yml                                | 6 +++---
 .github/workflows/publish-alloy-linux.yml                  | 2 +-
 .github/workflows/publish-alloy-release.yml                | 6 +++---
 .github/workflows/test_full.yml                            | 2 +-
 .github/workflows/test_linux_system_packages.yml           | 2 +-
 Dockerfile                                                 | 4 ++--
 docs/Makefile                                              | 4 ++--
 go.mod                                                     | 2 +-
 internal/cmd/integration-tests/configs/kafka/Dockerfile    | 2 +-
 internal/cmd/integration-tests/configs/otel-gen/Dockerfile | 2 +-
 internal/cmd/integration-tests/configs/prom-gen/Dockerfile | 2 +-
 syntax/go.mod                                              | 2 +-
 tools/make/build-container.mk                              | 2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 28569782eca..3a99d312d22 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
   build_linux:
     name: Build on Linux
     runs-on: github-hosted-ubuntu-x64-large
-    container: grafana/alloy-build-image:v0.1.22@sha256:a797a8e2efdf6e2c8280e91a50dc79418f8efb56d4a591f04c8f2435b78154ab
+    container: grafana/alloy-build-image:v0.1.23@sha256:89dad4df5afe167898860bfa06c2eea290f4da0c2cff668fdf43299ddca867dc
     strategy:
       matrix:
         os: [linux]
@@ -42,7 +42,7 @@ jobs:
   build_linux_boringcrypto:
     name: Build on Linux (boringcrypto)
     runs-on: github-hosted-ubuntu-x64-large
-    container: grafana/alloy-build-image:v0.1.22-boringcrypto@sha256:b609db5a06d6cd768514d1daac6bb81bed9f7fed4336f48cfb5410b8a3d8d65d
+    container: grafana/alloy-build-image:v0.1.23-boringcrypto@sha256:ea758e67ff9feff60a3ad3c7ac803a2b0061abbbe3061a765712283035f8d2d3
     strategy:
       matrix:
         os: [linux]
@@ -123,7 +123,7 @@ jobs:
   build_freebsd:
     name: Build on FreeBSD (AMD64)
     runs-on: github-hosted-ubuntu-x64-large
-    container: grafana/alloy-build-image:v0.1.22@sha256:a797a8e2efdf6e2c8280e91a50dc79418f8efb56d4a591f04c8f2435b78154ab
+    container: grafana/alloy-build-image:v0.1.23@sha256:89dad4df5afe167898860bfa06c2eea290f4da0c2cff668fdf43299ddca867dc
     steps:
     - name: Checkout code
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
diff --git a/.github/workflows/publish-alloy-linux.yml b/.github/workflows/publish-alloy-linux.yml
index e2263bc0a43..2fcd1be1403 100644
--- a/.github/workflows/publish-alloy-linux.yml
+++ b/.github/workflows/publish-alloy-linux.yml
@@ -26,7 +26,7 @@ permissions:
 jobs:
   publish_linux_container:
     name: Publish Alloy Linux container
-    container: grafana/alloy-build-image:v0.1.22@sha256:a797a8e2efdf6e2c8280e91a50dc79418f8efb56d4a591f04c8f2435b78154ab
+    container: grafana/alloy-build-image:v0.1.23@sha256:89dad4df5afe167898860bfa06c2eea290f4da0c2cff668fdf43299ddca867dc
     runs-on:
       labels: github-hosted-ubuntu-x64-large
     permissions:
diff --git a/.github/workflows/publish-alloy-release.yml b/.github/workflows/publish-alloy-release.yml
index bca3fbeba86..f3bbe2dfb76 100644
--- a/.github/workflows/publish-alloy-release.yml
+++ b/.github/workflows/publish-alloy-release.yml
@@ -34,7 +34,7 @@ jobs:
 
   build_alloy:
     name: Build Alloy
-    container: grafana/alloy-build-image:v0.1.22@sha256:a797a8e2efdf6e2c8280e91a50dc79418f8efb56d4a591f04c8f2435b78154ab
+    container: grafana/alloy-build-image:v0.1.23@sha256:89dad4df5afe167898860bfa06c2eea290f4da0c2cff668fdf43299ddca867dc
     runs-on:
       labels: github-hosted-ubuntu-x64-large
     needs:
@@ -118,7 +118,7 @@ jobs:
 
   build_alloy_windows_installer:
     name: Build Alloy Windows installer with signed executables
-    container: grafana/alloy-build-image:v0.1.22@sha256:a797a8e2efdf6e2c8280e91a50dc79418f8efb56d4a591f04c8f2435b78154ab
+    container: grafana/alloy-build-image:v0.1.23@sha256:89dad4df5afe167898860bfa06c2eea290f4da0c2cff668fdf43299ddca867dc
     runs-on:
       labels: github-hosted-ubuntu-x64-large
     needs:
@@ -196,7 +196,7 @@ jobs:
   publish_github_release:
     name: Publish GitHub release
     if: github.ref_type == 'tag'
-    container: grafana/alloy-build-image:v0.1.22@sha256:a797a8e2efdf6e2c8280e91a50dc79418f8efb56d4a591f04c8f2435b78154ab
+    container: grafana/alloy-build-image:v0.1.23@sha256:89dad4df5afe167898860bfa06c2eea290f4da0c2cff668fdf43299ddca867dc
     runs-on:
       labels: github-hosted-ubuntu-x64-large
     needs:
diff --git a/.github/workflows/test_full.yml b/.github/workflows/test_full.yml
index c278fc9ea61..f9e04af117f 100644
--- a/.github/workflows/test_full.yml
+++ b/.github/workflows/test_full.yml
@@ -15,7 +15,7 @@ jobs:
     name: Test (Full)
     runs-on: ubuntu-latest-8-cores
     container:
-      image: grafana/alloy-build-image:v0.1.22@sha256:a797a8e2efdf6e2c8280e91a50dc79418f8efb56d4a591f04c8f2435b78154ab
+      image: grafana/alloy-build-image:v0.1.23@sha256:89dad4df5afe167898860bfa06c2eea290f4da0c2cff668fdf43299ddca867dc
       volumes:
         - /var/run/docker.sock
     steps:
diff --git a/.github/workflows/test_linux_system_packages.yml b/.github/workflows/test_linux_system_packages.yml
index 64969a16489..fc21a017e53 100644
--- a/.github/workflows/test_linux_system_packages.yml
+++ b/.github/workflows/test_linux_system_packages.yml
@@ -17,7 +17,7 @@ jobs:
     name: Test Linux system packages
     runs-on: ubuntu-latest
     container:
-      image: grafana/alloy-build-image:v0.1.22@sha256:a797a8e2efdf6e2c8280e91a50dc79418f8efb56d4a591f04c8f2435b78154ab
+      image: grafana/alloy-build-image:v0.1.23@sha256:89dad4df5afe167898860bfa06c2eea290f4da0c2cff668fdf43299ddca867dc
       volumes:
         - /var/run/docker.sock
     steps:
diff --git a/Dockerfile b/Dockerfile
index c947f5dd83b..942853e141c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@
 # default when running `docker buildx build` or when DOCKER_BUILDKIT=1 is set
 # in environment variables.
 
-FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.22 AS ui-build
+FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.23 AS ui-build
 ARG BUILDPLATFORM
 COPY ./internal/web/ui /ui
 WORKDIR /ui
@@ -12,7 +12,7 @@ RUN --mount=type=cache,target=/ui/node_modules,sharing=locked \
     npm install                                               \
     && npm run build
 
-FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.22 AS build
+FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.23 AS build
 
 ARG BUILDPLATFORM
 ARG TARGETPLATFORM
diff --git a/docs/Makefile b/docs/Makefile
index 3b5db016d0e..0b3ce2630eb 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -15,7 +15,7 @@ docs: check-cloudwatch-integration
 endif
 
 check-cloudwatch-integration:
-	$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.25.1-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md
+	$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.25.5-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md
 
 generate-cloudwatch-integration:
-	$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.25.1-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate
+	$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.25.5-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate
diff --git a/go.mod b/go.mod
index 8fe073a8d0e..f8f3ab70e35 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/alloy
 
-go 1.25.1
+go 1.25.5
 
 require (
 	cloud.google.com/go/pubsub v1.50.1
diff --git a/internal/cmd/integration-tests/configs/kafka/Dockerfile b/internal/cmd/integration-tests/configs/kafka/Dockerfile
index 5845b01f5ba..ce2b6766cb4 100644
--- a/internal/cmd/integration-tests/configs/kafka/Dockerfile
+++ b/internal/cmd/integration-tests/configs/kafka/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.25.1 as build
+FROM golang:1.25.5 as build
 WORKDIR /app/
 COPY go.mod go.sum ./
 COPY syntax/go.mod syntax/go.sum ./syntax/
diff --git a/internal/cmd/integration-tests/configs/otel-gen/Dockerfile b/internal/cmd/integration-tests/configs/otel-gen/Dockerfile
index f4a9d62beab..9ef3876d34b 100644
--- a/internal/cmd/integration-tests/configs/otel-gen/Dockerfile
+++ b/internal/cmd/integration-tests/configs/otel-gen/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.25.1 as build
+FROM golang:1.25.5 as build
 WORKDIR /app/
 COPY go.mod go.sum ./
 COPY syntax/go.mod syntax/go.sum ./syntax/
diff --git a/internal/cmd/integration-tests/configs/prom-gen/Dockerfile b/internal/cmd/integration-tests/configs/prom-gen/Dockerfile
index b1ae5cbdec8..358ed6cab39 100644
--- a/internal/cmd/integration-tests/configs/prom-gen/Dockerfile
+++ b/internal/cmd/integration-tests/configs/prom-gen/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.25.1 as build
+FROM golang:1.25.5 as build
 WORKDIR /app/
 COPY go.mod go.sum ./
 COPY syntax/go.mod syntax/go.sum ./syntax/
diff --git a/syntax/go.mod b/syntax/go.mod
index b8b8370c32c..36d2bb02e7c 100644
--- a/syntax/go.mod
+++ b/syntax/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/alloy/syntax
 
-go 1.25.1
+go 1.25.5
 
 require (
 	github.com/blang/semver/v4 v4.0.0
diff --git a/tools/make/build-container.mk b/tools/make/build-container.mk
index 3c587f5b1d3..70f049753a9 100644
--- a/tools/make/build-container.mk
+++ b/tools/make/build-container.mk
@@ -34,7 +34,7 @@
 # variable names should be passed through to the container.
 
 USE_CONTAINER       ?= 0
-BUILD_IMAGE_VERSION ?= v0.1.22
+BUILD_IMAGE_VERSION ?= v0.1.23
 BUILD_IMAGE         ?= grafana/alloy-build-image:$(BUILD_IMAGE_VERSION)
 DOCKER_OPTS         ?= -it
 

From f86c8b2baafdc4853eaaab7265cd27a5eed1f1ba Mon Sep 17 00:00:00 2001
From: Bejal Lewis <164711649+blewis12@users.noreply.github.com>
Date: Tue, 9 Dec 2025 14:16:28 +0100
Subject: [PATCH 16/24] Introduce Shared YAML Dependency File To Manage Replace
 Directives (#4862)

* Introduce new dependency management tool

* Move syntax replace to top of go.mod to avoid confusion

* Apply replaces from tool

* Introduce PR workflow to check modules are synced

* Add E2E test

* Address some PR comments

Co-authored-by: Piotr <17101802+thampiotr@users.noreply.github.com>

* Refactor to use a centralised cobra CLI, called by generate.go

* Refactor to not generate .txt files and pass replace text in memory

* Refactor E2E tests to use explicit test data

* Update tools/generate-module-dependencies/replaces-mod.tpl

Co-authored-by: Kyle Eckhart <kgeckhart@users.noreply.github.com>

* Return errors in FileHelper instead of using Fatalf

* Address PR comments

* go mod/mod changes

* Reference actual calculated file to dependency yaml file in error logs

* Group the generate-module-dependencies and Check for go.mod changes properly in workflow

and use git diff instead so we can ignore whitespace changes

* nit: a few improvements for clarity

---------

Co-authored-by: Piotr <17101802+thampiotr@users.noreply.github.com>
Co-authored-by: Kyle Eckhart <kgeckhart@users.noreply.github.com>
---
 .../check-sync-module-dependencies.yml        |  46 ++++++
 Makefile                                      |   8 ++
 dependency-replacements.yaml                  | 131 ++++++++++++++++++
 dirwatch-test/.remote_config_hash             |   1 +
 dirwatch-test/config.yaml                     |  32 +++++
 go.mod                                        | 115 +++++++--------
 go.sum                                        |   4 +-
 tools/generate-module-dependencies/README.md  |  46 ++++++
 .../cmd/sync-mod.go                           |  52 +++++++
 .../generate-module-dependencies/e2e_test.go  |  79 +++++++++++
 .../generate-module-dependencies/generate.go  |   3 +
 tools/generate-module-dependencies/go.mod     |  12 ++
 tools/generate-module-dependencies/go.sum     |  13 ++
 .../internal/apply-replaces.go                |  96 +++++++++++++
 .../internal/generate-replaces.go             |  73 ++++++++++
 .../internal/helpers/files.go                 |  86 ++++++++++++
 .../internal/tidy-modules.go                  |  36 +++++
 .../internal/types/types.go                   |  52 +++++++
 tools/generate-module-dependencies/main.go    |   7 +
 .../replaces-mod.tpl                          |   9 ++
 .../dependency-replacements-test.yaml         |  14 ++
 .../testdata/basic-mod/go.mod                 |   4 +
 .../testdata/basic-mod/go.mod.expected        |  13 ++
 .../dependency-replacements-test.yaml         |  10 ++
 .../testdata/update-existing-mod/go.mod       |  10 ++
 .../update-existing-mod/go.mod.expected       |  10 ++
 26 files changed, 898 insertions(+), 64 deletions(-)
 create mode 100644 .github/workflows/check-sync-module-dependencies.yml
 create mode 100644 dependency-replacements.yaml
 create mode 100644 dirwatch-test/.remote_config_hash
 create mode 100644 dirwatch-test/config.yaml
 create mode 100644 tools/generate-module-dependencies/README.md
 create mode 100644 tools/generate-module-dependencies/cmd/sync-mod.go
 create mode 100644 tools/generate-module-dependencies/e2e_test.go
 create mode 100644 tools/generate-module-dependencies/generate.go
 create mode 100644 tools/generate-module-dependencies/go.mod
 create mode 100644 tools/generate-module-dependencies/go.sum
 create mode 100644 tools/generate-module-dependencies/internal/apply-replaces.go
 create mode 100644 tools/generate-module-dependencies/internal/generate-replaces.go
 create mode 100644 tools/generate-module-dependencies/internal/helpers/files.go
 create mode 100644 tools/generate-module-dependencies/internal/tidy-modules.go
 create mode 100644 tools/generate-module-dependencies/internal/types/types.go
 create mode 100644 tools/generate-module-dependencies/main.go
 create mode 100644 tools/generate-module-dependencies/replaces-mod.tpl
 create mode 100644 tools/generate-module-dependencies/testdata/basic-mod/dependency-replacements-test.yaml
 create mode 100644 tools/generate-module-dependencies/testdata/basic-mod/go.mod
 create mode 100644 tools/generate-module-dependencies/testdata/basic-mod/go.mod.expected
 create mode 100644 tools/generate-module-dependencies/testdata/update-existing-mod/dependency-replacements-test.yaml
 create mode 100644 tools/generate-module-dependencies/testdata/update-existing-mod/go.mod
 create mode 100644 tools/generate-module-dependencies/testdata/update-existing-mod/go.mod.expected

diff --git a/.github/workflows/check-sync-module-dependencies.yml b/.github/workflows/check-sync-module-dependencies.yml
new file mode 100644
index 00000000000..4a28629feed
--- /dev/null
+++ b/.github/workflows/check-sync-module-dependencies.yml
@@ -0,0 +1,46 @@
+name: Check generate-module-dependencies
+permissions:
+  contents: read
+on: pull_request
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.25.x'
+
+      - name: Run tests
+        run: |
+          cd tools/generate-module-dependencies
+          go test -v .
+
+      - name: Run generate-module-dependencies
+        run: |
+          make generate-module-dependencies
+
+      - name: Check for go.mod changes
+        run: |
+          # List changed go.mod files (added/modified/deleted)
+          CHANGED=$(git diff --name-only --ignore-all-space | grep -E '(^|/)go\.mod$' || true)
+
+          if [ -n "$CHANGED" ]; then
+            echo "::error::go.mod files are out of sync with generate-module-dependencies."
+            echo "The following go.mod files changed:"
+            echo "$CHANGED"
+            echo
+            echo "Diff:"
+            git --no-pager diff -- $CHANGED || true
+            echo
+            echo "To fix locally:"
+            echo "  Ensure that you update the dependency-replacements.yaml file and run make generate-module-dependencies"
+            exit 1
+          fi
\ No newline at end of file
diff --git a/Makefile b/Makefile
index ccb5e1a7b1b..1dbc72e13a5 100644
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,7 @@
 ##   generate-versioned-files  Generate versioned files.
 ##   generate-winmanifest      Generate the Windows application manifest.
 ##   generate-snmp             Generate SNMP modules from prometheus/snmp_exporter for prometheus.exporter.snmp and bumps SNMP version in _index.md.t.
+##   generate-module-dependencies  Generate replace directives from dependency-replacements.yaml and inject them into go.mod and builder-config.yaml.
 ##
 ## Other targets:
 ##
@@ -257,6 +258,13 @@ else
 	bash ./operations/helm/scripts/rebuild-tests.sh
 endif
 
+generate-module-dependencies:
+ifeq ($(USE_CONTAINER),1)
+	$(RERUN_IN_CONTAINER)
+else
+	cd ./tools/generate-module-dependencies && $(GO_ENV) go generate
+endif
+
 generate-ui:
 ifeq ($(USE_CONTAINER),1)
 	$(RERUN_IN_CONTAINER)
diff --git a/dependency-replacements.yaml b/dependency-replacements.yaml
new file mode 100644
index 00000000000..ee4710b180f
--- /dev/null
+++ b/dependency-replacements.yaml
@@ -0,0 +1,131 @@
+# NOTE: replace directives below must always be *temporary*.
+#
+# Adding a replace directive to change a module to a fork of a module will
+# only be accepted when a PR or an issue upstream has been opened to accept the new
+# change.
+#
+# Contributors are expected to work with upstream to make their changes
+# acceptable, and remove the `replace` directive as soon as possible.
+#
+# If upstream is unresponsive, you should consider making a hard fork
+# (i.e., creating a new Go module with the same source) or picking a different
+# dependency.
+
+# Modules define the target files where replaces will be applied.
+# Each module specifies:
+#   - name: the name of the module
+#   - path: the path to the module's go.mod file
+#   - file_type: enum of what sort of generation pipeline will be used, currently the only available value is "mod"
+
+# Replace directives define the replacements that will be applied to the defined modules
+# Each replace directive specifies:
+#   - comment: a brief explanation as to why the replace is necessary. This must contain a link to an upstream issue or a PR that is required to complete in order to remove the replace directive
+#   - dependency: the dependency to be replaced
+#   - replacement: the replacement for the dependency
+
+modules:
+  - name: alloy
+    path: go.mod
+    file_type: mod
+
+replaces:
+  - comment: >
+      TODO: remove this replace directive once the upstream issue is fixed:
+      https://github.com/prometheus/prometheus/issues/13842
+    dependency: go.opentelemetry.io/collector/featuregate
+    replacement: github.com/grafana/opentelemetry-collector/featuregate v0.0.0-20240325174506-2fd1623b2ca0
+
+  - comment: Replace directives from Prometheus
+    dependency: github.com/fsnotify/fsnotify v1.8.0
+    replacement: github.com/fsnotify/fsnotify v1.7.0
+
+  - comment: >
+      TODO: remove replace directive once there is a release of Prometheus
+      which addresses https://github.com/prometheus/prometheus/issues/14049,
+      for example, via this implementation: https://github.com/grafana/prometheus/pull/34
+    dependency: github.com/prometheus/prometheus
+    replacement: github.com/grafana/prometheus v1.8.2-0.20251030104821-c9e0b31e9aeb
+
+  - comment: Replace yaml.v2 with fork
+    dependency: gopkg.in/yaml.v2
+    replacement: github.com/rfratto/go-yaml v0.0.0-20211119180816-77389c3526dc
+
+  - comment: Replace directives from Loki — Azure SDK
+    dependency: github.com/Azure/azure-sdk-for-go
+    replacement: github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
+
+  - comment: Replace directives from Loki — Azure storage blob fork
+    dependency: github.com/Azure/azure-storage-blob-go
+    replacement: github.com/MasslessParticle/azure-storage-blob-go v0.14.1-0.20240322194317-344980fda573
+
+  - comment: Use fork of gocql that has gokit logs and Prometheus metrics
+    dependency: github.com/gocql/gocql
+    replacement: github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85
+
+  - comment: Insist on the optimised version of grafana/regexp
+    dependency: github.com/grafana/regexp
+    replacement: github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc
+
+  - comment: Replace memberlist with Grafana fork which includes unmerged upstream fixes
+    dependency: github.com/hashicorp/memberlist
+    replacement: github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe
+
+  - comment: Use forked syslog implementation by leodido for continued support
+    dependency: github.com/influxdata/go-syslog/v3
+    replacement: github.com/leodido/go-syslog/v4 v4.2.0
+
+  - comment: Replace thanos-io/objstore with Grafana fork
+    dependency: github.com/thanos-io/objstore
+    replacement: github.com/grafana/objstore v0.0.0-20250210100727-533688b5600d
+
+  - comment: TODO - remove forks when changes are merged upstream — non-singleton cadvisor
+    dependency: github.com/google/cadvisor
+    replacement: github.com/grafana/cadvisor v0.0.0-20240729082359-1f04a91701e2
+
+  - comment: TODO - track exporter-package-v0.18.1 branch of grafana fork; remove once merged upstream
+    dependency: github.com/prometheus-community/postgres_exporter
+    replacement: github.com/grafana/postgres_exporter v0.0.0-20250930111128-c8f6a9f4d363
+
+  - comment: TODO - remove once PR is merged upstream - https://github.com/prometheus/mysqld_exporter/pull/774
+    dependency: github.com/prometheus/mysqld_exporter
+    replacement: github.com/grafana/mysqld_exporter v0.17.2-0.20250226152553-be612e3fdedd
+
+  - comment: >
+      TODO: replace node_exporter with custom fork for multi usage.
+      https://github.com/prometheus/node_exporter/pull/2812
+    dependency: github.com/prometheus/node_exporter
+    replacement: github.com/grafana/node_exporter v0.18.1-grafana-r01.0.20251024135609-318b01780c89
+
+  - comment: Use Grafana fork of smimesign
+    dependency: github.com/github/smimesign
+    replacement: github.com/grafana/smimesign v0.2.1-0.20220408144937-2a5adf3481d3
+
+  - comment: Replace OpenTelemetry OBI with Grafana fork
+    dependency: go.opentelemetry.io/obi
+    replacement: github.com/grafana/opentelemetry-ebpf-instrumentation v1.3.13
+
+  - comment: Replace OpenTelemetry eBPF profiler with Grafana fork
+    dependency: go.opentelemetry.io/ebpf-profiler
+    replacement: github.com/grafana/opentelemetry-ebpf-profiler v0.0.202546-0.20251106085643-a00a0ef2a84c
+
+  - comment: Update openshift/client-go to version compatible with structured-merge-diff v6
+    dependency: github.com/openshift/client-go
+    replacement: github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235
+
+  - comment: Use Grafana's patched k8sattributesprocessor with support for k8s.io/client-go v0.34.1
+    dependency: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor
+    replacement: github.com/grafana/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.0.0-20251021125353-73458b01ab23
+
+  - comment: >
+      Do not remove until bug in walqueue backwards compatibility is resolved:
+      https://github.com/deneonet/benc/issues/13
+    dependency: github.com/deneonet/benc
+    replacement: github.com/deneonet/benc v1.1.7
+
+  - comment: Pin runc to v1.2.8 for compatibility with cadvisor requiring libcontainer/cgroups packages
+    dependency: github.com/opencontainers/runc
+    replacement: github.com/opencontainers/runc v1.2.8
+
+  - comment: Replace controller-runtime with pinned version
+    dependency: sigs.k8s.io/controller-runtime
+    replacement: sigs.k8s.io/controller-runtime v0.20.4
\ No newline at end of file
diff --git a/dirwatch-test/.remote_config_hash b/dirwatch-test/.remote_config_hash
new file mode 100644
index 00000000000..896f85ac8f1
--- /dev/null
+++ b/dirwatch-test/.remote_config_hash
@@ -0,0 +1 @@
+¬¦PRº‚›'È¢‰Æ¿’Jé¾�™ØŠŽÄ�žt)8
\ No newline at end of file
diff --git a/dirwatch-test/config.yaml b/dirwatch-test/config.yaml
new file mode 100644
index 00000000000..1f969bc9a63
--- /dev/null
+++ b/dirwatch-test/config.yaml
@@ -0,0 +1,32 @@
+service:
+  telemetry:
+    logs:
+      processors:
+        - batch:
+            exporter:
+              otlp:
+                endpoint: https://otlp-gateway-prod-us-central-0.grafana.net/otlp/v1/logs
+                headers:
+                  - name: Authorization
+                    value: Basic ${env:GCLOUD_BASIC_AUTH}
+                protocol: http/protobuf
+    metrics:
+      readers:
+        - periodic:
+            exporter:
+              otlp:
+                endpoint: https://otlp-gateway-prod-us-central-0.grafana.net/otlp/v1/metrics
+                headers:
+                  - name: Authorization
+                    value: Basic ${env:GCLOUD_BASIC_AUTH}
+                protocol: http/protobuf
+    traces:
+      processors:
+        - batch:
+            exporter:
+              otlp:
+                endpoint: https://otlp-gateway-prod-us-central-0.grafana.net/otlp/v1/traces
+                headers:
+                  - name: Authorization
+                    value: Basic ${env:GCLOUD_BASIC_AUTH}
+                protocol: http/protobuf
diff --git a/go.mod b/go.mod
index f8f3ab70e35..a0787643f28 100644
--- a/go.mod
+++ b/go.mod
@@ -2,6 +2,10 @@ module github.com/grafana/alloy
 
 go 1.25.5
 
+// This local replace is required for local development and testing of the syntax submodule.
+// It is intentionally kept outside the generated block to avoid being overwritten by dependency management tools.
+replace github.com/grafana/alloy/syntax => ./syntax
+
 require (
 	cloud.google.com/go/pubsub v1.50.1
 	cloud.google.com/go/pubsub/v2 v2.0.0
@@ -116,7 +120,7 @@ require (
 	github.com/oklog/run v1.2.0
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/oliver006/redis_exporter v1.74.0
-  github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.139.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.139.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.139.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.139.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.139.0
@@ -1006,94 +1010,81 @@ require (
 	golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 // indirect
 )
 
-// NOTE: replace directives below must always be *temporary*.
-//
-// Adding a replace directive to change a module to a fork of a module will
-// only be accepted when a PR upstream has been opened to accept the new
-// change.
-//
-// Contributors are expected to work with upstream to make their changes
-// acceptable, and remove the `replace` directive as soon as possible.
-//
-// If upstream is unresponsive, you should consider making a hard fork
-// (i.e., creating a new Go module with the same source) or picking a different
-// dependency.
+// Add exclude directives so Go doesn't pick old incompatible k8s.io/client-go
+// versions.
+exclude (
+	k8s.io/client-go v8.0.0+incompatible
+	k8s.io/client-go v12.0.0+incompatible
+)
 
+// BEGIN GENERATED REPLACES - DO NOT EDIT MANUALLY
 // TODO: remove this replace directive once the upstream issue is fixed: https://github.com/prometheus/prometheus/issues/13842
-replace go.opentelemetry.io/collector/featuregate => github.com/grafana/opentelemetry-collector/featuregate v0.0.0-20240325174506-2fd1623b2ca0 // feature-gate-registration-error-handler branch
+replace go.opentelemetry.io/collector/featuregate => github.com/grafana/opentelemetry-collector/featuregate v0.0.0-20240325174506-2fd1623b2ca0
 
 // Replace directives from Prometheus
 replace github.com/fsnotify/fsnotify v1.8.0 => github.com/fsnotify/fsnotify v1.7.0
 
-// TODO: remove replace directive once:
-// * There is a release of Prometheus which addresses https://github.com/prometheus/prometheus/issues/14049,
-// for example, via this implementation: https://github.com/grafana/prometheus/pull/34
-replace github.com/prometheus/prometheus => github.com/grafana/prometheus v1.8.2-0.20251030104821-c9e0b31e9aeb // staleness_disabling_v3.7.3 branch
+// TODO: remove replace directive once there is a release of Prometheus which addresses https://github.com/prometheus/prometheus/issues/14049, for example, via this implementation: https://github.com/grafana/prometheus/pull/34
+replace github.com/prometheus/prometheus => github.com/grafana/prometheus v1.8.2-0.20251030104821-c9e0b31e9aeb
 
+// Replace yaml.v2 with fork
 replace gopkg.in/yaml.v2 => github.com/rfratto/go-yaml v0.0.0-20211119180816-77389c3526dc
 
-// Replace directives from Loki
-replace (
-	github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
-	github.com/Azure/azure-storage-blob-go => github.com/MasslessParticle/azure-storage-blob-go v0.14.1-0.20240322194317-344980fda573
-	// Use fork of gocql that has gokit logs and Prometheus metrics.
-	github.com/gocql/gocql => github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85
-	// Insist on the optimised version of grafana/regexp
-	github.com/grafana/regexp => github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc
-	// Replace memberlist with our fork which includes some fixes that haven't been
-	// merged upstream yet.
-	github.com/hashicorp/memberlist => github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe
-	// leodido fork his project to continue support
-	github.com/influxdata/go-syslog/v3 => github.com/leodido/go-syslog/v4 v4.2.0
-	github.com/thanos-io/objstore => github.com/grafana/objstore v0.0.0-20250210100727-533688b5600d
-)
+// Replace directives from Loki — Azure SDK
+replace github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
 
-// TODO(rfratto): remove forks when changes are merged upstream
-replace (
-	// TODO(tpaschalis) this is to remove global instantiation of plugins
-	// and allow non-singleton components.
-	// https://github.com/grafana/cadvisor/tree/grafana-v0.47-noglobals
-	github.com/google/cadvisor => github.com/grafana/cadvisor v0.0.0-20240729082359-1f04a91701e2
+// Replace directives from Loki — Azure storage blob fork
+replace github.com/Azure/azure-storage-blob-go => github.com/MasslessParticle/azure-storage-blob-go v0.14.1-0.20240322194317-344980fda573
 
-	// TODO(dehaansa,cristiangreco): this tracks the exporter-package-v0.18.1 branch of the grafana fork,
-	// which we could get rid of once the changes are merged upstream.
-	github.com/prometheus-community/postgres_exporter => github.com/grafana/postgres_exporter v0.0.0-20250930111128-c8f6a9f4d363
+// Use fork of gocql that has gokit logs and Prometheus metrics
+replace github.com/gocql/gocql => github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85
 
-	// TODO(marctc): remove once this PR is merged upstream: https://github.com/prometheus/mysqld_exporter/pull/774
-	github.com/prometheus/mysqld_exporter => github.com/grafana/mysqld_exporter v0.17.2-0.20250226152553-be612e3fdedd
+// Insist on the optimised version of grafana/regexp
+replace github.com/grafana/regexp => github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc
 
-	// TODO(marctc, mattdurham): Replace node_export with custom fork for multi usage. https://github.com/prometheus/node_exporter/pull/2812
-	// this commit is on the refactor_collectors branch in the grafana fork.
-	github.com/prometheus/node_exporter => github.com/grafana/node_exporter v0.18.1-grafana-r01.0.20251024135609-318b01780c89 //refactor_collectors
-)
+// Replace memberlist with Grafana fork which includes unmerged upstream fixes
+replace github.com/hashicorp/memberlist => github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe
 
-replace github.com/github/smimesign => github.com/grafana/smimesign v0.2.1-0.20220408144937-2a5adf3481d3
+// Use forked syslog implementation by leodido for continued support
+replace github.com/influxdata/go-syslog/v3 => github.com/leodido/go-syslog/v4 v4.2.0
 
-// Submodules.
-replace github.com/grafana/alloy/syntax => ./syntax
+// Replace thanos-io/objstore with Grafana fork
+replace github.com/thanos-io/objstore => github.com/grafana/objstore v0.0.0-20250210100727-533688b5600d
 
-// Add exclude directives so Go doesn't pick old incompatible k8s.io/client-go
-// versions.
-exclude (
-	k8s.io/client-go v8.0.0+incompatible
-	k8s.io/client-go v12.0.0+incompatible
-)
+// TODO - remove forks when changes are merged upstream — non-singleton cadvisor
+replace github.com/google/cadvisor => github.com/grafana/cadvisor v0.0.0-20240729082359-1f04a91701e2
 
+// TODO - track exporter-package-v0.18.1 branch of grafana fork; remove once merged upstream
+replace github.com/prometheus-community/postgres_exporter => github.com/grafana/postgres_exporter v0.0.0-20250930111128-c8f6a9f4d363
+
+// TODO - remove once PR is merged upstream - https://github.com/prometheus/mysqld_exporter/pull/774
+replace github.com/prometheus/mysqld_exporter => github.com/grafana/mysqld_exporter v0.17.2-0.20250226152553-be612e3fdedd
+
+// TODO: replace node_exporter with custom fork for multi usage. https://github.com/prometheus/node_exporter/pull/2812
+replace github.com/prometheus/node_exporter => github.com/grafana/node_exporter v0.18.1-grafana-r01.0.20251024135609-318b01780c89
+
+// Use Grafana fork of smimesign
+replace github.com/github/smimesign => github.com/grafana/smimesign v0.2.1-0.20220408144937-2a5adf3481d3
+
+// Replace OpenTelemetry OBI with Grafana fork
 replace go.opentelemetry.io/obi => github.com/grafana/opentelemetry-ebpf-instrumentation v1.3.13
 
+// Replace OpenTelemetry eBPF profiler with Grafana fork
 replace go.opentelemetry.io/ebpf-profiler => github.com/grafana/opentelemetry-ebpf-profiler v0.0.202546-0.20251106085643-a00a0ef2a84c
 
-// Update openshift/client-go to a version compatible with structured-merge-diff v6
+// Update openshift/client-go to version compatible with structured-merge-diff v6
 replace github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235
 
-// Use Grafana's patched k8sattributesprocessor that supports k8s.io/client-go v0.34.1
-// Adds RunWithContext and AddEventHandlerWithOptions methods to fake informers
+// Use Grafana's patched k8sattributesprocessor with support for k8s.io/client-go v0.34.1
 replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor => github.com/grafana/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.0.0-20251021125353-73458b01ab23
 
-// Do not remove this until the bug breaking backwards compatibility is resolved & included in walqueue: https://github.com/deneonet/benc/issues/13
+// Do not remove until bug in walqueue backwards compatibility is resolved: https://github.com/deneonet/benc/issues/13
 replace github.com/deneonet/benc => github.com/deneonet/benc v1.1.7
 
-// Pin runc to v1.1.12 to maintain compatibility with cadvisor that requires libcontainer/cgroups packages
+// Pin runc to v1.2.8 for compatibility with cadvisor requiring libcontainer/cgroups packages
 replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.2.8
 
+// Replace controller-runtime with pinned version
 replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.20.4
+
+// END GENERATED REPLACES
diff --git a/go.sum b/go.sum
index 43c6853d01d..345496a7285 100644
--- a/go.sum
+++ b/go.sum
@@ -1738,10 +1738,10 @@ github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus
 github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOTusL46e8=
 github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y=
 github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
-github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.139.0 h1:L/mt81EynyqP8+Eo1RScotNMKodU8tzu5kdDVZsxzos=
-github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.139.0/go.mod h1:aamgZ/EgklfjbFzEpZHJFw6558jhx7iVrH/BF4aIkDM=
 github.com/open-telemetry/opamp-go v0.22.0 h1:7UnsQgFFS7ffM09JQk+9aGVBAAlsLfcooZ9xvSYwxWM=
 github.com/open-telemetry/opamp-go v0.22.0/go.mod h1:339N71soCPrhHywbAcKUZJDODod581ZOxCpTkrl3zYQ=
+github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.139.0 h1:L/mt81EynyqP8+Eo1RScotNMKodU8tzu5kdDVZsxzos=
+github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.139.0/go.mod h1:aamgZ/EgklfjbFzEpZHJFw6558jhx7iVrH/BF4aIkDM=
 github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.139.0 h1:wsylHna5nuu6Jl+ow9uv3WJ0qKGJxg2aRORFUDa8SAs=
 github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.139.0/go.mod h1:LIR7KA0MIoHFQN/mO3zLEeK7piZL3cR6Ig10GfpS5UU=
 github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.139.0 h1:USQU4VEL4Vi1rDm1am6LFjIvRGSOWhb+huw1OLIo3Eo=
diff --git a/tools/generate-module-dependencies/README.md b/tools/generate-module-dependencies/README.md
new file mode 100644
index 00000000000..abf0d855942
--- /dev/null
+++ b/tools/generate-module-dependencies/README.md
@@ -0,0 +1,46 @@
+
+# generate-module-dependencies
+
+A small utility to keep Go module replace directives consistent across the repository from a single source of truth.
+
+## What it does
+
+- Reads dependency definitions from the project-level `dependency-replacements.yaml`.
+- Renders the list of `replace` directives using a template.
+- Injects the rendered block into target files (e.g., `go.mod`) between well-known markers.
+- Runs `go mod tidy` for affected modules.
+
+Generated blocks are wrapped with:
+```
+BEGIN GENERATED REPLACES - DO NOT EDIT MANUALLY ...  END GENERATED REPLACES
+```
+
+**Do not edit anything between these markers**, manually—update `dependency-replacements.yaml` instead. Anything 
+changed manually within these markers will be overwritten during the next run.
+
+Please note that local replacement directives (ie pointing a dependency to a local module) are _not_ meant to be included
+in `dependency-replacements.yaml`. These must be included separately in `go.mod` files, outside of the template boundaries
+
+## Usage
+
+- One-off run from repo root:
+    - `make generate-module-dependencies`
+    - or `cd tools/generate-module-dependencies && go generate`
+
+## Configuration
+
+All inputs come from `dependency-replacements.yaml`, which defines:
+- Modules to update (name, path, file_type).
+- Replace entries (dependency, replacement, optional comment).
+
+Comments are normalized (single-line) and included above the corresponding `replace` directive in generated output.
+
+## Troubleshooting
+
+- If a start marker exists without an end marker (or vice versa), generation fails—ensure both markers are present or absent together.
+- If `go mod tidy` fails, fix the underlying module issues and rerun the command above.
+
+## Notes
+
+- This tool writes only the generated block; existing content outside the markers is preserved.
+- The CI will run a check and fail if the output of the generate-module-dependencies step differs from the committed version.
diff --git a/tools/generate-module-dependencies/cmd/sync-mod.go b/tools/generate-module-dependencies/cmd/sync-mod.go
new file mode 100644
index 00000000000..9118e54e4a5
--- /dev/null
+++ b/tools/generate-module-dependencies/cmd/sync-mod.go
@@ -0,0 +1,52 @@
+package cmd
+
+import (
+	"log"
+	"os"
+
+	"github.com/grafana/replace-generator/internal"
+	"github.com/grafana/replace-generator/internal/helpers"
+	"github.com/spf13/cobra"
+)
+
+var generateAndApplyReplaces = &cobra.Command{
+	Use:   "generate",
+	Short: "Generates replace directives as specified in the input dependency-replacements.yaml",
+	Run: func(cmd *cobra.Command, args []string) {
+		pathToYaml := cmd.Flag("dependency-yaml").Value.String()
+		pathToRoot := cmd.Flag("project-root").Value.String()
+
+		fileHelper, err := helpers.NewFileHelper(pathToYaml, pathToRoot)
+		if err != nil {
+			log.Fatalf("Failed to create file helper: %v", err)
+		}
+
+		projectReplaces, err := fileHelper.LoadProjectReplaces()
+		if err != nil {
+			log.Fatalf("Failed to load project replaces: %v", err)
+		}
+
+		modByReplaceStr := internal.GenerateReplaces(fileHelper, projectReplaces)
+		internal.ApplyReplaces(fileHelper, projectReplaces, modByReplaceStr)
+		internal.TidyModules(fileHelper, projectReplaces)
+	},
+}
+
+func Execute() {
+	if err := NewRootCommand().Execute(); err != nil {
+		os.Exit(1)
+	}
+}
+
+func NewRootCommand() *cobra.Command {
+	var rootCmd = &cobra.Command{
+		Use:               "sync-mod",
+		CompletionOptions: cobra.CompletionOptions{DisableDefaultCmd: true},
+	}
+
+	rootCmd.AddCommand(generateAndApplyReplaces)
+	generateAndApplyReplaces.Flags().String("dependency-yaml", "", "Relative path to the dependency-replacements.yaml file")
+	generateAndApplyReplaces.Flags().String("project-root", "", "Relative path to the project root")
+
+	return rootCmd
+}
diff --git a/tools/generate-module-dependencies/e2e_test.go b/tools/generate-module-dependencies/e2e_test.go
new file mode 100644
index 00000000000..6a543405c8e
--- /dev/null
+++ b/tools/generate-module-dependencies/e2e_test.go
@@ -0,0 +1,79 @@
+package main
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/grafana/replace-generator/cmd"
+)
+
+type testCase struct {
+	name        string
+	testdataDir string
+}
+
+var testCases = []testCase{
+	{
+		name:        "Basic",
+		testdataDir: "basic-mod",
+	},
+	{
+		name:        "UpdateExisting",
+		testdataDir: "update-existing-mod",
+	},
+}
+
+func TestE2E(t *testing.T) {
+	currentDir, err := os.Getwd()
+	if err != nil {
+		t.Fatalf("Failed to get current working directory: %v", err)
+	}
+
+	command := cmd.NewRootCommand()
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			testdataDir := filepath.Join(currentDir, "testdata", tc.testdataDir)
+			goModPath := filepath.Join(testdataDir, "go.mod")
+			expectedPath := filepath.Join(testdataDir, "go.mod.expected")
+			dependencyYaml := filepath.Join("testdata", tc.testdataDir, "dependency-replacements-test.yaml")
+			projectRoot := filepath.Join("testdata", tc.testdataDir)
+
+			originalGoMod, err := os.ReadFile(goModPath)
+			if err != nil {
+				t.Fatalf("Failed to read original go.mod: %v", err)
+			}
+
+			// Restore the original go.mod after the test
+			defer func() {
+				if err := os.WriteFile(goModPath, originalGoMod, 0644); err != nil {
+					t.Errorf("Failed to restore original go.mod: %v", err)
+				}
+			}()
+
+			command.SetArgs([]string{"generate", "--dependency-yaml", dependencyYaml, "--project-root", projectRoot})
+			err = command.Execute()
+			if err != nil {
+				t.Fatalf("Failed to run command: %v", err)
+			}
+
+			expectedContent, err := os.ReadFile(expectedPath)
+			if err != nil {
+				t.Fatalf("Failed to read expected go.mod: %v", err)
+			}
+			expectedGoMod := strings.TrimSpace(string(expectedContent))
+
+			actualContent, err := os.ReadFile(goModPath)
+			if err != nil {
+				t.Fatalf("Failed to read actual go.mod: %v", err)
+			}
+			actualGoMod := strings.TrimSpace(string(actualContent))
+
+			if actualGoMod != expectedGoMod {
+				t.Errorf("go.mod content mismatch.\nExpected:\n%s\n\nActual:\n%s", expectedGoMod, actualGoMod)
+			}
+		})
+	}
+}
diff --git a/tools/generate-module-dependencies/generate.go b/tools/generate-module-dependencies/generate.go
new file mode 100644
index 00000000000..8550a029ece
--- /dev/null
+++ b/tools/generate-module-dependencies/generate.go
@@ -0,0 +1,3 @@
+package main
+
+//go:generate go run main.go generate --dependency-yaml=../../dependency-replacements.yaml --project-root=../..
diff --git a/tools/generate-module-dependencies/go.mod b/tools/generate-module-dependencies/go.mod
new file mode 100644
index 00000000000..c5f42a9ea07
--- /dev/null
+++ b/tools/generate-module-dependencies/go.mod
@@ -0,0 +1,12 @@
+module github.com/grafana/replace-generator
+
+go 1.25.1
+
+require gopkg.in/yaml.v3 v3.0.1
+
+require github.com/spf13/cobra v1.10.1
+
+require (
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.10 // indirect
+)
diff --git a/tools/generate-module-dependencies/go.sum b/tools/generate-module-dependencies/go.sum
new file mode 100644
index 00000000000..1c33d39098d
--- /dev/null
+++ b/tools/generate-module-dependencies/go.sum
@@ -0,0 +1,13 @@
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
+github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
+github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
+github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/tools/generate-module-dependencies/internal/apply-replaces.go b/tools/generate-module-dependencies/internal/apply-replaces.go
new file mode 100644
index 00000000000..dd5e0c71013
--- /dev/null
+++ b/tools/generate-module-dependencies/internal/apply-replaces.go
@@ -0,0 +1,96 @@
+package internal
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"strings"
+
+	"github.com/grafana/replace-generator/internal/helpers"
+	"github.com/grafana/replace-generator/internal/types"
+)
+
+func ApplyReplaces(fileHelper *helpers.FileHelper, projectReplaces *types.ProjectReplaces, modByReplaceStr map[string]*string) {
+	for _, module := range projectReplaces.Modules {
+		replacesStr := modByReplaceStr[module.Name]
+		if err := applyReplacesToModule(fileHelper, module, replacesStr); err != nil {
+			log.Fatalf("Failed to apply replaces to module %q: %v", module.Name, err)
+		}
+		log.Printf("Updated %s", module.Path)
+	}
+}
+
+func applyReplacesToModule(dirs *helpers.FileHelper, module types.Module, replacesStr *string) error {
+	targetPath := dirs.ModuleTargetPath(module.Path)
+
+	targetContent, err := os.ReadFile(targetPath)
+	if err != nil {
+		return fmt.Errorf("read target file %s: %w", targetPath, err)
+	}
+
+	startMarker, endMarker, err := getMarkers(module.FileType)
+	if err != nil {
+		return fmt.Errorf("get markers for file type %q: %w", module.FileType, err)
+	}
+
+	newContent, err := upsertGeneratedBlock(string(targetContent), *replacesStr, startMarker, endMarker)
+	if err != nil {
+		return fmt.Errorf("update generated block: %w", err)
+	}
+
+	if err := os.WriteFile(targetPath, []byte(newContent), 0644); err != nil {
+		return fmt.Errorf("write target file %s: %w", targetPath, err)
+	}
+
+	return nil
+}
+
+func getCommentMarker(fileType types.FileType) (string, error) {
+	switch fileType {
+	case types.FileTypeMod:
+		return "//", nil
+	default:
+		return "", fmt.Errorf("unknown file_type %q", fileType)
+	}
+}
+
+func getMarkers(fileType types.FileType) (startMarker, endMarker string, err error) {
+	commentSymbol, err := getCommentMarker(fileType)
+	if err != nil {
+		return "", "", err
+	}
+
+	return fmt.Sprintf("%s BEGIN GENERATED REPLACES - DO NOT EDIT MANUALLY", commentSymbol),
+		fmt.Sprintf("%s END GENERATED REPLACES", commentSymbol),
+		nil
+}
+
+// Upserts the generated block using the markers, or lack thereof, as a guide
+func upsertGeneratedBlock(targetContent, replacement, startMarker, endMarker string) (string, error) {
+	startIdx := strings.Index(targetContent, startMarker)
+	startFound := startIdx != -1
+
+	if !startFound {
+		// No start marker: if the end marker exists anywhere, it's invalid.
+		if strings.Contains(targetContent, endMarker) {
+			return "", fmt.Errorf("found end marker without start marker")
+		}
+
+		// Neither start not end marker found, append to the end of the file
+		targetContent = strings.TrimRight(targetContent, "\n")
+		return targetContent + "\n" + replacement, nil
+	}
+
+	searchFrom := startIdx + len(startMarker)
+	endRel := strings.Index(targetContent[searchFrom:], endMarker)
+	if endRel == -1 {
+		// Start marker exists without an end marker, which is invalid
+		return "", fmt.Errorf("found start marker without end marker")
+	}
+
+	endIdx := searchFrom + endRel
+	endOfMarker := endIdx + len(endMarker)
+
+	// Replace [startIdx, endOfMarker) with replacement.
+	return targetContent[:startIdx] + replacement + targetContent[endOfMarker:], nil
+}
diff --git a/tools/generate-module-dependencies/internal/generate-replaces.go b/tools/generate-module-dependencies/internal/generate-replaces.go
new file mode 100644
index 00000000000..1b634dddd12
--- /dev/null
+++ b/tools/generate-module-dependencies/internal/generate-replaces.go
@@ -0,0 +1,73 @@
+package internal
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"path/filepath"
+	"strings"
+	"text/template"
+
+	"github.com/grafana/replace-generator/internal/helpers"
+	"github.com/grafana/replace-generator/internal/types"
+)
+
+func GenerateReplaces(fileHelper *helpers.FileHelper, projectReplaces *types.ProjectReplaces) map[string]*string {
+	normalizeComments(projectReplaces.Replaces)
+	replaceTxtByMod := make(map[string]*string)
+
+	for _, module := range projectReplaces.Modules {
+		str, err := generateReplacesForFileType(fileHelper, projectReplaces, module.FileType)
+		if err != nil {
+			log.Fatalf("Failed to generate replaces for module %q: %v", module.Name, err)
+		}
+
+		replaceTxtByMod[module.Name] = str
+	}
+
+	return replaceTxtByMod
+}
+
+func normalizeComments(entries []types.ReplaceEntry) {
+	for i := range entries {
+		entries[i].Comment = strings.ReplaceAll(entries[i].Comment, "\n", " ")
+		entries[i].Comment = strings.TrimSpace(entries[i].Comment)
+	}
+}
+
+func generateReplacesForFileType(dirs *helpers.FileHelper, projectReplaces *types.ProjectReplaces, fileType types.FileType) (*string, error) {
+	templatePath, err := dirs.TemplatePath(fileType)
+
+	if err != nil {
+		return nil, fmt.Errorf("could not get template path: %w", err)
+	}
+
+	str, err := generateFromTemplate(templatePath, projectReplaces.Replaces)
+
+	if err != nil {
+		return nil, fmt.Errorf("could not execute template generation: %w", err)
+	}
+
+	return str, nil
+}
+
+func generateFromTemplate(templatePath string, entries []types.ReplaceEntry) (*string, error) {
+	tmplContent, err := os.ReadFile(templatePath)
+	if err != nil {
+		return nil, fmt.Errorf("could not read template %s: %w", templatePath, err)
+	}
+
+	tmpl, err := template.New(filepath.Base(templatePath)).Parse(string(tmplContent))
+
+	if err != nil {
+		return nil, fmt.Errorf("could not parse template: %w", err)
+	}
+
+	var buf strings.Builder
+	if err := tmpl.Execute(&buf, entries); err != nil {
+		return nil, fmt.Errorf("could not generate template: %w", err)
+	}
+
+	str := buf.String()
+	return &str, nil
+}
diff --git a/tools/generate-module-dependencies/internal/helpers/files.go b/tools/generate-module-dependencies/internal/helpers/files.go
new file mode 100644
index 00000000000..99f9ed20f97
--- /dev/null
+++ b/tools/generate-module-dependencies/internal/helpers/files.go
@@ -0,0 +1,86 @@
+package helpers
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/grafana/replace-generator/internal/types"
+	"gopkg.in/yaml.v3"
+)
+
+type FileHelper struct {
+	// ScriptDir is the directory where the generate-module-dependencies code is located
+	ScriptDir string
+
+	// ProjectRoot is the root directory of the Alloy project
+	ProjectRoot string
+
+	// ProjectReplacesPath is the absolute path to dependency-replacements.yaml.
+	ProjectReplacesPath string
+}
+
+func NewFileHelper(pathToDependencyReplacements string, projectRoot string) (*FileHelper, error) {
+	scriptDir, err := os.Getwd()
+	if err != nil {
+		return nil, fmt.Errorf("Failed to resolve working directory: %v", err)
+	}
+
+	scriptDir, err = filepath.Abs(scriptDir)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to resolve script directory: %v", err)
+	}
+
+	absReplacesPath, err := filepath.Abs(pathToDependencyReplacements)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to resolve %s: %v", pathToDependencyReplacements, err)
+	}
+
+	return &FileHelper{
+		ScriptDir:           scriptDir,
+		ProjectRoot:         projectRoot,
+		ProjectReplacesPath: absReplacesPath,
+	}, nil
+}
+
+func (d *FileHelper) TemplatePath(fileType types.FileType) (string, error) {
+	var templateName string
+	var err error
+
+	switch fileType {
+	case types.FileTypeMod:
+		templateName = "replaces-mod.tpl"
+	default:
+		err = fmt.Errorf("Unknown file_type %q (expected %q)", fileType, types.FileTypeMod)
+	}
+	return filepath.Join(d.ScriptDir, templateName), err
+}
+
+func (d *FileHelper) ModuleTargetPath(modulePath string) string {
+	return filepath.Join(d.ProjectRoot, modulePath)
+}
+
+func (d *FileHelper) ModuleDir(modulePath string) (string, error) {
+	moduleDir := filepath.Join(d.ProjectRoot, filepath.Dir(modulePath))
+	abs, err := filepath.Abs(moduleDir)
+
+	if err != nil {
+		return "", fmt.Errorf("Failed to resolve module directory %s: %v", moduleDir, err)
+	}
+
+	return abs, nil
+}
+
+func (d *FileHelper) LoadProjectReplaces() (*types.ProjectReplaces, error) {
+	data, err := os.ReadFile(d.ProjectReplacesPath)
+	if err != nil {
+		return nil, fmt.Errorf("could not read %s: %w", d.ProjectReplacesPath, err)
+	}
+
+	var projectReplaces types.ProjectReplaces
+	if err := yaml.Unmarshal(data, &projectReplaces); err != nil {
+		return nil, fmt.Errorf("could not parse %s: %w", d.ProjectReplacesPath, err)
+	}
+
+	return &projectReplaces, nil
+}
diff --git a/tools/generate-module-dependencies/internal/tidy-modules.go b/tools/generate-module-dependencies/internal/tidy-modules.go
new file mode 100644
index 00000000000..e7290769c76
--- /dev/null
+++ b/tools/generate-module-dependencies/internal/tidy-modules.go
@@ -0,0 +1,36 @@
+package internal
+
+import (
+	"fmt"
+	"log"
+	"os/exec"
+
+	"github.com/grafana/replace-generator/internal/helpers"
+	"github.com/grafana/replace-generator/internal/types"
+)
+
+func TidyModules(fileHelper *helpers.FileHelper, projectReplaces *types.ProjectReplaces) {
+	for _, module := range projectReplaces.Modules {
+		if err := runGoModTidy(fileHelper, module); err != nil {
+			log.Fatalf("Failed to run go mod tidy for module %q: %v", module.Name, err)
+		}
+	}
+}
+
+func runGoModTidy(dirs *helpers.FileHelper, module types.Module) error {
+	moduleDir, err := dirs.ModuleDir(module.Path)
+
+	if err != nil {
+		return err
+	}
+
+	cmd := exec.Command("go", "mod", "tidy")
+	cmd.Dir = moduleDir
+
+	log.Printf("Running go mod tidy in %s (module: %s)", moduleDir, module.Name)
+	if err := cmd.Run(); err != nil {
+		return fmt.Errorf("go mod tidy failed: %w", err)
+	}
+
+	return nil
+}
diff --git a/tools/generate-module-dependencies/internal/types/types.go b/tools/generate-module-dependencies/internal/types/types.go
new file mode 100644
index 00000000000..0a1fa9432e3
--- /dev/null
+++ b/tools/generate-module-dependencies/internal/types/types.go
@@ -0,0 +1,52 @@
+package types
+
+import (
+	"fmt"
+
+	"gopkg.in/yaml.v3"
+)
+
+type FileType string
+
+const (
+	FileTypeMod FileType = "mod"
+)
+
+func (ft FileType) String() string {
+	return string(ft)
+}
+
+func (ft *FileType) UnmarshalYAML(value *yaml.Node) error {
+	var s string
+	if err := value.Decode(&s); err != nil {
+		return err
+	}
+
+	switch FileType(s) {
+	case FileTypeMod:
+		*ft = FileTypeMod
+		return nil
+	default:
+		return fmt.Errorf("invalid Module.file_type %q (expected %q)", s, FileTypeMod)
+	}
+}
+
+// ReplaceEntry represents a single replace directive for a Go module dependency.
+type ReplaceEntry struct {
+	Comment     string `yaml:"comment"`
+	Dependency  string `yaml:"dependency"`
+	Replacement string `yaml:"replacement"`
+}
+
+// Module represents a Go module that needs replace directives applied.
+type Module struct {
+	Name     string   `yaml:"name"`
+	Path     string   `yaml:"path"`
+	FileType FileType `yaml:"file_type"`
+}
+
+// ProjectReplaces is the root structure of the dependency-replacements.yaml file.
+type ProjectReplaces struct {
+	Modules  []Module       `yaml:"modules"`
+	Replaces []ReplaceEntry `yaml:"replaces"`
+}
diff --git a/tools/generate-module-dependencies/main.go b/tools/generate-module-dependencies/main.go
new file mode 100644
index 00000000000..75aaee11d5f
--- /dev/null
+++ b/tools/generate-module-dependencies/main.go
@@ -0,0 +1,7 @@
+package main
+
+import "github.com/grafana/replace-generator/cmd"
+
+func main() {
+	cmd.Execute()
+}
diff --git a/tools/generate-module-dependencies/replaces-mod.tpl b/tools/generate-module-dependencies/replaces-mod.tpl
new file mode 100644
index 00000000000..0b2c8bfcf57
--- /dev/null
+++ b/tools/generate-module-dependencies/replaces-mod.tpl
@@ -0,0 +1,9 @@
+// BEGIN GENERATED REPLACES - DO NOT EDIT MANUALLY
+{{- range . }}
+{{- if .Comment }}
+// {{ .Comment }}
+{{- end }}
+replace {{ .Dependency }} => {{ .Replacement }}
+{{ end -}}
+// END GENERATED REPLACES
+
diff --git a/tools/generate-module-dependencies/testdata/basic-mod/dependency-replacements-test.yaml b/tools/generate-module-dependencies/testdata/basic-mod/dependency-replacements-test.yaml
new file mode 100644
index 00000000000..f4b5d4937dc
--- /dev/null
+++ b/tools/generate-module-dependencies/testdata/basic-mod/dependency-replacements-test.yaml
@@ -0,0 +1,14 @@
+modules:
+  - name: test-module
+    path: go.mod
+    file_type: mod
+
+replaces:
+  - comment: Test replace for example.com/package
+    dependency: example.com/package
+    replacement: example.com/fork v1.0.0
+
+  - comment: Another test replace
+    dependency: github.com/test/dependency
+    replacement: github.com/test/fork v1.0.0
+
diff --git a/tools/generate-module-dependencies/testdata/basic-mod/go.mod b/tools/generate-module-dependencies/testdata/basic-mod/go.mod
new file mode 100644
index 00000000000..a642c0aa26b
--- /dev/null
+++ b/tools/generate-module-dependencies/testdata/basic-mod/go.mod
@@ -0,0 +1,4 @@
+module test.example.com
+
+go 1.21
+
diff --git a/tools/generate-module-dependencies/testdata/basic-mod/go.mod.expected b/tools/generate-module-dependencies/testdata/basic-mod/go.mod.expected
new file mode 100644
index 00000000000..f13b7260caa
--- /dev/null
+++ b/tools/generate-module-dependencies/testdata/basic-mod/go.mod.expected
@@ -0,0 +1,13 @@
+module test.example.com
+
+go 1.21
+
+// BEGIN GENERATED REPLACES - DO NOT EDIT MANUALLY
+// Test replace for example.com/package
+replace example.com/package => example.com/fork v1.0.0
+
+// Another test replace
+replace github.com/test/dependency => github.com/test/fork v1.0.0
+
+// END GENERATED REPLACES
+
diff --git a/tools/generate-module-dependencies/testdata/update-existing-mod/dependency-replacements-test.yaml b/tools/generate-module-dependencies/testdata/update-existing-mod/dependency-replacements-test.yaml
new file mode 100644
index 00000000000..3e6330220b1
--- /dev/null
+++ b/tools/generate-module-dependencies/testdata/update-existing-mod/dependency-replacements-test.yaml
@@ -0,0 +1,10 @@
+modules:
+  - name: test-module
+    path: go.mod
+    file_type: mod
+
+replaces:
+  - comment: Updated replace
+    dependency: example.com/package
+    replacement: example.com/fork v1.1.0
+
diff --git a/tools/generate-module-dependencies/testdata/update-existing-mod/go.mod b/tools/generate-module-dependencies/testdata/update-existing-mod/go.mod
new file mode 100644
index 00000000000..8d6861788f7
--- /dev/null
+++ b/tools/generate-module-dependencies/testdata/update-existing-mod/go.mod
@@ -0,0 +1,10 @@
+module test.example.com
+
+go 1.21
+
+// BEGIN GENERATED REPLACES - DO NOT EDIT MANUALLY
+// Old comment
+replace example.com/package => example.com/fork v1.0.0
+
+// END GENERATED REPLACES
+
diff --git a/tools/generate-module-dependencies/testdata/update-existing-mod/go.mod.expected b/tools/generate-module-dependencies/testdata/update-existing-mod/go.mod.expected
new file mode 100644
index 00000000000..bd0a31b1559
--- /dev/null
+++ b/tools/generate-module-dependencies/testdata/update-existing-mod/go.mod.expected
@@ -0,0 +1,10 @@
+module test.example.com
+
+go 1.21
+
+// BEGIN GENERATED REPLACES - DO NOT EDIT MANUALLY
+// Updated replace
+replace example.com/package => example.com/fork v1.1.0
+
+// END GENERATED REPLACES
+

From e9ab34410d43e113f047e99d888b76877f52d8b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9onard=20Suslian?=
 <58216931+synthe102@users.noreply.github.com>
Date: Tue, 9 Dec 2025 15:37:39 +0100
Subject: [PATCH 17/24] fix: add StoreBuilder to mimir.alerts.kubernetes
 eventProcessor (#5010)

* fix: add StoreBuilder to mimir.alerts.kubernetes eventProcessor

Fixes #4975

* Add integration and unit tests

* Fix lint error

* Add changelog entry

---------

Co-authored-by: Paulin Todev <paulin.todev@gmail.com>
---
 CHANGELOG.md                                  |  2 +
 .../testdata/expected_1.yml                   | 11 ++++
 .../testdata/expected_2.yml                   | 11 ++++
 .../testdata/kubernetes.yml                   | 23 +++++++-
 .../mimir/alerts/kubernetes/alerts.go         |  7 ++-
 .../mimir/alerts/kubernetes/events.go         |  3 +-
 .../mimir/alerts/kubernetes/events_test.go    | 53 ++++++++++++++++++-
 7 files changed, 105 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b374eff6a1..0539345eb98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,8 @@ Main (unreleased)
 
 - Fix the `prometheus.operator.*` components internal scrape manager now having a way to enable ingesting native histograms. (@dehaansa)
 
+- [`mimir.alerts.kubernetes`] Fixed a bug which caused Alloy to crash when using a Kubernetes secret or configmap in the AlertmanagerConfig CRD. (@synthe102)
+
 v1.12.0
 -----------------
 
diff --git a/internal/cmd/integration-tests-k8s/tests/mimir-alerts-kubernetes/testdata/expected_1.yml b/internal/cmd/integration-tests-k8s/tests/mimir-alerts-kubernetes/testdata/expected_1.yml
index 5b32e9a83f5..78e74ef5203 100644
--- a/internal/cmd/integration-tests-k8s/tests/mimir-alerts-kubernetes/testdata/expected_1.yml
+++ b/internal/cmd/integration-tests-k8s/tests/mimir-alerts-kubernetes/testdata/expected_1.yml
@@ -34,6 +34,17 @@ alertmanager_config: |
     - name: alloy-namespace/global-config/myreceiver
     - name: testing/alertmgr-config1/null
     - name: testing/alertmgr-config1/myamc
+      slack_configs:
+      - api_url: https://val1.com
+        fields:
+        - title: title
+          value: value`
+        actions:
+        - type: type
+          text: text
+          name: my-action
+          confirm:
+            text: text
       webhook_configs:
       - url: http://test.url
         http_config:
diff --git a/internal/cmd/integration-tests-k8s/tests/mimir-alerts-kubernetes/testdata/expected_2.yml b/internal/cmd/integration-tests-k8s/tests/mimir-alerts-kubernetes/testdata/expected_2.yml
index 0b6890638a2..e51488d992f 100644
--- a/internal/cmd/integration-tests-k8s/tests/mimir-alerts-kubernetes/testdata/expected_2.yml
+++ b/internal/cmd/integration-tests-k8s/tests/mimir-alerts-kubernetes/testdata/expected_2.yml
@@ -25,6 +25,17 @@ alertmanager_config: |
     - name: alloy-namespace/global-config/myreceiver
     - name: testing/alertmgr-config1/null
     - name: testing/alertmgr-config1/myamc
+      slack_configs:
+      - api_url: https://val1.com
+        fields:
+        - title: title
+          value: value`
+        actions:
+        - type: type
+          text: text
+          name: my-action
+          confirm:
+            text: text
       webhook_configs:
       - url: http://test.url
         http_config:
diff --git a/internal/cmd/integration-tests-k8s/tests/mimir-alerts-kubernetes/testdata/kubernetes.yml b/internal/cmd/integration-tests-k8s/tests/mimir-alerts-kubernetes/testdata/kubernetes.yml
index d98fa150ab4..2f5e73fddc3 100644
--- a/internal/cmd/integration-tests-k8s/tests/mimir-alerts-kubernetes/testdata/kubernetes.yml
+++ b/internal/cmd/integration-tests-k8s/tests/mimir-alerts-kubernetes/testdata/kubernetes.yml
@@ -17,7 +17,7 @@ metadata:
   name: grafana-alloy
 rules:
 - apiGroups: [""]
-  resources: ["namespaces", "configmaps"]
+  resources: ["namespaces", "configmaps", "secrets"]
   verbs: ["get", "list", "watch"]
 - apiGroups: ["monitoring.coreos.com"]
   resources: ["alertmanagerconfigs"]
@@ -139,6 +139,14 @@ data:
     templates:
     - 'default_template'
 ---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: s-receiver-api-url
+  namespace: testing
+stringData:
+  api-url: https://val1.com
+---
 apiVersion: monitoring.coreos.com/v1alpha1
 kind: AlertmanagerConfig
 metadata:
@@ -159,6 +167,19 @@ spec:
     - url: http://test.url
       httpConfig:
         followRedirects: true
+    slackConfigs:
+    - apiURL:
+        key: api-url
+        name: "s-receiver-api-url"
+      actions:
+      - type: type
+        text: text
+        name: my-action
+        confirm:
+          text: text
+      fields:
+      - title: title
+        value: value`
 ---
 apiVersion: monitoring.coreos.com/v1alpha1
 kind: AlertmanagerConfig
diff --git a/internal/component/mimir/alerts/kubernetes/alerts.go b/internal/component/mimir/alerts/kubernetes/alerts.go
index fe2cffc46fb..d2bc3baa7f5 100644
--- a/internal/component/mimir/alerts/kubernetes/alerts.go
+++ b/internal/component/mimir/alerts/kubernetes/alerts.go
@@ -28,6 +28,7 @@ import (
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes"
 
+	"github.com/prometheus-operator/prometheus-operator/pkg/assets"
 	promExternalVersions "github.com/prometheus-operator/prometheus-operator/pkg/client/informers/externalversions"
 	promListers_v1alpha1 "github.com/prometheus-operator/prometheus-operator/pkg/client/listers/monitoring/v1alpha1"
 	promVersioned "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned"
@@ -233,8 +234,9 @@ func (c *Component) Startup(ctx context.Context) error {
 	if err != nil {
 		return fmt.Errorf("failed to unmarshal global config: %w", err)
 	}
+	sb := assets.NewStoreBuilder(c.k8sClient.CoreV1(), c.k8sClient.CoreV1())
 
-	c.eventProcessor = c.newEventProcessor(queue, informerStopChan, namespaceLister, cfgLister, *baseCfg)
+	c.eventProcessor = c.newEventProcessor(queue, informerStopChan, namespaceLister, cfgLister, *baseCfg, sb)
 
 	go c.eventProcessor.run(ctx)
 	return nil
@@ -346,7 +348,7 @@ func (c *Component) startConfigInformer(queue workqueue.TypedRateLimitingInterfa
 
 func (c *Component) newEventProcessor(queue workqueue.TypedRateLimitingInterface[commonK8s.Event], stopChan chan struct{},
 	namespaceLister coreListers.NamespaceLister, cfgLister promListers_v1alpha1.AlertmanagerConfigLister,
-	baseCfg alertmgr_cfg.Config) *eventProcessor {
+	baseCfg alertmgr_cfg.Config, sb *assets.StoreBuilder) *eventProcessor {
 
 	// Deep copy to make sure that a change in arguments won't immediately propagate to the event processor.
 	templateFiles := make(map[string]string, len(c.args.TemplateFiles))
@@ -366,5 +368,6 @@ func (c *Component) newEventProcessor(queue workqueue.TypedRateLimitingInterface
 		logger:            c.log,
 		kclient:           c.k8sClient,
 		templateFiles:     templateFiles,
+		storeBuilder:      sb,
 	}
 }
diff --git a/internal/component/mimir/alerts/kubernetes/events.go b/internal/component/mimir/alerts/kubernetes/events.go
index 3bcf528cad0..271cee9e6bf 100644
--- a/internal/component/mimir/alerts/kubernetes/events.go
+++ b/internal/component/mimir/alerts/kubernetes/events.go
@@ -41,6 +41,7 @@ type eventProcessor struct {
 	namespaceSelector labels.Selector
 	cfgSelector       labels.Selector
 	kclient           go_k8s.Interface
+	storeBuilder      *assets.StoreBuilder
 
 	baseCfg       alertmgr_cfg.Config
 	templateFiles map[string]string
@@ -253,7 +254,7 @@ func (e *eventProcessor) desiredStateFromKubernetes(ctx context.Context) (*alert
 		}
 	}
 
-	cfg, err := e.provisionAlertmanagerConfiguration(ctx, amConfigs, nil)
+	cfg, err := e.provisionAlertmanagerConfiguration(ctx, amConfigs, e.storeBuilder)
 	if err != nil {
 		return nil, fmt.Errorf("failed to provision Alertmanager configuration: %w", err)
 	}
diff --git a/internal/component/mimir/alerts/kubernetes/events_test.go b/internal/component/mimir/alerts/kubernetes/events_test.go
index ce5da66856a..b8631bd864e 100644
--- a/internal/component/mimir/alerts/kubernetes/events_test.go
+++ b/internal/component/mimir/alerts/kubernetes/events_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/grafana/alloy/internal/mimir/alertmanager"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	monitoringv1alpha1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1"
+	"github.com/prometheus-operator/prometheus-operator/pkg/assets"
 	promListers_v1alpha1 "github.com/prometheus-operator/prometheus-operator/pkg/client/listers/monitoring/v1alpha1"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -20,6 +21,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/kubernetes/fake"
 	coreListers "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
@@ -113,7 +115,20 @@ spec:
     webhookConfigs:
     - url: http://test.url
       httpConfig:
-        followRedirects: true`
+        followRedirects: true
+    slackConfigs:
+    - apiURL:
+        key: api-url
+        name: "s-receiver-api-url"
+      actions:
+      - type: type
+        text: text
+        name: my-action
+        confirm:
+          text: text
+      fields:
+      - title: title
+        value: value`
 
 	amConfCrd1_mynamespace := fmt.Sprintf(amConfCrd1, "mynamespace", "")
 	amConfCrd1_mynamespace_alloyLabel := fmt.Sprintf(amConfCrd1, "mynamespace", `{alloy: "yes"}`)
@@ -160,6 +175,17 @@ receivers:
 - name: "null"
 - name: mynamespace/alertmgr-config1/null
 - name: mynamespace/alertmgr-config1/myamc
+  slack_configs:
+  - api_url: https://val1.com
+    fields:
+    - title: title
+      value: value
+    actions:
+    - type: type
+      text: text
+      name: my-action
+      confirm:
+        text: text
   webhook_configs:
   - http_config:
       follow_redirects: true
@@ -196,6 +222,17 @@ receivers:
 - name: "null"
 - name: mynamespace/alertmgr-config1/null
 - name: mynamespace/alertmgr-config1/myamc
+  slack_configs:
+  - api_url: https://val1.com
+    fields:
+    - title: title
+      value: value
+    actions:
+    - type: type
+      text: text
+      name: my-action
+      confirm:
+        text: text
   webhook_configs:
   - http_config:
       follow_redirects: true
@@ -349,6 +386,19 @@ spec:
 				testLogger = util.TestLogger(t)
 			}
 
+			c := fake.NewSimpleClientset(
+				&corev1.Secret{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "s-receiver-api-url",
+						Namespace: "mynamespace",
+					},
+					Data: map[string][]byte{
+						"api-url": []byte("https://val1.com"),
+					},
+				},
+			)
+			store := assets.NewStoreBuilder(c.CoreV1(), c.CoreV1())
+
 			processor := &eventProcessor{
 				queue:             workqueue.NewTypedRateLimitingQueue(workqueue.DefaultTypedControllerRateLimiter[kubernetes.Event]()),
 				stopChan:          make(chan struct{}),
@@ -361,6 +411,7 @@ spec:
 				cfgSelector:       cfgSelector,
 				metrics:           newMetrics(),
 				logger:            testLogger,
+				storeBuilder:      store,
 			}
 
 			ctx := t.Context()

From e1f5704aa303a8345f645ee5584f9222b1a8f478 Mon Sep 17 00:00:00 2001
From: Sam DeHaan <sam.dehaan@grafana.com>
Date: Tue, 9 Dec 2025 10:56:14 -0500
Subject: [PATCH 18/24] Add changelog for PR 5002 (#5042)

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0539345eb98..85709ea7fe4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,8 @@ Main (unreleased)
 
 - [`mimir.alerts.kubernetes`] Fixed a bug which caused Alloy to crash when using a Kubernetes secret or configmap in the AlertmanagerConfig CRD. (@synthe102)
 
+- Remove extraneous `output` stage from the `cri` stage pipeline in `loki.process`. (@kalleep)
+
 v1.12.0
 -----------------
 

From 390d445e282d9324b3ac3463505ce52423b73e02 Mon Sep 17 00:00:00 2001
From: Piotr <17101802+thampiotr@users.noreply.github.com>
Date: Tue, 9 Dec 2025 15:57:48 +0000
Subject: [PATCH 19/24] Fix missing release note for v1.12 (#5043)

---
 docs/sources/release-notes.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/sources/release-notes.md b/docs/sources/release-notes.md
index c79268491b2..e1def66d7c6 100644
--- a/docs/sources/release-notes.md
+++ b/docs/sources/release-notes.md
@@ -14,6 +14,17 @@ For a complete list of changes to {{< param "FULL_PRODUCT_NAME" >}}, with links
 
 [Changelog]: https://github.com/grafana/alloy/blob/main/CHANGELOG.md
 
+## v1.12
+
+### Breaking changes due to bugfixes in Prometheus exporters
+
+The `prometheus.exporter.blackbox`, `prometheus.exporter.snmp` and `prometheus.exporter.statsd` components now use the component ID instead of the hostname as
+their `instance` label in their exported metrics. This is a consequence of a bug fix that could lead to [missing data when using the exporter
+with clustering](https://github.com/grafana/alloy/issues/1009).
+
+If you would like to retain the previous behaviour, you can use `discovery.relabel` with `action = "replace"` rule to
+set the `instance` label to `sys.env("HOSTNAME")`.
+
 ## v1.11
 
 ### Breaking changes due to major version upgrade of Prometheus

From bd52fba8853bfed98a8d70d88d73fad5b4709381 Mon Sep 17 00:00:00 2001
From: Kyle Eckhart <kgeckhart@users.noreply.github.com>
Date: Tue, 9 Dec 2025 12:54:51 -0500
Subject: [PATCH 20/24] remove labelstore from prometheus interceptor (#4890)

* Add some high level pipeline tests for prometheus

* Remove labelstore interactions from the interceptor

* Move back to uber atomic and fix flaky remote write test

* One more thing to move back to uber atomic

* Actually fix the flaky test and lints

* Fix flaky test for real and add a comment to Fanout about its role in global labels

* Put componentID back on fanout for now
---
 CHANGELOG.md                                  |   2 +
 .../component/prometheus/enrich/enrich.go     |   1 -
 .../prometheus/enrich/enrich_test.go          |   3 +-
 internal/component/prometheus/fanout.go       |   1 +
 internal/component/prometheus/fanout_test.go  |   3 +-
 internal/component/prometheus/interceptor.go  |  65 +----
 .../component/prometheus/pipeline_test.go     | 270 ++++++++++++++++++
 .../receive_http/receive_http_test.go         |   2 -
 .../component/prometheus/relabel/relabel.go   |   1 -
 .../prometheus/relabel/relabel_test.go        |  55 +---
 .../prometheus/remotewrite/interceptor.go     | 147 ++++++++++
 .../prometheus/remotewrite/remote_write.go    | 133 +--------
 .../remotewrite/remote_write_test.go          |  14 +-
 .../prometheus/scrape/interceptor.go          |  77 +++++
 .../component/prometheus/scrape/scrape.go     |  67 +----
 .../runtime/componenttest/componenttest.go    |  10 +-
 16 files changed, 539 insertions(+), 312 deletions(-)
 create mode 100644 internal/component/prometheus/pipeline_test.go
 create mode 100644 internal/component/prometheus/remotewrite/interceptor.go
 create mode 100644 internal/component/prometheus/scrape/interceptor.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85709ea7fe4..da210a1999e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,8 @@ Main (unreleased)
   - `explain_plans`
     - always send an explain plan log message for each query, even skipped or errored queries. (@rgeyer)
 
+- Reduced resource overhead of `prometheus.scrape`, `prometheus.relabel`, `prometheus.enrich`, and `prometheus.remote_write` by removing unnecessary usage of labelstore.LabelStore. (@kgeckhart)
+
 ### Bugfixes
 
 - (_Public Preview_) Additions to `database_observability.postgres` component:
diff --git a/internal/component/prometheus/enrich/enrich.go b/internal/component/prometheus/enrich/enrich.go
index 2128ac544bb..0a3aa43bf29 100644
--- a/internal/component/prometheus/enrich/enrich.go
+++ b/internal/component/prometheus/enrich/enrich.go
@@ -100,7 +100,6 @@ func New(opts component.Options, args Arguments) (*Component, error) {
 	c.fanout = prometheus.NewFanout(args.ForwardTo, opts.ID, opts.Registerer, ls)
 	c.receiver = prometheus.NewInterceptor(
 		c.fanout,
-		ls,
 		prometheus.WithComponentID(c.opts.ID),
 		prometheus.WithAppendHook(func(_ storage.SeriesRef, l labels.Labels, t int64, v float64, next storage.Appender) (storage.SeriesRef, error) {
 			if c.exited.Load() {
diff --git a/internal/component/prometheus/enrich/enrich_test.go b/internal/component/prometheus/enrich/enrich_test.go
index ba75d2cde26..631aab45e65 100644
--- a/internal/component/prometheus/enrich/enrich_test.go
+++ b/internal/component/prometheus/enrich/enrich_test.go
@@ -108,9 +108,8 @@ func TestEnricher(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			ls := labelstore.New(nil, prom.DefaultRegisterer)
 			fanout := prometheus.NewInterceptor(
-				nil, ls,
+				nil,
 				prometheus.WithAppendHook(func(ref storage.SeriesRef, l labels.Labels, _ int64, _ float64, _ storage.Appender) (storage.SeriesRef, error) {
 					for name, value := range tt.expectedLabels {
 						require.Equal(t, l.Get(name), value)
diff --git a/internal/component/prometheus/fanout.go b/internal/component/prometheus/fanout.go
index bcb0e604377..5a3e96f499b 100644
--- a/internal/component/prometheus/fanout.go
+++ b/internal/component/prometheus/fanout.go
@@ -23,6 +23,7 @@ import (
 var _ storage.Appendable = (*Fanout)(nil)
 
 // Fanout supports the default Alloy style of appendables since it can go to multiple outputs. It also allows the intercepting of appends.
+// It also maintains the responsibility of assigning global ref IDs to a series via the label store.
 type Fanout struct {
 	mut sync.RWMutex
 	// children is where to fan out.
diff --git a/internal/component/prometheus/fanout_test.go b/internal/component/prometheus/fanout_test.go
index e9ab46a7aac..138417a5ad6 100644
--- a/internal/component/prometheus/fanout_test.go
+++ b/internal/component/prometheus/fanout_test.go
@@ -3,9 +3,10 @@ package prometheus
 import (
 	"testing"
 
-	"github.com/grafana/alloy/internal/service/labelstore"
 	"github.com/prometheus/client_golang/prometheus"
 
+	"github.com/grafana/alloy/internal/service/labelstore"
+
 	"github.com/prometheus/prometheus/storage"
 
 	"github.com/stretchr/testify/require"
diff --git a/internal/component/prometheus/interceptor.go b/internal/component/prometheus/interceptor.go
index 7994f3530d5..8c57f706ffc 100644
--- a/internal/component/prometheus/interceptor.go
+++ b/internal/component/prometheus/interceptor.go
@@ -8,9 +8,6 @@ import (
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/metadata"
 	"github.com/prometheus/prometheus/storage"
-	"go.uber.org/atomic"
-
-	"github.com/grafana/alloy/internal/service/labelstore"
 )
 
 // Interceptor is a storage.Appendable which invokes callback functions upon
@@ -26,12 +23,6 @@ type Interceptor struct {
 	// next is the next appendable to pass in the chain.
 	next storage.Appendable
 
-	ls labelstore.LabelStore
-
-	// lastSeriesCount stores the number of series that were sent through the last interceptappender. It helps to estimate how
-	// much memory to allocate for the staleness trackers.
-	lastSeriesCount atomic.Int64
-
 	componentID string
 }
 
@@ -39,10 +30,9 @@ var _ storage.Appendable = (*Interceptor)(nil)
 
 // NewInterceptor creates a new Interceptor storage.Appendable. Options can be
 // provided to NewInterceptor to install custom hooks for different methods.
-func NewInterceptor(next storage.Appendable, ls labelstore.LabelStore, opts ...InterceptorOption) *Interceptor {
+func NewInterceptor(next storage.Appendable, opts ...InterceptorOption) *Interceptor {
 	i := &Interceptor{
 		next: next,
-		ls:   ls,
 	}
 	for _, opt := range opts {
 		opt(i)
@@ -102,27 +92,23 @@ func WithComponentID(id string) InterceptorOption {
 }
 
 // Appender satisfies the Appendable interface.
-func (f *Interceptor) Appender(ctx context.Context) storage.Appender {
+func (i *Interceptor) Appender(ctx context.Context) storage.Appender {
 	app := &interceptappender{
-		interceptor:       f,
-		ls:                f.ls,
-		stalenessTrackers: make([]labelstore.StalenessTracker, 0, f.lastSeriesCount.Load()),
+		interceptor: i,
 	}
-	if f.next != nil {
-		app.child = f.next.Appender(ctx)
+	if i.next != nil {
+		app.child = i.next.Appender(ctx)
 	}
 	return app
 }
 
-func (f *Interceptor) String() string {
-	return f.componentID + ".receiver"
+func (i *Interceptor) String() string {
+	return i.componentID + ".receiver"
 }
 
 type interceptappender struct {
-	interceptor       *Interceptor
-	child             storage.Appender
-	ls                labelstore.LabelStore
-	stalenessTrackers []labelstore.StalenessTracker
+	interceptor *Interceptor
+	child       storage.Appender
 }
 
 func (a *interceptappender) SetOptions(opts *storage.AppendOptions) {
@@ -135,15 +121,6 @@ var _ storage.Appender = (*interceptappender)(nil)
 
 // Append satisfies the Appender interface.
 func (a *interceptappender) Append(ref storage.SeriesRef, l labels.Labels, t int64, v float64) (storage.SeriesRef, error) {
-	if ref == 0 {
-		ref = storage.SeriesRef(a.ls.GetOrAddGlobalRefID(l))
-	}
-	a.stalenessTrackers = append(a.stalenessTrackers, labelstore.StalenessTracker{
-		GlobalRefID: uint64(ref),
-		Labels:      l,
-		Value:       v,
-	})
-
 	if a.interceptor.onAppend != nil {
 		return a.interceptor.onAppend(ref, l, t, v, a.child)
 	}
@@ -155,8 +132,6 @@ func (a *interceptappender) Append(ref storage.SeriesRef, l labels.Labels, t int
 
 // Commit satisfies the Appender interface.
 func (a *interceptappender) Commit() error {
-	a.interceptor.lastSeriesCount.Store(int64(len(a.stalenessTrackers)))
-	a.ls.TrackStaleness(a.stalenessTrackers)
 	if a.child == nil {
 		return nil
 	}
@@ -165,8 +140,6 @@ func (a *interceptappender) Commit() error {
 
 // Rollback satisfies the Appender interface.
 func (a *interceptappender) Rollback() error {
-	a.interceptor.lastSeriesCount.Store(int64(len(a.stalenessTrackers)))
-	a.ls.TrackStaleness(a.stalenessTrackers)
 	if a.child == nil {
 		return nil
 	}
@@ -180,10 +153,6 @@ func (a *interceptappender) AppendExemplar(
 	e exemplar.Exemplar,
 ) (storage.SeriesRef, error) {
 
-	if ref == 0 {
-		ref = storage.SeriesRef(a.ls.GetOrAddGlobalRefID(l))
-	}
-
 	if a.interceptor.onAppendExemplar != nil {
 		return a.interceptor.onAppendExemplar(ref, l, e, a.child)
 	}
@@ -200,10 +169,6 @@ func (a *interceptappender) UpdateMetadata(
 	m metadata.Metadata,
 ) (storage.SeriesRef, error) {
 
-	if ref == 0 {
-		ref = storage.SeriesRef(a.ls.GetOrAddGlobalRefID(l))
-	}
-
 	if a.interceptor.onUpdateMetadata != nil {
 		return a.interceptor.onUpdateMetadata(ref, l, m, a.child)
 	}
@@ -221,10 +186,6 @@ func (a *interceptappender) AppendHistogram(
 	fh *histogram.FloatHistogram,
 ) (storage.SeriesRef, error) {
 
-	if ref == 0 {
-		ref = storage.SeriesRef(a.ls.GetOrAddGlobalRefID(l))
-	}
-	// TODO histograms are not currently tracked for staleness causing them to be held forever
 	if a.interceptor.onAppendHistogram != nil {
 		return a.interceptor.onAppendHistogram(ref, l, t, h, fh, a.child)
 	}
@@ -240,10 +201,6 @@ func (a *interceptappender) AppendCTZeroSample(
 	t, ct int64,
 ) (storage.SeriesRef, error) {
 
-	if ref == 0 {
-		ref = storage.SeriesRef(a.ls.GetOrAddGlobalRefID(l))
-	}
-
 	if a.interceptor.onAppendCTZeroSample != nil {
 		return a.interceptor.onAppendCTZeroSample(ref, l, t, ct, a.child)
 	}
@@ -261,10 +218,6 @@ func (a *interceptappender) AppendHistogramCTZeroSample(
 	fh *histogram.FloatHistogram,
 ) (storage.SeriesRef, error) {
 
-	if ref == 0 {
-		ref = storage.SeriesRef(a.ls.GetOrAddGlobalRefID(l))
-	}
-
 	if a.child == nil {
 		return 0, nil
 	}
diff --git a/internal/component/prometheus/pipeline_test.go b/internal/component/prometheus/pipeline_test.go
new file mode 100644
index 00000000000..92f82bd56ab
--- /dev/null
+++ b/internal/component/prometheus/pipeline_test.go
@@ -0,0 +1,270 @@
+package prometheus_test
+
+import (
+	"context"
+	"fmt"
+	"log/slog"
+	"testing"
+	"time"
+
+	"github.com/go-kit/log"
+	promclient "github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/prometheus/model/labels"
+	"github.com/prometheus/prometheus/storage"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.uber.org/atomic"
+	"golang.org/x/exp/maps"
+
+	"github.com/grafana/alloy/internal/component"
+	"github.com/grafana/alloy/internal/component/prometheus"
+	"github.com/grafana/alloy/internal/component/prometheus/relabel"
+	"github.com/grafana/alloy/internal/component/prometheus/remotewrite"
+	"github.com/grafana/alloy/internal/component/prometheus/scrape"
+	"github.com/grafana/alloy/internal/runtime/componenttest"
+	"github.com/grafana/alloy/internal/runtime/logging"
+	"github.com/grafana/alloy/internal/service/labelstore"
+	"github.com/grafana/alloy/internal/service/livedebugging"
+	"github.com/grafana/alloy/internal/static/metrics/wal"
+	"github.com/grafana/alloy/internal/util"
+	"github.com/grafana/alloy/internal/util/testappender"
+	"github.com/grafana/alloy/syntax"
+)
+
+// This test simulates a scrape -> remote_write pipeline, without actually scraping
+func TestPipeline(t *testing.T) {
+	pipeline, ls, destination := newDefaultPipeline(t, util.TestLogger(t))
+
+	// We need to use a future timestamp since remote_write will ignore any
+	// sample which is earlier than the time when it started. Adding a minute
+	// ensures that our samples will never get ignored.
+	sampleTimestamp := time.Now().Add(time.Minute).UnixMilli()
+
+	// Send metrics to our component. These will be written to the WAL and
+	// subsequently written to our HTTP server.
+	lset1 := labels.FromStrings("foo", "bar")
+	ref1 := sendMetric(t, pipeline.Appender(t.Context()), lset1, sampleTimestamp, 12)
+	lset2 := labels.FromStrings("fizz", "buzz")
+	ref2 := sendMetric(t, pipeline.Appender(t.Context()), lset2, sampleTimestamp, 34)
+
+	expect := []*testappender.MetricSample{{
+		Labels:    lset1,
+		Timestamp: sampleTimestamp,
+		Value:     12,
+	}, {
+		Labels:    lset2,
+		Timestamp: sampleTimestamp,
+		Value:     34,
+	}}
+
+	require.EventuallyWithT(t, func(t *assert.CollectT) {
+		require.Len(t, destination.CollectedSamples(), 2)
+		require.ElementsMatch(t, expect, maps.Values(destination.CollectedSamples()))
+	}, 5*time.Second, 10*time.Millisecond, "timed out waiting for metrics to be written to destination")
+
+	ref := ls.GetOrAddGlobalRefID(lset1)
+	require.NotZero(t, ref)
+	// Append result ref should match the labelstore ref
+	require.Equal(t, ref, ref1)
+	localRef := ls.GetLocalRefID("prometheus.remote_write.test", ref)
+	require.NotZero(t, localRef)
+
+	ref = ls.GetOrAddGlobalRefID(lset2)
+	require.NotZero(t, ref)
+	// Append result ref should match the labelstore ref
+	require.Equal(t, ref, ref2)
+	localRef = ls.GetLocalRefID("prometheus.remote_write.test", ref)
+	require.NotZero(t, localRef)
+}
+
+// This test simulates a scrape -> relabel -> remote_write pipeline, without actually scraping
+func TestRelabelPipeline(t *testing.T) {
+	pipeline, ls, destination := newRelabelPipeline(t, util.TestLogger(t))
+
+	// We need to use a future timestamp since remote_write will ignore any
+	// sample which is earlier than the time when it started. Adding a minute
+	// ensures that our samples will never get ignored.
+	sampleTimestamp := time.Now().Add(time.Minute).UnixMilli()
+
+	// Send metrics to our component. These will be written to the WAL and
+	// subsequently written to our HTTP server.
+	lset1 := labels.FromStrings("foo", "bar")
+	ref1 := sendMetric(t, pipeline.Appender(t.Context()), lset1, sampleTimestamp, 12)
+	lset2 := labels.FromStrings("fizz", "buzz")
+	ref2 := sendMetric(t, pipeline.Appender(t.Context()), lset2, sampleTimestamp, 34)
+
+	expect := []*testappender.MetricSample{{
+		Labels:    labels.NewBuilder(lset1).Set("lbl", "foo").Labels(),
+		Timestamp: sampleTimestamp,
+		Value:     12,
+	}, {
+		Labels:    labels.NewBuilder(lset2).Set("lbl", "foo").Labels(),
+		Timestamp: sampleTimestamp,
+		Value:     34,
+	}}
+
+	require.EventuallyWithT(t, func(t *assert.CollectT) {
+		require.Len(t, destination.CollectedSamples(), 2)
+		require.ElementsMatch(t, expect, maps.Values(destination.CollectedSamples()))
+	}, 1*time.Minute, 100*time.Millisecond, "timed out waiting for metrics to be written to destination")
+
+	ref := ls.GetOrAddGlobalRefID(lset1)
+	require.NotZero(t, ref)
+	// Append result ref should match the labelstore ref
+	require.Equal(t, ref, ref1)
+	// This was relabeled, so we shouldn't have a local ref
+	localRef := ls.GetLocalRefID("prometheus.remote_write.test", ref)
+	require.Zero(t, localRef)
+
+	ref = ls.GetOrAddGlobalRefID(lset2)
+	require.NotZero(t, ref)
+	// Append result ref should match the labelstore ref
+	require.Equal(t, ref, ref2)
+
+	// This was relabeled, so we shouldn't have a local ref
+	localRef = ls.GetLocalRefID("prometheus.remote_write.test", ref)
+	require.Zero(t, localRef)
+
+	lset1Relabeled := labels.NewBuilder(lset1).Set("lbl", "foo").Labels()
+	ref = ls.GetOrAddGlobalRefID(lset1Relabeled)
+	require.NotZero(t, ref)
+	localRef = ls.GetLocalRefID("prometheus.remote_write.test", ref)
+	require.NotZero(t, localRef)
+
+	lset2Relabeled := labels.NewBuilder(lset2).Set("lbl", "foo").Labels()
+	ref = ls.GetOrAddGlobalRefID(lset2Relabeled)
+	require.NotZero(t, ref)
+	localRef = ls.GetLocalRefID("prometheus.remote_write.test", ref)
+	require.NotZero(t, localRef)
+}
+
+func BenchmarkPipelines(b *testing.B) {
+	tests := []struct {
+		name            string
+		pipelineBuilder func(t testing.TB, logger log.Logger) (storage.Appendable, labelstore.LabelStore, testappender.CollectingAppender)
+	}{
+		{"default", newDefaultPipeline},
+		{"relabel", newRelabelPipeline},
+	}
+
+	numberOfMetrics := []int{2, 10, 100, 1000}
+
+	for _, n := range numberOfMetrics {
+		for _, tt := range tests {
+			// Don't need care about the labelstore and destination for benchmarks
+			pipeline, _, _ := tt.pipelineBuilder(b, log.NewNopLogger())
+			b.Run(fmt.Sprintf("%s/%d-metrics", tt.name, n), func(b *testing.B) {
+				b.ReportAllocs()
+				b.ResetTimer()
+
+				for b.Loop() {
+					for i := 0; i < n; i++ {
+						sendMetric(
+							b,
+							pipeline.Appender(b.Context()),
+							labels.FromStrings(fmt.Sprintf("metric-%d", i), fmt.Sprintf("metric-%d", i)),
+							time.Now().Add(time.Minute).UnixMilli(),
+							float64(i),
+						)
+					}
+				}
+			})
+		}
+	}
+}
+
+func newDefaultPipeline(t testing.TB, logger log.Logger) (storage.Appendable, labelstore.LabelStore, testappender.CollectingAppender) {
+	ls := labelstore.New(logger, promclient.DefaultRegisterer)
+	rwAppendable, rwDestination := newRemoteWriteComponent(t, logger, ls)
+	pipelineAppendable := prometheus.NewFanout([]storage.Appendable{rwAppendable}, "", promclient.DefaultRegisterer, ls)
+	scrapeInterceptor := scrape.NewInterceptor("prometheus.scrape.test", livedebugging.NewLiveDebugging(), pipelineAppendable)
+
+	return scrapeInterceptor, ls, rwDestination
+}
+
+func newRelabelPipeline(t testing.TB, logger log.Logger) (storage.Appendable, labelstore.LabelStore, testappender.CollectingAppender) {
+	ls := labelstore.New(logger, promclient.DefaultRegisterer)
+	rwAppendable, rwDestination := newRemoteWriteComponent(t, logger, ls)
+	relabelAppendable := newRelabelComponent(t, logger, []storage.Appendable{rwAppendable}, ls)
+	pipelineAppendable := prometheus.NewFanout([]storage.Appendable{relabelAppendable}, "", promclient.DefaultRegisterer, ls)
+	scrapeInterceptor := scrape.NewInterceptor("prometheus.scrape.test", livedebugging.NewLiveDebugging(), pipelineAppendable)
+
+	return scrapeInterceptor, ls, rwDestination
+}
+
+func newRemoteWriteComponent(t testing.TB, logger log.Logger, ls *labelstore.Service) (storage.Appendable, testappender.CollectingAppender) {
+	walDir := t.TempDir()
+
+	walStorage, err := wal.NewStorage(logger, promclient.NewRegistry(), walDir)
+	require.NoError(t, err)
+
+	fanoutLogger := slog.New(
+		logging.NewSlogGoKitHandler(
+			log.With(logger, "subcomponent", "fanout"),
+		),
+	)
+
+	inMemoryAppendable := testappender.ConstantAppendable{Inner: testappender.NewCollectingAppender()}
+	store := storage.NewFanout(fanoutLogger, walStorage, testStorage{inMemoryAppendable: inMemoryAppendable})
+
+	return remotewrite.NewInterceptor("prometheus.remote_write.test", &atomic.Bool{}, livedebugging.NewLiveDebugging(), ls, store), inMemoryAppendable.Inner
+}
+
+type testStorage struct {
+	// Embed Queryable/ChunkQueryable for compatibility, but don't actually implement it.
+	storage.Queryable
+	storage.ChunkQueryable
+
+	inMemoryAppendable storage.Appendable
+}
+
+func (t testStorage) Appender(ctx context.Context) storage.Appender {
+	return t.inMemoryAppendable.Appender(ctx)
+}
+
+func (t testStorage) StartTime() (int64, error) {
+	return 0, nil
+}
+
+func (t testStorage) Close() error {
+	return nil
+}
+
+func newRelabelComponent(t testing.TB, logger log.Logger, forwardTo []storage.Appendable, ls *labelstore.Service) storage.Appendable {
+	cfg := `forward_to = []
+			rule {
+				action       = "replace"
+				target_label = "lbl"
+				replacement  = "foo"
+			}`
+	var args relabel.Arguments
+	require.NoError(t, syntax.Unmarshal([]byte(cfg), &args))
+	args.ForwardTo = forwardTo
+
+	tc, err := componenttest.NewControllerFromID(logger, "prometheus.relabel")
+	require.NoError(t, err)
+	go func() {
+		err = tc.Run(componenttest.TestContext(t), args, func(opts component.Options) component.Options {
+			inner := opts.GetServiceData
+			opts.GetServiceData = func(name string) (interface{}, error) {
+				if name == labelstore.ServiceName {
+					return ls, nil
+				}
+				return inner(name)
+			}
+			return opts
+		})
+		require.NoError(t, err)
+	}()
+	require.NoError(t, tc.WaitRunning(5*time.Second))
+
+	return tc.Exports().(relabel.Exports).Receiver
+}
+
+func sendMetric(t testing.TB, appender storage.Appender, labels labels.Labels, time int64, value float64) uint64 {
+	ref, err := appender.Append(0, labels, time, value)
+	require.NoError(t, err)
+	require.NoError(t, appender.Commit())
+
+	return uint64(ref)
+}
diff --git a/internal/component/prometheus/receive_http/receive_http_test.go b/internal/component/prometheus/receive_http/receive_http_test.go
index 4907eed9ab1..f864a18bd1a 100644
--- a/internal/component/prometheus/receive_http/receive_http_test.go
+++ b/internal/component/prometheus/receive_http/receive_http_test.go
@@ -569,10 +569,8 @@ func testAppendable(actualSamples chan testSample) []storage.Appendable {
 		return ref, nil
 	}
 
-	ls := labelstore.New(nil, prometheus.DefaultRegisterer)
 	return []storage.Appendable{alloyprom.NewInterceptor(
 		nil,
-		ls,
 		alloyprom.WithAppendHook(
 			hookFn))}
 }
diff --git a/internal/component/prometheus/relabel/relabel.go b/internal/component/prometheus/relabel/relabel.go
index 10cb2853748..3cf7f8c12d8 100644
--- a/internal/component/prometheus/relabel/relabel.go
+++ b/internal/component/prometheus/relabel/relabel.go
@@ -156,7 +156,6 @@ func New(o component.Options, args Arguments) (*Component, error) {
 	c.fanout = prometheus.NewFanout(args.ForwardTo, o.ID, o.Registerer, ls)
 	c.receiver = prometheus.NewInterceptor(
 		c.fanout,
-		ls,
 		prometheus.WithComponentID(c.opts.ID),
 		prometheus.WithAppendHook(func(ref storage.SeriesRef, l labels.Labels, t int64, v float64, next storage.Appender) (storage.SeriesRef, error) {
 			if c.exited.Load() {
diff --git a/internal/component/prometheus/relabel/relabel_test.go b/internal/component/prometheus/relabel/relabel_test.go
index d1145cbb5bc..b82845ba2cf 100644
--- a/internal/component/prometheus/relabel/relabel_test.go
+++ b/internal/component/prometheus/relabel/relabel_test.go
@@ -25,32 +25,8 @@ import (
 	"github.com/grafana/alloy/syntax"
 )
 
-func TestRelabelThroughAppend(t *testing.T) {
-	appendable, relabeller := generateRelabel(t)
-	lbls := labels.FromStrings("__address__", "localhost")
-
-	app := appendable.Appender(t.Context())
-	relabedRef, err := app.Append(storage.SeriesRef(0), lbls, time.Now().UnixMilli(), 0)
-	require.NoError(t, err)
-	require.NoError(t, app.Commit())
-
-	require.True(t, relabeller.cache.Len() == 1)
-	// Get the first entry since we only have one we can get oldest
-	ref, cachedLbls, _ := relabeller.cache.GetOldest()
-
-	// We shouldn't have allowed a zero ref to be cached
-	require.NotEqual(t, storage.SeriesRef(0), ref)
-	require.NotEqual(t, lbls, cachedLbls)
-
-	// We should have added a new ref after relabeling
-	require.NotEqual(t, storage.SeriesRef(0), relabedRef)
-
-	// That ref should not be the cached ref
-	require.NotEqual(t, relabedRef, ref)
-}
-
 func TestUpdateReset(t *testing.T) {
-	_, relabeller := generateRelabel(t)
+	relabeller := generateRelabel(t)
 	lbls := labels.FromStrings("__address__", "localhost")
 	relabeller.relabel(storage.SeriesRef(1), 0, lbls)
 	require.True(t, relabeller.cache.Len() == 1)
@@ -72,8 +48,7 @@ func TestValidator(t *testing.T) {
 }
 
 func TestNil(t *testing.T) {
-	ls := labelstore.New(nil, prom.DefaultRegisterer)
-	fanout := prometheus.NewInterceptor(nil, ls, prometheus.WithAppendHook(func(ref storage.SeriesRef, _ labels.Labels, _ int64, _ float64, _ storage.Appender) (storage.SeriesRef, error) {
+	fanout := prometheus.NewInterceptor(nil, prometheus.WithAppendHook(func(ref storage.SeriesRef, _ labels.Labels, _ int64, _ float64, _ storage.Appender) (storage.SeriesRef, error) {
 		require.True(t, false)
 		return ref, nil
 	}))
@@ -102,7 +77,7 @@ func TestNil(t *testing.T) {
 }
 
 func TestLRU(t *testing.T) {
-	_, relabeller := generateRelabel(t)
+	relabeller := generateRelabel(t)
 
 	for i := 0; i < 600_000; i++ {
 		lbls := labels.FromStrings("__address__", "localhost", "inc", strconv.Itoa(i))
@@ -112,7 +87,7 @@ func TestLRU(t *testing.T) {
 }
 
 func TestLRUNaN(t *testing.T) {
-	_, relabeller := generateRelabel(t)
+	relabeller := generateRelabel(t)
 	lbls := labels.FromStrings("__address__", "localhost")
 	ref := storage.SeriesRef(1)
 	relabeller.relabel(ref, 0, lbls)
@@ -127,7 +102,7 @@ func TestLRUNaN(t *testing.T) {
 }
 
 func TestMetrics(t *testing.T) {
-	_, relabeller := generateRelabel(t)
+	relabeller := generateRelabel(t)
 	lbls := labels.FromStrings("__address__", "localhost")
 
 	relabeller.relabel(storage.SeriesRef(1), 0, lbls)
@@ -138,8 +113,7 @@ func TestMetrics(t *testing.T) {
 }
 
 func BenchmarkCache(b *testing.B) {
-	ls := labelstore.New(nil, prom.DefaultRegisterer)
-	fanout := prometheus.NewInterceptor(nil, ls, prometheus.WithAppendHook(func(ref storage.SeriesRef, l labels.Labels, _ int64, _ float64, _ storage.Appender) (storage.SeriesRef, error) {
+	fanout := prometheus.NewInterceptor(nil, prometheus.WithAppendHook(func(ref storage.SeriesRef, l labels.Labels, _ int64, _ float64, _ storage.Appender) (storage.SeriesRef, error) {
 		require.True(b, l.Has("new_label"))
 		return ref, nil
 	}))
@@ -173,17 +147,12 @@ func BenchmarkCache(b *testing.B) {
 	app.Commit()
 }
 
-func generateRelabel(t *testing.T) (storage.Appendable, *Component) {
-	ls := labelstore.New(nil, prom.DefaultRegisterer)
-	fanout := prometheus.NewInterceptor(nil, ls)
-	var appendable storage.Appendable
+func generateRelabel(t *testing.T) *Component {
+	fanout := prometheus.NewInterceptor(nil)
 	relabeller, err := New(component.Options{
-		ID:     "1",
-		Logger: util.TestAlloyLogger(t),
-		OnStateChange: func(e component.Exports) {
-			newE := e.(Exports)
-			appendable = newE.Receiver
-		},
+		ID:             "1",
+		Logger:         util.TestAlloyLogger(t),
+		OnStateChange:  func(e component.Exports) {},
 		Registerer:     prom.NewRegistry(),
 		GetServiceData: getServiceData,
 	}, Arguments{
@@ -201,7 +170,7 @@ func generateRelabel(t *testing.T) (storage.Appendable, *Component) {
 	})
 	require.NotNil(t, relabeller)
 	require.NoError(t, err)
-	return appendable, relabeller
+	return relabeller
 }
 
 func TestRuleGetter(t *testing.T) {
diff --git a/internal/component/prometheus/remotewrite/interceptor.go b/internal/component/prometheus/remotewrite/interceptor.go
new file mode 100644
index 00000000000..dbd2ae0ce02
--- /dev/null
+++ b/internal/component/prometheus/remotewrite/interceptor.go
@@ -0,0 +1,147 @@
+package remotewrite
+
+import (
+	"fmt"
+
+	"github.com/prometheus/prometheus/model/exemplar"
+	"github.com/prometheus/prometheus/model/histogram"
+	"github.com/prometheus/prometheus/model/labels"
+	"github.com/prometheus/prometheus/model/metadata"
+	"github.com/prometheus/prometheus/storage"
+	"go.uber.org/atomic"
+
+	"github.com/grafana/alloy/internal/component/prometheus"
+	"github.com/grafana/alloy/internal/service/labelstore"
+	"github.com/grafana/alloy/internal/service/livedebugging"
+)
+
+func NewInterceptor(componentID string, exited *atomic.Bool, debugDataPublisher livedebugging.DebugDataPublisher, ls labelstore.LabelStore, store storage.Storage) *prometheus.Interceptor {
+	liveDebuggingComponentID := livedebugging.ComponentID(componentID)
+
+	handleLocalLink := func(globalRef uint64, l labels.Labels, cachedLocalRef uint64, newLocalRef uint64) {
+		// We had a local ref that was still valid nothing to do
+		if cachedLocalRef != 0 && cachedLocalRef == newLocalRef {
+			return
+		}
+
+		// There are some unique scenarios that can have an append end with no error but the returned localRef is zero (duplicate exemplars).
+		// We don't want to update a valid link to an invalid link
+		if cachedLocalRef != 0 && newLocalRef == 0 {
+			return
+		}
+
+		// This should never happen in a proper appender chain. Since we cannot enforce it, we are extra defensive.
+		if globalRef == 0 {
+			globalRef = ls.GetOrAddGlobalRefID(l)
+		}
+
+		if cachedLocalRef == 0 {
+			ls.AddLocalLink(componentID, globalRef, newLocalRef)
+		} else {
+			ls.ReplaceLocalLink(componentID, globalRef, cachedLocalRef, newLocalRef)
+		}
+	}
+
+	return prometheus.NewInterceptor(
+		store,
+		prometheus.WithComponentID(componentID),
+		// In the methods below, conversion is needed because remote_writes assume
+		// they are responsible for generating ref IDs. This means two
+		// remote_writes may return the same ref ID for two different series. We
+		// treat the remote_write ID as a "local ID" and translate it to a "global
+		// ID" to ensure Alloy compatibility.
+
+		prometheus.WithAppendHook(func(globalRef storage.SeriesRef, l labels.Labels, t int64, v float64, next storage.Appender) (storage.SeriesRef, error) {
+			if exited.Load() {
+				return 0, fmt.Errorf("%s has exited", componentID)
+			}
+
+			localRef := ls.GetLocalRefID(componentID, uint64(globalRef))
+			newLocalRef, nextErr := next.Append(storage.SeriesRef(localRef), l, t, v)
+			if nextErr == nil {
+				handleLocalLink(uint64(globalRef), l, localRef, uint64(newLocalRef))
+			}
+
+			debugDataPublisher.PublishIfActive(livedebugging.NewData(
+				liveDebuggingComponentID,
+				livedebugging.PrometheusMetric,
+				1,
+				func() string {
+					return fmt.Sprintf("sample: ts=%d, labels=%s, value=%f", t, l, v)
+				},
+			))
+			return globalRef, nextErr
+		}),
+		prometheus.WithHistogramHook(func(globalRef storage.SeriesRef, l labels.Labels, t int64, h *histogram.Histogram, fh *histogram.FloatHistogram, next storage.Appender) (storage.SeriesRef, error) {
+			if exited.Load() {
+				return 0, fmt.Errorf("%s has exited", componentID)
+			}
+
+			localRef := ls.GetLocalRefID(componentID, uint64(globalRef))
+			newLocalRef, nextErr := next.AppendHistogram(storage.SeriesRef(localRef), l, t, h, fh)
+			if nextErr == nil {
+				handleLocalLink(uint64(globalRef), l, localRef, uint64(newLocalRef))
+			}
+
+			debugDataPublisher.PublishIfActive(livedebugging.NewData(
+				liveDebuggingComponentID,
+				livedebugging.PrometheusMetric,
+				1,
+				func() string {
+					var data string
+					if h != nil {
+						data = fmt.Sprintf("histogram: ts=%d, labels=%s, value=%s", t, l, h.String())
+					} else if fh != nil {
+						data = fmt.Sprintf("float_histogram: ts=%d, labels=%s, value=%s", t, l, fh.String())
+					} else {
+						data = fmt.Sprintf("histogram_with_no_value: ts=%d, labels=%s", t, l)
+					}
+					return data
+				},
+			))
+			return globalRef, nextErr
+		}),
+		prometheus.WithMetadataHook(func(globalRef storage.SeriesRef, l labels.Labels, m metadata.Metadata, next storage.Appender) (storage.SeriesRef, error) {
+			if exited.Load() {
+				return 0, fmt.Errorf("%s has exited", componentID)
+			}
+
+			localRef := ls.GetLocalRefID(componentID, uint64(globalRef))
+			newLocalRef, nextErr := next.UpdateMetadata(storage.SeriesRef(localRef), l, m)
+			if nextErr == nil {
+				handleLocalLink(uint64(globalRef), l, localRef, uint64(newLocalRef))
+			}
+
+			debugDataPublisher.PublishIfActive(livedebugging.NewData(
+				liveDebuggingComponentID,
+				livedebugging.PrometheusMetric,
+				1,
+				func() string {
+					return fmt.Sprintf("metadata: labels=%s, type=%q, unit=%q, help=%q", l, m.Type, m.Unit, m.Help)
+				},
+			))
+			return globalRef, nextErr
+		}),
+		prometheus.WithExemplarHook(func(globalRef storage.SeriesRef, l labels.Labels, e exemplar.Exemplar, next storage.Appender) (storage.SeriesRef, error) {
+			if exited.Load() {
+				return 0, fmt.Errorf("%s has exited", componentID)
+			}
+
+			localRef := ls.GetLocalRefID(componentID, uint64(globalRef))
+			newLocalRef, nextErr := next.AppendExemplar(storage.SeriesRef(localRef), l, e)
+			if nextErr == nil {
+				handleLocalLink(uint64(globalRef), l, localRef, uint64(newLocalRef))
+			}
+
+			debugDataPublisher.PublishIfActive(livedebugging.NewData(
+				liveDebuggingComponentID,
+				livedebugging.PrometheusMetric,
+				1,
+				func() string {
+					return fmt.Sprintf("exemplar: ts=%d, labels=%s, exemplar_labels=%s, value=%f", e.Ts, l, e.Labels, e.Value)
+				},
+			))
+			return globalRef, nextErr
+		}),
+	)
+}
diff --git a/internal/component/prometheus/remotewrite/remote_write.go b/internal/component/prometheus/remotewrite/remote_write.go
index 236a1ba1b28..fe8f52fb387 100644
--- a/internal/component/prometheus/remotewrite/remote_write.go
+++ b/internal/component/prometheus/remotewrite/remote_write.go
@@ -11,10 +11,6 @@ import (
 	"time"
 
 	"github.com/go-kit/log"
-	"github.com/prometheus/prometheus/model/exemplar"
-	"github.com/prometheus/prometheus/model/histogram"
-	"github.com/prometheus/prometheus/model/labels"
-	"github.com/prometheus/prometheus/model/metadata"
 	"github.com/prometheus/prometheus/model/timestamp"
 	"github.com/prometheus/prometheus/storage"
 	"github.com/prometheus/prometheus/storage/remote"
@@ -125,135 +121,8 @@ func New(o component.Options, args Arguments) (*Component, error) {
 		storage:            storage.NewFanout(fanoutLogger, walStorage, remoteStore),
 		debugDataPublisher: debugDataPublisher.(livedebugging.DebugDataPublisher),
 	}
-	componentID := livedebugging.ComponentID(res.opts.ID)
 
-	handleLocalLink := func(globalRef uint64, l labels.Labels, cachedLocalRef uint64, newLocalRef uint64) {
-		// We had a local ref that was still valid nothing to do
-		if cachedLocalRef != 0 && cachedLocalRef == newLocalRef {
-			return
-		}
-
-		// There are some unique scenarios that can have an append end with no error but the returned localRef is zero (duplicate exemplars).
-		// We don't want to update a valid link to an invalid link
-		if cachedLocalRef != 0 && newLocalRef == 0 {
-			return
-		}
-
-		// This should never happen in a proper appender chain. Since we cannot enforce it, we are extra defensive.
-		if globalRef == 0 {
-			globalRef = ls.GetOrAddGlobalRefID(l)
-		}
-
-		if cachedLocalRef == 0 {
-			ls.AddLocalLink(res.opts.ID, globalRef, newLocalRef)
-		} else {
-			ls.ReplaceLocalLink(res.opts.ID, globalRef, cachedLocalRef, newLocalRef)
-		}
-	}
-
-	res.receiver = prometheus.NewInterceptor(
-		res.storage,
-		ls,
-		prometheus.WithComponentID(res.opts.ID),
-		// In the methods below, conversion is needed because remote_writes assume
-		// they are responsible for generating ref IDs. This means two
-		// remote_writes may return the same ref ID for two different series. We
-		// treat the remote_write ID as a "local ID" and translate it to a "global
-		// ID" to ensure Alloy compatibility.
-
-		prometheus.WithAppendHook(func(globalRef storage.SeriesRef, l labels.Labels, t int64, v float64, next storage.Appender) (storage.SeriesRef, error) {
-			if res.exited.Load() {
-				return 0, fmt.Errorf("%s has exited", o.ID)
-			}
-
-			localRef := ls.GetLocalRefID(res.opts.ID, uint64(globalRef))
-			newLocalRef, nextErr := next.Append(storage.SeriesRef(localRef), l, t, v)
-			if nextErr == nil {
-				handleLocalLink(uint64(globalRef), l, localRef, uint64(newLocalRef))
-			}
-
-			res.debugDataPublisher.PublishIfActive(livedebugging.NewData(
-				componentID,
-				livedebugging.PrometheusMetric,
-				1,
-				func() string {
-					return fmt.Sprintf("sample: ts=%d, labels=%s, value=%f", t, l, v)
-				},
-			))
-			return globalRef, nextErr
-		}),
-		prometheus.WithHistogramHook(func(globalRef storage.SeriesRef, l labels.Labels, t int64, h *histogram.Histogram, fh *histogram.FloatHistogram, next storage.Appender) (storage.SeriesRef, error) {
-			if res.exited.Load() {
-				return 0, fmt.Errorf("%s has exited", o.ID)
-			}
-
-			localRef := ls.GetLocalRefID(res.opts.ID, uint64(globalRef))
-			newLocalRef, nextErr := next.AppendHistogram(storage.SeriesRef(localRef), l, t, h, fh)
-			if nextErr == nil {
-				handleLocalLink(uint64(globalRef), l, localRef, uint64(newLocalRef))
-			}
-
-			res.debugDataPublisher.PublishIfActive(livedebugging.NewData(
-				componentID,
-				livedebugging.PrometheusMetric,
-				1,
-				func() string {
-					var data string
-					if h != nil {
-						data = fmt.Sprintf("histogram: ts=%d, labels=%s, value=%s", t, l, h.String())
-					} else if fh != nil {
-						data = fmt.Sprintf("float_histogram: ts=%d, labels=%s, value=%s", t, l, fh.String())
-					} else {
-						data = fmt.Sprintf("histogram_with_no_value: ts=%d, labels=%s", t, l)
-					}
-					return data
-				},
-			))
-			return globalRef, nextErr
-		}),
-		prometheus.WithMetadataHook(func(globalRef storage.SeriesRef, l labels.Labels, m metadata.Metadata, next storage.Appender) (storage.SeriesRef, error) {
-			if res.exited.Load() {
-				return 0, fmt.Errorf("%s has exited", o.ID)
-			}
-
-			localRef := ls.GetLocalRefID(res.opts.ID, uint64(globalRef))
-			newLocalRef, nextErr := next.UpdateMetadata(storage.SeriesRef(localRef), l, m)
-			if nextErr == nil {
-				handleLocalLink(uint64(globalRef), l, localRef, uint64(newLocalRef))
-			}
-
-			res.debugDataPublisher.PublishIfActive(livedebugging.NewData(
-				componentID,
-				livedebugging.PrometheusMetric,
-				1,
-				func() string {
-					return fmt.Sprintf("metadata: labels=%s, type=%q, unit=%q, help=%q", l, m.Type, m.Unit, m.Help)
-				},
-			))
-			return globalRef, nextErr
-		}),
-		prometheus.WithExemplarHook(func(globalRef storage.SeriesRef, l labels.Labels, e exemplar.Exemplar, next storage.Appender) (storage.SeriesRef, error) {
-			if res.exited.Load() {
-				return 0, fmt.Errorf("%s has exited", o.ID)
-			}
-
-			localRef := ls.GetLocalRefID(res.opts.ID, uint64(globalRef))
-			newLocalRef, nextErr := next.AppendExemplar(storage.SeriesRef(localRef), l, e)
-			if nextErr == nil {
-				handleLocalLink(uint64(globalRef), l, localRef, uint64(newLocalRef))
-			}
-
-			res.debugDataPublisher.PublishIfActive(livedebugging.NewData(
-				componentID,
-				livedebugging.PrometheusMetric,
-				1,
-				func() string {
-					return fmt.Sprintf("exemplar: ts=%d, labels=%s, exemplar_labels=%s, value=%f", e.Ts, l, e.Labels, e.Value)
-				},
-			))
-			return globalRef, nextErr
-		}),
-	)
+	res.receiver = NewInterceptor(o.ID, &res.exited, res.debugDataPublisher, ls, res.storage)
 
 	// Immediately export the receiver which remains the same for the component
 	// lifetime.
diff --git a/internal/component/prometheus/remotewrite/remote_write_test.go b/internal/component/prometheus/remotewrite/remote_write_test.go
index 0cb846892ea..e7ca57a231c 100644
--- a/internal/component/prometheus/remotewrite/remote_write_test.go
+++ b/internal/component/prometheus/remotewrite/remote_write_test.go
@@ -7,14 +7,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grafana/alloy/internal/component/prometheus/remotewrite"
-	"github.com/grafana/alloy/internal/runtime/componenttest"
-	"github.com/grafana/alloy/internal/util"
-	"github.com/grafana/alloy/syntax"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/prompb"
 	"github.com/prometheus/prometheus/storage/remote"
 	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/alloy/internal/component/prometheus/remotewrite"
+	"github.com/grafana/alloy/internal/runtime/componenttest"
+	"github.com/grafana/alloy/internal/util"
+	"github.com/grafana/alloy/syntax"
 )
 
 // Test is an integration-level test which ensures that metrics can get sent to
@@ -40,7 +41,9 @@ func Test(t *testing.T) {
 			remote_timeout = "100ms"
 
 			queue_config {
-				batch_send_deadline = "100ms"
+                // This will guarantee that we get both samples we expect or the test times out
+				max_samples_per_send = 2
+				batch_send_deadline = "1m"
 			}
 		}
 	`, srv.URL))
@@ -221,6 +224,7 @@ func sendMetric(
 }
 
 func testArgsForConfig(t *testing.T, cfg string) remotewrite.Arguments {
+	t.Helper()
 	var args remotewrite.Arguments
 	require.NoError(t, syntax.Unmarshal([]byte(cfg), &args))
 	return args
diff --git a/internal/component/prometheus/scrape/interceptor.go b/internal/component/prometheus/scrape/interceptor.go
new file mode 100644
index 00000000000..f99ed36fedb
--- /dev/null
+++ b/internal/component/prometheus/scrape/interceptor.go
@@ -0,0 +1,77 @@
+package scrape
+
+import (
+	"fmt"
+
+	"github.com/prometheus/prometheus/model/exemplar"
+	"github.com/prometheus/prometheus/model/histogram"
+	"github.com/prometheus/prometheus/model/labels"
+	"github.com/prometheus/prometheus/model/metadata"
+	"github.com/prometheus/prometheus/storage"
+
+	"github.com/grafana/alloy/internal/component/prometheus"
+	"github.com/grafana/alloy/internal/service/livedebugging"
+)
+
+// NewInterceptor creates a new Prometheus storage.Appendable interceptor proxies calls to the provided appendable publishing
+// live debugging data using the provided debugDataPublisher if live debugging is active.
+func NewInterceptor(componentID livedebugging.ComponentID, debugDataPublisher livedebugging.DebugDataPublisher, appendable storage.Appendable) *prometheus.Interceptor {
+	return prometheus.NewInterceptor(appendable,
+		prometheus.WithAppendHook(func(globalRef storage.SeriesRef, l labels.Labels, t int64, v float64, next storage.Appender) (storage.SeriesRef, error) {
+			newRef, nextErr := next.Append(globalRef, l, t, v)
+			debugDataPublisher.PublishIfActive(livedebugging.NewData(
+				componentID,
+				livedebugging.PrometheusMetric,
+				1,
+				func() string {
+					return fmt.Sprintf("sample: ts=%d, labels=%s, value=%f", t, l, v)
+				},
+			))
+			return newRef, nextErr
+		}),
+		prometheus.WithHistogramHook(func(globalRef storage.SeriesRef, l labels.Labels, t int64, h *histogram.Histogram, fh *histogram.FloatHistogram, next storage.Appender) (storage.SeriesRef, error) {
+			newRef, nextErr := next.AppendHistogram(globalRef, l, t, h, fh)
+			debugDataPublisher.PublishIfActive(livedebugging.NewData(
+				componentID,
+				livedebugging.PrometheusMetric,
+				1,
+				func() string {
+					var data string
+					if h != nil {
+						data = fmt.Sprintf("histogram: ts=%d, labels=%s, value=%s", t, l, h.String())
+					} else if fh != nil {
+						data = fmt.Sprintf("float_histogram: ts=%d, labels=%s, value=%s", t, l, fh.String())
+					} else {
+						data = fmt.Sprintf("histogram_with_no_value: ts=%d, labels=%s", t, l)
+					}
+					return data
+				},
+			))
+			return newRef, nextErr
+		}),
+		prometheus.WithMetadataHook(func(globalRef storage.SeriesRef, l labels.Labels, m metadata.Metadata, next storage.Appender) (storage.SeriesRef, error) {
+			newRef, nextErr := next.UpdateMetadata(globalRef, l, m)
+			debugDataPublisher.PublishIfActive(livedebugging.NewData(
+				componentID,
+				livedebugging.PrometheusMetric,
+				1,
+				func() string {
+					return fmt.Sprintf("metadata: labels=%s, type=%q, unit=%q, help=%q", l, m.Type, m.Unit, m.Help)
+				},
+			))
+			return newRef, nextErr
+		}),
+		prometheus.WithExemplarHook(func(globalRef storage.SeriesRef, l labels.Labels, e exemplar.Exemplar, next storage.Appender) (storage.SeriesRef, error) {
+			newRef, nextErr := next.AppendExemplar(globalRef, l, e)
+			debugDataPublisher.PublishIfActive(livedebugging.NewData(
+				componentID,
+				livedebugging.PrometheusMetric,
+				1,
+				func() string {
+					return fmt.Sprintf("exemplar: ts=%d, labels=%s, exemplar_labels=%s, value=%f", e.Ts, l, e.Labels, e.Value)
+				},
+			))
+			return newRef, nextErr
+		}),
+	)
+}
diff --git a/internal/component/prometheus/scrape/scrape.go b/internal/component/prometheus/scrape/scrape.go
index 54c2ef540de..ea565e9090c 100644
--- a/internal/component/prometheus/scrape/scrape.go
+++ b/internal/component/prometheus/scrape/scrape.go
@@ -16,10 +16,7 @@ import (
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/config"
 	"github.com/prometheus/prometheus/discovery/targetgroup"
-	"github.com/prometheus/prometheus/model/exemplar"
-	"github.com/prometheus/prometheus/model/histogram"
 	"github.com/prometheus/prometheus/model/labels"
-	"github.com/prometheus/prometheus/model/metadata"
 	"github.com/prometheus/prometheus/scrape"
 	"github.com/prometheus/prometheus/storage"
 	promlogging "github.com/prometheus/prometheus/util/logging"
@@ -353,7 +350,7 @@ func New(o component.Options, args Arguments) (*Component, error) {
 		unregisterer:        unregisterer,
 	}
 
-	interceptor := c.newInterceptor(ls)
+	interceptor := NewInterceptor(livedebugging.ComponentID(o.ID), c.debugDataPublisher, alloyAppendable)
 
 	scraper, err := scrape.NewManager(
 		scrapeOptions,
@@ -648,66 +645,4 @@ func (c *Component) populatePromLabels(targets []discovery.Target, jobName strin
 	return allTargets
 }
 
-func (c *Component) newInterceptor(ls labelstore.LabelStore) *prometheus.Interceptor {
-	componentID := livedebugging.ComponentID(c.opts.ID)
-	return prometheus.NewInterceptor(c.appendable, ls,
-		prometheus.WithAppendHook(func(globalRef storage.SeriesRef, l labels.Labels, t int64, v float64, next storage.Appender) (storage.SeriesRef, error) {
-			_, nextErr := next.Append(globalRef, l, t, v)
-			c.debugDataPublisher.PublishIfActive(livedebugging.NewData(
-				componentID,
-				livedebugging.PrometheusMetric,
-				1,
-				func() string {
-					return fmt.Sprintf("sample: ts=%d, labels=%s, value=%f", t, l, v)
-				},
-			))
-			return globalRef, nextErr
-		}),
-		prometheus.WithHistogramHook(func(globalRef storage.SeriesRef, l labels.Labels, t int64, h *histogram.Histogram, fh *histogram.FloatHistogram, next storage.Appender) (storage.SeriesRef, error) {
-			_, nextErr := next.AppendHistogram(globalRef, l, t, h, fh)
-			c.debugDataPublisher.PublishIfActive(livedebugging.NewData(
-				componentID,
-				livedebugging.PrometheusMetric,
-				1,
-				func() string {
-					var data string
-					if h != nil {
-						data = fmt.Sprintf("histogram: ts=%d, labels=%s, value=%s", t, l, h.String())
-					} else if fh != nil {
-						data = fmt.Sprintf("float_histogram: ts=%d, labels=%s, value=%s", t, l, fh.String())
-					} else {
-						data = fmt.Sprintf("histogram_with_no_value: ts=%d, labels=%s", t, l)
-					}
-					return data
-				},
-			))
-			return globalRef, nextErr
-		}),
-		prometheus.WithMetadataHook(func(globalRef storage.SeriesRef, l labels.Labels, m metadata.Metadata, next storage.Appender) (storage.SeriesRef, error) {
-			_, nextErr := next.UpdateMetadata(globalRef, l, m)
-			c.debugDataPublisher.PublishIfActive(livedebugging.NewData(
-				componentID,
-				livedebugging.PrometheusMetric,
-				1,
-				func() string {
-					return fmt.Sprintf("metadata: labels=%s, type=%q, unit=%q, help=%q", l, m.Type, m.Unit, m.Help)
-				},
-			))
-			return globalRef, nextErr
-		}),
-		prometheus.WithExemplarHook(func(globalRef storage.SeriesRef, l labels.Labels, e exemplar.Exemplar, next storage.Appender) (storage.SeriesRef, error) {
-			_, nextErr := next.AppendExemplar(globalRef, l, e)
-			c.debugDataPublisher.PublishIfActive(livedebugging.NewData(
-				componentID,
-				livedebugging.PrometheusMetric,
-				1,
-				func() string {
-					return fmt.Sprintf("exemplar: ts=%d, labels=%s, exemplar_labels=%s, value=%f", e.Ts, l, e.Labels, e.Value)
-				},
-			))
-			return globalRef, nextErr
-		}),
-	)
-}
-
 func (c *Component) LiveDebugging() {}
diff --git a/internal/runtime/componenttest/componenttest.go b/internal/runtime/componenttest/componenttest.go
index 0df4c20c753..d72dd890480 100644
--- a/internal/runtime/componenttest/componenttest.go
+++ b/internal/runtime/componenttest/componenttest.go
@@ -118,7 +118,7 @@ func (c *Controller) Exports() component.Exports {
 // until ctx is canceled, the component exits, or if there was an error.
 //
 // Run may only be called once per Controller.
-func (c *Controller) Run(ctx context.Context, args component.Arguments) error {
+func (c *Controller) Run(ctx context.Context, args component.Arguments, optsModifiers ...func(opts component.Options) component.Options) error {
 	dataPath, err := os.MkdirTemp("", "controller-*")
 	if err != nil {
 		return err
@@ -127,7 +127,7 @@ func (c *Controller) Run(ctx context.Context, args component.Arguments) error {
 		_ = os.RemoveAll(dataPath)
 	}()
 
-	run, err := c.buildComponent(dataPath, args)
+	run, err := c.buildComponent(dataPath, args, optsModifiers...)
 
 	if err != nil {
 		c.onRun.Do(func() {
@@ -157,7 +157,7 @@ func (c *Controller) Run(ctx context.Context, args component.Arguments) error {
 	return err
 }
 
-func (c *Controller) buildComponent(dataPath string, args component.Arguments) (component.Component, error) {
+func (c *Controller) buildComponent(dataPath string, args component.Arguments, optsModifiers ...func(opts component.Options) component.Options) (component.Component, error) {
 	c.innerMut.Lock()
 	defer c.innerMut.Unlock()
 
@@ -189,6 +189,10 @@ func (c *Controller) buildComponent(dataPath string, args component.Arguments) (
 		},
 	}
 
+	for _, mod := range optsModifiers {
+		opts = mod(opts)
+	}
+
 	inner, err := c.reg.Build(opts, args)
 	if err != nil {
 		return nil, err

From c6b36d0396cd440af841583a7477e13841815be4 Mon Sep 17 00:00:00 2001
From: Axd1x8a <26704473+axd1x8a@users.noreply.github.com>
Date: Tue, 9 Dec 2025 23:58:56 +0300
Subject: [PATCH 21/24] Fix handling of multiplexed long lines in Docker logs
 (#4713)

* Improve docker's multiplexed long lines handling

* Fix `dockerChunkWriter` buffer flushing and add test for it

* Update `CHANGELOG.md`

* Fix potential panic in `extractTsFromBytes` and `dockerChunkWriter` buffer allocation
---
 CHANGELOG.md                                  |   2 +
 .../docker/internal/dockertarget/target.go    | 142 +++++++++++++-----
 .../internal/dockertarget/target_test.go      |  39 +++++
 3 files changed, 142 insertions(+), 41 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da210a1999e..6c533e9e332 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,8 @@ Main (unreleased)
 
 - Remove extraneous `output` stage from the `cri` stage pipeline in `loki.process`. (@kalleep)
 
+- Fix Docker log corruption for multiplexed long lines. (@axd1x8a)
+
 v1.12.0
 -----------------
 
diff --git a/internal/component/loki/source/docker/internal/dockertarget/target.go b/internal/component/loki/source/docker/internal/dockertarget/target.go
index d05abcc2bc6..97c00ac2c51 100644
--- a/internal/component/loki/source/docker/internal/dockertarget/target.go
+++ b/internal/component/loki/source/docker/internal/dockertarget/target.go
@@ -6,6 +6,7 @@ package dockertarget
 
 import (
 	"bufio"
+	"bytes"
 	"context"
 	"fmt"
 	"io"
@@ -13,6 +14,7 @@ import (
 	"strings"
 	"sync"
 	"time"
+	"unsafe"
 
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/client"
@@ -34,6 +36,7 @@ const (
 	dockerLabel                = model.MetaLabelPrefix + "docker_"
 	dockerLabelContainerPrefix = dockerLabel + "container_"
 	dockerLabelLogStream       = dockerLabelContainerPrefix + "log_stream"
+	dockerMaxChunkSize         = 16384
 )
 
 // Target enables reading Docker container logs.
@@ -110,7 +113,12 @@ func (t *Target) processLoop(ctx context.Context, tty bool, reader io.ReadCloser
 		if tty {
 			written, err = io.Copy(wstdout, reader)
 		} else {
-			written, err = stdcopy.StdCopy(wstdout, wstderr, reader)
+			// For non-TTY, wrap the pipe writers with our chunk writer to reassemble frames.
+			wcstdout := newChunkWriter(wstdout, t.logger)
+			defer wcstdout.Close()
+			wcstderr := newChunkWriter(wstderr, t.logger)
+			defer wcstderr.Close()
+			written, err = stdcopy.StdCopy(wcstdout, wcstderr, reader)
 		}
 		if err != nil {
 			level.Warn(t.logger).Log("msg", "could not transfer logs", "written", written, "container", t.containerName, "err", err)
@@ -128,53 +136,38 @@ func (t *Target) processLoop(ctx context.Context, tty bool, reader io.ReadCloser
 	level.Debug(t.logger).Log("msg", "done processing Docker logs", "container", t.containerName)
 }
 
-// extractTs tries for read the timestamp from the beginning of the log line.
-// It's expected to follow the format 2006-01-02T15:04:05.999999999Z07:00.
-func extractTs(line string) (time.Time, string, error) {
-	pair := strings.SplitN(line, " ", 2)
-	if len(pair) != 2 {
-		return time.Now(), line, fmt.Errorf("could not find timestamp in '%s'", line)
-	}
-	ts, err := time.Parse("2006-01-02T15:04:05.999999999Z07:00", pair[0])
-	if err != nil {
-		return time.Now(), line, fmt.Errorf("could not parse timestamp from '%s': %w", pair[0], err)
-	}
-	return ts, pair[1], nil
-}
+// extractTsFromBytes parses an RFC3339Nano timestamp from the byte slice.
+func extractTsFromBytes(line []byte) (time.Time, []byte, error) {
+	const timestampLayout = "2006-01-02T15:04:05.999999999Z07:00"
 
-// https://devmarkpro.com/working-big-files-golang
-func readLine(r *bufio.Reader) (string, error) {
-	var (
-		isPrefix = true
-		err      error
-		line, ln []byte
-	)
-
-	for isPrefix && err == nil {
-		line, isPrefix, err = r.ReadLine()
-		ln = append(ln, line...)
+	spaceIdx := bytes.IndexByte(line, ' ')
+	if spaceIdx == -1 || spaceIdx >= len(line)-1 {
+		return time.Time{}, nil, fmt.Errorf("could not find timestamp in bytes")
 	}
 
-	return string(ln), err
+	// The unsafe.String is used here to avoid allocation and string conversion when parsing the timestamp
+	// This is safe because:
+	// 1. spaceIdx > 0 and spaceIdx < len(line)-1 is guaranteed by the check above
+	// 2. time.Parse doesn't retain the string after returning
+	// 3. The underlying bytes aren't modified during parsing
+	ts, err := time.Parse(timestampLayout, unsafe.String(&line[0], spaceIdx))
+	if err != nil {
+		return time.Time{}, nil, fmt.Errorf("could not parse timestamp: %w", err)
+	}
+	return ts, line[spaceIdx+1:], nil
 }
 
 func (t *Target) process(r io.Reader, logStreamLset model.LabelSet) {
-	defer func() {
-		t.wg.Done()
-	}()
+	defer t.wg.Done()
 
-	reader := bufio.NewReader(r)
-	for {
-		line, err := readLine(reader)
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			level.Error(t.logger).Log("msg", "error reading docker log line, skipping line", "err", err)
-			t.metrics.dockerErrors.Inc()
-		}
+	scanner := bufio.NewScanner(r)
+	const maxCapacity = dockerMaxChunkSize * 64
+	buf := make([]byte, 0, maxCapacity)
+	scanner.Buffer(buf, maxCapacity)
+	for scanner.Scan() {
+		line := scanner.Bytes()
 
-		ts, line, err := extractTs(line)
+		ts, content, err := extractTsFromBytes(line)
 		if err != nil {
 			level.Error(t.logger).Log("msg", "could not extract timestamp, skipping line", "err", err)
 			t.metrics.dockerErrors.Inc()
@@ -185,7 +178,7 @@ func (t *Target) process(r io.Reader, logStreamLset model.LabelSet) {
 			Labels: logStreamLset,
 			Entry: push.Entry{
 				Timestamp: ts,
-				Line:      line,
+				Line:      string(content),
 			},
 		}
 		t.metrics.dockerEntries.Inc()
@@ -200,6 +193,10 @@ func (t *Target) process(r io.Reader, logStreamLset model.LabelSet) {
 		t.since.Store(ts.Unix())
 		t.last.Store(time.Now().Unix())
 	}
+	if err := scanner.Err(); err != nil {
+		level.Error(t.logger).Log("msg", "error reading docker log line", "err", err)
+		t.metrics.dockerErrors.Inc()
+	}
 }
 
 // StartIfNotRunning starts processing container logs. The operation is idempotent , i.e. the processing cannot be started twice.
@@ -321,3 +318,66 @@ func (t *Target) getStreamLabels(logStream string) model.LabelSet {
 
 	return filtered
 }
+
+// dockerChunkWriter implements io.Writer to preprocess and reassemble Docker log frames.
+type dockerChunkWriter struct {
+	writer      io.Writer
+	logger      log.Logger
+	buffer      *bytes.Buffer
+	isBuffering bool
+}
+
+var bufferPool = sync.Pool{
+	New: func() interface{} {
+		return bytes.NewBuffer(make([]byte, 0, dockerMaxChunkSize*2))
+	},
+}
+
+func newChunkWriter(writer io.Writer, logger log.Logger) *dockerChunkWriter {
+	return &dockerChunkWriter{
+		writer: writer,
+		logger: logger,
+		buffer: bufferPool.Get().(*bytes.Buffer),
+	}
+}
+
+func (fw *dockerChunkWriter) Close() error {
+	if fw.buffer != nil {
+		fw.buffer.Reset()
+		bufferPool.Put(fw.buffer)
+		fw.buffer = nil
+	}
+	return nil
+}
+
+func (fw *dockerChunkWriter) Write(p []byte) (int, error) {
+	if !fw.isBuffering {
+		if len(p) < dockerMaxChunkSize || p[len(p)-1] == 0x0A {
+			// Short or complete frame: write directly without buffering.
+			return fw.writer.Write(p)
+		}
+		// Long frame start: buffer the first chunk.
+		fw.buffer.Write(p)
+		fw.isBuffering = true
+		return len(p), nil
+	}
+
+	// Continuation chunk: strip redundant timestamp and append content.
+	_, content, err := extractTsFromBytes(p)
+	if err != nil {
+		// Should not normally happen, but flog.log has entries like this for some reason.
+		level.Warn(fw.logger).Log("msg", "could not strip timestamp from continuation chunk", "err", err)
+		fw.buffer.Write(p)
+	} else {
+		fw.buffer.Write(content)
+	}
+	// If this is the last continuation chunk (ends with newline), flush the buffer
+	if len(p) > 0 && p[len(p)-1] == 0x0A {
+		if _, err := fw.writer.Write(fw.buffer.Bytes()); err != nil {
+			return 0, err
+		}
+		fw.buffer.Reset()
+		fw.isBuffering = false
+	}
+	return len(p), nil
+}
diff --git a/internal/component/loki/source/docker/internal/dockertarget/target_test.go b/internal/component/loki/source/docker/internal/dockertarget/target_test.go
index 2f6fa64b91c..eeacc2b829b 100644
--- a/internal/component/loki/source/docker/internal/dockertarget/target_test.go
+++ b/internal/component/loki/source/docker/internal/dockertarget/target_test.go
@@ -5,6 +5,7 @@ package dockertarget
 // read logs from Docker containers and forward them to other loki components.
 
 import (
+	"bytes"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
@@ -136,6 +137,44 @@ func TestStartStopStressTest(t *testing.T) {
 	wg.Wait()
 }
 
+func TestDockerChunkWriter(t *testing.T) {
+	logger := log.NewNopLogger()
+	var buf bytes.Buffer
+	writer := newChunkWriter(&buf, logger)
+
+	timestamp := []byte("2023-12-09T12:00:00.000000000Z ")
+	shortLine := []byte("short log line\n")
+
+	var longContent []byte
+	for range 50 * 1024 {
+		longContent = append(longContent, 'a')
+	}
+	longContent = append(longContent, '\n')
+
+	// First part of long line
+	chunk1 := append(timestamp, longContent[:32*1024]...)
+	_, err := writer.Write(chunk1)
+	require.NoError(t, err)
+
+	// Second part of long line
+	chunk2 := append(timestamp, longContent[32*1024:]...)
+	_, err = writer.Write(chunk2)
+	require.NoError(t, err)
+
+	// Start a new short line
+	chunk3 := append(timestamp, shortLine...)
+	_, err = writer.Write(chunk3)
+	require.NoError(t, err)
+
+	err = writer.Close()
+	require.NoError(t, err)
+
+	expected := append(timestamp, longContent...)
+	expected = append(expected, chunk3...)
+
+	assert.Equal(t, expected, buf.Bytes())
+}
+
 func newDockerServer(t *testing.T) *httptest.Server {
 	h := func(w http.ResponseWriter, r *http.Request) {
 		path := r.URL.Path

From c38d836464a08a871258f346f9d2194e4e83d33e Mon Sep 17 00:00:00 2001
From: Sam DeHaan <sam.dehaan@grafana.com>
Date: Wed, 10 Dec 2025 09:29:39 -0500
Subject: [PATCH 22/24] update changelog

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c533e9e332..a26a7301c11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,8 @@ Main (unreleased)
 
 - Add htpasswd file based authentication for `otelcol.auth.basic` (@pkarakal)
 
+- Add `prometheus.echo` component for local inspection of Prometheus metrics. The component writes received metrics to stdout in Prometheus exposition format, enabling easier debugging and testing of metrics flow. (@iamrajiv)
+
 ### Enhancements
 
 - update promtail converter to use `file_match` block for `loki.source.file` instead of going through `local.file_match`. (@kalleep)
@@ -297,8 +299,6 @@ v1.11.0
 
 ### Features
 
-- Add `prometheus.echo` component for local inspection of Prometheus metrics. The component writes received metrics to stdout in Prometheus exposition format, enabling easier debugging and testing of metrics flow. (@iamrajiv)
-
 - Add the `otelcol.receiver.fluentforward` receiver to receive logs via Fluent Forward Protocol. (@rucciva)
 - Add the `prometheus.enrich` component to enrich metrics using labels from `discovery.*` components. (@ArkovKonstantin)
 

From c48fc0d29225acec7542e304cdb1fff8fbd9758f Mon Sep 17 00:00:00 2001
From: MattNolf <86960799+matthewnolf@users.noreply.github.com>
Date: Wed, 10 Dec 2025 13:52:07 +0000
Subject: [PATCH 23/24] add cloud-provider labels to target metrics (#4942)

---
 CHANGELOG.md                                  |  1 +
 .../database_observability/cloud_provider.go  | 10 ++-
 .../mysql/cloud_provider.go                   | 63 +++++++++++++++++++
 .../mysql/cloud_provider_test.go              | 36 +++++++++++
 .../database_observability/mysql/component.go | 38 +++++------
 .../postgres/cloud_provider.go                | 61 ++++++++++++++++++
 .../postgres/cloud_provider_test.go           | 36 +++++++++++
 .../postgres/component.go                     | 37 ++++++-----
 .../database_observability/relabeling.go      | 26 +++++++-
 .../database_observability/relabeling_test.go | 48 ++++++++++++++
 10 files changed, 317 insertions(+), 39 deletions(-)
 create mode 100644 internal/component/database_observability/mysql/cloud_provider.go
 create mode 100644 internal/component/database_observability/mysql/cloud_provider_test.go
 create mode 100644 internal/component/database_observability/postgres/cloud_provider.go
 create mode 100644 internal/component/database_observability/postgres/cloud_provider_test.go
 create mode 100644 internal/component/database_observability/relabeling_test.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a26a7301c11..1309974650d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ Main (unreleased)
 - (_Public Preview_) Additions to `database_observability.mysql` and `database_observability.postgres` components:
   - `explain_plans`
     - always send an explain plan log message for each query, even skipped or errored queries. (@rgeyer)
+  - Metrics are now appended with cloud provider information labels (@matthewnolf)
 
 - Reduced resource overhead of `prometheus.scrape`, `prometheus.relabel`, `prometheus.enrich`, and `prometheus.remote_write` by removing unnecessary usage of labelstore.LabelStore. (@kgeckhart)
 
diff --git a/internal/component/database_observability/cloud_provider.go b/internal/component/database_observability/cloud_provider.go
index 581735c4c3b..60b162d09ab 100644
--- a/internal/component/database_observability/cloud_provider.go
+++ b/internal/component/database_observability/cloud_provider.go
@@ -1,11 +1,17 @@
 package database_observability
 
-import "github.com/aws/aws-sdk-go-v2/aws/arn"
+import (
+	"github.com/aws/aws-sdk-go-v2/aws/arn"
+)
 
 type CloudProvider struct {
-	AWS *AWSCloudProviderInfo
+	AWS   *AWSCloudProviderInfo
+	Azure *AzureCloudProviderInfo
 }
 
 type AWSCloudProviderInfo struct {
 	ARN arn.ARN
 }
+type AzureCloudProviderInfo struct {
+	Resource string
+}
diff --git a/internal/component/database_observability/mysql/cloud_provider.go b/internal/component/database_observability/mysql/cloud_provider.go
new file mode 100644
index 00000000000..e5a0925eaea
--- /dev/null
+++ b/internal/component/database_observability/mysql/cloud_provider.go
@@ -0,0 +1,63 @@
+package mysql
+
+import (
+	"fmt"
+	"net"
+	"regexp"
+	"strings"
+
+	"github.com/aws/aws-sdk-go-v2/aws/arn"
+	"github.com/go-sql-driver/mysql"
+	"github.com/grafana/alloy/internal/component/database_observability"
+)
+
+var (
+	rdsRegex   = regexp.MustCompile(`(?P<identifier>[^\.]+)\.([^\.]+)\.(?P<region>[^\.]+)\.rds\.amazonaws\.com`)
+	azureRegex = regexp.MustCompile(`(?P<identifier>[^\.]+)\.mysql\.database\.azure\.com`)
+)
+
+func populateCloudProviderFromConfig(config *CloudProvider) (*database_observability.CloudProvider, error) {
+	var cloudProvider database_observability.CloudProvider
+	if config.AWS != nil {
+		arn, err := arn.Parse(config.AWS.ARN)
+		if err != nil {
+			return nil, fmt.Errorf("failed to parse AWS cloud provider ARN: %w", err)
+		}
+		cloudProvider.AWS = &database_observability.AWSCloudProviderInfo{
+			ARN: arn,
+		}
+	}
+	return &cloudProvider, nil
+}
+
+func populateCloudProviderFromDSN(dsn string) (*database_observability.CloudProvider, error) {
+	var cloudProvider database_observability.CloudProvider
+
+	cfg, err := mysql.ParseDSN(dsn)
+	if err != nil {
+		return nil, err
+	}
+
+	host, _, err := net.SplitHostPort(cfg.Addr)
+	if err == nil && host != "" {
+		if strings.HasSuffix(host, "rds.amazonaws.com") {
+			if matches := rdsRegex.FindStringSubmatch(host); len(matches) >= 4 {
+				cloudProvider.AWS = &database_observability.AWSCloudProviderInfo{
+					ARN: arn.ARN{
+						Resource:  fmt.Sprintf("db:%s", matches[1]),
+						Region:    matches[3],
+						AccountID: "unknown",
+					},
+				}
+			}
+		} else if strings.HasSuffix(host, "mysql.database.azure.com") {
+			if matches := azureRegex.FindStringSubmatch(host); len(matches) >= 2 {
+				cloudProvider.Azure = &database_observability.AzureCloudProviderInfo{
+					Resource: matches[1],
+				}
+			}
+		}
+	}
+
+	return &cloudProvider, nil
+}
diff --git a/internal/component/database_observability/mysql/cloud_provider_test.go b/internal/component/database_observability/mysql/cloud_provider_test.go
new file mode 100644
index 00000000000..ef4414123b1
--- /dev/null
+++ b/internal/component/database_observability/mysql/cloud_provider_test.go
@@ -0,0 +1,36 @@
+package mysql
+
+import (
+	"testing"
+
+	"github.com/aws/aws-sdk-go-v2/aws/arn"
+	"github.com/grafana/alloy/internal/component/database_observability"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestPopulateCloudProvider(t *testing.T) {
+	t.Run("populates AWS RDS details from DSN", func(t *testing.T) {
+		dsn := "user:pass@tcp(products-db.abc123xyz.us-east-1.rds.amazonaws.com:3306)/schema"
+		got, err := populateCloudProviderFromDSN(dsn)
+		require.NoError(t, err)
+
+		assert.Equal(t, &database_observability.CloudProvider{
+			AWS: &database_observability.AWSCloudProviderInfo{
+				ARN: arn.ARN{Resource: "db:products-db", Region: "us-east-1", AccountID: "unknown"},
+			},
+		}, got)
+	})
+
+	t.Run("populates Azure details from DSN", func(t *testing.T) {
+		dsn := "user:pass@tcp(products-db.mysql.database.azure.com:3306)/schema"
+		got, err := populateCloudProviderFromDSN(dsn)
+		require.NoError(t, err)
+
+		assert.Equal(t, &database_observability.CloudProvider{
+			Azure: &database_observability.AzureCloudProviderInfo{
+				Resource: "products-db",
+			},
+		}, got)
+	})
+}
diff --git a/internal/component/database_observability/mysql/component.go b/internal/component/database_observability/mysql/component.go
index 4eb85532d55..2a4ee73b2b1 100644
--- a/internal/component/database_observability/mysql/component.go
+++ b/internal/component/database_observability/mysql/component.go
@@ -12,7 +12,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/aws/aws-sdk-go-v2/aws/arn"
 	"github.com/blang/semver/v4"
 	"github.com/go-sql-driver/mysql"
 	"github.com/prometheus/client_golang/prometheus"
@@ -345,11 +344,28 @@ func (c *Component) Update(args component.Arguments) error {
 		}
 	}
 
+	var cp *database_observability.CloudProvider
+	if c.args.CloudProvider != nil {
+		cloudProvider, err := populateCloudProviderFromConfig(c.args.CloudProvider)
+		if err != nil {
+			c.reportError("failed to collect cloud provider information from config", err)
+			return nil
+		}
+		cp = cloudProvider
+	} else {
+		cloudProvider, err := populateCloudProviderFromDSN(string(c.args.DataSourceName))
+		if err != nil {
+			c.reportError("failed to collect cloud provider information from DSN", err)
+			return nil
+		}
+		cp = cloudProvider
+	}
+
 	c.args.Targets = append([]discovery.Target{c.baseTarget}, c.args.Targets...)
 	targets := make([]discovery.Target, 0, len(c.args.Targets)+1)
 	for _, t := range c.args.Targets {
 		builder := discovery.NewTargetBuilderFrom(t)
-		if relabel.ProcessBuilder(builder, database_observability.GetRelabelingRules(generatedServerID)...) {
+		if relabel.ProcessBuilder(builder, database_observability.GetRelabelingRules(generatedServerID, cp)...) {
 			targets = append(targets, builder.Target())
 		}
 	}
@@ -363,7 +379,7 @@ func (c *Component) Update(args component.Arguments) error {
 	}
 	c.collectors = nil
 
-	if err := c.startCollectors(generatedServerID, engineVersion, parsedEngineVersion); err != nil {
+	if err := c.startCollectors(generatedServerID, engineVersion, parsedEngineVersion, cp); err != nil {
 		c.reportError("failed to start collectors", err)
 		return nil
 	}
@@ -399,7 +415,7 @@ func enableOrDisableCollectors(a Arguments) map[string]bool {
 }
 
 // startCollectors attempts to start all of the enabled collectors. If one or more collectors fail to start, their errors are reported
-func (c *Component) startCollectors(serverID string, engineVersion string, parsedEngineVersion semver.Version) error {
+func (c *Component) startCollectors(serverID string, engineVersion string, parsedEngineVersion semver.Version, cloudProviderInfo *database_observability.CloudProvider) error {
 	var startErrors []string
 
 	logStartError := func(collectorName, action string, err error) {
@@ -407,20 +423,6 @@ func (c *Component) startCollectors(serverID string, engineVersion string, parse
 		level.Error(c.opts.Logger).Log("msg", errorString)
 		startErrors = append(startErrors, errorString)
 	}
-
-	var cloudProviderInfo *database_observability.CloudProvider
-	if c.args.CloudProvider != nil && c.args.CloudProvider.AWS != nil {
-		arn, err := arn.Parse(c.args.CloudProvider.AWS.ARN)
-		if err != nil {
-			level.Error(c.opts.Logger).Log("msg", "failed to parse AWS cloud provider ARN", "err", err)
-		}
-		cloudProviderInfo = &database_observability.CloudProvider{
-			AWS: &database_observability.AWSCloudProviderInfo{
-				ARN: arn,
-			},
-		}
-	}
-
 	entryHandler := addLokiLabels(loki.NewEntryHandler(c.handler.Chan(), func() {}), c.instanceKey, serverID)
 
 	collectors := enableOrDisableCollectors(c.args)
diff --git a/internal/component/database_observability/postgres/cloud_provider.go b/internal/component/database_observability/postgres/cloud_provider.go
new file mode 100644
index 00000000000..a32a78c5433
--- /dev/null
+++ b/internal/component/database_observability/postgres/cloud_provider.go
@@ -0,0 +1,61 @@
+package postgres
+
+import (
+	"fmt"
+	"regexp"
+	"strings"
+
+	"github.com/aws/aws-sdk-go-v2/aws/arn"
+	"github.com/grafana/alloy/internal/component/database_observability"
+	"github.com/grafana/alloy/internal/component/database_observability/postgres/collector"
+)
+
+var (
+	rdsRegex   = regexp.MustCompile(`(?P<identifier>[^\.]+)\.([^\.]+)\.(?P<region>[^\.]+)\.rds\.amazonaws\.com`)
+	azureRegex = regexp.MustCompile(`(?P<identifier>[^\.]+)\.postgres\.database\.azure\.com`)
+)
+
+func populateCloudProviderFromConfig(config *CloudProvider) (*database_observability.CloudProvider, error) {
+	var cloudProvider database_observability.CloudProvider
+	if config.AWS != nil {
+		arn, err := arn.Parse(config.AWS.ARN)
+		if err != nil {
+			return nil, fmt.Errorf("failed to parse AWS cloud provider ARN: %w", err)
+		}
+		cloudProvider.AWS = &database_observability.AWSCloudProviderInfo{
+			ARN: arn,
+		}
+	}
+	return &cloudProvider, nil
+}
+
+func populateCloudProviderFromDSN(dsn string) (*database_observability.CloudProvider, error) {
+	var cloudProvider database_observability.CloudProvider
+
+	parts, err := collector.ParseURL(dsn)
+	if err != nil {
+		return nil, err
+	}
+
+	if host, ok := parts["host"]; ok {
+		if strings.HasSuffix(host, "rds.amazonaws.com") {
+			matches := rdsRegex.FindStringSubmatch(host)
+			cloudProvider.AWS = &database_observability.AWSCloudProviderInfo{
+				ARN: arn.ARN{
+					Resource:  fmt.Sprintf("db:%s", matches[1]),
+					Region:    matches[3],
+					AccountID: "unknown",
+				},
+			}
+		} else if strings.HasSuffix(host, "postgres.database.azure.com") {
+			matches := azureRegex.FindStringSubmatch(host)
+			if len(matches) > 1 {
+				cloudProvider.Azure = &database_observability.AzureCloudProviderInfo{
+					Resource: matches[1],
+				}
+			}
+		}
+	}
+
+	return &cloudProvider, nil
+}
diff --git a/internal/component/database_observability/postgres/cloud_provider_test.go b/internal/component/database_observability/postgres/cloud_provider_test.go
new file mode 100644
index 00000000000..365fb0b5421
--- /dev/null
+++ b/internal/component/database_observability/postgres/cloud_provider_test.go
@@ -0,0 +1,36 @@
+package postgres
+
+import (
+	"testing"
+
+	"github.com/aws/aws-sdk-go-v2/aws/arn"
+	"github.com/grafana/alloy/internal/component/database_observability"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestPopulateCloudProvider(t *testing.T) {
+	t.Run("populates AWS RDS details from DSN", func(t *testing.T) {
+		dsn := "postgres://user:pass@products-db.abc123xyz.us-east-1.rds.amazonaws.com:5432/mydb"
+		got, err := populateCloudProviderFromDSN(dsn)
+		require.NoError(t, err)
+
+		assert.Equal(t, &database_observability.CloudProvider{
+			AWS: &database_observability.AWSCloudProviderInfo{
+				ARN: arn.ARN{Resource: "db:products-db", Region: "us-east-1", AccountID: "unknown"},
+			},
+		}, got)
+	})
+
+	t.Run("populates Azure details from DSN", func(t *testing.T) {
+		dsn := "postgres://user:pass@products-db.postgres.database.azure.com:5432/mydb"
+		got, err := populateCloudProviderFromDSN(dsn)
+		require.NoError(t, err)
+
+		assert.Equal(t, &database_observability.CloudProvider{
+			Azure: &database_observability.AzureCloudProviderInfo{
+				Resource: "products-db",
+			},
+		}, got)
+	})
+}
diff --git a/internal/component/database_observability/postgres/component.go b/internal/component/database_observability/postgres/component.go
index abccf389ef3..21994af9c7b 100644
--- a/internal/component/database_observability/postgres/component.go
+++ b/internal/component/database_observability/postgres/component.go
@@ -11,7 +11,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/aws/aws-sdk-go-v2/aws/arn"
 	"github.com/blang/semver/v4"
 	"github.com/lib/pq"
 	"github.com/prometheus/client_golang/prometheus"
@@ -292,11 +291,28 @@ func (c *Component) Update(args component.Arguments) error {
 
 	generatedSystemID := fmt.Sprintf("%x", sha256.Sum256([]byte(fmt.Sprintf("%s:%s:%s", systemID.String, systemIP.String, systemPort.String))))
 
+	var cp *database_observability.CloudProvider
+	if c.args.CloudProvider != nil {
+		cloudProvider, err := populateCloudProviderFromConfig(c.args.CloudProvider)
+		if err != nil {
+			c.reportError("failed to collect cloud provider information from config", err)
+			return nil
+		}
+		cp = cloudProvider
+	} else {
+		cloudProvider, err := populateCloudProviderFromDSN(string(c.args.DataSourceName))
+		if err != nil {
+			c.reportError("failed to collect cloud provider information from DSN", err)
+			return nil
+		}
+		cp = cloudProvider
+	}
+
 	c.args.Targets = append([]discovery.Target{c.baseTarget}, c.args.Targets...)
 	targets := make([]discovery.Target, 0, len(c.args.Targets)+1)
 	for _, t := range c.args.Targets {
 		builder := discovery.NewTargetBuilderFrom(t)
-		if relabel.ProcessBuilder(builder, database_observability.GetRelabelingRules(generatedSystemID)...) {
+		if relabel.ProcessBuilder(builder, database_observability.GetRelabelingRules(generatedSystemID, cp)...) {
 			targets = append(targets, builder.Target())
 		}
 	}
@@ -309,7 +325,7 @@ func (c *Component) Update(args component.Arguments) error {
 	}
 	c.collectors = nil
 
-	if err := c.startCollectors(generatedSystemID, engineVersion.String); err != nil {
+	if err := c.startCollectors(generatedSystemID, engineVersion.String, cp); err != nil {
 		c.reportError("failed to start collectors", err)
 		return nil
 	}
@@ -342,7 +358,7 @@ func enableOrDisableCollectors(a Arguments) map[string]bool {
 }
 
 // startCollectors attempts to start all of the enabled collectors. If one or more collectors fail to start, their errors are reported
-func (c *Component) startCollectors(systemID string, engineVersion string) error {
+func (c *Component) startCollectors(systemID string, engineVersion string, cloudProviderInfo *database_observability.CloudProvider) error {
 	var startErrors []string
 
 	logStartError := func(collectorName, action string, err error) {
@@ -351,19 +367,6 @@ func (c *Component) startCollectors(systemID string, engineVersion string) error
 		startErrors = append(startErrors, errorString)
 	}
 
-	var cloudProviderInfo *database_observability.CloudProvider
-	if c.args.CloudProvider != nil && c.args.CloudProvider.AWS != nil {
-		arn, err := arn.Parse(c.args.CloudProvider.AWS.ARN)
-		if err != nil {
-			level.Error(c.opts.Logger).Log("msg", "failed to parse AWS cloud provider ARN", "err", err)
-		}
-		cloudProviderInfo = &database_observability.CloudProvider{
-			AWS: &database_observability.AWSCloudProviderInfo{
-				ARN: arn,
-			},
-		}
-	}
-
 	entryHandler := addLokiLabels(loki.NewEntryHandler(c.handler.Chan(), func() {}), c.instanceKey, systemID)
 
 	var tableRegistry *collector.TableRegistry
diff --git a/internal/component/database_observability/relabeling.go b/internal/component/database_observability/relabeling.go
index c0859785ce4..77daf2414b7 100644
--- a/internal/component/database_observability/relabeling.go
+++ b/internal/component/database_observability/relabeling.go
@@ -2,10 +2,32 @@ package database_observability
 
 import "github.com/grafana/alloy/internal/component/common/relabel"
 
-func GetRelabelingRules(serverID string) []*relabel.Config {
+func GetRelabelingRules(serverID string, cp *CloudProvider) []*relabel.Config {
 	r := relabel.DefaultRelabelConfig // use default to avoid defining all fields
 	r.Replacement = serverID
 	r.TargetLabel = "server_id"
 	r.Action = relabel.Replace
-	return []*relabel.Config{&r}
+
+	rs := []*relabel.Config{&r}
+
+	if cp != nil && cp.AWS != nil {
+		providerName := relabel.DefaultRelabelConfig
+		providerName.Replacement = "aws"
+		providerName.TargetLabel = "provider_name"
+		providerName.Action = relabel.Replace
+
+		providerRegion := relabel.DefaultRelabelConfig
+		providerRegion.Replacement = cp.AWS.ARN.Region
+		providerRegion.TargetLabel = "provider_region"
+		providerRegion.Action = relabel.Replace
+
+		providerAccount := relabel.DefaultRelabelConfig
+		providerAccount.Replacement = cp.AWS.ARN.AccountID
+		providerAccount.TargetLabel = "provider_account"
+		providerAccount.Action = relabel.Replace
+
+		rs = append(rs, &providerName, &providerRegion, &providerAccount)
+	}
+
+	return rs
 }
diff --git a/internal/component/database_observability/relabeling_test.go b/internal/component/database_observability/relabeling_test.go
new file mode 100644
index 00000000000..f661d7c73aa
--- /dev/null
+++ b/internal/component/database_observability/relabeling_test.go
@@ -0,0 +1,48 @@
+package database_observability
+
+import (
+	"testing"
+
+	"github.com/aws/aws-sdk-go-v2/aws/arn"
+	"github.com/grafana/alloy/internal/component/common/relabel"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_GetRelabelingRules(t *testing.T) {
+	t.Run("return relabeling rules", func(t *testing.T) {
+		rr := GetRelabelingRules("some-server-id", nil)
+
+		require.Equal(t, 1, len(rr))
+		require.Equal(t, "some-server-id", rr[0].Replacement)
+		require.Equal(t, "server_id", rr[0].TargetLabel)
+		require.Equal(t, relabel.Replace, rr[0].Action)
+	})
+
+	t.Run("return relabeling rules with AWS config", func(t *testing.T) {
+		rr := GetRelabelingRules("some-server-id", &CloudProvider{
+			AWS: &AWSCloudProviderInfo{
+				ARN: arn.ARN{
+					Region:    "some-region",
+					AccountID: "some-account",
+				},
+			},
+		})
+
+		require.Equal(t, 4, len(rr))
+		require.Equal(t, "some-server-id", rr[0].Replacement)
+		require.Equal(t, "server_id", rr[0].TargetLabel)
+		require.Equal(t, relabel.Replace, rr[0].Action)
+
+		require.Equal(t, "aws", rr[1].Replacement)
+		require.Equal(t, "provider_name", rr[1].TargetLabel)
+		require.Equal(t, relabel.Replace, rr[1].Action)
+
+		require.Equal(t, "some-region", rr[2].Replacement)
+		require.Equal(t, "provider_region", rr[2].TargetLabel)
+		require.Equal(t, relabel.Replace, rr[2].Action)
+
+		require.Equal(t, "some-account", rr[3].Replacement)
+		require.Equal(t, "provider_account", rr[3].TargetLabel)
+		require.Equal(t, relabel.Replace, rr[3].Action)
+	})
+}

From 3941a47d25f0c71be8c3f9ee6e61115aaceeb5cc Mon Sep 17 00:00:00 2001
From: Karl Persson <23356117+kalleep@users.noreply.github.com>
Date: Wed, 10 Dec 2025 14:58:42 +0100
Subject: [PATCH 24/24] stop storage and wal after test (#5056)

---
 internal/component/prometheus/pipeline_test.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/internal/component/prometheus/pipeline_test.go b/internal/component/prometheus/pipeline_test.go
index 92f82bd56ab..756e3aaeaa2 100644
--- a/internal/component/prometheus/pipeline_test.go
+++ b/internal/component/prometheus/pipeline_test.go
@@ -207,6 +207,11 @@ func newRemoteWriteComponent(t testing.TB, logger log.Logger, ls *labelstore.Ser
 	inMemoryAppendable := testappender.ConstantAppendable{Inner: testappender.NewCollectingAppender()}
 	store := storage.NewFanout(fanoutLogger, walStorage, testStorage{inMemoryAppendable: inMemoryAppendable})
 
+	t.Cleanup(func() {
+		store.Close()
+		walStorage.Close()
+	})
+
 	return remotewrite.NewInterceptor("prometheus.remote_write.test", &atomic.Bool{}, livedebugging.NewLiveDebugging(), ls, store), inMemoryAppendable.Inner
 }