update to latest otel snapshot

internal/components/components_test.go

@@ -25,7 +25,7 @@ import (
 )
 
 func TestDefaultComponents(t *testing.T) {
-	expectedExtensions := []component.Type{
+	expectedExtensions := []string{
 		"basicauth",
 		"ecs_observer",
 		"ecs_task_observer",
@@ -40,7 +40,7 @@ func TestDefaultComponents(t *testing.T) {
 		"memory_ballast",
 		"file_storage",
 	}
-	expectedReceivers := []component.Type{
+	expectedReceivers := []string{
 		"azureeventhub",
 		"carbon",
 		"cloudfoundry",
@@ -88,7 +88,7 @@ func TestDefaultComponents(t *testing.T) {
 		"windowsperfcounters",
 		"zipkin",
 	}
-	expectedProcessors := []component.Type{
+	expectedProcessors := []string{
 		"attributes",
 		"batch",
 		"cumulativetodelta",
@@ -107,7 +107,7 @@ func TestDefaultComponents(t *testing.T) {
 		"timestamp",
 		"transform",
 	}
-	expectedExporters := []component.Type{
+	expectedExporters := []string{
 		"awss3",
 		"debug",
 		"file",
@@ -122,7 +122,7 @@ func TestDefaultComponents(t *testing.T) {
 		"splunk_hec",
 		"httpsink",
 	}
-	expectedConnectors := []component.Type{
+	expectedConnectors := []string{
 		"count",
 		"routing",
 		"spanmetrics",
@@ -135,40 +135,40 @@ func TestDefaultComponents(t *testing.T) {
 	exts := factories.Extensions
 	assert.Len(t, exts, len(expectedExtensions))
 	for _, k := range expectedExtensions {
-		v, ok := exts[k]
+		v, ok := exts[component.MustNewType(k)]
 		assert.True(t, ok)
-		assert.Equal(t, k, v.Type())
+		assert.Equal(t, k, v.Type().String())
 	}
 
 	recvs := factories.Receivers
 	assert.Len(t, recvs, len(expectedReceivers))
 	for _, k := range expectedReceivers {
-		v, ok := recvs[k]
+		v, ok := recvs[component.MustNewType(k)]
 		require.True(t, ok)
-		assert.Equal(t, k, v.Type())
+		assert.Equal(t, k, v.Type().String())
 	}
 
 	procs := factories.Processors
 	assert.Len(t, procs, len(expectedProcessors))
 	for _, k := range expectedProcessors {
-		v, ok := procs[k]
+		v, ok := procs[component.MustNewType(k)]
 		require.True(t, ok, fmt.Sprintf("Missing expected processor %s", k))
-		assert.Equal(t, k, v.Type())
+		assert.Equal(t, k, v.Type().String())
 	}
 
 	exps := factories.Exporters
 	assert.Len(t, exps, len(expectedExporters))
 	for _, k := range expectedExporters {
-		v, ok := exps[k]
+		v, ok := exps[component.MustNewType(k)]
 		require.True(t, ok)
-		assert.Equal(t, k, v.Type())
+		assert.Equal(t, k, v.Type().String())
 	}
 
 	conns := factories.Connectors
 	assert.Len(t, conns, len(expectedConnectors))
 	for _, k := range expectedConnectors {
-		v, ok := conns[k]
+		v, ok := conns[component.MustNewType(k)]
 		require.True(t, ok, fmt.Sprintf("Missing expected connector %s", k))
-		assert.Equal(t, k, v.Type())
+		assert.Equal(t, k, v.Type().String())
 	}
 }

internal/configsource/envvarconfigsource/config_test.go

@@ -34,7 +34,7 @@ func TestEnvVarConfigSourceLoadConfig(t *testing.T) {
 	require.NoError(t, err)
 
 	factories := map[component.Type]configsource.Factory{
-		typeStr: NewFactory(),
+		component.MustNewType(typeStr): NewFactory(),
 	}
 
 	actualSettings, splitConf, err := configsource.SettingsFromConf(context.Background(), v, factories, nil)

internal/configsource/envvarconfigsource/factory.go

@@ -32,7 +32,7 @@ const (
 type envVarFactory struct{}
 
 func (e *envVarFactory) Type() component.Type {
-	return typeStr
+	return component.MustNewType(typeStr)
 }
 
 func (e *envVarFactory) CreateDefaultConfig() configsource.Settings {

internal/configsource/etcd2configsource/config_test.go

@@ -34,7 +34,7 @@ func TestEtcd2LoadConfig(t *testing.T) {
 	require.NoError(t, err)
 
 	factories := map[component.Type]configsource.Factory{
-		typeStr: NewFactory(),
+		component.MustNewType(typeStr): NewFactory(),
 	}
 
 	actualSettings, splitConf, err := configsource.SettingsFromConf(context.Background(), v, factories, nil)

internal/configsource/etcd2configsource/factory.go

@@ -42,7 +42,7 @@ type (
 type etcd2Factory struct{}
 
 func (v *etcd2Factory) Type() component.Type {
-	return typeStr
+	return component.MustNewType(typeStr)
 }
 
 func (v *etcd2Factory) CreateDefaultConfig() configsource.Settings {

internal/configsource/includeconfigsource/config_test.go

@@ -35,7 +35,7 @@ func TestIncludeConfigSourceLoadConfig(t *testing.T) {
 	require.NoError(t, err)
 
 	factories := map[component.Type]configsource.Factory{
-		typeStr: NewFactory(),
+		component.MustNewType(typeStr): NewFactory(),
 	}
 
 	actualSettings, splitConf, err := configsource.SettingsFromConf(context.Background(), v, factories, nil)

internal/configsource/includeconfigsource/factory.go

@@ -32,7 +32,7 @@ const (
 type includeFactory struct{}
 
 func (f *includeFactory) Type() component.Type {
-	return typeStr
+	return component.MustNewType(typeStr)
 }
 
 func (f *includeFactory) CreateDefaultConfig() configsource.Settings {

internal/configsource/settings_test.go

@@ -31,7 +31,7 @@ func TestConfigSourceParser(t *testing.T) {
 	ctx := context.Background()
 
 	testFactories := Factories{
-		"tstcfgsrc": &MockCfgSrcFactory{},
+		component.MustNewType("tstcfgsrc"): &MockCfgSrcFactory{},
 	}
 	tests := []struct {
 		factories        Factories
@@ -91,7 +91,7 @@ func TestConfigSourceParser(t *testing.T) {
 			name: "missing_factory",
 			file: "basic_config",
 			factories: Factories{
-				"not_in_basic_config": &MockCfgSrcFactory{},
+				component.MustNewType("not_in_basic_config"): &MockCfgSrcFactory{},
 			},
 			wantErr: "unknown config_sources type \"tstcfgsrc\"",
 		},

internal/configsource/source_test.go

@@ -52,7 +52,7 @@ func TestConfigSourceManagerNewManager(t *testing.T) {
 			name: "basic_config",
 			file: "basic_config",
 			factories: Factories{
-				"tstcfgsrc": &MockCfgSrcFactory{},
+				component.MustNewType("tstcfgsrc"): &MockCfgSrcFactory{},
 			},
 		},
 		{
@@ -65,7 +65,7 @@ func TestConfigSourceManagerNewManager(t *testing.T) {
 			name: "build_error",
 			file: "basic_config",
 			factories: Factories{
-				"tstcfgsrc": &MockCfgSrcFactory{
+				component.MustNewType("tstcfgsrc"): &MockCfgSrcFactory{
 					ErrOnCreateConfigSource: errors.New("forced test error"),
 				},
 			},
@@ -657,7 +657,7 @@ func callClose(closeFunc confmap.CloseFunc) error {
 func TestConfigSourceBuild(t *testing.T) {
 	ctx := context.Background()
 	testFactories := Factories{
-		"tstcfgsrc": &MockCfgSrcFactory{},
+		component.MustNewType("tstcfgsrc"): &MockCfgSrcFactory{},
 	}
 
 	tests := []struct {
@@ -685,7 +685,7 @@ func TestConfigSourceBuild(t *testing.T) {
 				},
 			},
 			factories: Factories{
-				"tstcfgsrc": &MockCfgSrcFactory{
+				component.MustNewType("tstcfgsrc"): &MockCfgSrcFactory{
 					ErrOnCreateConfigSource: errors.New("forced test error"),
 				},
 			},
@@ -699,7 +699,7 @@ func TestConfigSourceBuild(t *testing.T) {
 				},
 			},
 			factories: Factories{
-				"tstcfgsrc": &mockNilCfgSrcFactory{},
+				component.MustNewType("tstcfgsrc"): &mockNilCfgSrcFactory{},
 			},
 			wantErr: "factory for \"tstcfgsrc\" produced a nil extension",
 		},
@@ -745,7 +745,7 @@ func TestConfigSourceBuild(t *testing.T) {
 type mockNilCfgSrcFactory struct{}
 
 func (m *mockNilCfgSrcFactory) Type() component.Type {
-	return "tstcfgsrc"
+	return component.MustNewType("tstcfgsrc")
 }
 
 var _ (Factory) = (*mockNilCfgSrcFactory)(nil)
@@ -776,7 +776,7 @@ var _ Settings = (*MockCfgSrcSettings)(nil)
 var _ Factory = (*MockCfgSrcFactory)(nil)
 
 func (m *MockCfgSrcFactory) Type() component.Type {
-	return "tstcfgsrc"
+	return component.MustNewType("tstcfgsrc")
 }
 
 func (m *MockCfgSrcFactory) CreateDefaultConfig() Settings {

internal/configsource/vaultconfigsource/config_test.go

@@ -35,7 +35,7 @@ func TestVaultLoadConfig(t *testing.T) {
 	require.NoError(t, err)
 
 	factories := map[component.Type]configsource.Factory{
-		typeStr: NewFactory(),
+		component.MustNewType(typeStr): NewFactory(),
 	}
 
 	actualSettings, splitConf, err := configsource.SettingsFromConf(context.Background(), v, factories, nil)

internal/configsource/vaultconfigsource/factory.go

@@ -49,7 +49,7 @@ type (
 type vaultFactory struct{}
 
 func (v *vaultFactory) Type() component.Type {
-	return typeStr
+	return component.MustNewType(typeStr)
 }
 
 func (v *vaultFactory) CreateDefaultConfig() configsource.Settings {

internal/configsource/zookeeperconfigsource/config_test.go

@@ -35,7 +35,7 @@ func TestZookeeperLoadConfig(t *testing.T) {
 	require.NoError(t, err)
 
 	factories := map[component.Type]configsource.Factory{
-		typeStr: NewFactory(),
+		component.MustNewType(typeStr): NewFactory(),
 	}
 
 	actualSettings, splitConf, err := configsource.SettingsFromConf(context.Background(), v, factories, nil)

internal/configsource/zookeeperconfigsource/factory.go

@@ -38,7 +38,7 @@ type errMissingEndpoint struct{ error }
 type zkFactory struct{}
 
 func (v *zkFactory) Type() component.Type {
-	return typeStr
+	return component.MustNewType(typeStr)
 }
 
 func (v *zkFactory) CreateDefaultConfig() configsource.Settings {

internal/confmapprovider/configsource/provider_test.go

@@ -54,23 +54,23 @@ func TestConfigSourceConfigMapProvider(t *testing.T) {
 		{
 			name: "new_manager_builder_error",
 			factories: configsource.Factories{
-				"tstcfgsrc": &MockCfgSrcFactory{
+				component.MustNewType("tstcfgsrc"): &MockCfgSrcFactory{
 					ErrOnCreateConfigSource: errors.New("new_manager_builder_error forced error"),
 				},
 			},
-			parserProvider: fileprovider.New(),
+			parserProvider: fileprovider.NewWithSettings(confmap.ProviderSettings{}),
 			uris:           []string{"file:" + path.Join("testdata", "basic_config.yaml")},
 			wantErr:        "failed to create config source tstcfgsrc",
 		},
 		{
 			name:           "manager_resolve_error",
-			parserProvider: fileprovider.New(),
+			parserProvider: fileprovider.NewWithSettings(confmap.ProviderSettings{}),
 			uris:           []string{"file:" + path.Join("testdata", "manager_resolve_error.yaml")},
 			wantErr:        "config source \"tstcfgsrc\" failed to retrieve value: no value for selector \"selector\"",
 		},
 		{
 			name:           "multiple_config_success",
-			parserProvider: fileprovider.New(),
+			parserProvider: fileprovider.NewWithSettings(confmap.ProviderSettings{}),
 			uris: []string{"file:" + path.Join("testdata", "arrays_and_maps_expected.yaml"),
 				"file:" + path.Join("testdata", "yaml_injection_expected.yaml")},
 		},
@@ -80,7 +80,7 @@ func TestConfigSourceConfigMapProvider(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			if tt.factories == nil {
 				tt.factories = configsource.Factories{
-					"tstcfgsrc": &MockCfgSrcFactory{},
+					component.MustNewType("tstcfgsrc"): &MockCfgSrcFactory{},
 				}
 			}
 
@@ -212,7 +212,7 @@ var _ configsource.Settings = (*MockCfgSrcSettings)(nil)
 var _ configsource.Factory = (*MockCfgSrcFactory)(nil)
 
 func (m *MockCfgSrcFactory) Type() component.Type {
-	return "tstcfgsrc"
+	return component.MustNewType("tstcfgsrc")
 }
 
 func (m *MockCfgSrcFactory) CreateDefaultConfig() configsource.Settings {

internal/confmapprovider/discovery/discoverer.go

@@ -59,8 +59,8 @@ const (
 )
 
 var (
-	yamlProvider = yamlprovider.New()
-	envProvider  = envprovider.New()
+	yamlProvider = yamlprovider.NewWithSettings(confmap.ProviderSettings{})
+	envProvider  = envprovider.NewWithSettings(confmap.ProviderSettings{})
 )
 
 // discoverer provides the mechanism for a "preflight" collector service
@@ -459,10 +459,10 @@ func (d *discoverer) updateReceiverForObserver(receiverID component.ID, receiver
 
 func factoryForObserverType(extType component.Type) (otelcolextension.Factory, error) {
 	factories := map[component.Type]otelcolextension.Factory{
-		"docker_observer":   dockerobserver.NewFactory(),
-		"host_observer":     hostobserver.NewFactory(),
-		"k8s_observer":      k8sobserver.NewFactory(),
-		"ecs_task_observer": ecstaskobserver.NewFactory(),
+		component.MustNewType("docker_observer"):   dockerobserver.NewFactory(),
+		component.MustNewType("host_observer"):     hostobserver.NewFactory(),
+		component.MustNewType("k8s_observer"):      k8sobserver.NewFactory(),
+		component.MustNewType("ecs_task_observer"): ecstaskobserver.NewFactory(),
 	}
 	ef, ok := factories[extType]
 	if !ok {

internal/exporter/httpsinkexporter/factory.go

@@ -32,7 +32,7 @@ const (
 // NewFactory creates a factory for httpsink exporter.
 func NewFactory() exporter.Factory {
 	return exporter.NewFactory(
-		typeStr,
+		component.MustNewType(typeStr),
 		createDefaultConfig,
 		exporter.WithMetrics(createMetricsExporter, component.StabilityLevelDevelopment),
 		exporter.WithTraces(createTracesExporter, component.StabilityLevelDevelopment),

internal/receiver/discoveryreceiver/config.go

@@ -98,7 +98,7 @@ func (cfg *Config) Validate() error {
 	var err error
 	for rName, rEntry := range cfg.Receivers {
 		name := rName.String()
-		if rName.Type() == "receiver_creator" {
+		if rName.Type() == component.MustNewType("receiver_creator") {
 			err = multierr.Combine(err, fmt.Errorf("receiver %q validation failure: receiver cannot be a receiver_creator", name))
 			continue
 		}
@@ -209,7 +209,7 @@ func (cfg *Config) receiverCreatorReceiversConfig(correlations correlationStore)
 			resourceAttributes[k] = v
 		}
 		resourceAttributes[discovery.ReceiverNameAttr] = receiverID.Name()
-		resourceAttributes[discovery.ReceiverTypeAttr] = string(receiverID.Type())
+		resourceAttributes[discovery.ReceiverTypeAttr] = receiverID.Type().String()
 		resourceAttributes[receiverRuleAttr] = rEntry.Rule
 		resourceAttributes[discovery.EndpointIDAttr] = "`id`"
 

internal/receiver/discoveryreceiver/endpoint_tracker.go

@@ -132,7 +132,7 @@ func endpointToPLogs(observerID component.ID, eventType string, endpoints []obse
 	rAttrs := rlog.Resource().Attributes()
 	rAttrs.PutStr(eventTypeAttr, eventType)
 	rAttrs.PutStr(observerNameAttr, observerID.Name())
-	rAttrs.PutStr(observerTypeAttr, string(observerID.Type()))
+	rAttrs.PutStr(observerTypeAttr, observerID.Type().String())
 	sl := rlog.ScopeLogs().AppendEmpty()
 	for _, endpoint := range endpoints {
 		logRecord := sl.LogRecords().AppendEmpty()

internal/receiver/discoveryreceiver/factory.go

@@ -29,7 +29,7 @@ const (
 
 func NewFactory() receiver.Factory {
 	return receiver.NewFactory(
-		typeStr,
+		component.MustNewType(typeStr),
 		createDefaultConfig,
 		receiver.WithLogs(createLogsReceiver, component.StabilityLevelDevelopment))
 }