Merge pull request #2748 from aws-observability/chore/updateOtel

Update OTel dependencies to v0.102.[01]

pkg/config/config_factory.go

@@ -43,26 +43,21 @@ func GetConfigProviderSettings(flags *flag.FlagSet) otelcol.ConfigProviderSettin
 	}
 
 	// generate the MapProviders for the Config Provider Settings
-	providers := []confmap.Provider{
-		fileprovider.NewWithSettings(confmap.ProviderSettings{}),
-		envprovider.NewWithSettings(confmap.ProviderSettings{}),
-		yamlprovider.NewWithSettings(confmap.ProviderSettings{}),
-		httpprovider.NewWithSettings(confmap.ProviderSettings{}),
-		httpsprovider.NewWithSettings(confmap.ProviderSettings{}),
-		s3provider.New(),
-	}
-
-	mapProviders := make(map[string]confmap.Provider, len(providers))
-	for _, provider := range providers {
-		mapProviders[provider.Scheme()] = provider
+	providers := []confmap.ProviderFactory{
+		fileprovider.NewFactory(),
+		envprovider.NewFactory(),
+		yamlprovider.NewFactory(),
+		httpprovider.NewFactory(),
+		httpsprovider.NewFactory(),
+		s3provider.NewFactory(),
 	}
 
 	// create Config Provider Settings
 	configProviderSettings := otelcol.ConfigProviderSettings{
 		ResolverSettings: confmap.ResolverSettings{
-			URIs:       loc,
-			Providers:  mapProviders,
-			Converters: []confmap.Converter{expandconverter.New(confmap.ConverterSettings{})},
+			URIs:               loc,
+			ProviderFactories:  providers,
+			ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()},
 		},
 	}
 

pkg/defaultcomponents/defaults.go

@@ -78,15 +78,15 @@ var datadogExporterFeatureGateDeprecation = featuregate.GlobalRegistry().MustReg
 	featuregate.WithRegisterDescription("Removes the Datadog exporter from the set of configurable exporters "))
 
 var logzioExporterFeatureGateDeprecation = featuregate.GlobalRegistry().MustRegister("adot.exporter.logzioexporter.deprecation",
-	featuregate.StageAlpha,
+	featuregate.StageBeta,
 	featuregate.WithRegisterDescription("Removes the Logzio Exporter from the set of configurable exporters "))
 
 var sapmExporterFeatureGateDeprecation = featuregate.GlobalRegistry().MustRegister("adot.exporter.sapmexporter.deprecation",
-	featuregate.StageAlpha,
+	featuregate.StageBeta,
 	featuregate.WithRegisterDescription("Removes the SAPM Exporter from the set of configurable exporters"))
 
 var signalfxExporterFeatureGateDeprecation = featuregate.GlobalRegistry().MustRegister("adot.exporter.signalfxexporter.deprecation",
-	featuregate.StageAlpha,
+	featuregate.StageBeta,
 	featuregate.WithRegisterDescription("Removes the SignalFx Metrics Exporter from the set of configurable exporters"))
 
 // Components register OTel components for ADOT-collector distribution

pkg/defaultcomponents/defaults_test.go

@@ -16,15 +16,16 @@
 package defaultcomponents
 
 import (
+	"testing"
+
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/featuregate"
-	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
 const (
-	exportersCount  = 15
+	exportersCount  = 12
 	receiversCount  = 10
 	extensionsCount = 8
 	processorCount  = 15
@@ -105,9 +106,6 @@ func TestComponents(t *testing.T) {
 
 	// Ensure that the components behind feature gates are included
 	assert.NotNil(t, exporters[component.MustNewType("datadog")])
-	assert.NotNil(t, exporters[component.MustNewType("sapm")])
-	assert.NotNil(t, exporters[component.MustNewType("signalfx")])
-	assert.NotNil(t, exporters[component.MustNewType("logzio")])
 }
 
 func TestEnableFeatureGate(t *testing.T) {
@@ -122,21 +120,6 @@ func TestEnableFeatureGate(t *testing.T) {
 			featureName: "adot.exporter.datadogexporter.deprecation",
 			component:   component.MustNewType("datadog"),
 		},
-		{
-			desc:        "disable logzio exporter",
-			featureName: "adot.exporter.logzioexporter.deprecation",
-			component:   component.MustNewType("logzio"),
-		},
-		{
-			desc:        "disable sapm exporter",
-			featureName: "adot.exporter.sapmexporter.deprecation",
-			component:   component.MustNewType("sapm"),
-		},
-		{
-			desc:        "disable signalfx exporter",
-			featureName: "adot.exporter.signalfxexporter.deprecation",
-			component:   component.MustNewType("signalfx"),
-		},
 	}
 	expectedLen := exportersCount