Update to Prometheus 3.3 (& Loki 3.5)

internal/component/common/kubernetes/diff_test.go

@@ -11,7 +11,7 @@ import (
 func parseRuleGroups(t *testing.T, buf []byte) []rulefmt.RuleGroup {
 	t.Helper()
 
-	groups, errs := rulefmt.Parse(buf)
+	groups, errs := rulefmt.Parse(buf, false)
 	require.Empty(t, errs)
 
 	return groups.Groups

internal/component/common/loki/wal/wal.go

@@ -2,13 +2,15 @@ package wal
 
 import (
 	"fmt"
+	"log/slog"
 	"os"
 
 	"github.com/go-kit/log"
 	"github.com/grafana/loki/v3/pkg/ingester/wal"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/prometheus/tsdb/wlog"
 
+	"github.com/grafana/alloy/internal/runtime/logging"
 	"github.com/grafana/alloy/internal/runtime/logging/level"
 )
 
@@ -37,7 +39,7 @@ type wrapper struct {
 func New(cfg Config, log log.Logger, registerer prometheus.Registerer) (WAL, error) {
 	// TODO: We should fine-tune the WAL instantiated here to allow some buffering of written entries, but not written to disk
 	// yet. This will attest for the lack of buffering in the channel Writer exposes.
-	tsdbWAL, err := wlog.NewSize(log, registerer, cfg.Dir, wlog.DefaultSegmentSize, wlog.CompressionSnappy)
+	tsdbWAL, err := wlog.NewSize(slog.New(logging.NewSlogGoKitHandler(log)), registerer, cfg.Dir, wlog.DefaultSegmentSize, wlog.CompressionSnappy)
 	if err != nil {
 		return nil, fmt.Errorf("failde to create tsdb WAL: %w", err)
 	}

internal/component/common/loki/wal/watcher.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"log/slog"
 	"math"
 	"os"
 	"strconv"
@@ -15,6 +16,7 @@ import (
 	"github.com/prometheus/prometheus/tsdb/wlog"
 
 	"github.com/grafana/alloy/internal/component/common/loki/wal/internal"
+	"github.com/grafana/alloy/internal/runtime/logging"
 	"github.com/grafana/alloy/internal/runtime/logging/level"
 )
 
@@ -205,7 +207,7 @@ func (w *Watcher) watch(segmentNum int, tail bool) error {
 	}
 	defer segment.Close()
 
-	reader := wlog.NewLiveReader(w.logger, nil, segment)
+	reader := wlog.NewLiveReader(slog.New(logging.NewSlogGoKitHandler(w.logger)), nil, segment)
 
 	readTimer := newBackoffTimer(w.minReadFreq, w.maxReadFreq)
 

internal/component/discovery/consulagent/promtail_consulagent.go

@@ -15,6 +15,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"log/slog"
 	"net"
 	"net/http"
 	"strconv"
@@ -27,11 +28,13 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/config"
 	"github.com/prometheus/common/model"
+	"github.com/prometheus/common/promslog"
 	"github.com/prometheus/prometheus/discovery"
 	"github.com/prometheus/prometheus/discovery/targetgroup"
 	"github.com/prometheus/prometheus/util/strutil"
 
 	"github.com/grafana/alloy/internal/runtime/logging/level"
+	"github.com/grafana/alloy/internal/slogadapter"
 )
 
 const (
@@ -164,9 +167,9 @@ type Discovery struct {
 }
 
 // NewDiscovery returns a new Discovery for the given config.
-func NewDiscovery(conf *SDConfig, logger log.Logger) (*Discovery, error) {
+func NewDiscovery(conf *SDConfig, logger *slog.Logger) (*Discovery, error) {
 	if logger == nil {
-		logger = log.NewNopLogger()
+		logger = promslog.NewNopLogger()
 	}
 
 	tls, err := config.NewTLSConfig(&conf.TLSConfig)
@@ -209,7 +212,7 @@ func NewDiscovery(conf *SDConfig, logger log.Logger) (*Discovery, error) {
 		refreshInterval:  time.Duration(conf.RefreshInterval),
 		clientDatacenter: conf.Datacenter,
 		finalizer:        transport.CloseIdleConnections,
-		logger:           logger,
+		logger:           slogadapter.GoKit(logger.Handler()),
 	}
 	return cd, nil
 }

internal/component/discovery/consulagent/promtail_consulagent_test.go

@@ -23,8 +23,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-kit/log"
 	"github.com/prometheus/common/model"
+	"github.com/prometheus/common/promslog"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
 
@@ -341,7 +341,7 @@ func newServer(t *testing.T) (*httptest.Server, *SDConfig) {
 }
 
 func newDiscovery(t *testing.T, config *SDConfig) *Discovery {
-	logger := log.NewNopLogger()
+	logger := promslog.NewNopLogger()
 	d, err := NewDiscovery(config, logger)
 	require.NoError(t, err)
 	return d

internal/component/discovery/discovery_metrics.go

@@ -2,8 +2,10 @@ package discovery
 
 import (
 	"context"
+	"log/slog"
 
 	"github.com/go-kit/log"
+	"github.com/grafana/alloy/internal/runtime/logging"
 	"github.com/prometheus/client_golang/prometheus"
 	promdiscovery "github.com/prometheus/prometheus/discovery"
 	"github.com/prometheus/prometheus/discovery/targetgroup"
@@ -27,7 +29,7 @@ func NewDiscovererWithMetrics(cfg promdiscovery.Config, reg prometheus.Registere
 	sdMetrics := cfg.NewDiscovererMetrics(reg, refreshMetrics)
 
 	discoverer, err := cfg.NewDiscoverer(promdiscovery.DiscovererOptions{
-		Logger:  logger,
+		Logger:  slog.New(logging.NewSlogGoKitHandler(logger)),
 		Metrics: sdMetrics,
 	})
 

internal/component/discovery/kubelet/discoverer_config.go

@@ -2,12 +2,14 @@ package kubelet
 
 import (
 	"fmt"
+	"log/slog"
 
 	"github.com/prometheus/client_golang/prometheus"
 	prom_discovery "github.com/prometheus/prometheus/discovery"
 	"github.com/prometheus/prometheus/discovery/refresh"
 
 	"github.com/grafana/alloy/internal/component"
+	"github.com/grafana/alloy/internal/runtime/logging"
 )
 
 type kubeletDiscoveryConfig struct {
@@ -40,7 +42,7 @@ func (k *kubeletDiscoveryConfig) NewDiscoverer(discOpts prom_discovery.Discovere
 	}
 
 	return refresh.NewDiscovery(refresh.Options{
-		Logger:              k.opts.Logger,
+		Logger:              slog.New(logging.NewSlogGoKitHandler(k.opts.Logger)),
 		Mech:                "kubelet",
 		Interval:            interval,
 		RefreshF:            kubeletDiscovery.Refresh,

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

@@ -148,7 +148,7 @@ func convertCRDRuleGroupToRuleGroup(crd promv1.PrometheusRuleSpec) ([]rulefmt.Ru
 		return nil, err
 	}
 
-	groups, _ := rulefmt.Parse(buf)
+	groups, _ := rulefmt.Parse(buf, false)
 
 	// Disable looking for errors, loki queries won't be valid prometheus queries, but still want the similar information
 	//if len(errs) > 0 {

internal/component/loki/source/api/internal/lokipush/push_api_server.go

@@ -160,10 +160,11 @@ func (s *PushAPIServer) handleLoki(w http.ResponseWriter, r *http.Request) {
 		logger,
 		tenantID,
 		r,
-		nil, // tenants retention
 		push.EmptyLimits{},
 		push.ParseLokiRequest,
 		nil, // usage tracker
+		nil,
+		false,
 	)
 	if err != nil {
 		level.Warn(s.logger).Log("msg", "failed to parse incoming push request", "err", err.Error())

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

@@ -201,12 +201,12 @@ func (e *eventProcessor) desiredStateFromKubernetes() (kubernetes.RuleGroupsByNa
 			if e.extraQueryMatchers != nil {
 				for _, ruleGroup := range groups {
 					for i := range ruleGroup.Rules {
-						query := ruleGroup.Rules[i].Expr.Value
+						query := ruleGroup.Rules[i].Expr
 						newQuery, err := addMatchersToQuery(query, e.extraQueryMatchers.Matchers)
 						if err != nil {
 							level.Error(e.logger).Log("msg", "failed to add labels to PrometheusRule query", "query", query, "err", err)
 						}
-						ruleGroup.Rules[i].Expr.Value = newQuery
+						ruleGroup.Rules[i].Expr = newQuery
 					}
 				}
 			}
@@ -280,7 +280,7 @@ func convertCRDRuleGroupToRuleGroup(crd promv1.PrometheusRuleSpec) ([]rulefmt.Ru
 		return nil, err
 	}
 
-	groups, errs := rulefmt.Parse(buf)
+	groups, errs := rulefmt.Parse(buf, false)
 	if len(errs) > 0 {
 		return nil, multierror.Append(nil, errs...)
 	}

internal/component/otelcol/receiver/prometheus/internal/metadata.go

@@ -16,30 +16,30 @@ type dataPoint struct {
 // internalMetricMetadata allows looking up metadata for internal scrape metrics
 var internalMetricMetadata = map[string]*scrape.MetricMetadata{
 	scrapeUpMetricName: {
-		Metric: scrapeUpMetricName,
-		Type:   model.MetricTypeGauge,
-		Help:   "The scraping was successful",
+		MetricFamily: scrapeUpMetricName,
+		Type:         model.MetricTypeGauge,
+		Help:         "The scraping was successful",
 	},
 	"scrape_duration_seconds": {
-		Metric: "scrape_duration_seconds",
-		Unit:   "seconds",
-		Type:   model.MetricTypeGauge,
-		Help:   "Duration of the scrape",
+		MetricFamily: "scrape_duration_seconds",
+		Unit:         "seconds",
+		Type:         model.MetricTypeGauge,
+		Help:         "Duration of the scrape",
 	},
 	"scrape_samples_scraped": {
-		Metric: "scrape_samples_scraped",
-		Type:   model.MetricTypeGauge,
-		Help:   "The number of samples the target exposed",
+		MetricFamily: "scrape_samples_scraped",
+		Type:         model.MetricTypeGauge,
+		Help:         "The number of samples the target exposed",
 	},
 	"scrape_series_added": {
-		Metric: "scrape_series_added",
-		Type:   model.MetricTypeGauge,
-		Help:   "The approximate number of new series in this scrape",
+		MetricFamily: "scrape_series_added",
+		Type:         model.MetricTypeGauge,
+		Help:         "The approximate number of new series in this scrape",
 	},
 	"scrape_samples_post_metric_relabeling": {
-		Metric: "scrape_samples_post_metric_relabeling",
-		Type:   model.MetricTypeGauge,
-		Help:   "The number of samples remaining after metric relabeling was applied",
+		MetricFamily: "scrape_samples_post_metric_relabeling",
+		Type:         model.MetricTypeGauge,
+		Help:         "The number of samples remaining after metric relabeling was applied",
 	},
 }
 
@@ -61,7 +61,7 @@ func metadataForMetric(metricName string, mc scrape.MetricMetadataStore) (*scrap
 	}
 	// Otherwise, the metric is unknown
 	return &scrape.MetricMetadata{
-		Metric: metricName,
-		Type:   model.MetricTypeUnknown,
+		MetricFamily: metricName,
+		Type:         model.MetricTypeUnknown,
 	}, metricName
 }

internal/component/otelcol/receiver/prometheus/internal/metricfamily.go

@@ -397,7 +397,7 @@ func (mf *metricFamily) addSeries(seriesRef uint64, metricName string, ls labels
 			mg.ts = t
 			mg.count = v
 			mg.hasCount = true
-		case metricName == mf.metadata.Metric+metricSuffixCreated:
+		case metricName == mf.metadata.MetricFamily+metricSuffixCreated:
 			mg.created = v
 		default:
 			boundary, err := getBoundary(mf.mtype, ls)
@@ -407,11 +407,11 @@ func (mf *metricFamily) addSeries(seriesRef uint64, metricName string, ls labels
 			mg.complexValue = append(mg.complexValue, &dataPoint{value: v, boundary: boundary})
 		}
 	case pmetric.MetricTypeExponentialHistogram:
-		if metricName == mf.metadata.Metric+metricSuffixCreated {
+		if metricName == mf.metadata.MetricFamily+metricSuffixCreated {
 			mg.created = v
 		}
 	case pmetric.MetricTypeSum:
-		if metricName == mf.metadata.Metric+metricSuffixCreated {
+		if metricName == mf.metadata.MetricFamily+metricSuffixCreated {
 			mg.created = v
 		} else {
 			mg.value = v