Update OpenTelemetry Dependencies to latest (#5001)

* Update OpenTelemetry Dependencies to latest * update deprecated component.MarshalConfig * rename deprecated NewCommand to NewCommandMustSetProvider * rename deprecated CreateSettings to Settings * make generate-metrics * update golden file for TestHostObserver * update golden file for TestDiscoveryReceiverWithHostObserverAndSimplePrometheusReceiverProvideStatusLogs --------- Co-authored-by: jeffreyc-splunk <[email protected]>
signalfx · Jun 21, 2024 · ee41830 · ee41830
1 parent 0a2b4b6
commit ee41830
Show file tree

Hide file tree

Showing 56 changed files with 920 additions and 896 deletions.
diff --git a/cmd/otelcol/main.go b/cmd/otelcol/main.go
@@ -87,7 +87,7 @@ func main() {
 }
 
 func runInteractive(settings otelcol.CollectorSettings) error {
-	cmd := otelcol.NewCommand(settings)
+	cmd := otelcol.NewCommandMustSetProvider(settings)
 	if err := cmd.Execute(); err != nil {
 		return fmt.Errorf("application run finished with error: %w", err)
 	}

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/internal/confmapprovider/discovery/discoverer.go b/internal/confmapprovider/discovery/discoverer.go
@@ -326,7 +326,7 @@ func (d *discoverer) createDiscoveryReceiversAndObservers(cfg *Config) (map[comp
 			return nil, nil, fmt.Errorf("error preparing discovery receiver config: %w", err)
 		}
 
-		if err = component.UnmarshalConfig(discoveryReceiverConfMap, discoveryReceiverConfig); err != nil {
+		if err = discoveryReceiverConfMap.Unmarshal(&discoveryReceiverConfig); err != nil {
 			return nil, nil, fmt.Errorf("failed unmarshaling discovery receiver config: %w", err)
 		}
 
@@ -401,7 +401,7 @@ func (d *discoverer) createObserver(observerID component.ID, cfg *Config) (otelc
 		return nil, fmt.Errorf("error converting environment variables in %q config: %w", observerID, err)
 	}
 
-	if err = component.UnmarshalConfig(observerDiscoveryConf, observerConfig); err != nil {
+	if err = observerDiscoveryConf.Unmarshal(&observerConfig); err != nil {
 		return nil, fmt.Errorf("failed unmarshaling %q config: %w", observerID, err)
 	}
 
@@ -538,8 +538,8 @@ func (d *discoverer) discoveryConfig(cfg *Config) (map[string]any, error) {
 	return sMap, nil
 }
 
-func (d *discoverer) createExtensionCreateSettings(observerID component.ID) otelcolextension.CreateSettings {
-	return otelcolextension.CreateSettings{
+func (d *discoverer) createExtensionCreateSettings(observerID component.ID) otelcolextension.Settings {
+	return otelcolextension.Settings{
 		ID: observerID,
 		TelemetrySettings: component.TelemetrySettings{
 			Logger:         zap.New(d.logger.Core()).With(zap.String("kind", observerID.String())),
@@ -551,8 +551,8 @@ func (d *discoverer) createExtensionCreateSettings(observerID component.ID) otel
 	}
 }
 
-func (d *discoverer) createReceiverCreateSettings() otelcolreceiver.CreateSettings {
-	return otelcolreceiver.CreateSettings{
+func (d *discoverer) createReceiverCreateSettings() otelcolreceiver.Settings {
+	return otelcolreceiver.Settings{
 		TelemetrySettings: component.TelemetrySettings{
 			Logger:         zap.New(d.logger.Core()).With(zap.String("kind", "receiver")),
 			TracerProvider: tnoop.NewTracerProvider(),

diff --git a/internal/exporter/httpsinkexporter/config_test.go b/internal/exporter/httpsinkexporter/config_test.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
 )
 
@@ -34,14 +33,14 @@ func TestLoadConfig(t *testing.T) {
 	e0cm, err := configs.Sub("httpsink")
 	require.NoError(t, err)
 	e0 := createDefaultConfig()
-	require.NoError(t, component.UnmarshalConfig(e0cm, e0))
+	require.NoError(t, e0cm.Unmarshal(&e0))
 
 	assert.Equal(t, NewFactory().CreateDefaultConfig(), e0)
 
 	e1cm, err := configs.Sub("httpsink/2")
 	require.NoError(t, err)
 	e1 := createDefaultConfig()
-	require.NoError(t, component.UnmarshalConfig(e1cm, e1))
+	require.NoError(t, e1cm.Unmarshal(&e1))
 
 	assert.Equal(t,
 		&Config{

diff --git a/internal/exporter/httpsinkexporter/factory.go b/internal/exporter/httpsinkexporter/factory.go
@@ -46,7 +46,7 @@ func createDefaultConfig() component.Config {
 }
 
 func createTracesExporter(ctx context.Context,
-	set exporter.CreateSettings,
+	set exporter.Settings,
 	cfg component.Config,
 ) (exporter.Traces, error) {
 	exp := newExporter(set.Logger, cfg.(*Config).Endpoint)
@@ -61,7 +61,7 @@ func createTracesExporter(ctx context.Context,
 }
 
 func createMetricsExporter(ctx context.Context,
-	set exporter.CreateSettings,
+	set exporter.Settings,
 	cfg component.Config,
 ) (exporter.Metrics, error) {
 	exp := newExporter(set.Logger, cfg.(*Config).Endpoint)

diff --git a/internal/exporter/httpsinkexporter/factory_test.go b/internal/exporter/httpsinkexporter/factory_test.go
@@ -34,7 +34,7 @@ func TestCreateTracesExporter(t *testing.T) {
 	factory := NewFactory()
 	cfg := factory.CreateDefaultConfig()
 
-	te, err := factory.CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg)
+	te, err := factory.CreateTracesExporter(context.Background(), exportertest.NewNopSettings(), cfg)
 	assert.NoError(t, err)
 	assert.NotNil(t, te)
 }
diff --git a/internal/receiver/discoveryreceiver/config_test.go b/internal/receiver/discoveryreceiver/config_test.go
@@ -40,7 +40,7 @@ func TestValidConfig(t *testing.T) {
 	cm, err := configs.Sub("discovery")
 	require.NoError(t, err)
 	cfg := createDefaultConfig().(*Config)
-	err = component.UnmarshalConfig(cm, cfg)
+	err = cm.Unmarshal(&cfg)
 	require.NoError(t, err)
 
 	require.Equal(t, &Config{
@@ -117,7 +117,7 @@ func TestInvalidConfigs(t *testing.T) {
 				cm, err := config.Sub(typeStr)
 				require.NoError(t, err)
 				cfg := createDefaultConfig().(*Config)
-				err = component.UnmarshalConfig(cm, cfg)
+				err = cm.Unmarshal(&cfg)
 				require.NoError(t, err)
 				err = cfg.Validate()
 				require.Error(t, err)

diff --git a/internal/receiver/discoveryreceiver/endpoint_tracker_test.go b/internal/receiver/discoveryreceiver/endpoint_tracker_test.go
@@ -627,7 +627,7 @@ func TestUpdateEndpoints(t *testing.T) {
 			cm, err := config.Sub(typeStr)
 			require.NoError(t, err)
 			cfg := createDefaultConfig().(*Config)
-			require.NoError(t, component.UnmarshalConfig(cm, cfg))
+			require.NoError(t, cm.Unmarshal(&cfg))
 
 			logger := zap.NewNop()
 			et := newEndpointTracker(nil, cfg, logger, nil, newCorrelationStore(logger, cfg.CorrelationTTL))

diff --git a/internal/receiver/discoveryreceiver/factory.go b/internal/receiver/discoveryreceiver/factory.go
@@ -43,7 +43,7 @@ func createDefaultConfig() component.Config {
 
 func createLogsReceiver(
 	_ context.Context,
-	settings receiver.CreateSettings,
+	settings receiver.Settings,
 	cfg component.Config,
 	consumer consumer.Logs,
 ) (receiver.Logs, error) {

diff --git a/internal/receiver/discoveryreceiver/factory_test.go b/internal/receiver/discoveryreceiver/factory_test.go
@@ -41,7 +41,7 @@ func TestCreateLogsReceiver(t *testing.T) {
 	factory := NewFactory()
 	cfg := factory.CreateDefaultConfig()
 
-	params := otelcolreceiver.CreateSettings{}
+	params := otelcolreceiver.Settings{}
 	receiver, err := factory.CreateLogsReceiver(context.Background(), params, cfg, consumertest.NewNop())
 	assert.Error(t, err)
 	assert.EqualError(t, err, "`watch_observers` must be defined and include at least one configured observer extension")
@@ -53,7 +53,7 @@ func TestCreateMetricsReceiver(t *testing.T) {
 	cfg := &Config{}
 	require.Error(t, cfg.Validate())
 
-	params := otelcolreceiver.CreateSettings{}
+	params := otelcolreceiver.Settings{}
 	rcvr, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop())
 	require.Error(t, err)
 	assert.EqualError(t, err, "telemetry type is not supported")
@@ -65,7 +65,7 @@ func TestCreateTracesReceiver(t *testing.T) {
 	cfg := &Config{}
 	require.Error(t, cfg.Validate())
 
-	params := otelcolreceiver.CreateSettings{}
+	params := otelcolreceiver.Settings{}
 	rcvr, err := factory.CreateTracesReceiver(context.Background(), params, cfg, consumertest.NewNop())
 	require.Error(t, err)
 	assert.EqualError(t, err, "telemetry type is not supported")

diff --git a/internal/receiver/discoveryreceiver/receiver.go b/internal/receiver/discoveryreceiver/receiver.go
@@ -56,11 +56,11 @@ type discoveryReceiver struct {
 	pLogs              chan plog.Logs
 	observables        map[component.ID]observer.Observable
 	loopFinished       *sync.WaitGroup
-	settings           receiver.CreateSettings
+	settings           receiver.Settings
 }
 
 func newDiscoveryReceiver(
-	settings receiver.CreateSettings,
+	settings receiver.Settings,
 	config *Config,
 	consumer consumer.Logs,
 ) (*discoveryReceiver, error) {
@@ -176,7 +176,7 @@ func (d *discoveryReceiver) createAndSetReceiverCreator() error {
 	id := component.MustNewIDWithName(receiverCreatorFactory.Type().String(), d.settings.ID.String())
 	// receiverCreatorConfig.SetIDName(d.settings.ID.String())
 
-	receiverCreatorSettings := receiver.CreateSettings{
+	receiverCreatorSettings := receiver.Settings{
 		ID: id,
 		TelemetrySettings: component.TelemetrySettings{
 			Logger: d.statementEvaluator.evaluatedLogger.With(

diff --git a/internal/receiver/discoveryreceiver/receiver_test.go b/internal/receiver/discoveryreceiver/receiver_test.go
@@ -30,7 +30,7 @@ import (
 )
 
 func TestNewDiscoveryReceiver(t *testing.T) {
-	rcs := otelcolreceiver.CreateSettings{
+	rcs := otelcolreceiver.Settings{
 		TelemetrySettings: component.TelemetrySettings{
 			Logger:         zap.NewNop(),
 			MeterProvider:  mnoop.NewMeterProvider(),
@@ -100,7 +100,7 @@ func TestObservablesFromHost(t *testing.T) {
 	} {
 		test := tt
 		t.Run(test.name, func(t *testing.T) {
-			rcs := otelcolreceiver.CreateSettings{
+			rcs := otelcolreceiver.Settings{
 				TelemetrySettings: component.TelemetrySettings{
 					Logger:         zap.NewNop(),
 					TracerProvider: tnoop.NewTracerProvider(),

diff --git a/internal/receiver/lightprometheusreceiver/config_test.go b/internal/receiver/lightprometheusreceiver/config_test.go
@@ -20,7 +20,6 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
 	"go.opentelemetry.io/collector/receiver/scraperhelper"
@@ -35,7 +34,7 @@ func TestValidConfig(t *testing.T) {
 	require.NoError(t, err)
 
 	cfg := createDefaultConfig().(*Config)
-	err = component.UnmarshalConfig(cm, cfg)
+	err = cm.Unmarshal(&cfg)
 	require.NoError(t, err)
 	require.NoError(t, cfg.Validate())
 

diff --git a/internal/receiver/lightprometheusreceiver/factory.go b/internal/receiver/lightprometheusreceiver/factory.go
@@ -36,7 +36,7 @@ func NewFactory() receiver.Factory {
 // createMetricsReceiver creates a metrics receiver for scraping Prometheus metrics.
 func createMetricsReceiver(
 	_ context.Context,
-	params receiver.CreateSettings,
+	params receiver.Settings,
 	rConf component.Config,
 	consumer consumer.Metrics,
 ) (receiver.Metrics, error) {

diff --git a/internal/receiver/lightprometheusreceiver/scraper.go b/internal/receiver/lightprometheusreceiver/scraper.go
@@ -42,7 +42,7 @@ type scraper struct {
 }
 
 func newScraper(
-	settings receiver.CreateSettings,
+	settings receiver.Settings,
 	cfg *Config,
 ) *scraper {
 	e := &scraper{

diff --git a/internal/receiver/lightprometheusreceiver/scraper_test.go b/internal/receiver/lightprometheusreceiver/scraper_test.go
@@ -87,7 +87,7 @@ func TestScraper(t *testing.T) {
 			cfg.ClientConfig.Endpoint = fmt.Sprintf("%s%s", promMock.URL, "/metrics")
 			require.NoError(t, component.ValidateConfig(cfg))
 
-			scraper := newScraper(receivertest.NewNopCreateSettings(), cfg)
+			scraper := newScraper(receivertest.NewNopSettings(), cfg)
 
 			err := scraper.start(context.Background(), componenttest.NewNopHost())
 			require.NoError(t, err)

diff --git a/internal/receiver/scriptedinputsreceiver/config_test.go b/internal/receiver/scriptedinputsreceiver/config_test.go
@@ -24,7 +24,6 @@ import (
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/split"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
 )
@@ -48,7 +47,7 @@ func TestValidConfig(t *testing.T) {
 	require.NoError(t, err)
 
 	cfg := createDefaultConfig()
-	err = component.UnmarshalConfig(cm, cfg)
+	err = cm.Unmarshal(&cfg)
 	require.NoError(t, err)
 
 	require.Equal(t, &Config{

diff --git a/internal/receiver/signalfxgatewayprometheusremotewritereceiver/config.go b/internal/receiver/signalfxgatewayprometheusremotewritereceiver/config.go
@@ -25,9 +25,9 @@ import (
 var _ component.Config = (*Config)(nil)
 
 type Config struct {
-	confighttp.ServerConfig `mapstructure:",squash"`
 	ListenPath              string `mapstructure:"path"`
-	BufferSize              int    `mapstructure:"buffer_size"`
+	confighttp.ServerConfig `mapstructure:",squash"`
+	BufferSize              int `mapstructure:"buffer_size"`
 }
 
 func (c *Config) Validate() error {

diff --git a/internal/receiver/signalfxgatewayprometheusremotewritereceiver/config_test.go b/internal/receiver/signalfxgatewayprometheusremotewritereceiver/config_test.go
@@ -57,6 +57,6 @@ func TestParseConfig(t *testing.T) {
 	sub, err = sub.Sub(metadata.Type.String())
 	require.NoError(t, err)
 	require.NotEmpty(t, sub)
-	require.NoError(t, component.UnmarshalConfig(sub, config))
+	require.NoError(t, sub.Unmarshal(&config))
 
 }
diff --git a/internal/receiver/signalfxgatewayprometheusremotewritereceiver/factory.go b/internal/receiver/signalfxgatewayprometheusremotewritereceiver/factory.go
@@ -35,7 +35,7 @@ func NewFactory() receiver.Factory {
 
 func createMetricsReceiver(
 	_ context.Context,
-	params receiver.CreateSettings,
+	params receiver.Settings,
 	cfg component.Config,
 	consumer consumer.Metrics,
 ) (receiver.Metrics, error) {

diff --git a/internal/receiver/signalfxgatewayprometheusremotewritereceiver/factory_test.go b/internal/receiver/signalfxgatewayprometheusremotewritereceiver/factory_test.go
@@ -41,7 +41,7 @@ func TestFactory(t *testing.T) {
 	cfg.ListenPath = "/metrics"
 
 	nopHost := componenttest.NewNopHost()
-	mockSettings := receivertest.NewNopCreateSettings()
+	mockSettings := receivertest.NewNopSettings()
 	mockConsumer := consumertest.NewNop()
 	receiver, err := newReceiver(mockSettings, cfg, mockConsumer)
 

diff --git a/internal/receiver/signalfxgatewayprometheusremotewritereceiver/generated_component_test.go b/internal/receiver/signalfxgatewayprometheusremotewritereceiver/generated_component_test.go
diff --git a/internal/receiver/signalfxgatewayprometheusremotewritereceiver/receiver.go b/internal/receiver/signalfxgatewayprometheusremotewritereceiver/receiver.go
@@ -35,11 +35,11 @@ type prometheusRemoteWriteReceiver struct {
 	nextConsumer consumer.Metrics
 	cancel       context.CancelFunc
 	config       *Config
-	settings     receiver.CreateSettings
+	settings     receiver.Settings
 }
 
 func newReceiver(
-	settings receiver.CreateSettings,
+	settings receiver.Settings,
 	config *Config,
 	nextConsumer consumer.Metrics,
 ) (receiver.Metrics, error) {

diff --git a/internal/receiver/signalfxgatewayprometheusremotewritereceiver/reporter.go b/internal/receiver/signalfxgatewayprometheusremotewritereceiver/reporter.go
@@ -35,7 +35,7 @@ type otelReporter struct {
 	obsrecv       *receiverhelper.ObsReport
 }
 
-func newOtelReporter(settings receiver.CreateSettings) (reporter, error) {
+func newOtelReporter(settings receiver.Settings) (reporter, error) {
 	obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{
 		ReceiverID:             settings.ID,
 		Transport:              "tcp",

diff --git a/internal/receiver/signalfxgatewayprometheusremotewritereceiver/server.go b/internal/receiver/signalfxgatewayprometheusremotewritereceiver/server.go
@@ -38,13 +38,13 @@ type prometheusRemoteWriteServer struct {
 }
 
 type serverConfig struct {
-	confighttp.ServerConfig
 	component.TelemetrySettings
 	Reporter reporter
 	component.Host
 	Mc     chan<- pmetric.Metrics
 	Parser *prometheusRemoteOtelParser
 	Path   string
+	confighttp.ServerConfig
 }
 
 func newPrometheusRemoteWriteServer(ctx context.Context, config *serverConfig) (*prometheusRemoteWriteServer, error) {