Rename config.NewID to config.NewComponentID and config.NewIDFromString to config.NewComponentIDFromString

CHANGELOG.md

@@ -8,6 +8,7 @@
 - Rename `configparser.Parser` as `config.Map` (#4075)
 - Rename `component.DefaultBuildInfo()` to `component.NewDefaultBuildInfo()` (#4129)
 - Rename consumererror.Permanent to consumererror.NewPermanent (#4118)
+- Rename `config.NewID` to `config.NewComponentID` and `config.NewIDFromString` to `config.NewComponentIDFromString` (#4137)
 
 ## 💡 Enhancements 💡
 

component/componenttest/nop_exporter.go

@@ -53,7 +53,7 @@ func (f *nopExporterFactory) Type() config.Type {
 // CreateDefaultConfig creates the default configuration for the Exporter.
 func (f *nopExporterFactory) CreateDefaultConfig() config.Exporter {
 	return &nopExporterConfig{
-		ExporterSettings: config.NewExporterSettings(config.NewID("nop")),
+		ExporterSettings: config.NewExporterSettings(config.NewComponentID("nop")),
 	}
 }
 

component/componenttest/nop_exporter_test.go

@@ -30,7 +30,7 @@ func TestNewNopExporterFactory(t *testing.T) {
 	require.NotNil(t, factory)
 	assert.Equal(t, config.Type("nop"), factory.Type())
 	cfg := factory.CreateDefaultConfig()
-	assert.Equal(t, &nopExporterConfig{ExporterSettings: config.NewExporterSettings(config.NewID("nop"))}, cfg)
+	assert.Equal(t, &nopExporterConfig{ExporterSettings: config.NewExporterSettings(config.NewComponentID("nop"))}, cfg)
 
 	traces, err := factory.CreateTracesExporter(context.Background(), NewNopExporterCreateSettings(), cfg)
 	require.NoError(t, err)

component/componenttest/nop_extension.go

@@ -52,7 +52,7 @@ func (f *nopExtensionFactory) Type() config.Type {
 // CreateDefaultConfig creates the default configuration for the Extension.
 func (f *nopExtensionFactory) CreateDefaultConfig() config.Extension {
 	return &nopExtensionConfig{
-		ExtensionSettings: config.NewExtensionSettings(config.NewID("nop")),
+		ExtensionSettings: config.NewExtensionSettings(config.NewComponentID("nop")),
 	}
 }
 

component/componenttest/nop_extension_test.go

@@ -29,7 +29,7 @@ func TestNewNopExtensionFactory(t *testing.T) {
 	require.NotNil(t, factory)
 	assert.Equal(t, config.Type("nop"), factory.Type())
 	cfg := factory.CreateDefaultConfig()
-	assert.Equal(t, &nopExtensionConfig{ExtensionSettings: config.NewExtensionSettings(config.NewID("nop"))}, cfg)
+	assert.Equal(t, &nopExtensionConfig{ExtensionSettings: config.NewExtensionSettings(config.NewComponentID("nop"))}, cfg)
 
 	traces, err := factory.CreateExtension(context.Background(), NewNopExtensionCreateSettings(), cfg)
 	require.NoError(t, err)

component/componenttest/nop_processor.go

@@ -56,7 +56,7 @@ func (f *nopProcessorFactory) Type() config.Type {
 // CreateDefaultConfig creates the default configuration for the Processor.
 func (f *nopProcessorFactory) CreateDefaultConfig() config.Processor {
 	return &nopProcessorConfig{
-		ProcessorSettings: config.NewProcessorSettings(config.NewID("nop")),
+		ProcessorSettings: config.NewProcessorSettings(config.NewComponentID("nop")),
 	}
 }
 

component/componenttest/nop_processor_test.go

@@ -32,7 +32,7 @@ func TestNewNopProcessorFactory(t *testing.T) {
 	require.NotNil(t, factory)
 	assert.Equal(t, config.Type("nop"), factory.Type())
 	cfg := factory.CreateDefaultConfig()
-	assert.Equal(t, &nopProcessorConfig{ProcessorSettings: config.NewProcessorSettings(config.NewID("nop"))}, cfg)
+	assert.Equal(t, &nopProcessorConfig{ProcessorSettings: config.NewProcessorSettings(config.NewComponentID("nop"))}, cfg)
 
 	traces, err := factory.CreateTracesProcessor(context.Background(), NewNopProcessorCreateSettings(), cfg, consumertest.NewNop())
 	require.NoError(t, err)

component/componenttest/nop_receiver.go

@@ -47,13 +47,13 @@ func NewNopReceiverFactory() component.ReceiverFactory {
 
 // Type gets the type of the Receiver config created by this factory.
 func (f *nopReceiverFactory) Type() config.Type {
-	return config.NewID("nop").Type()
+	return config.NewComponentID("nop").Type()
 }
 
 // CreateDefaultConfig creates the default configuration for the Receiver.
 func (f *nopReceiverFactory) CreateDefaultConfig() config.Receiver {
 	return &nopReceiverConfig{
-		ReceiverSettings: config.NewReceiverSettings(config.NewID("nop")),
+		ReceiverSettings: config.NewReceiverSettings(config.NewComponentID("nop")),
 	}
 }
 

component/componenttest/nop_receiver_test.go

@@ -30,7 +30,7 @@ func TestNewNopReceiverFactory(t *testing.T) {
 	require.NotNil(t, factory)
 	assert.Equal(t, config.Type("nop"), factory.Type())
 	cfg := factory.CreateDefaultConfig()
-	assert.Equal(t, &nopReceiverConfig{ReceiverSettings: config.NewReceiverSettings(config.NewID("nop"))}, cfg)
+	assert.Equal(t, &nopReceiverConfig{ReceiverSettings: config.NewReceiverSettings(config.NewComponentID("nop"))}, cfg)
 
 	traces, err := factory.CreateTracesReceiver(context.Background(), NewNopReceiverCreateSettings(), cfg, consumertest.NewNop())
 	require.NoError(t, err)

component/processor_test.go

@@ -85,7 +85,7 @@ func TestBaseProcessorFactory(t *testing.T) {
 		bpf.CreateDefaultConfig()
 	})
 	assert.NotPanics(t, bpf.unexportedProcessor)
-	defaultCfg := config.NewProcessorSettings(config.NewID("nop"))
+	defaultCfg := config.NewProcessorSettings(config.NewComponentID("nop"))
 	_, err := bpf.CreateTracesProcessor(context.Background(), ProcessorCreateSettings{}, &defaultCfg, consumertest.NewNop())
 	assert.ErrorIs(t, err, componenterror.ErrDataTypeIsNotSupported)
 	_, err = bpf.CreateMetricsProcessor(context.Background(), ProcessorCreateSettings{}, &defaultCfg, consumertest.NewNop())

config/config_test.go

@@ -33,7 +33,7 @@ type nopRecvConfig struct {
 }
 
 func (nc *nopRecvConfig) Validate() error {
-	if nc.ID() != NewID("nop") {
+	if nc.ID() != NewComponentID("nop") {
 		return errInvalidRecvConfig
 	}
 	return nil
@@ -44,7 +44,7 @@ type nopExpConfig struct {
 }
 
 func (nc *nopExpConfig) Validate() error {
-	if nc.ID() != NewID("nop") {
+	if nc.ID() != NewComponentID("nop") {
 		return errInvalidExpConfig
 	}
 	return nil
@@ -55,7 +55,7 @@ type nopProcConfig struct {
 }
 
 func (nc *nopProcConfig) Validate() error {
-	if nc.ID() != NewID("nop") {
+	if nc.ID() != NewComponentID("nop") {
 		return errInvalidProcConfig
 	}
 	return nil
@@ -66,7 +66,7 @@ type nopExtConfig struct {
 }
 
 func (nc *nopExtConfig) Validate() error {
-	if nc.ID() != NewID("nop") {
+	if nc.ID() != NewComponentID("nop") {
 		return errInvalidExtConfig
 	}
 	return nil
@@ -173,8 +173,8 @@ func TestConfigValidate(t *testing.T) {
 			name: "invalid-receiver-config",
 			cfgFn: func() *Config {
 				cfg := generateConfig()
-				cfg.Receivers[NewID("nop")] = &nopRecvConfig{
-					ReceiverSettings: NewReceiverSettings(NewID("invalid_rec_type")),
+				cfg.Receivers[NewComponentID("nop")] = &nopRecvConfig{
+					ReceiverSettings: NewReceiverSettings(NewComponentID("invalid_rec_type")),
 				}
 				return cfg
 			},
@@ -184,8 +184,8 @@ func TestConfigValidate(t *testing.T) {
 			name: "invalid-exporter-config",
 			cfgFn: func() *Config {
 				cfg := generateConfig()
-				cfg.Exporters[NewID("nop")] = &nopExpConfig{
-					ExporterSettings: NewExporterSettings(NewID("invalid_rec_type")),
+				cfg.Exporters[NewComponentID("nop")] = &nopExpConfig{
+					ExporterSettings: NewExporterSettings(NewComponentID("invalid_rec_type")),
 				}
 				return cfg
 			},
@@ -195,8 +195,8 @@ func TestConfigValidate(t *testing.T) {
 			name: "invalid-processor-config",
 			cfgFn: func() *Config {
 				cfg := generateConfig()
-				cfg.Processors[NewID("nop")] = &nopProcConfig{
-					ProcessorSettings: NewProcessorSettings(NewID("invalid_rec_type")),
+				cfg.Processors[NewComponentID("nop")] = &nopProcConfig{
+					ProcessorSettings: NewProcessorSettings(NewComponentID("invalid_rec_type")),
 				}
 				return cfg
 			},
@@ -206,8 +206,8 @@ func TestConfigValidate(t *testing.T) {
 			name: "invalid-extension-config",
 			cfgFn: func() *Config {
 				cfg := generateConfig()
-				cfg.Extensions[NewID("nop")] = &nopExtConfig{
-					ExtensionSettings: NewExtensionSettings(NewID("invalid_rec_type")),
+				cfg.Extensions[NewComponentID("nop")] = &nopExtConfig{
+					ExtensionSettings: NewExtensionSettings(NewComponentID("invalid_rec_type")),
 				}
 				return cfg
 			},
@@ -235,35 +235,35 @@ func TestConfigValidate(t *testing.T) {
 func generateConfig() *Config {
 	return &Config{
 		Receivers: map[ComponentID]Receiver{
-			NewID("nop"): &nopRecvConfig{
-				ReceiverSettings: NewReceiverSettings(NewID("nop")),
+			NewComponentID("nop"): &nopRecvConfig{
+				ReceiverSettings: NewReceiverSettings(NewComponentID("nop")),
 			},
 		},
 		Exporters: map[ComponentID]Exporter{
-			NewID("nop"): &nopExpConfig{
-				ExporterSettings: NewExporterSettings(NewID("nop")),
+			NewComponentID("nop"): &nopExpConfig{
+				ExporterSettings: NewExporterSettings(NewComponentID("nop")),
 			},
 		},
 		Processors: map[ComponentID]Processor{
-			NewID("nop"): &nopProcConfig{
-				ProcessorSettings: NewProcessorSettings(NewID("nop")),
+			NewComponentID("nop"): &nopProcConfig{
+				ProcessorSettings: NewProcessorSettings(NewComponentID("nop")),
 			},
 		},
 		Extensions: map[ComponentID]Extension{
-			NewID("nop"): &nopExtConfig{
-				ExtensionSettings: NewExtensionSettings(NewID("nop")),
+			NewComponentID("nop"): &nopExtConfig{
+				ExtensionSettings: NewExtensionSettings(NewComponentID("nop")),
 			},
 		},
 		Service: Service{
 			Telemetry:  ServiceTelemetry{Logs: ServiceTelemetryLogs{Level: zapcore.DebugLevel, Development: true, Encoding: "console"}},
-			Extensions: []ComponentID{NewID("nop")},
+			Extensions: []ComponentID{NewComponentID("nop")},
 			Pipelines: map[string]*Pipeline{
 				"traces": {
 					Name:       "traces",
 					InputType:  TracesDataType,
-					Receivers:  []ComponentID{NewID("nop")},
-					Processors: []ComponentID{NewID("nop")},
-					Exporters:  []ComponentID{NewID("nop")},
+					Receivers:  []ComponentID{NewComponentID("nop")},
+					Processors: []ComponentID{NewComponentID("nop")},
+					Exporters:  []ComponentID{NewComponentID("nop")},
 				},
 			},
 		},

config/configauth/configauth_test.go

@@ -29,11 +29,11 @@ func TestGetAuthenticator(t *testing.T) {
 		AuthenticatorName: "mock",
 	}
 	ext := map[config.ComponentID]component.Extension{
-		config.NewID("mock"): &MockAuthenticator{},
+		config.NewComponentID("mock"): &MockAuthenticator{},
 	}
 
 	// test
-	componentID, err := config.NewIDFromString(cfg.AuthenticatorName)
+	componentID, err := config.NewComponentIDFromString(cfg.AuthenticatorName)
 	assert.NoError(t, err)
 
 	authenticator, err := GetServerAuthenticator(ext, componentID)
@@ -61,7 +61,7 @@ func TestGetAuthenticatorFails(t *testing.T) {
 	}
 	for _, tC := range testCases {
 		t.Run(tC.desc, func(t *testing.T) {
-			componentID, err := config.NewIDFromString(tC.cfg.AuthenticatorName)
+			componentID, err := config.NewComponentIDFromString(tC.cfg.AuthenticatorName)
 			assert.NoError(t, err)
 			authenticator, err := GetServerAuthenticator(tC.ext, componentID)
 			assert.ErrorIs(t, err, tC.expected)

config/configgrpc/configgrpc.go

@@ -227,7 +227,7 @@ func (gcs *GRPCClientSettings) ToDialOptions(host component.Host) ([]grpc.DialOp
 			return nil, fmt.Errorf("no extensions configuration available")
 		}
 
-		componentID, cperr := config.NewIDFromString(gcs.Auth.AuthenticatorName)
+		componentID, cperr := config.NewComponentIDFromString(gcs.Auth.AuthenticatorName)
 		if cperr != nil {
 			return nil, cperr
 		}
@@ -333,7 +333,7 @@ func (gss *GRPCServerSettings) ToServerOption(host component.Host, settings comp
 	sInterceptors := []grpc.StreamServerInterceptor{}
 
 	if gss.Auth != nil {
-		componentID, cperr := config.NewIDFromString(gss.Auth.AuthenticatorName)
+		componentID, cperr := config.NewComponentIDFromString(gss.Auth.AuthenticatorName)
 		if cperr != nil {
 			return nil, cperr
 		}

config/configgrpc/configgrpc_test.go

@@ -71,7 +71,7 @@ func TestAllGrpcClientSettings(t *testing.T) {
 
 	host := &mockHost{
 		ext: map[config.ComponentID]component.Extension{
-			config.NewID("testauth"): &configauth.MockClientAuthenticator{},
+			config.NewComponentID("testauth"): &configauth.MockClientAuthenticator{},
 		},
 	}
 
@@ -137,7 +137,7 @@ func TestGrpcServerAuthSettings(t *testing.T) {
 	}
 	host := &mockHost{
 		ext: map[config.ComponentID]component.Extension{
-			config.NewID("mock"): &configauth.MockAuthenticator{},
+			config.NewComponentID("mock"): &configauth.MockAuthenticator{},
 		},
 	}
 	opts, err := gss.ToServerOption(host, componenttest.NewNopTelemetrySettings())
@@ -215,7 +215,7 @@ func TestGRPCClientSettingsError(t *testing.T) {
 				Auth:     &configauth.Authentication{},
 			},
 			host: &mockHost{ext: map[config.ComponentID]component.Extension{
-				config.NewID("mock"): &configauth.MockClientAuthenticator{},
+				config.NewComponentID("mock"): &configauth.MockClientAuthenticator{},
 			}},
 		},
 		{

config/confighttp/confighttp.go

@@ -95,7 +95,7 @@ func (hcs *HTTPClientSettings) ToClient(ext map[config.ComponentID]component.Ext
 			return nil, fmt.Errorf("extensions configuration not found")
 		}
 
-		componentID, cperr := config.NewIDFromString(hcs.Auth.AuthenticatorName)
+		componentID, cperr := config.NewComponentIDFromString(hcs.Auth.AuthenticatorName)
 		if cperr != nil {
 			return nil, cperr
 		}

config/confighttp/confighttp_test.go

@@ -46,7 +46,7 @@ func (c *customRoundTripper) RoundTrip(request *http.Request) (*http.Response, e
 
 func TestAllHTTPClientSettings(t *testing.T) {
 	ext := map[config.ComponentID]component.Extension{
-		config.NewID("testauth"): &configauth.MockClientAuthenticator{ResultRoundTripper: &customRoundTripper{}},
+		config.NewComponentID("testauth"): &configauth.MockClientAuthenticator{ResultRoundTripper: &customRoundTripper{}},
 	}
 	tests := []struct {
 		name        string
@@ -165,7 +165,7 @@ func TestHTTPClientSettingWithAuthConfig(t *testing.T) {
 			},
 			shouldErr: false,
 			extensionMap: map[config.ComponentID]component.Extension{
-				config.NewID("mock"): &configauth.MockClientAuthenticator{
+				config.NewComponentID("mock"): &configauth.MockClientAuthenticator{
 					ResultRoundTripper: &customRoundTripper{},
 				},
 			},
@@ -178,7 +178,7 @@ func TestHTTPClientSettingWithAuthConfig(t *testing.T) {
 			},
 			shouldErr: true,
 			extensionMap: map[config.ComponentID]component.Extension{
-				config.NewID("mock"): &configauth.MockClientAuthenticator{ResultRoundTripper: &customRoundTripper{}},
+				config.NewComponentID("mock"): &configauth.MockClientAuthenticator{ResultRoundTripper: &customRoundTripper{}},
 			},
 		},
 		{
@@ -197,7 +197,7 @@ func TestHTTPClientSettingWithAuthConfig(t *testing.T) {
 			},
 			shouldErr: false,
 			extensionMap: map[config.ComponentID]component.Extension{
-				config.NewID("mock"): &configauth.MockClientAuthenticator{ResultRoundTripper: &customRoundTripper{}},
+				config.NewComponentID("mock"): &configauth.MockClientAuthenticator{ResultRoundTripper: &customRoundTripper{}},
 			},
 		},
 		{
@@ -208,7 +208,7 @@ func TestHTTPClientSettingWithAuthConfig(t *testing.T) {
 			},
 			shouldErr: true,
 			extensionMap: map[config.ComponentID]component.Extension{
-				config.NewID("mock"): &configauth.MockClientAuthenticator{
+				config.NewComponentID("mock"): &configauth.MockClientAuthenticator{
 					ResultRoundTripper: &customRoundTripper{}, MustError: true},
 			},
 		},

config/configtest/configtest_test.go

@@ -35,35 +35,35 @@ func TestLoadConfig(t *testing.T) {
 
 	// Verify extensions.
 	require.Len(t, cfg.Extensions, 2)
-	assert.Contains(t, cfg.Extensions, config.NewID("nop"))
+	assert.Contains(t, cfg.Extensions, config.NewComponentID("nop"))
 	assert.Contains(t, cfg.Extensions, config.NewIDWithName("nop", "myextension"))
 
 	// Verify receivers
 	require.Len(t, cfg.Receivers, 2)
-	assert.Contains(t, cfg.Receivers, config.NewID("nop"))
+	assert.Contains(t, cfg.Receivers, config.NewComponentID("nop"))
 	assert.Contains(t, cfg.Receivers, config.NewIDWithName("nop", "myreceiver"))
 
 	// Verify exporters
 	assert.Len(t, cfg.Exporters, 2)
-	assert.Contains(t, cfg.Exporters, config.NewID("nop"))
+	assert.Contains(t, cfg.Exporters, config.NewComponentID("nop"))
 	assert.Contains(t, cfg.Exporters, config.NewIDWithName("nop", "myexporter"))
 
 	// Verify Processors
 	assert.Len(t, cfg.Processors, 2)
-	assert.Contains(t, cfg.Processors, config.NewID("nop"))
+	assert.Contains(t, cfg.Processors, config.NewComponentID("nop"))
 	assert.Contains(t, cfg.Processors, config.NewIDWithName("nop", "myprocessor"))
 
 	// Verify service.
 	require.Len(t, cfg.Service.Extensions, 1)
-	assert.Contains(t, cfg.Service.Extensions, config.NewID("nop"))
+	assert.Contains(t, cfg.Service.Extensions, config.NewComponentID("nop"))
 	require.Len(t, cfg.Service.Pipelines, 1)
 	assert.Equal(t,
 		&config.Pipeline{
 			Name:       "traces",
 			InputType:  config.TracesDataType,
-			Receivers:  []config.ComponentID{config.NewID("nop")},
-			Processors: []config.ComponentID{config.NewID("nop")},
-			Exporters:  []config.ComponentID{config.NewID("nop")},
+			Receivers:  []config.ComponentID{config.NewComponentID("nop")},
+			Processors: []config.ComponentID{config.NewComponentID("nop")},
+			Exporters:  []config.ComponentID{config.NewComponentID("nop")},
 		},
 		cfg.Service.Pipelines["traces"],
 		"Did not load pipeline config correctly")