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]>

Author: srv-gh-o11y-gdi

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)
 	}

go.mod

@@ -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(),

go.sum

@@ -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{

internal/confmapprovider/discovery/discoverer.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)

internal/exporter/httpsinkexporter/config_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)
 }

internal/exporter/httpsinkexporter/factory.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)

internal/exporter/httpsinkexporter/factory_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))

internal/receiver/discoveryreceiver/config_test.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) {