Move configmodels to config

Signed-off-by: Bogdan Drutu <[email protected]>

cmd/schemagen/schemagen/cli_all.go

@@ -16,7 +16,7 @@ package schemagen
 
 import (
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/config/configmodels"
+	"go.opentelemetry.io/collector/config"
 )
 
 // createAllSchemaFiles creates config yaml schema files for all registered components
@@ -27,8 +27,8 @@ func createAllSchemaFiles(components component.Factories, env env) {
 	}
 }
 
-func getAllConfigs(components component.Factories) []configmodels.NamedEntity {
-	var cfgs []configmodels.NamedEntity
+func getAllConfigs(components component.Factories) []config.NamedEntity {
+	var cfgs []config.NamedEntity
 	for _, f := range components.Receivers {
 		cfgs = append(cfgs, f.CreateDefaultConfig())
 	}

cmd/schemagen/schemagen/cli_single.go

@@ -19,7 +19,7 @@ import (
 	"os"
 
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/config/configmodels"
+	"go.opentelemetry.io/collector/config"
 )
 
 // createSingleSchemaFile creates a config schema yaml file for a single component
@@ -32,8 +32,8 @@ func createSingleSchemaFile(components component.Factories, componentType, compo
 	createSchemaFile(cfg, env)
 }
 
-func getConfig(components component.Factories, componentType, componentName string) (configmodels.NamedEntity, error) {
-	t := configmodels.Type(componentName)
+func getConfig(components component.Factories, componentType, componentName string) (config.NamedEntity, error) {
+	t := config.Type(componentName)
 	switch componentType {
 	case "receiver":
 		c := components.Receivers[t]

component/component.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/spf13/viper"
 
-	"go.opentelemetry.io/collector/config/configmodels"
+	"go.opentelemetry.io/collector/config"
 )
 
 // Component is either a receiver, exporter, processor or extension.
@@ -76,7 +76,7 @@ const (
 // Factory interface must be implemented by all component factories.
 type Factory interface {
 	// Type gets the type of the component created by this factory.
-	Type() configmodels.Type
+	Type() config.Type
 }
 
 // ConfigUnmarshaler interface is an optional interface that if implemented by a Factory,

component/componenttest/nop_exporter.go

@@ -19,7 +19,7 @@ import (
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenthelper"
-	"go.opentelemetry.io/collector/config/configmodels"
+	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/consumer/consumertest"
 )
@@ -35,13 +35,13 @@ func NewNopExporterFactory() component.ExporterFactory {
 }
 
 // Type gets the type of the Exporter config created by this factory.
-func (f *nopExporterFactory) Type() configmodels.Type {
+func (f *nopExporterFactory) Type() config.Type {
 	return "nop"
 }
 
 // CreateDefaultConfig creates the default configuration for the Exporter.
-func (f *nopExporterFactory) CreateDefaultConfig() configmodels.Exporter {
-	return &configmodels.ExporterSettings{
+func (f *nopExporterFactory) CreateDefaultConfig() config.Exporter {
+	return &config.ExporterSettings{
 		TypeVal: f.Type(),
 	}
 }
@@ -50,7 +50,7 @@ func (f *nopExporterFactory) CreateDefaultConfig() configmodels.Exporter {
 func (f *nopExporterFactory) CreateTracesExporter(
 	_ context.Context,
 	_ component.ExporterCreateParams,
-	_ configmodels.Exporter,
+	_ config.Exporter,
 ) (component.TracesExporter, error) {
 	return nopExporterInstance, nil
 }
@@ -59,7 +59,7 @@ func (f *nopExporterFactory) CreateTracesExporter(
 func (f *nopExporterFactory) CreateMetricsExporter(
 	_ context.Context,
 	_ component.ExporterCreateParams,
-	_ configmodels.Exporter,
+	_ config.Exporter,
 ) (component.MetricsExporter, error) {
 	return nopExporterInstance, nil
 }
@@ -68,7 +68,7 @@ func (f *nopExporterFactory) CreateMetricsExporter(
 func (f *nopExporterFactory) CreateLogsExporter(
 	_ context.Context,
 	_ component.ExporterCreateParams,
-	_ configmodels.Exporter,
+	_ config.Exporter,
 ) (component.LogsExporter, error) {
 	return nopExporterInstance, nil
 }

component/componenttest/nop_exporter_test.go

@@ -22,16 +22,16 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/config/configmodels"
+	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/consumer/pdata"
 )
 
 func TestNewNopExporterFactory(t *testing.T) {
 	factory := NewNopExporterFactory()
 	require.NotNil(t, factory)
-	assert.Equal(t, configmodels.Type("nop"), factory.Type())
+	assert.Equal(t, config.Type("nop"), factory.Type())
 	cfg := factory.CreateDefaultConfig()
-	assert.Equal(t, &configmodels.ExporterSettings{TypeVal: factory.Type()}, cfg)
+	assert.Equal(t, &config.ExporterSettings{TypeVal: factory.Type()}, cfg)
 
 	traces, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateParams{}, cfg)
 	require.NoError(t, err)

component/componenttest/nop_extension.go

@@ -19,7 +19,7 @@ import (
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenthelper"
-	"go.opentelemetry.io/collector/config/configmodels"
+	"go.opentelemetry.io/collector/config"
 )
 
 // nopExtensionFactory is factory for nopExtension.
@@ -33,13 +33,13 @@ func NewNopExtensionFactory() component.ExtensionFactory {
 }
 
 // Type gets the type of the Extension config created by this factory.
-func (f *nopExtensionFactory) Type() configmodels.Type {
+func (f *nopExtensionFactory) Type() config.Type {
 	return "nop"
 }
 
 // CreateDefaultConfig creates the default configuration for the Extension.
-func (f *nopExtensionFactory) CreateDefaultConfig() configmodels.Extension {
-	return &configmodels.ExtensionSettings{
+func (f *nopExtensionFactory) CreateDefaultConfig() config.Extension {
+	return &config.ExtensionSettings{
 		TypeVal: f.Type(),
 	}
 }
@@ -48,7 +48,7 @@ func (f *nopExtensionFactory) CreateDefaultConfig() configmodels.Extension {
 func (f *nopExtensionFactory) CreateExtension(
 	_ context.Context,
 	_ component.ExtensionCreateParams,
-	_ configmodels.Extension,
+	_ config.Extension,
 ) (component.Extension, error) {
 	return nopExtensionInstance, nil
 }

component/componenttest/nop_extension_test.go

@@ -22,15 +22,15 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/config/configmodels"
+	"go.opentelemetry.io/collector/config"
 )
 
 func TestNewNopExtensionFactory(t *testing.T) {
 	factory := NewNopExtensionFactory()
 	require.NotNil(t, factory)
-	assert.Equal(t, configmodels.Type("nop"), factory.Type())
+	assert.Equal(t, config.Type("nop"), factory.Type())
 	cfg := factory.CreateDefaultConfig()
-	assert.Equal(t, &configmodels.ExtensionSettings{TypeVal: factory.Type()}, cfg)
+	assert.Equal(t, &config.ExtensionSettings{TypeVal: factory.Type()}, cfg)
 
 	traces, err := factory.CreateExtension(context.Background(), component.ExtensionCreateParams{}, cfg)
 	require.NoError(t, err)

component/componenttest/nop_host.go

@@ -16,7 +16,7 @@ package componenttest
 
 import (
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/config/configmodels"
+	"go.opentelemetry.io/collector/config"
 )
 
 // nopHost mocks a receiver.ReceiverHost for test purposes.
@@ -31,14 +31,14 @@ func NewNopHost() component.Host {
 
 func (nh *nopHost) ReportFatalError(_ error) {}
 
-func (nh *nopHost) GetFactory(_ component.Kind, _ configmodels.Type) component.Factory {
+func (nh *nopHost) GetFactory(_ component.Kind, _ config.Type) component.Factory {
 	return nil
 }
 
-func (nh *nopHost) GetExtensions() map[configmodels.NamedEntity]component.Extension {
+func (nh *nopHost) GetExtensions() map[config.NamedEntity]component.Extension {
 	return nil
 }
 
-func (nh *nopHost) GetExporters() map[configmodels.DataType]map[configmodels.NamedEntity]component.Exporter {
+func (nh *nopHost) GetExporters() map[config.DataType]map[config.NamedEntity]component.Exporter {
 	return nil
 }

component/componenttest/nop_processor.go

@@ -19,7 +19,7 @@ import (
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenthelper"
-	"go.opentelemetry.io/collector/config/configmodels"
+	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/consumer/consumertest"
 )
@@ -35,13 +35,13 @@ func NewNopProcessorFactory() component.ProcessorFactory {
 }
 
 // Type gets the type of the Processor config created by this factory.
-func (f *nopProcessorFactory) Type() configmodels.Type {
+func (f *nopProcessorFactory) Type() config.Type {
 	return "nop"
 }
 
 // CreateDefaultConfig creates the default configuration for the Processor.
-func (f *nopProcessorFactory) CreateDefaultConfig() configmodels.Processor {
-	return &configmodels.ProcessorSettings{
+func (f *nopProcessorFactory) CreateDefaultConfig() config.Processor {
+	return &config.ProcessorSettings{
 		TypeVal: f.Type(),
 	}
 }
@@ -50,7 +50,7 @@ func (f *nopProcessorFactory) CreateDefaultConfig() configmodels.Processor {
 func (f *nopProcessorFactory) CreateTracesProcessor(
 	_ context.Context,
 	_ component.ProcessorCreateParams,
-	_ configmodels.Processor,
+	_ config.Processor,
 	_ consumer.Traces,
 ) (component.TracesProcessor, error) {
 	return nopProcessorInstance, nil
@@ -60,7 +60,7 @@ func (f *nopProcessorFactory) CreateTracesProcessor(
 func (f *nopProcessorFactory) CreateMetricsProcessor(
 	_ context.Context,
 	_ component.ProcessorCreateParams,
-	_ configmodels.Processor,
+	_ config.Processor,
 	_ consumer.Metrics,
 ) (component.MetricsProcessor, error) {
 	return nopProcessorInstance, nil
@@ -70,7 +70,7 @@ func (f *nopProcessorFactory) CreateMetricsProcessor(
 func (f *nopProcessorFactory) CreateLogsProcessor(
 	_ context.Context,
 	_ component.ProcessorCreateParams,
-	_ configmodels.Processor,
+	_ config.Processor,
 	_ consumer.Logs,
 ) (component.LogsProcessor, error) {
 	return nopProcessorInstance, nil

component/componenttest/nop_processor_test.go

@@ -22,17 +22,17 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/config/configmodels"
+	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/consumer/consumertest"
 	"go.opentelemetry.io/collector/consumer/pdata"
 )
 
 func TestNewNopProcessorFactory(t *testing.T) {
 	factory := NewNopProcessorFactory()
 	require.NotNil(t, factory)
-	assert.Equal(t, configmodels.Type("nop"), factory.Type())
+	assert.Equal(t, config.Type("nop"), factory.Type())
 	cfg := factory.CreateDefaultConfig()
-	assert.Equal(t, &configmodels.ProcessorSettings{TypeVal: factory.Type()}, cfg)
+	assert.Equal(t, &config.ProcessorSettings{TypeVal: factory.Type()}, cfg)
 
 	traces, err := factory.CreateTracesProcessor(context.Background(), component.ProcessorCreateParams{}, cfg, consumertest.NewTracesNop())
 	require.NoError(t, err)

component/componenttest/nop_receiver.go

@@ -19,7 +19,7 @@ import (
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenthelper"
-	"go.opentelemetry.io/collector/config/configmodels"
+	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/consumer"
 )
 
@@ -34,13 +34,13 @@ func NewNopReceiverFactory() component.ReceiverFactory {
 }
 
 // Type gets the type of the Receiver config created by this factory.
-func (f *nopReceiverFactory) Type() configmodels.Type {
+func (f *nopReceiverFactory) Type() config.Type {
 	return "nop"
 }
 
 // CreateDefaultConfig creates the default configuration for the Receiver.
-func (f *nopReceiverFactory) CreateDefaultConfig() configmodels.Receiver {
-	return &configmodels.ReceiverSettings{
+func (f *nopReceiverFactory) CreateDefaultConfig() config.Receiver {
+	return &config.ReceiverSettings{
 		TypeVal: f.Type(),
 	}
 }
@@ -49,7 +49,7 @@ func (f *nopReceiverFactory) CreateDefaultConfig() configmodels.Receiver {
 func (f *nopReceiverFactory) CreateTracesReceiver(
 	_ context.Context,
 	_ component.ReceiverCreateParams,
-	_ configmodels.Receiver,
+	_ config.Receiver,
 	_ consumer.Traces,
 ) (component.TracesReceiver, error) {
 	return nopReceiverInstance, nil
@@ -59,7 +59,7 @@ func (f *nopReceiverFactory) CreateTracesReceiver(
 func (f *nopReceiverFactory) CreateMetricsReceiver(
 	_ context.Context,
 	_ component.ReceiverCreateParams,
-	_ configmodels.Receiver,
+	_ config.Receiver,
 	_ consumer.Metrics,
 ) (component.MetricsReceiver, error) {
 	return nopReceiverInstance, nil
@@ -69,7 +69,7 @@ func (f *nopReceiverFactory) CreateMetricsReceiver(
 func (f *nopReceiverFactory) CreateLogsReceiver(
 	_ context.Context,
 	_ component.ReceiverCreateParams,
-	_ configmodels.Receiver,
+	_ config.Receiver,
 	_ consumer.Logs,
 ) (component.LogsReceiver, error) {
 	return nopReceiverInstance, nil

component/componenttest/nop_receiver_test.go

@@ -22,16 +22,16 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/config/configmodels"
+	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/consumer/consumertest"
 )
 
 func TestNewNopReceiverFactory(t *testing.T) {
 	factory := NewNopReceiverFactory()
 	require.NotNil(t, factory)
-	assert.Equal(t, configmodels.Type("nop"), factory.Type())
+	assert.Equal(t, config.Type("nop"), factory.Type())
 	cfg := factory.CreateDefaultConfig()
-	assert.Equal(t, &configmodels.ReceiverSettings{TypeVal: factory.Type()}, cfg)
+	assert.Equal(t, &config.ReceiverSettings{TypeVal: factory.Type()}, cfg)
 
 	traces, err := factory.CreateTracesReceiver(context.Background(), component.ReceiverCreateParams{}, cfg, consumertest.NewTracesNop())
 	require.NoError(t, err)

component/componenttest/shutdown_verifier.go

@@ -23,13 +23,13 @@ import (
 	"go.uber.org/zap"
 
 	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/config/configerror"
-	"go.opentelemetry.io/collector/config/configmodels"
 	"go.opentelemetry.io/collector/consumer/consumertest"
 	"go.opentelemetry.io/collector/internal/testdata"
 )
 
-func verifyTraceProcessorDoesntProduceAfterShutdown(t *testing.T, factory component.ProcessorFactory, cfg configmodels.Processor) {
+func verifyTraceProcessorDoesntProduceAfterShutdown(t *testing.T, factory component.ProcessorFactory, cfg config.Processor) {
 	// Create a processor and output its produce to a sink.
 	nextSink := new(consumertest.TracesSink)
 	processor, err := factory.CreateTracesProcessor(
@@ -62,7 +62,7 @@ func verifyTraceProcessorDoesntProduceAfterShutdown(t *testing.T, factory compon
 	assert.EqualValues(t, generatedCount, nextSink.SpansCount())
 }
 
-func VerifyProcessorShutdown(t *testing.T, factory component.ProcessorFactory, cfg configmodels.Processor) {
+func VerifyProcessorShutdown(t *testing.T, factory component.ProcessorFactory, cfg config.Processor) {
 	verifyTraceProcessorDoesntProduceAfterShutdown(t, factory, cfg)
 	// TODO: add metrics and logs verification.
 	// TODO: add other shutdown verifications.