Otel bump v0.143.0

internal/merge/confmap/confmap.go

@@ -10,9 +10,7 @@ import (
 	otelconfmap "go.opentelemetry.io/collector/confmap"
 )
 
-const (
-	KeyDelimiter = otelconfmap.KeyDelimiter
-)
+var KeyDelimiter = otelconfmap.KeyDelimiter
 
 type Conf struct {
 	k *koanf.Koanf

plugins/inputs/prometheus/metric_type_handler_test.go

@@ -4,10 +4,10 @@
 package prometheus
 
 import (
-	"net/url"
 	"testing"
 
 	"github.com/prometheus/common/model"
+	promconfig "github.com/prometheus/prometheus/config"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/scrape"
 	"github.com/stretchr/testify/assert"
@@ -35,10 +35,10 @@ func (mStore *mockMetricMetadataStore) GetMetadata(metric string) (scrape.Metric
 	}
 
 	return scrape.MetricMetadata{
-		Metric: metric,
-		Type:   mStore.Type,
-		Help:   mStore.Help,
-		Unit:   mStore.Unit,
+		MetricFamily: metric,
+		Type:         mStore.Type,
+		Help:         mStore.Help,
+		Unit:         mStore.Unit,
 	}, true
 }
 
@@ -63,16 +63,17 @@ func (ms *mockScrapeManager) TargetsAll() map[string][]*scrape.Target {
 	targetMap := make(map[string][]*scrape.Target)
 
 	//add a target
-	params := url.Values{
-		"abc": []string{"foo", "bar", "baz"},
-		"xyz": []string{"www"},
-	}
 	labels1 := labels.FromMap(map[string]string{
 		model.JobLabel:           "job1",
 		model.InstanceLabel:      "instance1",
 		savedScrapeInstanceLabel: "instance1",
 	})
-	target1 := scrape.NewTarget(labels1, labels1, params)
+	tLabels1 := model.LabelSet{
+		model.LabelName(model.JobLabel):           "job1",
+		model.LabelName(model.InstanceLabel):      "instance1",
+		model.LabelName(savedScrapeInstanceLabel): "instance1",
+	}
+	target1 := scrape.NewTarget(labels1, &promconfig.ScrapeConfig{}, tLabels1, nil)
 	mStore1 := &mockMetricMetadataStore{
 		MetricList: []string{"m1", "m2", "m4"},
 		Type:       model.MetricTypeCounter,
@@ -83,16 +84,17 @@ func (ms *mockScrapeManager) TargetsAll() map[string][]*scrape.Target {
 	targetMap["job1"] = []*scrape.Target{target1}
 
 	//add a target whose job name has been replaced (e.g. job2 -> job2_replaced)
-	params2 := url.Values{
-		"abc": []string{"foo", "bar", "foobar"},
-		"xyz": []string{"ooo"},
-	}
 	labels2 := labels.FromMap(map[string]string{
 		model.JobLabel:           "job2_replaced",
 		model.InstanceLabel:      "instance2",
 		savedScrapeInstanceLabel: "instance2",
 	})
-	target2 := scrape.NewTarget(labels2, labels2, params2)
+	tLabels2 := model.LabelSet{
+		model.LabelName(model.JobLabel):           "job2_replaced",
+		model.LabelName(model.InstanceLabel):      "instance2",
+		model.LabelName(savedScrapeInstanceLabel): "instance2",
+	}
+	target2 := scrape.NewTarget(labels2, &promconfig.ScrapeConfig{}, tLabels2, nil)
 	mStore2 := &mockMetricMetadataStore{
 		MetricList: []string{"m1", "m2"},
 		Type:       model.MetricTypeGauge,
@@ -133,20 +135,20 @@ func TestMetadataServiceImpl_GetWithOriginalJobname(t *testing.T) {
 	mCache, err = metricsTypeHandler.ms.Get("job1", "instance1")
 	require.NoError(t, err)
 	expectedMetricMetadata := scrape.MetricMetadata{
-		Metric: "m1",
-		Type:   model.MetricTypeCounter,
-		Help:   "",
-		Unit:   "",
+		MetricFamily: "m1",
+		Type:         model.MetricTypeCounter,
+		Help:         "",
+		Unit:         "",
 	}
 	metricMetadata, ok := mCache.Metadata("m1")
 	assert.Equal(t, ok, true)
 	assert.Equal(t, expectedMetricMetadata, metricMetadata)
 
 	expectedMetricMetadata = scrape.MetricMetadata{
-		Metric: "m2",
-		Type:   model.MetricTypeCounter,
-		Help:   "",
-		Unit:   "",
+		MetricFamily: "m2",
+		Type:         model.MetricTypeCounter,
+		Help:         "",
+		Unit:         "",
 	}
 	metricMetadata, ok = mCache.Metadata("m2")
 	assert.Equal(t, ok, true)

plugins/inputs/prometheus/metrics_receiver.go

@@ -78,14 +78,14 @@ func (mr *metricsReceiver) feed(batch PrometheusMetricBatch) error {
 func (ma *metricAppender) Append(_ storage.SeriesRef, ls labels.Labels, t int64, v float64) (storage.SeriesRef, error) {
 	metricName := ""
 
-	labelMap := make(map[string]string, len(ls))
-	for _, l := range ls {
+	labelMap := make(map[string]string, ls.Len())
+	ls.Range(func(l labels.Label) {
 		if l.Name == model.MetricNameLabel {
 			metricName = l.Value
-			continue
+			return
 		}
 		labelMap[l.Name] = l.Value
-	}
+	})
 
 	if metricName == "" {
 		// The error should never happen, print log here for debugging

plugins/inputs/prometheus/metrics_receiver_test.go

@@ -22,10 +22,10 @@ func Test_metricAppender_Add_BadMetricName(t *testing.T) {
 	var ts int64 = 10
 	var v = 10.0
 
-	ls := []labels.Label{
-		{Name: "name_a", Value: "value_a"},
-		{Name: "name_b", Value: "value_b"},
-	}
+	ls := labels.FromStrings(
+		"name_a", "value_a",
+		"name_b", "value_b",
+	)
 
 	r, err := ma.Append(0, ls, ts, v)
 	assert.Equal(t, storage.SeriesRef(0), r)
@@ -37,10 +37,10 @@ func Test_metricAppender_Add(t *testing.T) {
 	ma := mr.Appender(nil)
 	var ts int64 = 10
 	var v = 10.0
-	ls := []labels.Label{
-		{Name: "__name__", Value: "metric_name"},
-		{Name: "tag_a", Value: "a"},
-	}
+	ls := labels.FromStrings(
+		"__name__", "metric_name",
+		"tag_a", "a",
+	)
 
 	ref, err := ma.Append(0, ls, ts, v)
 	assert.Equal(t, ref, storage.SeriesRef(0))
@@ -70,10 +70,10 @@ func Test_metricAppender_Rollback(t *testing.T) {
 	ma := mr.Appender(nil)
 	var ts int64 = 10
 	var v = 10.0
-	ls := []labels.Label{
-		{Name: "__name__", Value: "metric_name"},
-		{Name: "tag_a", Value: "a"},
-	}
+	ls := labels.FromStrings(
+		"__name__", "metric_name",
+		"tag_a", "a",
+	)
 
 	ref, err := ma.Append(0, ls, ts, v)
 	assert.Equal(t, ref, storage.SeriesRef(0))
@@ -91,10 +91,10 @@ func Test_metricAppender_Commit(t *testing.T) {
 	ma := mr.Appender(nil)
 	var ts int64 = 10
 	var v = 10.0
-	ls := []labels.Label{
-		{Name: "__name__", Value: "metric_name"},
-		{Name: "tag_a", Value: "a"},
-	}
+	ls := labels.FromStrings(
+		"__name__", "metric_name",
+		"tag_a", "a",
+	)
 
 	ref, err := ma.Append(0, ls, ts, v)
 	assert.Equal(t, ref, storage.SeriesRef(0))
@@ -123,7 +123,7 @@ func Test_loadConfigFromFileWithTargetAllocator(t *testing.T) {
 
 	configFile := filepath.Join("testdata", "target_allocator.yaml")
 
-	logLevel := &promslog.AllowedLevel{}
+	logLevel := promslog.NewLevel()
 	err := logLevel.Set("info")
 	require.NoError(t, err)
 
@@ -141,8 +141,10 @@ func Test_loadConfigFromFileWithTargetAllocator(t *testing.T) {
 
 	assert.NoError(t, err)
 	assert.True(t, taManager.enabled)
-	assert.Equal(t, taManager.config.TargetAllocator.CollectorID, "collector-1")
-	assert.Equal(t, taManager.config.TargetAllocator.TLSSetting.CAFile, DefaultTLSCaFilePath)
+	taCfg := taManager.config.TargetAllocator.Get()
+	require.NotNil(t, taCfg)
+	assert.Equal(t, taCfg.CollectorID, "collector-1")
+	assert.Equal(t, taCfg.TLS.CAFile, DefaultTLSCaFilePath)
 }
 
 func Test_loadConfigFromFileWithoutTargetAllocator(t *testing.T) {
@@ -152,11 +154,11 @@ func Test_loadConfigFromFileWithoutTargetAllocator(t *testing.T) {
 	configFile := filepath.Join("testdata", "base-k8.yaml")
 
 	// Create logger configuration
-	logLevel := &promslog.AllowedLevel{}
+	logLevel := promslog.NewLevel()
 	err := logLevel.Set("debug")
 	require.NoError(t, err)
 
-	format := &promslog.AllowedFormat{}
+	format := &promslog.Format{}
 	err = format.Set("logfmt")
 	require.NoError(t, err)
 
@@ -184,11 +186,11 @@ func Test_loadConfigFromFileEC2(t *testing.T) {
 	configFile := filepath.Join("testdata", "base-k8.yaml")
 
 	// Create logger configuration
-	logLevel := &promslog.AllowedLevel{}
+	logLevel := promslog.NewLevel()
 	err := logLevel.Set("debug")
 	require.NoError(t, err)
 
-	format := &promslog.AllowedFormat{}
+	format := &promslog.Format{}
 	err = format.Set("logfmt")
 	require.NoError(t, err)
 

plugins/inputs/prometheus/metrics_type_handler.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 
 	v1 "github.com/prometheus/client_golang/api/prometheus/v1"
+	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/scrape"
 )
 
@@ -88,8 +89,10 @@ func (t *metadataServiceImpl) Get(job, instance string) (metadataCache, error) {
 	}
 
 	// from the same targetGroup, instance is not going to be duplicated
+	lb := labels.NewBuilder(labels.EmptyLabels())
 	for _, target := range targetGroup {
-		if target.DiscoveredLabels().Get(savedScrapeInstanceLabel) == instance || target.DiscoveredLabels().Get(scrapeInstanceLabel) == instance {
+		dl := target.DiscoveredLabels(lb)
+		if dl.Get(savedScrapeInstanceLabel) == instance || dl.Get(scrapeInstanceLabel) == instance {
 			return &mCache{target}, nil
 		}
 	}

plugins/inputs/prometheus/start.go

@@ -65,11 +65,12 @@ var (
 	// https://github.com/aws/amazon-cloudwatch-agent/blob/main/plugins/inputs/prometheus_scraper/metrics_filter.go#L23
 	metricNameRelabelConfigs = []*relabel.Config{
 		{
-			Action:       relabel.Replace,
-			Regex:        relabel.MustNewRegexp("(.*)"),
-			Replacement:  "$1",
-			TargetLabel:  savedScrapeNameLabel,
-			SourceLabels: model.LabelNames{"__name__"},
+			Action:               relabel.Replace,
+			Regex:                relabel.MustNewRegexp("(.*)"),
+			Replacement:          "$1",
+			TargetLabel:          savedScrapeNameLabel,
+			SourceLabels:         model.LabelNames{"__name__"},
+			NameValidationScheme: model.UTF8Validation,
 		},
 	}
 )
@@ -79,15 +80,15 @@ func init() {
 }
 
 func Start(configFilePath string, receiver storage.Appendable, shutDownChan chan interface{}, wg *sync.WaitGroup, mth *metricsTypeHandler) {
-	logLevel := &promslog.AllowedLevel{}
+	logLevel := promslog.NewLevel()
 	logLevel.Set("info")
 
 	if os.Getenv("DEBUG") != "" {
 		runtime.SetBlockProfileRate(20)
 		runtime.SetMutexProfileFraction(20)
 		logLevel.Set("debug")
 	}
-	logFormat := &promslog.AllowedFormat{}
+	logFormat := &promslog.Format{}
 	_ = logFormat.Set("logfmt")
 
 	cfg := struct {
@@ -340,19 +341,21 @@ func relabelScrapeConfigs(prometheusConfig *config.Config, logger *slog.Logger)
 		relabelConfigs := []*relabel.Config{
 			// job
 			{
-				Action:       relabel.Replace,
-				Regex:        relabel.MustNewRegexp(".*"), // __address__ is always there, so we will find a match for every job
-				Replacement:  sc.JobName,                  // value is hard coded job name
-				SourceLabels: model.LabelNames{"__address__"},
-				TargetLabel:  savedScrapeJobLabel, // creates a new magic label
+				Action:               relabel.Replace,
+				Regex:                relabel.MustNewRegexp(".*"), // __address__ is always there, so we will find a match for every job
+				Replacement:          sc.JobName,                  // value is hard coded job name
+				SourceLabels:         model.LabelNames{"__address__"},
+				TargetLabel:          savedScrapeJobLabel, // creates a new magic label
+				NameValidationScheme: model.UTF8Validation,
 			},
 			// instance
 			{
-				Action:       relabel.Replace,
-				Regex:        relabel.MustNewRegexp("(.*)"),
-				Replacement:  "$1", // value is actual __address__, i.e. instance if you don't relabel it.
-				SourceLabels: model.LabelNames{"__address__"},
-				TargetLabel:  savedScrapeInstanceLabel, // creates a new magic label
+				Action:               relabel.Replace,
+				Regex:                relabel.MustNewRegexp("(.*)"),
+				Replacement:          "$1", // value is actual __address__, i.e. instance if you don't relabel it.
+				SourceLabels:         model.LabelNames{"__address__"},
+				TargetLabel:          savedScrapeInstanceLabel, // creates a new magic label
+				NameValidationScheme: model.UTF8Validation,
 			},
 		}