Otel bump v0.115.0 -> v0.124.1

extension/agenthealth/config_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
+	"go.opentelemetry.io/collector/confmap/xconfmap"
 
 	"github.com/aws/amazon-cloudwatch-agent/extension/agenthealth/handler/stats/agent"
 )
@@ -41,7 +42,7 @@ func TestLoadConfig(t *testing.T) {
 		require.NoError(t, err)
 		require.NoError(t, sub.Unmarshal(cfg))
 
-		assert.NoError(t, component.ValidateConfig(cfg))
+		assert.NoError(t, xconfmap.Validate(cfg))
 		assert.Equal(t, testCase.want, cfg)
 	}
 }

extension/agenthealth/factory_test.go

@@ -20,7 +20,7 @@ func TestCreateDefaultConfig(t *testing.T) {
 
 func TestCreate(t *testing.T) {
 	cfg := &Config{}
-	got, err := NewFactory().Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+	got, err := NewFactory().Create(context.Background(), extensiontest.NewNopSettings(TypeStr), cfg)
 	assert.NoError(t, err)
 	assert.NotNil(t, got)
 }

extension/entitystore/factory_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/extension/extensiontest"
 )
@@ -20,7 +21,7 @@ func TestCreateDefaultConfig(t *testing.T) {
 
 func TestCreate(t *testing.T) {
 	cfg := &Config{}
-	got, err := NewFactory().Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+	got, err := NewFactory().Create(context.Background(), extensiontest.NewNopSettings(component.MustNewType("entitystore")), cfg)
 	assert.NoError(t, err)
 	assert.NotNil(t, got)
 }

extension/k8smetadata/factory_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/extension/extensiontest"
 )
@@ -20,7 +21,7 @@ func TestCreateDefaultConfig(t *testing.T) {
 
 func TestCreate(t *testing.T) {
 	cfg := &Config{}
-	got, err := NewFactory().Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+	got, err := NewFactory().Create(context.Background(), extensiontest.NewNopSettings(component.MustNewType("k8smetadata")), cfg)
 	assert.NoError(t, err)
 	assert.NotNil(t, got)
 }

extension/server/factory_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/extension/extensiontest"
 )
@@ -20,7 +21,7 @@ func TestCreateDefaultConfig(t *testing.T) {
 
 func TestCreateExtension(t *testing.T) {
 	cfg := &Config{}
-	got, err := NewFactory().Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+	got, err := NewFactory().Create(context.Background(), extensiontest.NewNopSettings(component.MustNewType("server")), cfg)
 	assert.NoError(t, err)
 	assert.NotNil(t, got)
 }
@@ -29,7 +30,7 @@ func TestCreateWithConfig(t *testing.T) {
 	cfg := &Config{ListenAddress: ":8080", TLSCertPath: "./testdata/example-server-cert.pem",
 		TLSKeyPath: "./testdata/example-server-key.pem",
 		TLSCAPath:  "./testdata/example-CA-cert.pem"}
-	got, err := NewFactory().Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+	got, err := NewFactory().Create(context.Background(), extensiontest.NewNopSettings(component.MustNewType("server")), cfg)
 	assert.NoError(t, err)
 	assert.NotNil(t, got)
 }

plugins/inputs/prometheus/metrics_receiver.go

@@ -48,12 +48,21 @@ type metricAppender struct {
 	batch    PrometheusMetricBatch
 }
 
-func (m *metricAppender) AppendCTZeroSample(storage.SeriesRef, labels.Labels, int64, int64) (storage.SeriesRef, error) {
+func (ma *metricAppender) AppendCTZeroSample(storage.SeriesRef, labels.Labels, int64, int64) (storage.SeriesRef, error) {
 	// TODO: implement this func
 	return 0, nil
 }
 
-func (mr *metricsReceiver) Appender(ctx context.Context) storage.Appender {
+func (ma *metricAppender) SetOptions(_ *storage.AppendOptions) {
+	// Implement if needed, or leave empty if no special handling is required
+}
+
+func (ma *metricAppender) AppendHistogramCTZeroSample(_ storage.SeriesRef, _ labels.Labels, _ int64, _ int64, _ *histogram.Histogram, _ *histogram.FloatHistogram) (storage.SeriesRef, error) {
+	// Implement basic handling or return nil if not needed
+	return 0, nil
+}
+
+func (mr *metricsReceiver) Appender(_ context.Context) storage.Appender {
 	return &metricAppender{receiver: mr, batch: PrometheusMetricBatch{}}
 }
 
@@ -66,7 +75,7 @@ func (mr *metricsReceiver) feed(batch PrometheusMetricBatch) error {
 	return nil
 }
 
-func (ma *metricAppender) Append(ref storage.SeriesRef, ls labels.Labels, t int64, v float64) (storage.SeriesRef, 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))
@@ -118,12 +127,12 @@ func (ma *metricAppender) AppendExemplar(ref storage.SeriesRef, l labels.Labels,
 	return 0, nil
 }
 
-func (ma *metricAppender) UpdateMetadata(ref storage.SeriesRef, l labels.Labels, m metadata.Metadata) (storage.SeriesRef, error) {
+func (ma *metricAppender) UpdateMetadata(ref storage.SeriesRef, _ labels.Labels, _ metadata.Metadata) (storage.SeriesRef, error) {
 	// This code should no longer be used
 	return ref, nil
 }
 
-func (ma *metricAppender) AppendHistogram(ref storage.SeriesRef, l labels.Labels, t int64, h *histogram.Histogram, fh *histogram.FloatHistogram) (storage.SeriesRef, error) {
+func (ma *metricAppender) AppendHistogram(ref storage.SeriesRef, _ labels.Labels, _ int64, _ *histogram.Histogram, _ *histogram.FloatHistogram) (storage.SeriesRef, error) {
 	// This code should no longer be used
 	return ref, nil
 }

plugins/inputs/prometheus/metrics_receiver_test.go

@@ -4,16 +4,17 @@
 package prometheus
 
 import (
+	"log/slog"
 	"os"
 	"path/filepath"
 	"testing"
 
-	kitlog "github.com/go-kit/log"
-	"github.com/prometheus/common/promlog"
+	"github.com/prometheus/common/promslog"
 	"github.com/prometheus/prometheus/config"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/storage"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func Test_metricAppender_Add_BadMetricName(t *testing.T) {
@@ -119,53 +120,94 @@ func Test_metricAppender_Commit(t *testing.T) {
 func Test_loadConfigFromFileWithTargetAllocator(t *testing.T) {
 	os.Setenv("POD_NAME", "collector-1")
 	defer os.Unsetenv("POD_NAME")
+
 	configFile := filepath.Join("testdata", "target_allocator.yaml")
-	logger := kitlog.NewLogfmtLogger(os.Stdout)
-	logLevel := promlog.AllowedLevel{}
-	logLevel.Set("DEBUG")
+
+	logLevel := &promslog.AllowedLevel{}
+	err := logLevel.Set("info")
+	require.NoError(t, err)
+
+	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
+		Level: slog.LevelInfo,
+	}))
+
 	var reloadHandler = func(cfg *config.Config) error {
-		logger.Log("reloaded")
+		logger.Info("reloaded")
 		return nil
 	}
-	taManager := createTargetAllocatorManager(configFile, logger, &logLevel, nil, nil)
-	err := reloadConfig(configFile, logger, taManager, reloadHandler)
+
+	taManager := createTargetAllocatorManager(configFile, logger, logLevel, nil, nil)
+	err = reloadConfig(configFile, logger, taManager, reloadHandler)
+
 	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, DEFAULT_TLS_CA_FILE_PATH)
-
 }
 
 func Test_loadConfigFromFileWithoutTargetAllocator(t *testing.T) {
 	os.Setenv("POD_NAME", "collector-1")
 	defer os.Unsetenv("POD_NAME")
+
 	configFile := filepath.Join("testdata", "base-k8.yaml")
-	logLevel := promlog.AllowedLevel{}
-	logLevel.Set("DEBUG")
-	logger := kitlog.NewLogfmtLogger(os.Stdout)
+
+	// Create logger configuration
+	logLevel := &promslog.AllowedLevel{}
+	err := logLevel.Set("debug")
+	require.NoError(t, err)
+
+	format := &promslog.AllowedFormat{}
+	err = format.Set("logfmt")
+	require.NoError(t, err)
+
+	logConfig := &promslog.Config{
+		Level:  logLevel,
+		Format: format,
+		Style:  promslog.SlogStyle,
+		Writer: os.Stdout,
+	}
+	logger := promslog.New(logConfig)
+
 	var reloadHandler = func(cfg *config.Config) error {
-		logger.Log("reloaded")
+		logger.Info("reloaded")
 		return nil
 	}
-	taManager := createTargetAllocatorManager(configFile, logger, &logLevel, nil, nil)
-	err := reloadConfig(configFile, logger, taManager, reloadHandler)
+
+	taManager := createTargetAllocatorManager(configFile, logger, logLevel, nil, nil)
+	err = reloadConfig(configFile, logger, taManager, reloadHandler)
+
 	assert.NoError(t, err)
 	assert.False(t, taManager.enabled)
-
 }
+
 func Test_loadConfigFromFileEC2(t *testing.T) {
 	configFile := filepath.Join("testdata", "base-k8.yaml")
-	logger := kitlog.NewLogfmtLogger(os.Stdout)
-	logLevel := promlog.AllowedLevel{}
-	logLevel.Set("DEBUG")
+
+	// Create logger configuration
+	logLevel := &promslog.AllowedLevel{}
+	err := logLevel.Set("debug")
+	require.NoError(t, err)
+
+	format := &promslog.AllowedFormat{}
+	err = format.Set("logfmt")
+	require.NoError(t, err)
+
+	logConfig := &promslog.Config{
+		Level:  logLevel,
+		Format: format,
+		Style:  promslog.SlogStyle,
+		Writer: os.Stdout,
+	}
+	logger := promslog.New(logConfig)
+
 	var reloadHandler = func(cfg *config.Config) error {
-		logger.Log("reloaded")
+		logger.Info("reloaded")
 		return nil
 	}
 
-	taManager := createTargetAllocatorManager(configFile, logger, &logLevel, nil, nil)
-	err := reloadConfig(configFile, logger, taManager, reloadHandler)
+	taManager := createTargetAllocatorManager(configFile, logger, logLevel, nil, nil)
+	err = reloadConfig(configFile, logger, taManager, reloadHandler)
+
 	assert.NoError(t, err)
 	assert.False(t, taManager.enabled)
-
 }