diff --git a/cmd/mdatagen/metrics.tmpl b/cmd/mdatagen/metrics.tmpl index f1cfd5f1144..887d9543743 100644 --- a/cmd/mdatagen/metrics.tmpl +++ b/cmd/mdatagen/metrics.tmpl @@ -17,12 +17,12 @@ package {{ .Package }} import ( - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/pdata" ) // Type is the component type name. -const Type configmodels.Type = "{{ .Name }}" +const Type config.Type = "{{ .Name }}" // MetricIntf is an interface to generically interact with generated metric. type MetricIntf interface { diff --git a/cmd/schemagen/schemagen/cli_all.go b/cmd/schemagen/schemagen/cli_all.go index 5acb4b8db7c..00cbc0a1bc3 100644 --- a/cmd/schemagen/schemagen/cli_all.go +++ b/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()) } diff --git a/cmd/schemagen/schemagen/cli_single.go b/cmd/schemagen/schemagen/cli_single.go index 8dc525e878d..b6853930ad8 100644 --- a/cmd/schemagen/schemagen/cli_single.go +++ b/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] diff --git a/component/component.go b/component/component.go index f035021c155..3da604322d4 100644 --- a/component/component.go +++ b/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, diff --git a/component/componenttest/nop_exporter.go b/component/componenttest/nop_exporter.go index 5233e644811..68511e1d3de 100644 --- a/component/componenttest/nop_exporter.go +++ b/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 } diff --git a/component/componenttest/nop_exporter_test.go b/component/componenttest/nop_exporter_test.go index d1b6f74e2ea..2fd24c363a3 100644 --- a/component/componenttest/nop_exporter_test.go +++ b/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) diff --git a/component/componenttest/nop_extension.go b/component/componenttest/nop_extension.go index 9f5622044d1..b3346ded98b 100644 --- a/component/componenttest/nop_extension.go +++ b/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 } diff --git a/component/componenttest/nop_extension_test.go b/component/componenttest/nop_extension_test.go index 2b2536ed0b3..796fb31c07b 100644 --- a/component/componenttest/nop_extension_test.go +++ b/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) diff --git a/component/componenttest/nop_host.go b/component/componenttest/nop_host.go index 7665fa53216..9b97c75c3e5 100644 --- a/component/componenttest/nop_host.go +++ b/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 } diff --git a/component/componenttest/nop_processor.go b/component/componenttest/nop_processor.go index 682d790b6d6..c773d12b7e3 100644 --- a/component/componenttest/nop_processor.go +++ b/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 diff --git a/component/componenttest/nop_processor_test.go b/component/componenttest/nop_processor_test.go index 62a1ed76635..6a3f13853a3 100644 --- a/component/componenttest/nop_processor_test.go +++ b/component/componenttest/nop_processor_test.go @@ -22,7 +22,7 @@ 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" ) @@ -30,9 +30,9 @@ import ( 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) diff --git a/component/componenttest/nop_receiver.go b/component/componenttest/nop_receiver.go index d3ee52ef02b..839e97de797 100644 --- a/component/componenttest/nop_receiver.go +++ b/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 diff --git a/component/componenttest/nop_receiver_test.go b/component/componenttest/nop_receiver_test.go index 16d37bc7b32..0e9904c6107 100644 --- a/component/componenttest/nop_receiver_test.go +++ b/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) diff --git a/component/componenttest/shutdown_verifier.go b/component/componenttest/shutdown_verifier.go index 5a6d97481a1..5e07ae5b342 100644 --- a/component/componenttest/shutdown_verifier.go +++ b/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. diff --git a/component/exporter.go b/component/exporter.go index 9bae486ad78..b971e617afe 100644 --- a/component/exporter.go +++ b/component/exporter.go @@ -19,7 +19,7 @@ import ( "go.uber.org/zap" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" ) @@ -68,7 +68,7 @@ type ExporterFactory interface { // The object returned by this method needs to pass the checks implemented by // 'configcheck.ValidateConfig'. It is recommended to have such check in the // tests of any implementation of the Factory interface. - CreateDefaultConfig() configmodels.Exporter + CreateDefaultConfig() config.Exporter // CreateTracesExporter creates a trace exporter based on this config. // If the exporter type does not support tracing or if the config is not valid @@ -76,7 +76,7 @@ type ExporterFactory interface { CreateTracesExporter( ctx context.Context, params ExporterCreateParams, - cfg configmodels.Exporter, + cfg config.Exporter, ) (TracesExporter, error) // CreateMetricsExporter creates a metrics exporter based on this config. @@ -85,7 +85,7 @@ type ExporterFactory interface { CreateMetricsExporter( ctx context.Context, params ExporterCreateParams, - cfg configmodels.Exporter, + cfg config.Exporter, ) (MetricsExporter, error) // CreateLogsExporter creates an exporter based on the config. @@ -94,6 +94,6 @@ type ExporterFactory interface { CreateLogsExporter( ctx context.Context, params ExporterCreateParams, - cfg configmodels.Exporter, + cfg config.Exporter, ) (LogsExporter, error) } diff --git a/component/exporter_test.go b/component/exporter_test.go index 8c0efe81d85..36aa1aecfad 100644 --- a/component/exporter_test.go +++ b/component/exporter_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configerror" - "go.opentelemetry.io/collector/config/configmodels" ) type TestExporterFactory struct { @@ -29,34 +29,34 @@ type TestExporterFactory struct { } // Type gets the type of the Exporter config created by this factory. -func (f *TestExporterFactory) Type() configmodels.Type { - return configmodels.Type(f.name) +func (f *TestExporterFactory) Type() config.Type { + return config.Type(f.name) } // CreateDefaultConfig creates the default configuration for the Exporter. -func (f *TestExporterFactory) CreateDefaultConfig() configmodels.Exporter { +func (f *TestExporterFactory) CreateDefaultConfig() config.Exporter { return nil } // CreateTraceExporter creates a trace exporter based on this config. -func (f *TestExporterFactory) CreateTracesExporter(context.Context, ExporterCreateParams, configmodels.Exporter) (TracesExporter, error) { +func (f *TestExporterFactory) CreateTracesExporter(context.Context, ExporterCreateParams, config.Exporter) (TracesExporter, error) { return nil, configerror.ErrDataTypeIsNotSupported } // CreateMetricsExporter creates a metrics exporter based on this config. -func (f *TestExporterFactory) CreateMetricsExporter(context.Context, ExporterCreateParams, configmodels.Exporter) (MetricsExporter, error) { +func (f *TestExporterFactory) CreateMetricsExporter(context.Context, ExporterCreateParams, config.Exporter) (MetricsExporter, error) { return nil, configerror.ErrDataTypeIsNotSupported } // CreateMetricsExporter creates a logs exporter based on this config. -func (f *TestExporterFactory) CreateLogsExporter(context.Context, ExporterCreateParams, configmodels.Exporter) (LogsExporter, error) { +func (f *TestExporterFactory) CreateLogsExporter(context.Context, ExporterCreateParams, config.Exporter) (LogsExporter, error) { return nil, configerror.ErrDataTypeIsNotSupported } func TestBuildExporters(t *testing.T) { type testCase struct { in []ExporterFactory - out map[configmodels.Type]ExporterFactory + out map[config.Type]ExporterFactory } testCases := []testCase{ @@ -65,7 +65,7 @@ func TestBuildExporters(t *testing.T) { &TestExporterFactory{"exp1"}, &TestExporterFactory{"exp2"}, }, - out: map[configmodels.Type]ExporterFactory{ + out: map[config.Type]ExporterFactory{ "exp1": &TestExporterFactory{"exp1"}, "exp2": &TestExporterFactory{"exp2"}, }, diff --git a/component/extension.go b/component/extension.go index 31753984325..7d04e932af0 100644 --- a/component/extension.go +++ b/component/extension.go @@ -19,7 +19,7 @@ import ( "go.uber.org/zap" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" ) // Extension is the interface for objects hosted by the OpenTelemetry Collector that @@ -67,8 +67,8 @@ type ExtensionFactory interface { // The object returned by this method needs to pass the checks implemented by // 'configcheck.ValidateConfig'. It is recommended to have such check in the // tests of any implementation of the Factory interface. - CreateDefaultConfig() configmodels.Extension + CreateDefaultConfig() config.Extension // CreateExtension creates a service extension based on the given config. - CreateExtension(ctx context.Context, params ExtensionCreateParams, cfg configmodels.Extension) (Extension, error) + CreateExtension(ctx context.Context, params ExtensionCreateParams, cfg config.Extension) (Extension, error) } diff --git a/component/factories.go b/component/factories.go index 860b5c57063..373bbdfc688 100644 --- a/component/factories.go +++ b/component/factories.go @@ -17,30 +17,30 @@ package component import ( "fmt" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" ) // Factories struct holds in a single type all component factories that // can be handled by the Config. type Factories struct { // Receivers maps receiver type names in the config to the respective factory. - Receivers map[configmodels.Type]ReceiverFactory + Receivers map[config.Type]ReceiverFactory // Processors maps processor type names in the config to the respective factory. - Processors map[configmodels.Type]ProcessorFactory + Processors map[config.Type]ProcessorFactory // Exporters maps exporter type names in the config to the respective factory. - Exporters map[configmodels.Type]ExporterFactory + Exporters map[config.Type]ExporterFactory // Extensions maps extension type names in the config to the respective factory. - Extensions map[configmodels.Type]ExtensionFactory + Extensions map[config.Type]ExtensionFactory } // MakeReceiverFactoryMap takes a list of receiver factories and returns a map // with factory type as keys. It returns a non-nil error when more than one factories // have the same type. -func MakeReceiverFactoryMap(factories ...ReceiverFactory) (map[configmodels.Type]ReceiverFactory, error) { - fMap := map[configmodels.Type]ReceiverFactory{} +func MakeReceiverFactoryMap(factories ...ReceiverFactory) (map[config.Type]ReceiverFactory, error) { + fMap := map[config.Type]ReceiverFactory{} for _, f := range factories { if _, ok := fMap[f.Type()]; ok { return fMap, fmt.Errorf("duplicate receiver factory %q", f.Type()) @@ -53,8 +53,8 @@ func MakeReceiverFactoryMap(factories ...ReceiverFactory) (map[configmodels.Type // MakeProcessorFactoryMap takes a list of processor factories and returns a map // with factory type as keys. It returns a non-nil error when more than one factories // have the same type. -func MakeProcessorFactoryMap(factories ...ProcessorFactory) (map[configmodels.Type]ProcessorFactory, error) { - fMap := map[configmodels.Type]ProcessorFactory{} +func MakeProcessorFactoryMap(factories ...ProcessorFactory) (map[config.Type]ProcessorFactory, error) { + fMap := map[config.Type]ProcessorFactory{} for _, f := range factories { if _, ok := fMap[f.Type()]; ok { return fMap, fmt.Errorf("duplicate processor factory %q", f.Type()) @@ -67,8 +67,8 @@ func MakeProcessorFactoryMap(factories ...ProcessorFactory) (map[configmodels.Ty // MakeExporterFactoryMap takes a list of exporter factories and returns a map // with factory type as keys. It returns a non-nil error when more than one factories // have the same type. -func MakeExporterFactoryMap(factories ...ExporterFactory) (map[configmodels.Type]ExporterFactory, error) { - fMap := map[configmodels.Type]ExporterFactory{} +func MakeExporterFactoryMap(factories ...ExporterFactory) (map[config.Type]ExporterFactory, error) { + fMap := map[config.Type]ExporterFactory{} for _, f := range factories { if _, ok := fMap[f.Type()]; ok { return fMap, fmt.Errorf("duplicate exporter factory %q", f.Type()) @@ -81,8 +81,8 @@ func MakeExporterFactoryMap(factories ...ExporterFactory) (map[configmodels.Type // MakeExtensionFactoryMap takes a list of extension factories and returns a map // with factory type as keys. It returns a non-nil error when more than one factories // have the same type. -func MakeExtensionFactoryMap(factories ...ExtensionFactory) (map[configmodels.Type]ExtensionFactory, error) { - fMap := map[configmodels.Type]ExtensionFactory{} +func MakeExtensionFactoryMap(factories ...ExtensionFactory) (map[config.Type]ExtensionFactory, error) { + fMap := map[config.Type]ExtensionFactory{} for _, f := range factories { if _, ok := fMap[f.Type()]; ok { return fMap, fmt.Errorf("duplicate extension factory %q", f.Type()) diff --git a/component/host.go b/component/host.go index cb953241e3e..f604429275b 100644 --- a/component/host.go +++ b/component/host.go @@ -15,7 +15,7 @@ package component import ( - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" ) // Host represents the entity that is hosting a Component. It is used to allow communication @@ -36,13 +36,13 @@ type Host interface { // GetFactory can be called by the component anytime after Start() begins and // until Shutdown() is called. Note that the component is responsible for destroying // other components that it creates. - GetFactory(kind Kind, componentType configmodels.Type) Factory + GetFactory(kind Kind, componentType config.Type) Factory // Return map of extensions. Only enabled and created extensions will be returned. // Typically is used to find an extension by type or by full config name. Both cases // can be done by iterating the returned map. There are typically very few extensions // so there there is no performance implications due to iteration. - GetExtensions() map[configmodels.NamedEntity]Extension + GetExtensions() map[config.NamedEntity]Extension // Return map of exporters. Only enabled and created exporters will be returned. // Typically is used to find exporters by type or by full config name. Both cases @@ -52,5 +52,5 @@ type Host interface { // Note that an exporter with the same name may be attached to multiple pipelines and // thus we may have an instance of the exporter for multiple data types. // This is an experimental function that may change or even be removed completely. - GetExporters() map[configmodels.DataType]map[configmodels.NamedEntity]Exporter + GetExporters() map[config.DataType]map[config.NamedEntity]Exporter } diff --git a/component/processor.go b/component/processor.go index d4f25c63c2f..be920406c5d 100644 --- a/component/processor.go +++ b/component/processor.go @@ -19,7 +19,7 @@ import ( "go.uber.org/zap" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" ) @@ -82,7 +82,7 @@ type ProcessorFactory interface { // The object returned by this method needs to pass the checks implemented by // 'configcheck.ValidateConfig'. It is recommended to have such check in the // tests of any implementation of the Factory interface. - CreateDefaultConfig() configmodels.Processor + CreateDefaultConfig() config.Processor // CreateTraceProcessor creates a trace processor based on this config. // If the processor type does not support tracing or if the config is not valid @@ -90,7 +90,7 @@ type ProcessorFactory interface { CreateTracesProcessor( ctx context.Context, params ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Traces, ) (TracesProcessor, error) @@ -100,7 +100,7 @@ type ProcessorFactory interface { CreateMetricsProcessor( ctx context.Context, params ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Metrics, ) (MetricsProcessor, error) @@ -110,7 +110,7 @@ type ProcessorFactory interface { CreateLogsProcessor( ctx context.Context, params ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Logs, ) (LogsProcessor, error) } diff --git a/component/processor_test.go b/component/processor_test.go index 8ea45325acc..4162556c7a4 100644 --- a/component/processor_test.go +++ b/component/processor_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configerror" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/consumer" ) @@ -30,34 +30,34 @@ type TestProcessorFactory struct { } // Type gets the type of the Processor config created by this factory. -func (f *TestProcessorFactory) Type() configmodels.Type { - return configmodels.Type(f.name) +func (f *TestProcessorFactory) Type() config.Type { + return config.Type(f.name) } // CreateDefaultConfig creates the default configuration for the Processor. -func (f *TestProcessorFactory) CreateDefaultConfig() configmodels.Processor { +func (f *TestProcessorFactory) CreateDefaultConfig() config.Processor { return nil } // CreateTraceProcessor creates a trace processor based on this config. -func (f *TestProcessorFactory) CreateTracesProcessor(context.Context, ProcessorCreateParams, configmodels.Processor, consumer.Traces) (TracesProcessor, error) { +func (f *TestProcessorFactory) CreateTracesProcessor(context.Context, ProcessorCreateParams, config.Processor, consumer.Traces) (TracesProcessor, error) { return nil, configerror.ErrDataTypeIsNotSupported } // CreateMetricsProcessor creates a metrics processor based on this config. -func (f *TestProcessorFactory) CreateMetricsProcessor(context.Context, ProcessorCreateParams, configmodels.Processor, consumer.Metrics) (MetricsProcessor, error) { +func (f *TestProcessorFactory) CreateMetricsProcessor(context.Context, ProcessorCreateParams, config.Processor, consumer.Metrics) (MetricsProcessor, error) { return nil, configerror.ErrDataTypeIsNotSupported } // CreateMetricsProcessor creates a metrics processor based on this config. -func (f *TestProcessorFactory) CreateLogsProcessor(context.Context, ProcessorCreateParams, configmodels.Processor, consumer.Logs) (LogsProcessor, error) { +func (f *TestProcessorFactory) CreateLogsProcessor(context.Context, ProcessorCreateParams, config.Processor, consumer.Logs) (LogsProcessor, error) { return nil, configerror.ErrDataTypeIsNotSupported } func TestFactoriesBuilder(t *testing.T) { type testCase struct { in []ProcessorFactory - out map[configmodels.Type]ProcessorFactory + out map[config.Type]ProcessorFactory } testCases := []testCase{ @@ -66,7 +66,7 @@ func TestFactoriesBuilder(t *testing.T) { &TestProcessorFactory{"p1"}, &TestProcessorFactory{"p2"}, }, - out: map[configmodels.Type]ProcessorFactory{ + out: map[config.Type]ProcessorFactory{ "p1": &TestProcessorFactory{"p1"}, "p2": &TestProcessorFactory{"p2"}, }, diff --git a/component/receiver.go b/component/receiver.go index 54d77f2ac03..8feb40c0f93 100644 --- a/component/receiver.go +++ b/component/receiver.go @@ -19,7 +19,7 @@ import ( "go.uber.org/zap" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" ) @@ -75,23 +75,23 @@ type ReceiverFactory interface { // The object returned by this method needs to pass the checks implemented by // 'configcheck.ValidateConfig'. It is recommended to have such check in the // tests of any implementation of the Factory interface. - CreateDefaultConfig() configmodels.Receiver + CreateDefaultConfig() config.Receiver // CreateTraceReceiver creates a trace receiver based on this config. // If the receiver type does not support tracing or if the config is not valid // error will be returned instead. CreateTracesReceiver(ctx context.Context, params ReceiverCreateParams, - cfg configmodels.Receiver, nextConsumer consumer.Traces) (TracesReceiver, error) + cfg config.Receiver, nextConsumer consumer.Traces) (TracesReceiver, error) // CreateMetricsReceiver creates a metrics receiver based on this config. // If the receiver type does not support metrics or if the config is not valid // error will be returned instead. CreateMetricsReceiver(ctx context.Context, params ReceiverCreateParams, - cfg configmodels.Receiver, nextConsumer consumer.Metrics) (MetricsReceiver, error) + cfg config.Receiver, nextConsumer consumer.Metrics) (MetricsReceiver, error) // CreateLogsReceiver creates a log receiver based on this config. // If the receiver type does not support the data type or if the config is not valid // error will be returned instead. CreateLogsReceiver(ctx context.Context, params ReceiverCreateParams, - cfg configmodels.Receiver, nextConsumer consumer.Logs) (LogsReceiver, error) + cfg config.Receiver, nextConsumer consumer.Logs) (LogsReceiver, error) } diff --git a/component/receiver_test.go b/component/receiver_test.go index 3fd8fc4288d..935bb166c91 100644 --- a/component/receiver_test.go +++ b/component/receiver_test.go @@ -20,44 +20,44 @@ import ( "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configerror" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/consumer" ) type TestReceiverFactory struct { - name configmodels.Type + name config.Type } // Type gets the type of the Receiver config created by this factory. -func (f *TestReceiverFactory) Type() configmodels.Type { +func (f *TestReceiverFactory) Type() config.Type { return f.name } // CreateDefaultConfig creates the default configuration for the Receiver. -func (f *TestReceiverFactory) CreateDefaultConfig() configmodels.Receiver { +func (f *TestReceiverFactory) CreateDefaultConfig() config.Receiver { return nil } // CreateTraceReceiver creates a trace receiver based on this config. -func (f *TestReceiverFactory) CreateTracesReceiver(context.Context, ReceiverCreateParams, configmodels.Receiver, consumer.Traces) (TracesReceiver, error) { +func (f *TestReceiverFactory) CreateTracesReceiver(context.Context, ReceiverCreateParams, config.Receiver, consumer.Traces) (TracesReceiver, error) { return nil, configerror.ErrDataTypeIsNotSupported } // CreateMetricsReceiver creates a metrics receiver based on this config. -func (f *TestReceiverFactory) CreateMetricsReceiver(context.Context, ReceiverCreateParams, configmodels.Receiver, consumer.Metrics) (MetricsReceiver, error) { +func (f *TestReceiverFactory) CreateMetricsReceiver(context.Context, ReceiverCreateParams, config.Receiver, consumer.Metrics) (MetricsReceiver, error) { return nil, configerror.ErrDataTypeIsNotSupported } // CreateMetricsReceiver creates a metrics receiver based on this config. -func (f *TestReceiverFactory) CreateLogsReceiver(context.Context, ReceiverCreateParams, configmodels.Receiver, consumer.Logs) (LogsReceiver, error) { +func (f *TestReceiverFactory) CreateLogsReceiver(context.Context, ReceiverCreateParams, config.Receiver, consumer.Logs) (LogsReceiver, error) { return nil, configerror.ErrDataTypeIsNotSupported } func TestBuildReceivers(t *testing.T) { type testCase struct { in []ReceiverFactory - out map[configmodels.Type]ReceiverFactory + out map[config.Type]ReceiverFactory } testCases := []testCase{ @@ -66,7 +66,7 @@ func TestBuildReceivers(t *testing.T) { &TestReceiverFactory{"e1"}, &TestReceiverFactory{"e2"}, }, - out: map[configmodels.Type]ReceiverFactory{ + out: map[config.Type]ReceiverFactory{ "e1": &TestReceiverFactory{"e1"}, "e2": &TestReceiverFactory{"e2"}, }, diff --git a/config/configmodels/config.go b/config/config.go similarity index 99% rename from config/configmodels/config.go rename to config/config.go index 04e676c5be8..7f292da4481 100644 --- a/config/configmodels/config.go +++ b/config/config.go @@ -27,7 +27,7 @@ // Specific Receivers/Exporters/Processors are expected to at the minimum implement the // corresponding interface and if they have additional settings they must also extend // the corresponding common settings struct (the easiest approach is to embed the common struct). -package configmodels +package config import ( "errors" diff --git a/config/configmodels/config_test.go b/config/config_test.go similarity index 99% rename from config/configmodels/config_test.go rename to config/config_test.go index 8dc2e848589..fb88a641d5a 100644 --- a/config/configmodels/config_test.go +++ b/config/config_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package configmodels +package config import ( "errors" diff --git a/config/configcheck/configcheck_test.go b/config/configcheck/configcheck_test.go index 708e9ded925..d2702231851 100644 --- a/config/configcheck/configcheck_test.go +++ b/config/configcheck/configcheck_test.go @@ -24,7 +24,7 @@ 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/service/defaultcomponents" ) @@ -187,17 +187,17 @@ func TestValidateConfig(t *testing.T) { // a config not satisfying the validation. type badConfigExtensionFactory struct{} -func (b badConfigExtensionFactory) Type() configmodels.Type { +func (b badConfigExtensionFactory) Type() config.Type { return "bad_config" } -func (b badConfigExtensionFactory) CreateDefaultConfig() configmodels.Extension { +func (b badConfigExtensionFactory) CreateDefaultConfig() config.Extension { return &struct { - configmodels.ExtensionSettings + config.ExtensionSettings BadTagField int `mapstructure:"tag-with-dashes"` }{} } -func (b badConfigExtensionFactory) CreateExtension(_ context.Context, _ component.ExtensionCreateParams, _ configmodels.Extension) (component.Extension, error) { +func (b badConfigExtensionFactory) CreateExtension(_ context.Context, _ component.ExtensionCreateParams, _ config.Extension) (component.Extension, error) { return nil, nil } diff --git a/config/configparser/config.go b/config/configparser/config.go index c643572c3bb..349bea61282 100644 --- a/config/configparser/config.go +++ b/config/configparser/config.go @@ -28,7 +28,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configmodels" ) // These are errors that can be returned by Load(). Note that error codes are not part @@ -94,9 +93,9 @@ const typeAndNameSeparator = "/" // Load loads a Config from Parser. // After loading the config, need to check if it is valid by calling `ValidateConfig`. -func Load(v *config.Parser, factories component.Factories) (*configmodels.Config, error) { +func Load(v *config.Parser, factories component.Factories) (*config.Config, error) { - var cfg configmodels.Config + var cfg config.Config // Load the config. @@ -155,11 +154,11 @@ func Load(v *config.Parser, factories component.Factories) (*configmodels.Config // fullName is the key normalized such that type and name components have spaces trimmed. // The "type" part must be present, the forward slash and "name" are optional. typeStr // will be non-empty if err is nil. -func DecodeTypeAndName(key string) (typeStr configmodels.Type, fullName string, err error) { +func DecodeTypeAndName(key string) (typeStr config.Type, fullName string, err error) { items := strings.SplitN(key, typeAndNameSeparator, 2) if len(items) >= 1 { - typeStr = configmodels.Type(strings.TrimSpace(items[0])) + typeStr = config.Type(strings.TrimSpace(items[0])) } if len(items) == 0 || typeStr == "" { @@ -197,7 +196,7 @@ func errorInvalidTypeAndNameKey(component, key string, err error) error { } } -func errorUnknownType(component string, typeStr configmodels.Type, fullName string) error { +func errorUnknownType(component string, typeStr config.Type, fullName string) error { return &configError{ code: errUnknownType, msg: fmt.Sprintf("unknown %s type %q for %s", component, typeStr, fullName), @@ -218,9 +217,9 @@ func errorDuplicateName(component string, fullName string) error { } } -func loadExtensions(exts map[string]interface{}, factories map[configmodels.Type]component.ExtensionFactory) (configmodels.Extensions, error) { +func loadExtensions(exts map[string]interface{}, factories map[config.Type]component.ExtensionFactory) (config.Extensions, error) { // Prepare resulting map. - extensions := make(configmodels.Extensions) + extensions := make(config.Extensions) // Iterate over extensions and create a config for each. for key, value := range exts { @@ -261,8 +260,8 @@ func loadExtensions(exts map[string]interface{}, factories map[configmodels.Type return extensions, nil } -func loadService(rawService serviceSettings) (configmodels.Service, error) { - var ret configmodels.Service +func loadService(rawService serviceSettings) (config.Service, error) { + var ret config.Service ret.Extensions = rawService.Extensions // Process the pipelines first so in case of error on them it can be properly @@ -274,7 +273,7 @@ func loadService(rawService serviceSettings) (configmodels.Service, error) { } // LoadReceiver loads a receiver config from componentConfig using the provided factories. -func LoadReceiver(componentConfig *config.Parser, typeStr configmodels.Type, fullName string, factory component.ReceiverFactory) (configmodels.Receiver, error) { +func LoadReceiver(componentConfig *config.Parser, typeStr config.Type, fullName string, factory component.ReceiverFactory) (config.Receiver, error) { // Create the default config for this receiver. receiverCfg := factory.CreateDefaultConfig() receiverCfg.SetName(fullName) @@ -290,9 +289,9 @@ func LoadReceiver(componentConfig *config.Parser, typeStr configmodels.Type, ful return receiverCfg, nil } -func loadReceivers(recvs map[string]interface{}, factories map[configmodels.Type]component.ReceiverFactory) (configmodels.Receivers, error) { +func loadReceivers(recvs map[string]interface{}, factories map[config.Type]component.ReceiverFactory) (config.Receivers, error) { // Prepare resulting map - receivers := make(configmodels.Receivers) + receivers := make(config.Receivers) // Iterate over input map and create a config for each. for key, value := range recvs { @@ -327,9 +326,9 @@ func loadReceivers(recvs map[string]interface{}, factories map[configmodels.Type return receivers, nil } -func loadExporters(exps map[string]interface{}, factories map[configmodels.Type]component.ExporterFactory) (configmodels.Exporters, error) { +func loadExporters(exps map[string]interface{}, factories map[config.Type]component.ExporterFactory) (config.Exporters, error) { // Prepare resulting map - exporters := make(configmodels.Exporters) + exporters := make(config.Exporters) // Iterate over Exporters and create a config for each. for key, value := range exps { @@ -370,9 +369,9 @@ func loadExporters(exps map[string]interface{}, factories map[configmodels.Type] return exporters, nil } -func loadProcessors(procs map[string]interface{}, factories map[configmodels.Type]component.ProcessorFactory) (configmodels.Processors, error) { +func loadProcessors(procs map[string]interface{}, factories map[config.Type]component.ProcessorFactory) (config.Processors, error) { // Prepare resulting map. - processors := make(configmodels.Processors) + processors := make(config.Processors) // Iterate over processors and create a config for each. for key, value := range procs { @@ -413,9 +412,9 @@ func loadProcessors(procs map[string]interface{}, factories map[configmodels.Typ return processors, nil } -func loadPipelines(pipelinesConfig map[string]pipelineSettings) (configmodels.Pipelines, error) { +func loadPipelines(pipelinesConfig map[string]pipelineSettings) (config.Pipelines, error) { // Prepare resulting map. - pipelines := make(configmodels.Pipelines) + pipelines := make(config.Pipelines) // Iterate over input map and create a config for each. for key, rawPipeline := range pipelinesConfig { @@ -426,14 +425,14 @@ func loadPipelines(pipelinesConfig map[string]pipelineSettings) (configmodels.Pi } // Create the config for this pipeline. - var pipelineCfg configmodels.Pipeline + var pipelineCfg config.Pipeline // Set the type. - pipelineCfg.InputType = configmodels.DataType(typeStr) + pipelineCfg.InputType = config.DataType(typeStr) switch pipelineCfg.InputType { - case configmodels.TracesDataType: - case configmodels.MetricsDataType: - case configmodels.LogsDataType: + case config.TracesDataType: + case config.MetricsDataType: + case config.LogsDataType: default: return nil, errorUnknownType(pipelinesKeyName, typeStr, fullName) } diff --git a/config/configparser/config_test.go b/config/configparser/config_test.go index 17ce2e6cd0b..dc8d878a68b 100644 --- a/config/configparser/config_test.go +++ b/config/configparser/config_test.go @@ -24,7 +24,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/internal/testcomponents" ) @@ -51,7 +50,7 @@ func TestDecodeConfig(t *testing.T) { assert.Equal(t, &testcomponents.ExampleReceiver{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: "examplereceiver", NameVal: "examplereceiver", }, @@ -65,7 +64,7 @@ func TestDecodeConfig(t *testing.T) { assert.Equal(t, &testcomponents.ExampleReceiver{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: "examplereceiver", NameVal: "examplereceiver/myreceiver", }, @@ -82,7 +81,7 @@ func TestDecodeConfig(t *testing.T) { assert.Equal(t, &testcomponents.ExampleExporter{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ NameVal: "exampleexporter", TypeVal: "exampleexporter", }, @@ -93,7 +92,7 @@ func TestDecodeConfig(t *testing.T) { assert.Equal(t, &testcomponents.ExampleExporter{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ NameVal: "exampleexporter/myexporter", TypeVal: "exampleexporter", }, @@ -107,7 +106,7 @@ func TestDecodeConfig(t *testing.T) { assert.Equal(t, &testcomponents.ExampleProcessorCfg{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: "exampleprocessor", NameVal: "exampleprocessor", }, @@ -120,9 +119,9 @@ func TestDecodeConfig(t *testing.T) { assert.Equal(t, 1, len(cfg.Service.Pipelines), "Incorrect pipelines count") assert.Equal(t, - &configmodels.Pipeline{ + &config.Pipeline{ Name: "traces", - InputType: configmodels.TracesDataType, + InputType: config.TracesDataType, Receivers: []string{"examplereceiver"}, Processors: []string{"exampleprocessor"}, Exporters: []string{"exampleexporter"}, @@ -209,7 +208,7 @@ func TestSimpleConfig(t *testing.T) { assert.Equalf(t, 1, len(cfg.Extensions), "TEST[%s]", test.name) assert.Equalf(t, &testcomponents.ExampleExtensionCfg{ - ExtensionSettings: configmodels.ExtensionSettings{ + ExtensionSettings: config.ExtensionSettings{ TypeVal: "exampleextension", NameVal: "exampleextension", }, @@ -229,7 +228,7 @@ func TestSimpleConfig(t *testing.T) { assert.Equalf(t, &testcomponents.ExampleReceiver{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: "examplereceiver", NameVal: "examplereceiver", }, @@ -248,7 +247,7 @@ func TestSimpleConfig(t *testing.T) { assert.Equalf(t, &testcomponents.ExampleExporter{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ NameVal: "exampleexporter", TypeVal: "exampleexporter", }, @@ -265,7 +264,7 @@ func TestSimpleConfig(t *testing.T) { assert.Equalf(t, &testcomponents.ExampleProcessorCfg{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: "exampleprocessor", NameVal: "exampleprocessor", }, @@ -280,9 +279,9 @@ func TestSimpleConfig(t *testing.T) { assert.Equalf(t, 1, len(cfg.Service.Pipelines), "TEST[%s]", test.name) assert.Equalf(t, - &configmodels.Pipeline{ + &config.Pipeline{ Name: "traces", - InputType: configmodels.TracesDataType, + InputType: config.TracesDataType, Receivers: []string{"examplereceiver"}, Processors: []string{"exampleprocessor"}, Exporters: []string{"exampleexporter"}, @@ -311,7 +310,7 @@ func TestEscapedEnvVars(t *testing.T) { assert.Equal(t, 1, len(cfg.Extensions)) assert.Equal(t, &testcomponents.ExampleExtensionCfg{ - ExtensionSettings: configmodels.ExtensionSettings{ + ExtensionSettings: config.ExtensionSettings{ TypeVal: "exampleextension", NameVal: "exampleextension", }, @@ -331,7 +330,7 @@ func TestEscapedEnvVars(t *testing.T) { assert.Equal(t, &testcomponents.ExampleReceiver{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: "examplereceiver", NameVal: "examplereceiver", }, @@ -365,7 +364,7 @@ func TestEscapedEnvVars(t *testing.T) { assert.Equal(t, &testcomponents.ExampleExporter{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ NameVal: "exampleexporter", TypeVal: "exampleexporter", }, @@ -381,7 +380,7 @@ func TestEscapedEnvVars(t *testing.T) { assert.Equal(t, &testcomponents.ExampleProcessorCfg{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: "exampleprocessor", NameVal: "exampleprocessor", }, @@ -396,9 +395,9 @@ func TestEscapedEnvVars(t *testing.T) { assert.Equal(t, 1, len(cfg.Service.Pipelines)) assert.Equal(t, - &configmodels.Pipeline{ + &config.Pipeline{ Name: "traces", - InputType: configmodels.TracesDataType, + InputType: config.TracesDataType, Receivers: []string{"examplereceiver"}, Processors: []string{"exampleprocessor"}, Exporters: []string{"exampleexporter"}, @@ -494,7 +493,7 @@ func TestLoadEmptyAllSections(t *testing.T) { assert.NoError(t, err) } -func loadConfigFile(t *testing.T, fileName string, factories component.Factories) (*configmodels.Config, error) { +func loadConfigFile(t *testing.T, fileName string, factories component.Factories) (*config.Config, error) { v, err := config.NewParserFromFile(fileName) require.NoError(t, err) @@ -508,7 +507,7 @@ type nestedConfig struct { } type testConfig struct { - configmodels.ExporterSettings + config.ExporterSettings NestedConfigPtr *nestedConfig NestedConfigValue nestedConfig @@ -531,8 +530,8 @@ func TestExpandEnvLoadedConfig(t *testing.T) { testString := "$PTR_VALUE" cfg := &testConfig{ - ExporterSettings: configmodels.ExporterSettings{ - TypeVal: configmodels.Type("test"), + ExporterSettings: config.ExporterSettings{ + TypeVal: config.Type("test"), NameVal: "test", }, NestedConfigPtr: &nestedConfig{ @@ -553,8 +552,8 @@ func TestExpandEnvLoadedConfig(t *testing.T) { replacedTestString := "replaced_ptr_value" assert.Equal(t, &testConfig{ - ExporterSettings: configmodels.ExporterSettings{ - TypeVal: configmodels.Type("test"), + ExporterSettings: config.ExporterSettings{ + TypeVal: config.Type("test"), NameVal: "test", }, NestedConfigPtr: &nestedConfig{ @@ -585,8 +584,8 @@ func TestExpandEnvLoadedConfigEscapedEnv(t *testing.T) { testString := "$$ESCAPED_PTR_VALUE" cfg := &testConfig{ - ExporterSettings: configmodels.ExporterSettings{ - TypeVal: configmodels.Type("test"), + ExporterSettings: config.ExporterSettings{ + TypeVal: config.Type("test"), NameVal: "test", }, NestedConfigPtr: &nestedConfig{ @@ -607,8 +606,8 @@ func TestExpandEnvLoadedConfigEscapedEnv(t *testing.T) { replacedTestString := "$ESCAPED_PTR_VALUE" assert.Equal(t, &testConfig{ - ExporterSettings: configmodels.ExporterSettings{ - TypeVal: configmodels.Type("test"), + ExporterSettings: config.ExporterSettings{ + TypeVal: config.Type("test"), NameVal: "test", }, NestedConfigPtr: &nestedConfig{ @@ -635,8 +634,8 @@ func TestExpandEnvLoadedConfigMissingEnv(t *testing.T) { testString := "$PTR_VALUE" cfg := &testConfig{ - ExporterSettings: configmodels.ExporterSettings{ - TypeVal: configmodels.Type("test"), + ExporterSettings: config.ExporterSettings{ + TypeVal: config.Type("test"), NameVal: "test", }, NestedConfigPtr: &nestedConfig{ @@ -657,8 +656,8 @@ func TestExpandEnvLoadedConfigMissingEnv(t *testing.T) { replacedTestString := "" assert.Equal(t, &testConfig{ - ExporterSettings: configmodels.ExporterSettings{ - TypeVal: configmodels.Type("test"), + ExporterSettings: config.ExporterSettings{ + TypeVal: config.Type("test"), NameVal: "test", }, NestedConfigPtr: &nestedConfig{ @@ -698,7 +697,7 @@ func TestExpandEnvLoadedConfigNoPointer(t *testing.T) { } type testUnexportedConfig struct { - configmodels.ExporterSettings + config.ExporterSettings unexportedStringValue string ExportedStringValue string diff --git a/config/configtest/configtest.go b/config/configtest/configtest.go index 2729adb6f48..c0040ccbb15 100644 --- a/config/configtest/configtest.go +++ b/config/configtest/configtest.go @@ -21,12 +21,11 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/configparser" ) // LoadConfigFile loads a config from file. -func LoadConfigFile(t *testing.T, fileName string, factories component.Factories) (*configmodels.Config, error) { +func LoadConfigFile(t *testing.T, fileName string, factories component.Factories) (*config.Config, error) { // Read yaml config from file cp, err := config.NewParserFromFile(fileName) require.NoError(t, err) diff --git a/config/configtest/configtest_test.go b/config/configtest/configtest_test.go index d8dce28122a..05a22b235d7 100644 --- a/config/configtest/configtest_test.go +++ b/config/configtest/configtest_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" ) func TestLoadConfigFile(t *testing.T) { @@ -56,9 +56,9 @@ func TestLoadConfigFile(t *testing.T) { assert.Contains(t, cfg.Service.Extensions, "nop") require.Len(t, cfg.Service.Pipelines, 1) assert.Equal(t, - &configmodels.Pipeline{ + &config.Pipeline{ Name: "traces", - InputType: configmodels.TracesDataType, + InputType: config.TracesDataType, Receivers: []string{"nop"}, Processors: []string{"nop"}, Exporters: []string{"nop"}, diff --git a/config/configmodels/exporter.go b/config/exporter.go similarity index 98% rename from config/configmodels/exporter.go rename to config/exporter.go index ef3e7b70f77..7cb7b2ff6d2 100644 --- a/config/configmodels/exporter.go +++ b/config/exporter.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package configmodels +package config // Exporter is the configuration of an exporter. type Exporter interface { diff --git a/config/configmodels/extension.go b/config/extension.go similarity index 98% rename from config/configmodels/extension.go rename to config/extension.go index f71644975f1..0c1afb4654b 100644 --- a/config/configmodels/extension.go +++ b/config/extension.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package configmodels +package config // Extension is the configuration of a service extension. Specific extensions // must implement this interface and will typically embed ExtensionSettings diff --git a/config/configmodels/processor.go b/config/processor.go similarity index 98% rename from config/configmodels/processor.go rename to config/processor.go index 5e80552bb8a..ec416e92f04 100644 --- a/config/configmodels/processor.go +++ b/config/processor.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package configmodels +package config // Processor is the configuration of a processor. Specific processors must implement this // interface and will typically embed ProcessorSettings struct or a struct that extends it. diff --git a/config/configmodels/receiver.go b/config/receiver.go similarity index 98% rename from config/configmodels/receiver.go rename to config/receiver.go index 3ba2ed70778..bfa80f1c2f9 100644 --- a/config/configmodels/receiver.go +++ b/config/receiver.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package configmodels +package config // Receiver is the configuration of a receiver. Specific receivers must implement this // interface and will typically embed ReceiverSettings struct or a struct that extends it. diff --git a/exporter/exporterhelper/common.go b/exporter/exporterhelper/common.go index ee389e15719..61413852f6f 100644 --- a/exporter/exporterhelper/common.go +++ b/exporter/exporterhelper/common.go @@ -22,7 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenthelper" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" ) // TimeoutSettings for timeout. The timeout applies to individual attempts to send data to the backend. @@ -152,13 +152,13 @@ func WithResourceToTelemetryConversion(resourceToTelemetrySettings ResourceToTel // baseExporter contains common fields between different exporter types. type baseExporter struct { component.Component - cfg configmodels.Exporter + cfg config.Exporter sender requestSender qrSender *queuedRetrySender convertResourceToTelemetry bool } -func newBaseExporter(cfg configmodels.Exporter, logger *zap.Logger, options ...Option) *baseExporter { +func newBaseExporter(cfg config.Exporter, logger *zap.Logger, options ...Option) *baseExporter { bs := fromOptions(options) be := &baseExporter{ Component: componenthelper.New(bs.componentOptions...), diff --git a/exporter/exporterhelper/common_test.go b/exporter/exporterhelper/common_test.go index 92d9592512c..6b642845925 100644 --- a/exporter/exporterhelper/common_test.go +++ b/exporter/exporterhelper/common_test.go @@ -24,12 +24,12 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" ) var okStatus = trace.Status{Code: trace.StatusCodeOK} -var defaultExporterCfg = &configmodels.ExporterSettings{ +var defaultExporterCfg = &config.ExporterSettings{ TypeVal: "test", NameVal: "test", } diff --git a/exporter/exporterhelper/factory.go b/exporter/exporterhelper/factory.go index 0855d2ecce1..044632939bc 100644 --- a/exporter/exporterhelper/factory.go +++ b/exporter/exporterhelper/factory.go @@ -20,27 +20,27 @@ import ( "github.com/spf13/viper" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configerror" - "go.opentelemetry.io/collector/config/configmodels" ) // FactoryOption apply changes to ExporterOptions. type FactoryOption func(o *factory) // CreateDefaultConfig is the equivalent of component.ExporterFactory.CreateDefaultConfig() -type CreateDefaultConfig func() configmodels.Exporter +type CreateDefaultConfig func() config.Exporter // CreateTracesExporter is the equivalent of component.ExporterFactory.CreateTracesExporter() -type CreateTracesExporter func(context.Context, component.ExporterCreateParams, configmodels.Exporter) (component.TracesExporter, error) +type CreateTracesExporter func(context.Context, component.ExporterCreateParams, config.Exporter) (component.TracesExporter, error) // CreateMetricsExporter is the equivalent of component.ExporterFactory.CreateMetricsExporter() -type CreateMetricsExporter func(context.Context, component.ExporterCreateParams, configmodels.Exporter) (component.MetricsExporter, error) +type CreateMetricsExporter func(context.Context, component.ExporterCreateParams, config.Exporter) (component.MetricsExporter, error) // CreateMetricsExporter is the equivalent of component.ExporterFactory.CreateLogsExporter() -type CreateLogsExporter func(context.Context, component.ExporterCreateParams, configmodels.Exporter) (component.LogsExporter, error) +type CreateLogsExporter func(context.Context, component.ExporterCreateParams, config.Exporter) (component.LogsExporter, error) type factory struct { - cfgType configmodels.Type + cfgType config.Type customUnmarshaler component.CustomUnmarshaler createDefaultConfig CreateDefaultConfig createTracesExporter CreateTracesExporter @@ -78,7 +78,7 @@ func WithCustomUnmarshaler(customUnmarshaler component.CustomUnmarshaler) Factor // NewFactory returns a component.ExporterFactory. func NewFactory( - cfgType configmodels.Type, + cfgType config.Type, createDefaultConfig CreateDefaultConfig, options ...FactoryOption) component.ExporterFactory { f := &factory{ @@ -98,12 +98,12 @@ func NewFactory( } // Type gets the type of the Exporter config created by this factory. -func (f *factory) Type() configmodels.Type { +func (f *factory) Type() config.Type { return f.cfgType } // CreateDefaultConfig creates the default configuration for processor. -func (f *factory) CreateDefaultConfig() configmodels.Exporter { +func (f *factory) CreateDefaultConfig() config.Exporter { return f.createDefaultConfig() } @@ -111,7 +111,7 @@ func (f *factory) CreateDefaultConfig() configmodels.Exporter { func (f *factory) CreateTracesExporter( ctx context.Context, params component.ExporterCreateParams, - cfg configmodels.Exporter) (component.TracesExporter, error) { + cfg config.Exporter) (component.TracesExporter, error) { if f.createTracesExporter != nil { return f.createTracesExporter(ctx, params, cfg) } @@ -122,7 +122,7 @@ func (f *factory) CreateTracesExporter( func (f *factory) CreateMetricsExporter( ctx context.Context, params component.ExporterCreateParams, - cfg configmodels.Exporter) (component.MetricsExporter, error) { + cfg config.Exporter) (component.MetricsExporter, error) { if f.createMetricsExporter != nil { return f.createMetricsExporter(ctx, params, cfg) } @@ -133,7 +133,7 @@ func (f *factory) CreateMetricsExporter( func (f *factory) CreateLogsExporter( ctx context.Context, params component.ExporterCreateParams, - cfg configmodels.Exporter, + cfg config.Exporter, ) (component.LogsExporter, error) { if f.createLogsExporter != nil { return f.createLogsExporter(ctx, params, cfg) diff --git a/exporter/exporterhelper/factory_test.go b/exporter/exporterhelper/factory_test.go index e6d95ac3c75..7f9c4e6dcfc 100644 --- a/exporter/exporterhelper/factory_test.go +++ b/exporter/exporterhelper/factory_test.go @@ -24,15 +24,15 @@ 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/pdata" ) const typeStr = "test" var ( - defaultCfg = &configmodels.ExporterSettings{ + defaultCfg = &config.ExporterSettings{ TypeVal: typeStr, NameVal: typeStr, } @@ -91,19 +91,19 @@ func TestNewFactory_WithConstructors(t *testing.T) { assert.Same(t, nopLogsExporter, le) } -func defaultConfig() configmodels.Exporter { +func defaultConfig() config.Exporter { return defaultCfg } -func createTraceExporter(context.Context, component.ExporterCreateParams, configmodels.Exporter) (component.TracesExporter, error) { +func createTraceExporter(context.Context, component.ExporterCreateParams, config.Exporter) (component.TracesExporter, error) { return nopTracesExporter, nil } -func createMetricsExporter(context.Context, component.ExporterCreateParams, configmodels.Exporter) (component.MetricsExporter, error) { +func createMetricsExporter(context.Context, component.ExporterCreateParams, config.Exporter) (component.MetricsExporter, error) { return nopMetricsExporter, nil } -func createLogsExporter(context.Context, component.ExporterCreateParams, configmodels.Exporter) (component.LogsExporter, error) { +func createLogsExporter(context.Context, component.ExporterCreateParams, config.Exporter) (component.LogsExporter, error) { return nopLogsExporter, nil } diff --git a/exporter/exporterhelper/logshelper.go b/exporter/exporterhelper/logshelper.go index 5ca03f1ebba..091d2cf5d33 100644 --- a/exporter/exporterhelper/logshelper.go +++ b/exporter/exporterhelper/logshelper.go @@ -20,7 +20,7 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/pdata" @@ -72,7 +72,7 @@ func (lexp *logsExporter) ConsumeLogs(ctx context.Context, ld pdata.Logs) error // NewLogsExporter creates an LogsExporter that records observability metrics and wraps every request with a Span. func NewLogsExporter( - cfg configmodels.Exporter, + cfg config.Exporter, logger *zap.Logger, pusher PushLogs, options ...Option, diff --git a/exporter/exporterhelper/logshelper_test.go b/exporter/exporterhelper/logshelper_test.go index c0e36d4cb16..4c5f2d51ac0 100644 --- a/exporter/exporterhelper/logshelper_test.go +++ b/exporter/exporterhelper/logshelper_test.go @@ -24,7 +24,7 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" @@ -39,7 +39,7 @@ const ( ) var ( - fakeLogsExporterConfig = &configmodels.ExporterSettings{ + fakeLogsExporterConfig = &config.ExporterSettings{ TypeVal: fakeLogsExporterType, NameVal: fakeLogsExporterName, } diff --git a/exporter/exporterhelper/metricshelper.go b/exporter/exporterhelper/metricshelper.go index 8b302b0056f..903d8f1e715 100644 --- a/exporter/exporterhelper/metricshelper.go +++ b/exporter/exporterhelper/metricshelper.go @@ -20,7 +20,7 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/pdata" @@ -76,7 +76,7 @@ func (mexp *metricsExporter) ConsumeMetrics(ctx context.Context, md pdata.Metric // NewMetricsExporter creates an MetricsExporter that records observability metrics and wraps every request with a Span. func NewMetricsExporter( - cfg configmodels.Exporter, + cfg config.Exporter, logger *zap.Logger, pusher PushMetrics, options ...Option, diff --git a/exporter/exporterhelper/metricshelper_test.go b/exporter/exporterhelper/metricshelper_test.go index 83009d6a886..7bebf4b18db 100644 --- a/exporter/exporterhelper/metricshelper_test.go +++ b/exporter/exporterhelper/metricshelper_test.go @@ -24,7 +24,7 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" @@ -39,7 +39,7 @@ const ( ) var ( - fakeMetricsExporterConfig = &configmodels.ExporterSettings{ + fakeMetricsExporterConfig = &config.ExporterSettings{ TypeVal: fakeMetricsExporterType, NameVal: fakeMetricsExporterName, } diff --git a/exporter/exporterhelper/tracehelper.go b/exporter/exporterhelper/tracehelper.go index 42b2e5bf6cf..4f530de5d5e 100644 --- a/exporter/exporterhelper/tracehelper.go +++ b/exporter/exporterhelper/tracehelper.go @@ -20,7 +20,7 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/pdata" @@ -72,7 +72,7 @@ func (texp *traceExporter) ConsumeTraces(ctx context.Context, td pdata.Traces) e // NewTraceExporter creates a TracesExporter that records observability metrics and wraps every request with a Span. func NewTraceExporter( - cfg configmodels.Exporter, + cfg config.Exporter, logger *zap.Logger, pusher PushTraces, options ...Option, diff --git a/exporter/exporterhelper/tracehelper_test.go b/exporter/exporterhelper/tracehelper_test.go index 577632f7897..79f319e5850 100644 --- a/exporter/exporterhelper/tracehelper_test.go +++ b/exporter/exporterhelper/tracehelper_test.go @@ -25,7 +25,7 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" @@ -40,7 +40,7 @@ const ( ) var ( - fakeTraceExporterConfig = &configmodels.ExporterSettings{ + fakeTraceExporterConfig = &config.ExporterSettings{ TypeVal: fakeTraceExporterType, NameVal: fakeTraceExporterName, } diff --git a/exporter/fileexporter/config.go b/exporter/fileexporter/config.go index e1086657960..820bbba8aba 100644 --- a/exporter/fileexporter/config.go +++ b/exporter/fileexporter/config.go @@ -15,12 +15,12 @@ package fileexporter import ( - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" ) // Config defines configuration for file exporter. type Config struct { - configmodels.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. // Path of the file to write to. Path is relative to current directory. Path string `mapstructure:"path"` diff --git a/exporter/fileexporter/config_test.go b/exporter/fileexporter/config_test.go index fe3e4ee9c54..0fc858a96f0 100644 --- a/exporter/fileexporter/config_test.go +++ b/exporter/fileexporter/config_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" ) @@ -43,7 +43,7 @@ func TestLoadConfig(t *testing.T) { e1 := cfg.Exporters["file/2"] assert.Equal(t, e1, &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ NameVal: "file/2", TypeVal: "file", }, diff --git a/exporter/fileexporter/factory.go b/exporter/fileexporter/factory.go index 4f72ccd6ee3..bb2d6e447ff 100644 --- a/exporter/fileexporter/factory.go +++ b/exporter/fileexporter/factory.go @@ -19,7 +19,7 @@ import ( "os" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -38,9 +38,9 @@ func NewFactory() component.ExporterFactory { exporterhelper.WithLogs(createLogsExporter)) } -func createDefaultConfig() configmodels.Exporter { +func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -50,7 +50,7 @@ func createDefaultConfig() configmodels.Exporter { func createTraceExporter( _ context.Context, _ component.ExporterCreateParams, - cfg configmodels.Exporter, + cfg config.Exporter, ) (component.TracesExporter, error) { return createExporter(cfg) } @@ -58,7 +58,7 @@ func createTraceExporter( func createMetricsExporter( _ context.Context, _ component.ExporterCreateParams, - cfg configmodels.Exporter, + cfg config.Exporter, ) (component.MetricsExporter, error) { return createExporter(cfg) } @@ -66,12 +66,12 @@ func createMetricsExporter( func createLogsExporter( _ context.Context, _ component.ExporterCreateParams, - cfg configmodels.Exporter, + cfg config.Exporter, ) (component.LogsExporter, error) { return createExporter(cfg) } -func createExporter(config configmodels.Exporter) (*fileExporter, error) { +func createExporter(config config.Exporter) (*fileExporter, error) { cfg := config.(*Config) // There must be one exporter for metrics, traces, and logs. We maintain a diff --git a/exporter/jaegerexporter/config.go b/exporter/jaegerexporter/config.go index d0bf6fb1e32..25c9c189e5a 100644 --- a/exporter/jaegerexporter/config.go +++ b/exporter/jaegerexporter/config.go @@ -15,14 +15,14 @@ package jaegerexporter import ( + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/exporter/exporterhelper" ) // Config defines configuration for Jaeger gRPC exporter. type Config struct { - configmodels.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.TimeoutSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` exporterhelper.RetrySettings `mapstructure:"retry_on_failure"` diff --git a/exporter/jaegerexporter/config_test.go b/exporter/jaegerexporter/config_test.go index 640c5423b11..347d73db317 100644 --- a/exporter/jaegerexporter/config_test.go +++ b/exporter/jaegerexporter/config_test.go @@ -26,8 +26,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -49,7 +49,7 @@ func TestLoadConfig(t *testing.T) { e1 := cfg.Exporters["jaeger/2"] assert.Equal(t, e1, &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ NameVal: "jaeger/2", TypeVal: "jaeger", }, diff --git a/exporter/jaegerexporter/factory.go b/exporter/jaegerexporter/factory.go index ac6e287b0ed..ac55c435575 100644 --- a/exporter/jaegerexporter/factory.go +++ b/exporter/jaegerexporter/factory.go @@ -19,8 +19,8 @@ import ( "fmt" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -37,9 +37,9 @@ func NewFactory() component.ExporterFactory { exporterhelper.WithTraces(createTraceExporter)) } -func createDefaultConfig() configmodels.Exporter { +func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -56,7 +56,7 @@ func createDefaultConfig() configmodels.Exporter { func createTraceExporter( _ context.Context, params component.ExporterCreateParams, - config configmodels.Exporter, + config config.Exporter, ) (component.TracesExporter, error) { expCfg := config.(*Config) diff --git a/exporter/kafkaexporter/config.go b/exporter/kafkaexporter/config.go index 3cd98f28428..71e67432d0d 100644 --- a/exporter/kafkaexporter/config.go +++ b/exporter/kafkaexporter/config.go @@ -17,13 +17,13 @@ package kafkaexporter import ( "time" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" ) // Config defines configuration for Kafka exporter. type Config struct { - configmodels.ExporterSettings `mapstructure:",squash"` + config.ExporterSettings `mapstructure:",squash"` exporterhelper.TimeoutSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` exporterhelper.RetrySettings `mapstructure:"retry_on_failure"` diff --git a/exporter/kafkaexporter/config_test.go b/exporter/kafkaexporter/config_test.go index 46ccae49dcd..7e6666c5832 100644 --- a/exporter/kafkaexporter/config_test.go +++ b/exporter/kafkaexporter/config_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -40,7 +40,7 @@ func TestLoadConfig(t *testing.T) { c := cfg.Exporters[typeStr].(*Config) assert.Equal(t, &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ NameVal: typeStr, TypeVal: typeStr, }, diff --git a/exporter/kafkaexporter/factory.go b/exporter/kafkaexporter/factory.go index 1064b7715f9..6b376952445 100644 --- a/exporter/kafkaexporter/factory.go +++ b/exporter/kafkaexporter/factory.go @@ -19,7 +19,7 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -65,9 +65,9 @@ func NewFactory(options ...FactoryOption) component.ExporterFactory { exporterhelper.WithMetrics(f.createMetricsExporter)) } -func createDefaultConfig() configmodels.Exporter { +func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -96,7 +96,7 @@ type kafkaExporterFactory struct { func (f *kafkaExporterFactory) createTraceExporter( _ context.Context, params component.ExporterCreateParams, - cfg configmodels.Exporter, + cfg config.Exporter, ) (component.TracesExporter, error) { oCfg := cfg.(*Config) if oCfg.Topic == "" { @@ -121,7 +121,7 @@ func (f *kafkaExporterFactory) createTraceExporter( func (f *kafkaExporterFactory) createMetricsExporter( _ context.Context, params component.ExporterCreateParams, - cfg configmodels.Exporter, + cfg config.Exporter, ) (component.MetricsExporter, error) { oCfg := cfg.(*Config) if oCfg.Topic == "" { diff --git a/exporter/loggingexporter/config.go b/exporter/loggingexporter/config.go index 204c81d5145..8ca609ede5f 100644 --- a/exporter/loggingexporter/config.go +++ b/exporter/loggingexporter/config.go @@ -15,12 +15,12 @@ package loggingexporter import ( - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" ) // Config defines configuration for logging exporter. type Config struct { - configmodels.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. // LogLevel defines log level of the logging exporter; options are debug, info, warn, error. LogLevel string `mapstructure:"loglevel"` diff --git a/exporter/loggingexporter/config_test.go b/exporter/loggingexporter/config_test.go index 9e8e1a12a25..d332f832c99 100644 --- a/exporter/loggingexporter/config_test.go +++ b/exporter/loggingexporter/config_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" ) @@ -43,7 +43,7 @@ func TestLoadConfig(t *testing.T) { e1 := cfg.Exporters["logging/2"] assert.Equal(t, e1, &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ NameVal: "logging/2", TypeVal: "logging", }, diff --git a/exporter/loggingexporter/factory.go b/exporter/loggingexporter/factory.go index 36c203e35c9..97015aa7292 100644 --- a/exporter/loggingexporter/factory.go +++ b/exporter/loggingexporter/factory.go @@ -21,7 +21,7 @@ import ( "go.uber.org/zap/zapcore" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -42,9 +42,9 @@ func NewFactory() component.ExporterFactory { exporterhelper.WithLogs(createLogsExporter)) } -func createDefaultConfig() configmodels.Exporter { +func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -54,7 +54,7 @@ func createDefaultConfig() configmodels.Exporter { } } -func createTraceExporter(_ context.Context, _ component.ExporterCreateParams, config configmodels.Exporter) (component.TracesExporter, error) { +func createTraceExporter(_ context.Context, _ component.ExporterCreateParams, config config.Exporter) (component.TracesExporter, error) { cfg := config.(*Config) exporterLogger, err := createLogger(cfg) @@ -65,7 +65,7 @@ func createTraceExporter(_ context.Context, _ component.ExporterCreateParams, co return newTraceExporter(config, cfg.LogLevel, exporterLogger) } -func createMetricsExporter(_ context.Context, _ component.ExporterCreateParams, config configmodels.Exporter) (component.MetricsExporter, error) { +func createMetricsExporter(_ context.Context, _ component.ExporterCreateParams, config config.Exporter) (component.MetricsExporter, error) { cfg := config.(*Config) exporterLogger, err := createLogger(cfg) @@ -76,7 +76,7 @@ func createMetricsExporter(_ context.Context, _ component.ExporterCreateParams, return newMetricsExporter(config, cfg.LogLevel, exporterLogger) } -func createLogsExporter(_ context.Context, _ component.ExporterCreateParams, config configmodels.Exporter) (component.LogsExporter, error) { +func createLogsExporter(_ context.Context, _ component.ExporterCreateParams, config config.Exporter) (component.LogsExporter, error) { cfg := config.(*Config) exporterLogger, err := createLogger(cfg) diff --git a/exporter/loggingexporter/logging_exporter.go b/exporter/loggingexporter/logging_exporter.go index 5aab583964d..a84ffa1161c 100644 --- a/exporter/loggingexporter/logging_exporter.go +++ b/exporter/loggingexporter/logging_exporter.go @@ -25,7 +25,7 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/exporter/exporterhelper" tracetranslator "go.opentelemetry.io/collector/translator/trace" @@ -406,7 +406,7 @@ func (s *loggingExporter) pushMetricsData( // newTraceExporter creates an exporter.TracesExporter that just drops the // received data and logs debugging messages. -func newTraceExporter(config configmodels.Exporter, level string, logger *zap.Logger) (component.TracesExporter, error) { +func newTraceExporter(config config.Exporter, level string, logger *zap.Logger) (component.TracesExporter, error) { s := &loggingExporter{ debug: strings.ToLower(level) == "debug", logger: logger, @@ -426,7 +426,7 @@ func newTraceExporter(config configmodels.Exporter, level string, logger *zap.Lo // newMetricsExporter creates an exporter.MetricsExporter that just drops the // received data and logs debugging messages. -func newMetricsExporter(config configmodels.Exporter, level string, logger *zap.Logger) (component.MetricsExporter, error) { +func newMetricsExporter(config config.Exporter, level string, logger *zap.Logger) (component.MetricsExporter, error) { s := &loggingExporter{ debug: strings.ToLower(level) == "debug", logger: logger, @@ -446,7 +446,7 @@ func newMetricsExporter(config configmodels.Exporter, level string, logger *zap. // newLogsExporter creates an exporter.LogsExporter that just drops the // received data and logs debugging messages. -func newLogsExporter(config configmodels.Exporter, level string, logger *zap.Logger) (component.LogsExporter, error) { +func newLogsExporter(config config.Exporter, level string, logger *zap.Logger) (component.LogsExporter, error) { s := &loggingExporter{ debug: strings.ToLower(level) == "debug", logger: logger, diff --git a/exporter/loggingexporter/logging_exporter_test.go b/exporter/loggingexporter/logging_exporter_test.go index 33cc024d208..8b71301df54 100644 --- a/exporter/loggingexporter/logging_exporter_test.go +++ b/exporter/loggingexporter/logging_exporter_test.go @@ -21,13 +21,13 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" ) func TestLoggingTraceExporterNoErrors(t *testing.T) { - lte, err := newTraceExporter(&configmodels.ExporterSettings{}, "Debug", zap.NewNop()) + lte, err := newTraceExporter(&config.ExporterSettings{}, "Debug", zap.NewNop()) require.NotNil(t, lte) assert.NoError(t, err) @@ -38,7 +38,7 @@ func TestLoggingTraceExporterNoErrors(t *testing.T) { } func TestLoggingMetricsExporterNoErrors(t *testing.T) { - lme, err := newMetricsExporter(&configmodels.ExporterSettings{}, "DEBUG", zap.NewNop()) + lme, err := newMetricsExporter(&config.ExporterSettings{}, "DEBUG", zap.NewNop()) require.NotNil(t, lme) assert.NoError(t, err) @@ -51,7 +51,7 @@ func TestLoggingMetricsExporterNoErrors(t *testing.T) { } func TestLoggingLogsExporterNoErrors(t *testing.T) { - lle, err := newLogsExporter(&configmodels.ExporterSettings{}, "debug", zap.NewNop()) + lle, err := newLogsExporter(&config.ExporterSettings{}, "debug", zap.NewNop()) require.NotNil(t, lle) assert.NoError(t, err) diff --git a/exporter/opencensusexporter/config.go b/exporter/opencensusexporter/config.go index 27a9e741bfe..269a7dbb141 100644 --- a/exporter/opencensusexporter/config.go +++ b/exporter/opencensusexporter/config.go @@ -15,14 +15,14 @@ package opencensusexporter import ( + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/exporter/exporterhelper" ) // Config defines configuration for OpenCensus exporter. type Config struct { - configmodels.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. configgrpc.GRPCClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` exporterhelper.RetrySettings `mapstructure:"retry_on_failure"` diff --git a/exporter/opencensusexporter/config_test.go b/exporter/opencensusexporter/config_test.go index bef13d4c920..c103056c824 100644 --- a/exporter/opencensusexporter/config_test.go +++ b/exporter/opencensusexporter/config_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -47,7 +47,7 @@ func TestLoadConfig(t *testing.T) { e1 := cfg.Exporters["opencensus/2"] assert.Equal(t, e1, &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ NameVal: "opencensus/2", TypeVal: "opencensus", }, diff --git a/exporter/opencensusexporter/factory.go b/exporter/opencensusexporter/factory.go index d11f2e3d4cc..ba3cb16ec1e 100644 --- a/exporter/opencensusexporter/factory.go +++ b/exporter/opencensusexporter/factory.go @@ -18,8 +18,8 @@ import ( "context" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -37,9 +37,9 @@ func NewFactory() component.ExporterFactory { exporterhelper.WithMetrics(createMetricsExporter)) } -func createDefaultConfig() configmodels.Exporter { +func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -52,7 +52,7 @@ func createDefaultConfig() configmodels.Exporter { } } -func createTraceExporter(ctx context.Context, params component.ExporterCreateParams, cfg configmodels.Exporter) (component.TracesExporter, error) { +func createTraceExporter(ctx context.Context, params component.ExporterCreateParams, cfg config.Exporter) (component.TracesExporter, error) { oCfg := cfg.(*Config) oce, err := newTraceExporter(ctx, oCfg) if err != nil { @@ -68,7 +68,7 @@ func createTraceExporter(ctx context.Context, params component.ExporterCreatePar exporterhelper.WithShutdown(oce.shutdown)) } -func createMetricsExporter(ctx context.Context, params component.ExporterCreateParams, cfg configmodels.Exporter) (component.MetricsExporter, error) { +func createMetricsExporter(ctx context.Context, params component.ExporterCreateParams, cfg config.Exporter) (component.MetricsExporter, error) { oCfg := cfg.(*Config) oce, err := newMetricsExporter(ctx, oCfg) if err != nil { diff --git a/exporter/otlpexporter/config.go b/exporter/otlpexporter/config.go index c410ddf5689..9ff29f0f700 100644 --- a/exporter/otlpexporter/config.go +++ b/exporter/otlpexporter/config.go @@ -15,14 +15,14 @@ package otlpexporter import ( + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/exporter/exporterhelper" ) // Config defines configuration for OpenCensus exporter. type Config struct { - configmodels.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.TimeoutSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` exporterhelper.RetrySettings `mapstructure:"retry_on_failure"` diff --git a/exporter/otlpexporter/config_test.go b/exporter/otlpexporter/config_test.go index 64bdd8f5d97..47b140116f7 100644 --- a/exporter/otlpexporter/config_test.go +++ b/exporter/otlpexporter/config_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -47,7 +47,7 @@ func TestLoadConfig(t *testing.T) { e1 := cfg.Exporters["otlp/2"] assert.Equal(t, e1, &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ NameVal: "otlp/2", TypeVal: "otlp", }, diff --git a/exporter/otlpexporter/factory.go b/exporter/otlpexporter/factory.go index 5fa88715efd..263695374e0 100644 --- a/exporter/otlpexporter/factory.go +++ b/exporter/otlpexporter/factory.go @@ -18,8 +18,8 @@ import ( "context" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -38,9 +38,9 @@ func NewFactory() component.ExporterFactory { exporterhelper.WithLogs(createLogsExporter)) } -func createDefaultConfig() configmodels.Exporter { +func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -58,7 +58,7 @@ func createDefaultConfig() configmodels.Exporter { func createTraceExporter( _ context.Context, params component.ExporterCreateParams, - cfg configmodels.Exporter, + cfg config.Exporter, ) (component.TracesExporter, error) { oce, err := newExporter(cfg) if err != nil { @@ -83,7 +83,7 @@ func createTraceExporter( func createMetricsExporter( _ context.Context, params component.ExporterCreateParams, - cfg configmodels.Exporter, + cfg config.Exporter, ) (component.MetricsExporter, error) { oce, err := newExporter(cfg) if err != nil { @@ -109,7 +109,7 @@ func createMetricsExporter( func createLogsExporter( _ context.Context, params component.ExporterCreateParams, - cfg configmodels.Exporter, + cfg config.Exporter, ) (component.LogsExporter, error) { oce, err := newExporter(cfg) if err != nil { diff --git a/exporter/otlpexporter/otlp.go b/exporter/otlpexporter/otlp.go index 26aa08c2cf5..3092ccd1062 100644 --- a/exporter/otlpexporter/otlp.go +++ b/exporter/otlpexporter/otlp.go @@ -26,7 +26,7 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -44,7 +44,7 @@ type exporterImp struct { // Crete new exporter and start it. The exporter will begin connecting but // this function may return before the connection is established. -func newExporter(cfg configmodels.Exporter) (*exporterImp, error) { +func newExporter(cfg config.Exporter) (*exporterImp, error) { oCfg := cfg.(*Config) if oCfg.Endpoint == "" { diff --git a/exporter/otlphttpexporter/config.go b/exporter/otlphttpexporter/config.go index 7dd17702e5f..259c607a619 100644 --- a/exporter/otlphttpexporter/config.go +++ b/exporter/otlphttpexporter/config.go @@ -15,14 +15,14 @@ package otlphttpexporter import ( + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/exporter/exporterhelper" ) // Config defines configuration for OTLP/HTTP exporter. type Config struct { - configmodels.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. confighttp.HTTPClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` exporterhelper.RetrySettings `mapstructure:"retry_on_failure"` diff --git a/exporter/otlphttpexporter/config_test.go b/exporter/otlphttpexporter/config_test.go index 8cb139b649f..a470d48c375 100644 --- a/exporter/otlphttpexporter/config_test.go +++ b/exporter/otlphttpexporter/config_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -47,7 +47,7 @@ func TestLoadConfig(t *testing.T) { e1 := cfg.Exporters["otlphttp/2"] assert.Equal(t, e1, &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ NameVal: "otlphttp/2", TypeVal: "otlphttp", }, diff --git a/exporter/otlphttpexporter/factory.go b/exporter/otlphttpexporter/factory.go index 592f0e016ab..e43231587d1 100644 --- a/exporter/otlphttpexporter/factory.go +++ b/exporter/otlphttpexporter/factory.go @@ -21,8 +21,8 @@ import ( "time" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -41,9 +41,9 @@ func NewFactory() component.ExporterFactory { exporterhelper.WithLogs(createLogsExporter)) } -func createDefaultConfig() configmodels.Exporter { +func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -77,7 +77,7 @@ func composeSignalURL(oCfg *Config, signalOverrideURL string, signalName string) func createTraceExporter( _ context.Context, params component.ExporterCreateParams, - cfg configmodels.Exporter, + cfg config.Exporter, ) (component.TracesExporter, error) { oce, err := newExporter(cfg, params.Logger) if err != nil { @@ -103,7 +103,7 @@ func createTraceExporter( func createMetricsExporter( _ context.Context, params component.ExporterCreateParams, - cfg configmodels.Exporter, + cfg config.Exporter, ) (component.MetricsExporter, error) { oce, err := newExporter(cfg, params.Logger) if err != nil { @@ -129,7 +129,7 @@ func createMetricsExporter( func createLogsExporter( _ context.Context, params component.ExporterCreateParams, - cfg configmodels.Exporter, + cfg config.Exporter, ) (component.LogsExporter, error) { oce, err := newExporter(cfg, params.Logger) if err != nil { diff --git a/exporter/otlphttpexporter/otlp.go b/exporter/otlphttpexporter/otlp.go index f004b4a2fec..d678e701d33 100644 --- a/exporter/otlphttpexporter/otlp.go +++ b/exporter/otlphttpexporter/otlp.go @@ -31,8 +31,8 @@ import ( "google.golang.org/genproto/googleapis/rpc/status" "google.golang.org/protobuf/proto" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -55,7 +55,7 @@ const ( ) // Crete new exporter. -func newExporter(cfg configmodels.Exporter, logger *zap.Logger) (*exporterImp, error) { +func newExporter(cfg config.Exporter, logger *zap.Logger) (*exporterImp, error) { oCfg := cfg.(*Config) if oCfg.Endpoint != "" { diff --git a/exporter/otlphttpexporter/otlp_test.go b/exporter/otlphttpexporter/otlp_test.go index fbca5c136d5..2b68e511677 100644 --- a/exporter/otlphttpexporter/otlp_test.go +++ b/exporter/otlphttpexporter/otlp_test.go @@ -32,8 +32,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/consumertest" @@ -321,7 +321,7 @@ func startLogsExporter(t *testing.T, baseURL string, overrideURL string) compone return exp } -func createExporterConfig(baseURL string, defaultCfg configmodels.Exporter) *Config { +func createExporterConfig(baseURL string, defaultCfg config.Exporter) *Config { cfg := defaultCfg.(*Config) cfg.Endpoint = baseURL cfg.QueueSettings.Enabled = false @@ -353,7 +353,7 @@ func startLogsReceiver(t *testing.T, addr string, next consumer.Logs) { startAndCleanup(t, recv) } -func createReceiverConfig(addr string, defaultCfg configmodels.Exporter) *otlpreceiver.Config { +func createReceiverConfig(addr string, defaultCfg config.Exporter) *otlpreceiver.Config { cfg := defaultCfg.(*otlpreceiver.Config) cfg.HTTP.Endpoint = addr cfg.GRPC = nil diff --git a/exporter/prometheusexporter/config.go b/exporter/prometheusexporter/config.go index 3bea326c12f..4824d6c7f7e 100644 --- a/exporter/prometheusexporter/config.go +++ b/exporter/prometheusexporter/config.go @@ -19,12 +19,12 @@ import ( "github.com/prometheus/client_golang/prometheus" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" ) // Config defines configuration for Prometheus exporter. type Config struct { - configmodels.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. // The address on which the Prometheus scrape handler will be run on. Endpoint string `mapstructure:"endpoint"` diff --git a/exporter/prometheusexporter/config_test.go b/exporter/prometheusexporter/config_test.go index 96187ffcb50..8914759bf2d 100644 --- a/exporter/prometheusexporter/config_test.go +++ b/exporter/prometheusexporter/config_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" ) @@ -44,7 +44,7 @@ func TestLoadConfig(t *testing.T) { e1 := cfg.Exporters["prometheus/2"] assert.Equal(t, e1, &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ NameVal: "prometheus/2", TypeVal: "prometheus", }, diff --git a/exporter/prometheusexporter/factory.go b/exporter/prometheusexporter/factory.go index d4f5963fd69..732b252882d 100644 --- a/exporter/prometheusexporter/factory.go +++ b/exporter/prometheusexporter/factory.go @@ -19,7 +19,7 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -35,9 +35,9 @@ func NewFactory() component.ExporterFactory { exporterhelper.WithMetrics(createMetricsExporter)) } -func createDefaultConfig() configmodels.Exporter { +func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -50,7 +50,7 @@ func createDefaultConfig() configmodels.Exporter { func createMetricsExporter( _ context.Context, params component.ExporterCreateParams, - cfg configmodels.Exporter, + cfg config.Exporter, ) (component.MetricsExporter, error) { pcfg := cfg.(*Config) diff --git a/exporter/prometheusremotewriteexporter/config.go b/exporter/prometheusremotewriteexporter/config.go index ea265be0ded..5b1a01b9e4d 100644 --- a/exporter/prometheusremotewriteexporter/config.go +++ b/exporter/prometheusremotewriteexporter/config.go @@ -15,15 +15,15 @@ package prometheusremotewriteexporter import ( + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/exporter/exporterhelper" ) // Config defines configuration for Remote Write exporter. type Config struct { // squash ensures fields are correctly decoded in embedded struct. - configmodels.ExporterSettings `mapstructure:",squash"` + config.ExporterSettings `mapstructure:",squash"` exporterhelper.TimeoutSettings `mapstructure:",squash"` exporterhelper.QueueSettings `mapstructure:"sending_queue"` exporterhelper.RetrySettings `mapstructure:"retry_on_failure"` diff --git a/exporter/prometheusremotewriteexporter/config_test.go b/exporter/prometheusremotewriteexporter/config_test.go index 6adafa545a5..724c723355c 100644 --- a/exporter/prometheusremotewriteexporter/config_test.go +++ b/exporter/prometheusremotewriteexporter/config_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -50,7 +50,7 @@ func Test_loadConfig(t *testing.T) { e1 := cfg.Exporters["prometheusremotewrite/2"] assert.Equal(t, e1, &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ NameVal: "prometheusremotewrite/2", TypeVal: "prometheusremotewrite", }, diff --git a/exporter/prometheusremotewriteexporter/exporter_test.go b/exporter/prometheusremotewriteexporter/exporter_test.go index 1224cf5fc45..a019a0189fd 100644 --- a/exporter/prometheusremotewriteexporter/exporter_test.go +++ b/exporter/prometheusremotewriteexporter/exporter_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + config2 "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/internal" @@ -43,7 +43,7 @@ import ( // Test_ NewPrwExporter checks that a new exporter instance with non-nil fields is initialized func Test_NewPrwExporter(t *testing.T) { config := &Config{ - ExporterSettings: configmodels.ExporterSettings{}, + ExporterSettings: config2.ExporterSettings{}, TimeoutSettings: exporterhelper.TimeoutSettings{}, QueueSettings: exporterhelper.QueueSettings{}, RetrySettings: exporterhelper.RetrySettings{}, @@ -685,7 +685,7 @@ func Test_PushMetrics(t *testing.T) { assert.NoError(t, uErr) config := &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config2.ExporterSettings{ TypeVal: "prometheusremotewrite", NameVal: "prometheusremotewrite", }, diff --git a/exporter/prometheusremotewriteexporter/factory.go b/exporter/prometheusremotewriteexporter/factory.go index af2c65154ab..8cc71530450 100644 --- a/exporter/prometheusremotewriteexporter/factory.go +++ b/exporter/prometheusremotewriteexporter/factory.go @@ -19,8 +19,8 @@ import ( "errors" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -37,7 +37,7 @@ func NewFactory() component.ExporterFactory { } func createMetricsExporter(_ context.Context, params component.ExporterCreateParams, - cfg configmodels.Exporter) (component.MetricsExporter, error) { + cfg config.Exporter) (component.MetricsExporter, error) { prwCfg, ok := cfg.(*Config) if !ok { @@ -67,9 +67,9 @@ func createMetricsExporter(_ context.Context, params component.ExporterCreatePar return prwexp, err } -func createDefaultConfig() configmodels.Exporter { +func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ TypeVal: typeStr, NameVal: typeStr, }, diff --git a/exporter/prometheusremotewriteexporter/factory_test.go b/exporter/prometheusremotewriteexporter/factory_test.go index a94cb6ce83b..b2d813a1478 100644 --- a/exporter/prometheusremotewriteexporter/factory_test.go +++ b/exporter/prometheusremotewriteexporter/factory_test.go @@ -22,9 +22,9 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/configtls" ) @@ -52,7 +52,7 @@ func Test_createMetricsExporter(t *testing.T) { } tests := []struct { name string - cfg configmodels.Exporter + cfg config.Exporter params component.ExporterCreateParams returnError bool }{ diff --git a/exporter/zipkinexporter/config.go b/exporter/zipkinexporter/config.go index 280c31a932f..38f7d6712fd 100644 --- a/exporter/zipkinexporter/config.go +++ b/exporter/zipkinexporter/config.go @@ -15,16 +15,16 @@ package zipkinexporter import ( + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/exporter/exporterhelper" ) // Config defines configuration settings for the Zipkin exporter. type Config struct { - configmodels.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. - exporterhelper.QueueSettings `mapstructure:"sending_queue"` - exporterhelper.RetrySettings `mapstructure:"retry_on_failure"` + config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + exporterhelper.QueueSettings `mapstructure:"sending_queue"` + exporterhelper.RetrySettings `mapstructure:"retry_on_failure"` // Configures the exporter client. // The Endpoint to send the Zipkin trace data to (e.g.: http://some.url:9411/api/v2/spans). diff --git a/exporter/zipkinexporter/config_test.go b/exporter/zipkinexporter/config_test.go index 0d545298507..7acbf31a507 100644 --- a/exporter/zipkinexporter/config_test.go +++ b/exporter/zipkinexporter/config_test.go @@ -26,8 +26,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -53,7 +53,7 @@ func TestLoadConfig(t *testing.T) { e1 := cfg.Exporters["zipkin/2"] assert.Equal(t, &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ NameVal: "zipkin/2", TypeVal: "zipkin", }, diff --git a/exporter/zipkinexporter/factory.go b/exporter/zipkinexporter/factory.go index daf5d1b5411..12cbf96423d 100644 --- a/exporter/zipkinexporter/factory.go +++ b/exporter/zipkinexporter/factory.go @@ -20,8 +20,8 @@ import ( "time" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -44,9 +44,9 @@ func NewFactory() component.ExporterFactory { exporterhelper.WithTraces(createTraceExporter)) } -func createDefaultConfig() configmodels.Exporter { +func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -65,7 +65,7 @@ func createDefaultConfig() configmodels.Exporter { func createTraceExporter( _ context.Context, params component.ExporterCreateParams, - cfg configmodels.Exporter, + cfg config.Exporter, ) (component.TracesExporter, error) { zc := cfg.(*Config) diff --git a/exporter/zipkinexporter/zipkin_test.go b/exporter/zipkinexporter/zipkin_test.go index f9d81c06793..f7e5ff474c5 100644 --- a/exporter/zipkinexporter/zipkin_test.go +++ b/exporter/zipkinexporter/zipkin_test.go @@ -34,8 +34,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + config2 "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/receiver/zipkinreceiver" "go.opentelemetry.io/collector/testutil" ) @@ -76,7 +76,7 @@ func TestZipkinExporter_roundtripJSON(t *testing.T) { // Run the Zipkin receiver to "receive spans upload from a client application" addr := testutil.GetAvailableLocalAddress(t) cfg := &zipkinreceiver.Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config2.ReceiverSettings{ NameVal: "zipkin_receiver", }, HTTPServerSettings: confighttp.HTTPServerSettings{ @@ -325,7 +325,7 @@ func TestZipkinExporter_roundtripProto(t *testing.T) { // Run the Zipkin receiver to "receive spans upload from a client application" port := testutil.GetAvailablePort(t) cfg := &zipkinreceiver.Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config2.ReceiverSettings{ NameVal: "zipkin_receiver", }, HTTPServerSettings: confighttp.HTTPServerSettings{ diff --git a/extension/extensionhelper/factory.go b/extension/extensionhelper/factory.go index 05d7c95cd29..e55f178f39d 100644 --- a/extension/extensionhelper/factory.go +++ b/extension/extensionhelper/factory.go @@ -20,20 +20,20 @@ import ( "github.com/spf13/viper" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" ) // FactoryOption apply changes to ExporterOptions. type FactoryOption func(o *factory) // CreateDefaultConfig is the equivalent of component.ExtensionFactory.CreateDefaultConfig() -type CreateDefaultConfig func() configmodels.Extension +type CreateDefaultConfig func() config.Extension // CreateServiceExtension is the equivalent of component.ExtensionFactory.CreateExtension() -type CreateServiceExtension func(context.Context, component.ExtensionCreateParams, configmodels.Extension) (component.Extension, error) +type CreateServiceExtension func(context.Context, component.ExtensionCreateParams, config.Extension) (component.Extension, error) type factory struct { - cfgType configmodels.Type + cfgType config.Type customUnmarshaler component.CustomUnmarshaler createDefaultConfig CreateDefaultConfig createServiceExtension CreateServiceExtension @@ -48,7 +48,7 @@ func WithCustomUnmarshaler(customUnmarshaler component.CustomUnmarshaler) Factor // NewFactory returns a component.ExtensionFactory. func NewFactory( - cfgType configmodels.Type, + cfgType config.Type, createDefaultConfig CreateDefaultConfig, createServiceExtension CreateServiceExtension, options ...FactoryOption) component.ExtensionFactory { @@ -70,12 +70,12 @@ func NewFactory( } // Type gets the type of the Extension config created by this factory. -func (f *factory) Type() configmodels.Type { +func (f *factory) Type() config.Type { return f.cfgType } // CreateDefaultConfig creates the default configuration for processor. -func (f *factory) CreateDefaultConfig() configmodels.Extension { +func (f *factory) CreateDefaultConfig() config.Extension { return f.createDefaultConfig() } @@ -83,7 +83,7 @@ func (f *factory) CreateDefaultConfig() configmodels.Extension { func (f *factory) CreateExtension( ctx context.Context, params component.ExtensionCreateParams, - cfg configmodels.Extension) (component.Extension, error) { + cfg config.Extension) (component.Extension, error) { return f.createServiceExtension(ctx, params, cfg) } diff --git a/extension/extensionhelper/factory_test.go b/extension/extensionhelper/factory_test.go index f0b21639843..319c6bd2693 100644 --- a/extension/extensionhelper/factory_test.go +++ b/extension/extensionhelper/factory_test.go @@ -23,13 +23,13 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" ) const typeStr = "test" var ( - defaultCfg = &configmodels.ExtensionSettings{ + defaultCfg = &config.ExtensionSettings{ TypeVal: typeStr, NameVal: typeStr, } @@ -66,11 +66,11 @@ func TestNewFactory_WithConstructors(t *testing.T) { assert.Same(t, nopExtensionInstance, ext) } -func defaultConfig() configmodels.Extension { +func defaultConfig() config.Extension { return defaultCfg } -func createExtension(context.Context, component.ExtensionCreateParams, configmodels.Extension) (component.Extension, error) { +func createExtension(context.Context, component.ExtensionCreateParams, config.Extension) (component.Extension, error) { return nopExtensionInstance, nil } diff --git a/extension/healthcheckextension/config.go b/extension/healthcheckextension/config.go index 762a1bd028a..53bc969812a 100644 --- a/extension/healthcheckextension/config.go +++ b/extension/healthcheckextension/config.go @@ -15,14 +15,14 @@ package healthcheckextension import ( - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" ) // Config has the configuration for the extension enabling the health check // extension, used to report the health status of the service. type Config struct { - configmodels.ExtensionSettings `mapstructure:",squash"` + config.ExtensionSettings `mapstructure:",squash"` // Port is the port used to publish the health check status. // The default value is 13133. diff --git a/extension/healthcheckextension/config_test.go b/extension/healthcheckextension/config_test.go index ee9762b58e8..6fab9e9d2bf 100644 --- a/extension/healthcheckextension/config_test.go +++ b/extension/healthcheckextension/config_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtest" ) @@ -44,7 +44,7 @@ func TestLoadConfig(t *testing.T) { ext1 := cfg.Extensions["health_check/1"] assert.Equal(t, &Config{ - ExtensionSettings: configmodels.ExtensionSettings{ + ExtensionSettings: config.ExtensionSettings{ TypeVal: "health_check", NameVal: "health_check/1", }, diff --git a/extension/healthcheckextension/factory.go b/extension/healthcheckextension/factory.go index a32b31d5efe..a41adabcd18 100644 --- a/extension/healthcheckextension/factory.go +++ b/extension/healthcheckextension/factory.go @@ -18,7 +18,7 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/extension/extensionhelper" ) @@ -38,9 +38,9 @@ func NewFactory() component.ExtensionFactory { createExtension) } -func createDefaultConfig() configmodels.Extension { +func createDefaultConfig() config.Extension { return &Config{ - ExtensionSettings: configmodels.ExtensionSettings{ + ExtensionSettings: config.ExtensionSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -50,7 +50,7 @@ func createDefaultConfig() configmodels.Extension { } } -func createExtension(_ context.Context, params component.ExtensionCreateParams, cfg configmodels.Extension) (component.Extension, error) { +func createExtension(_ context.Context, params component.ExtensionCreateParams, cfg config.Extension) (component.Extension, error) { config := cfg.(*Config) return newServer(*config, params.Logger), nil diff --git a/extension/healthcheckextension/factory_test.go b/extension/healthcheckextension/factory_test.go index 9ccf458683b..85db6913282 100644 --- a/extension/healthcheckextension/factory_test.go +++ b/extension/healthcheckextension/factory_test.go @@ -23,8 +23,8 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/testutil" ) @@ -32,7 +32,7 @@ import ( func TestFactory_CreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.Equal(t, &Config{ - ExtensionSettings: configmodels.ExtensionSettings{ + ExtensionSettings: config.ExtensionSettings{ NameVal: typeStr, TypeVal: typeStr, }, diff --git a/extension/pprofextension/config.go b/extension/pprofextension/config.go index 0eea6de88c1..8465ffb19bd 100644 --- a/extension/pprofextension/config.go +++ b/extension/pprofextension/config.go @@ -15,13 +15,13 @@ package pprofextension import ( - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" ) // Config has the configuration for the extension enabling the golang // net/http/pprof (Performance Profiler) extension. type Config struct { - configmodels.ExtensionSettings `mapstructure:",squash"` + config.ExtensionSettings `mapstructure:",squash"` // Endpoint is the address and port in which the pprof will be listening to. // Use localhost: to make it available only locally, or ":" to diff --git a/extension/pprofextension/config_test.go b/extension/pprofextension/config_test.go index 0bcca53c674..c2abd35fef8 100644 --- a/extension/pprofextension/config_test.go +++ b/extension/pprofextension/config_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" ) @@ -43,7 +43,7 @@ func TestLoadConfig(t *testing.T) { ext1 := cfg.Extensions["pprof/1"] assert.Equal(t, &Config{ - ExtensionSettings: configmodels.ExtensionSettings{ + ExtensionSettings: config.ExtensionSettings{ TypeVal: "pprof", NameVal: "pprof/1", }, diff --git a/extension/pprofextension/factory.go b/extension/pprofextension/factory.go index 18e01d01bf0..cc2021ec730 100644 --- a/extension/pprofextension/factory.go +++ b/extension/pprofextension/factory.go @@ -19,7 +19,7 @@ import ( "errors" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/extension/extensionhelper" ) @@ -36,9 +36,9 @@ func NewFactory() component.ExtensionFactory { createExtension) } -func createDefaultConfig() configmodels.Extension { +func createDefaultConfig() config.Extension { return &Config{ - ExtensionSettings: configmodels.ExtensionSettings{ + ExtensionSettings: config.ExtensionSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -46,7 +46,7 @@ func createDefaultConfig() configmodels.Extension { } } -func createExtension(_ context.Context, params component.ExtensionCreateParams, cfg configmodels.Extension) (component.Extension, error) { +func createExtension(_ context.Context, params component.ExtensionCreateParams, cfg config.Extension) (component.Extension, error) { config := cfg.(*Config) if config.Endpoint == "" { return nil, errors.New("\"endpoint\" is required when using the \"pprof\" extension") diff --git a/extension/pprofextension/factory_test.go b/extension/pprofextension/factory_test.go index 04d1af46a6e..e81a8492f6e 100644 --- a/extension/pprofextension/factory_test.go +++ b/extension/pprofextension/factory_test.go @@ -23,15 +23,15 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/testutil" ) func TestFactory_CreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.Equal(t, &Config{ - ExtensionSettings: configmodels.ExtensionSettings{ + ExtensionSettings: config.ExtensionSettings{ NameVal: typeStr, TypeVal: typeStr, }, diff --git a/extension/zpagesextension/config.go b/extension/zpagesextension/config.go index 2449ca139d2..c03d31d7f2b 100644 --- a/extension/zpagesextension/config.go +++ b/extension/zpagesextension/config.go @@ -15,12 +15,12 @@ package zpagesextension import ( - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" ) // Config has the configuration for the extension enabling the zPages extension. type Config struct { - configmodels.ExtensionSettings `mapstructure:",squash"` + config.ExtensionSettings `mapstructure:",squash"` // Endpoint is the address and port in which the zPages will be listening to. // Use localhost: to make it available only locally, or ":" to diff --git a/extension/zpagesextension/config_test.go b/extension/zpagesextension/config_test.go index 92224a122a2..4d58c63d102 100644 --- a/extension/zpagesextension/config_test.go +++ b/extension/zpagesextension/config_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" ) @@ -43,7 +43,7 @@ func TestLoadConfig(t *testing.T) { ext1 := cfg.Extensions["zpages/1"] assert.Equal(t, &Config{ - ExtensionSettings: configmodels.ExtensionSettings{ + ExtensionSettings: config.ExtensionSettings{ TypeVal: "zpages", NameVal: "zpages/1", }, diff --git a/extension/zpagesextension/factory.go b/extension/zpagesextension/factory.go index 8c0623466d8..09a592f71de 100644 --- a/extension/zpagesextension/factory.go +++ b/extension/zpagesextension/factory.go @@ -19,7 +19,7 @@ import ( "errors" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/extension/extensionhelper" ) @@ -36,9 +36,9 @@ func NewFactory() component.ExtensionFactory { createExtension) } -func createDefaultConfig() configmodels.Extension { +func createDefaultConfig() config.Extension { return &Config{ - ExtensionSettings: configmodels.ExtensionSettings{ + ExtensionSettings: config.ExtensionSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -47,7 +47,7 @@ func createDefaultConfig() configmodels.Extension { } // createExtension creates the extension based on this config. -func createExtension(_ context.Context, params component.ExtensionCreateParams, cfg configmodels.Extension) (component.Extension, error) { +func createExtension(_ context.Context, params component.ExtensionCreateParams, cfg config.Extension) (component.Extension, error) { config := cfg.(*Config) if config.Endpoint == "" { return nil, errors.New("\"endpoint\" is required when using the \"zpages\" extension") diff --git a/extension/zpagesextension/factory_test.go b/extension/zpagesextension/factory_test.go index 22466ca7f62..703d5ceca89 100644 --- a/extension/zpagesextension/factory_test.go +++ b/extension/zpagesextension/factory_test.go @@ -23,15 +23,15 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/testutil" ) func TestFactory_CreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.Equal(t, &Config{ - ExtensionSettings: configmodels.ExtensionSettings{ + ExtensionSettings: config.ExtensionSettings{ NameVal: typeStr, TypeVal: typeStr, }, diff --git a/internal/testcomponents/example_exporter.go b/internal/testcomponents/example_exporter.go index 5f1abec6f5f..57733314c2b 100644 --- a/internal/testcomponents/example_exporter.go +++ b/internal/testcomponents/example_exporter.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/viper" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -28,11 +28,11 @@ import ( // ExampleExporter is for testing purposes. We are defining an example config and factory // for "exampleexporter" exporter type. type ExampleExporter struct { - configmodels.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct - ExtraInt int32 `mapstructure:"extra_int"` - ExtraSetting string `mapstructure:"extra"` - ExtraMapSetting map[string]string `mapstructure:"extra_map"` - ExtraListSetting []string `mapstructure:"extra_list"` + config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + ExtraInt int32 `mapstructure:"extra_int"` + ExtraSetting string `mapstructure:"extra"` + ExtraMapSetting map[string]string `mapstructure:"extra_map"` + ExtraListSetting []string `mapstructure:"extra_list"` } const expType = "exampleexporter" @@ -47,9 +47,9 @@ var ExampleExporterFactory = exporterhelper.NewFactory( exporterhelper.WithLogs(createLogsExporter)) // CreateDefaultConfig creates the default configuration for the Exporter. -func createExporterDefaultConfig() configmodels.Exporter { +func createExporterDefaultConfig() config.Exporter { return &ExampleExporter{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ TypeVal: expType, NameVal: expType, }, @@ -66,7 +66,7 @@ func customUnmarshal(componentViperSection *viper.Viper, intoCfg interface{}) er func createTracesExporter( _ context.Context, _ component.ExporterCreateParams, - _ configmodels.Exporter, + _ config.Exporter, ) (component.TracesExporter, error) { return &ExampleExporterConsumer{}, nil } @@ -74,7 +74,7 @@ func createTracesExporter( func createMetricsExporter( _ context.Context, _ component.ExporterCreateParams, - _ configmodels.Exporter, + _ config.Exporter, ) (component.MetricsExporter, error) { return &ExampleExporterConsumer{}, nil } @@ -82,7 +82,7 @@ func createMetricsExporter( func createLogsExporter( _ context.Context, _ component.ExporterCreateParams, - _ configmodels.Exporter, + _ config.Exporter, ) (component.LogsExporter, error) { return &ExampleExporterConsumer{}, nil } diff --git a/internal/testcomponents/example_extension.go b/internal/testcomponents/example_extension.go index e038adcca76..096da60ddbd 100644 --- a/internal/testcomponents/example_extension.go +++ b/internal/testcomponents/example_extension.go @@ -19,17 +19,17 @@ 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/extension/extensionhelper" ) // ExampleExtensionCfg is for testing purposes. We are defining an example config and factory // for "exampleextension" extension type. type ExampleExtensionCfg struct { - configmodels.ExtensionSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct - ExtraSetting string `mapstructure:"extra"` - ExtraMapSetting map[string]string `mapstructure:"extra_map"` - ExtraListSetting []string `mapstructure:"extra_list"` + config.ExtensionSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + ExtraSetting string `mapstructure:"extra"` + ExtraMapSetting map[string]string `mapstructure:"extra_map"` + ExtraListSetting []string `mapstructure:"extra_list"` } const extType = "exampleextension" @@ -38,9 +38,9 @@ const extType = "exampleextension" var ExampleExtensionFactory = extensionhelper.NewFactory(extType, createExtensionDefaultConfig, createExtension) // CreateDefaultConfig creates the default configuration for the Extension. -func createExtensionDefaultConfig() configmodels.Extension { +func createExtensionDefaultConfig() config.Extension { return &ExampleExtensionCfg{ - ExtensionSettings: configmodels.ExtensionSettings{ + ExtensionSettings: config.ExtensionSettings{ TypeVal: extType, NameVal: extType, }, @@ -51,6 +51,6 @@ func createExtensionDefaultConfig() configmodels.Extension { } // CreateExtension creates an Extension based on this config. -func createExtension(context.Context, component.ExtensionCreateParams, configmodels.Extension) (component.Extension, error) { +func createExtension(context.Context, component.ExtensionCreateParams, config.Extension) (component.Extension, error) { return componenthelper.New(), nil } diff --git a/internal/testcomponents/example_processor.go b/internal/testcomponents/example_processor.go index adeba96749f..6c3b005f085 100644 --- a/internal/testcomponents/example_processor.go +++ b/internal/testcomponents/example_processor.go @@ -18,7 +18,7 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/processor/processorhelper" ) @@ -26,10 +26,10 @@ import ( // ExampleProcessorCfg is for testing purposes. We are defining an example config and factory // for "exampleprocessor" processor type. type ExampleProcessorCfg struct { - configmodels.ProcessorSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct - ExtraSetting string `mapstructure:"extra"` - ExtraMapSetting map[string]string `mapstructure:"extra_map"` - ExtraListSetting []string `mapstructure:"extra_list"` + config.ProcessorSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + ExtraSetting string `mapstructure:"extra"` + ExtraMapSetting map[string]string `mapstructure:"extra_map"` + ExtraListSetting []string `mapstructure:"extra_list"` } const procType = "exampleprocessor" @@ -43,9 +43,9 @@ var ExampleProcessorFactory = processorhelper.NewFactory( processorhelper.WithLogs(createLogsProcessor)) // CreateDefaultConfig creates the default configuration for the Processor. -func createDefaultConfig() configmodels.Processor { +func createDefaultConfig() config.Processor { return &ExampleProcessorCfg{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: procType, NameVal: procType, }, @@ -55,15 +55,15 @@ func createDefaultConfig() configmodels.Processor { } } -func createTracesProcessor(_ context.Context, _ component.ProcessorCreateParams, _ configmodels.Processor, nextConsumer consumer.Traces) (component.TracesProcessor, error) { +func createTracesProcessor(_ context.Context, _ component.ProcessorCreateParams, _ config.Processor, nextConsumer consumer.Traces) (component.TracesProcessor, error) { return &exampleProcessor{Traces: nextConsumer}, nil } -func createMetricsProcessor(_ context.Context, _ component.ProcessorCreateParams, _ configmodels.Processor, nextConsumer consumer.Metrics) (component.MetricsProcessor, error) { +func createMetricsProcessor(_ context.Context, _ component.ProcessorCreateParams, _ config.Processor, nextConsumer consumer.Metrics) (component.MetricsProcessor, error) { return &exampleProcessor{Metrics: nextConsumer}, nil } -func createLogsProcessor(_ context.Context, _ component.ProcessorCreateParams, _ configmodels.Processor, nextConsumer consumer.Logs) (component.LogsProcessor, error) { +func createLogsProcessor(_ context.Context, _ component.ProcessorCreateParams, _ config.Processor, nextConsumer consumer.Logs) (component.LogsProcessor, error) { return &exampleProcessor{Logs: nextConsumer}, nil } diff --git a/internal/testcomponents/example_receiver.go b/internal/testcomponents/example_receiver.go index 47ed2aa55e1..7f5a76e14c2 100644 --- a/internal/testcomponents/example_receiver.go +++ b/internal/testcomponents/example_receiver.go @@ -18,7 +18,7 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" @@ -27,7 +27,7 @@ import ( // ExampleReceiver is for testing purposes. We are defining an example config and factory // for "examplereceiver" receiver type. type ExampleReceiver struct { - configmodels.ReceiverSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + config.ReceiverSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct // Configures the receiver server protocol. confignet.TCPAddr `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct @@ -46,9 +46,9 @@ var ExampleReceiverFactory = receiverhelper.NewFactory( receiverhelper.WithMetrics(createMetricsReceiver), receiverhelper.WithLogs(createLogsReceiver)) -func createReceiverDefaultConfig() configmodels.Receiver { +func createReceiverDefaultConfig() config.Receiver { return &ExampleReceiver{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: recvType, NameVal: recvType, }, @@ -65,7 +65,7 @@ func createReceiverDefaultConfig() configmodels.Receiver { func createTracesReceiver( _ context.Context, _ component.ReceiverCreateParams, - cfg configmodels.Receiver, + cfg config.Receiver, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { receiver := createReceiver(cfg) @@ -77,7 +77,7 @@ func createTracesReceiver( func createMetricsReceiver( _ context.Context, _ component.ReceiverCreateParams, - cfg configmodels.Receiver, + cfg config.Receiver, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { receiver := createReceiver(cfg) @@ -88,7 +88,7 @@ func createMetricsReceiver( func createLogsReceiver( _ context.Context, _ component.ReceiverCreateParams, - cfg configmodels.Receiver, + cfg config.Receiver, nextConsumer consumer.Logs, ) (component.LogsReceiver, error) { receiver := createReceiver(cfg) @@ -97,7 +97,7 @@ func createLogsReceiver( return receiver, nil } -func createReceiver(cfg configmodels.Receiver) *ExampleReceiverProducer { +func createReceiver(cfg config.Receiver) *ExampleReceiverProducer { // There must be one receiver for all data types. We maintain a map of // receivers per config. @@ -137,4 +137,4 @@ func (erp *ExampleReceiverProducer) Shutdown(context.Context) error { // We maintain this map because the ReceiverFactory is asked trace and metric receivers separately // when it gets CreateTracesReceiver() and CreateMetricsReceiver() but they must not // create separate objects, they must use one Receiver object per configuration. -var exampleReceivers = map[configmodels.Receiver]*ExampleReceiverProducer{} +var exampleReceivers = map[config.Receiver]*ExampleReceiverProducer{} diff --git a/obsreport/obsreport_receiver.go b/obsreport/obsreport_receiver.go index 9a0915cca38..df58258120c 100644 --- a/obsreport/obsreport_receiver.go +++ b/obsreport/obsreport_receiver.go @@ -21,7 +21,7 @@ import ( "go.opencensus.io/tag" "go.opencensus.io/trace" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtelemetry" ) @@ -173,7 +173,7 @@ func EndTraceDataReceiveOp( format, numReceivedSpans, err, - configmodels.TracesDataType, + config.TracesDataType, ) } @@ -207,7 +207,7 @@ func EndLogsReceiveOp( format, numReceivedLogRecords, err, - configmodels.LogsDataType, + config.LogsDataType, ) } @@ -241,7 +241,7 @@ func EndMetricsReceiveOp( format, numReceivedPoints, err, - configmodels.MetricsDataType, + config.MetricsDataType, ) } @@ -304,7 +304,7 @@ func endReceiveOp( format string, numReceivedItems int, err error, - dataType configmodels.DataType, + dataType config.DataType, ) { numAccepted := numReceivedItems numRefused := 0 @@ -318,13 +318,13 @@ func endReceiveOp( if gLevel != configtelemetry.LevelNone { var acceptedMeasure, refusedMeasure *stats.Int64Measure switch dataType { - case configmodels.TracesDataType: + case config.TracesDataType: acceptedMeasure = mReceiverAcceptedSpans refusedMeasure = mReceiverRefusedSpans - case configmodels.MetricsDataType: + case config.MetricsDataType: acceptedMeasure = mReceiverAcceptedMetricPoints refusedMeasure = mReceiverRefusedMetricPoints - case configmodels.LogsDataType: + case config.LogsDataType: acceptedMeasure = mReceiverAcceptedLogRecords refusedMeasure = mReceiverRefusedLogRecords } @@ -339,13 +339,13 @@ func endReceiveOp( if span.IsRecordingEvents() { var acceptedItemsKey, refusedItemsKey string switch dataType { - case configmodels.TracesDataType: + case config.TracesDataType: acceptedItemsKey = AcceptedSpansKey refusedItemsKey = RefusedSpansKey - case configmodels.MetricsDataType: + case config.MetricsDataType: acceptedItemsKey = AcceptedMetricPointsKey refusedItemsKey = RefusedMetricPointsKey - case configmodels.LogsDataType: + case config.LogsDataType: acceptedItemsKey = AcceptedLogRecordsKey refusedItemsKey = RefusedLogRecordsKey } diff --git a/obsreport/obsreport_scraper.go b/obsreport/obsreport_scraper.go index 8d24223ef35..0c5a6123aac 100644 --- a/obsreport/obsreport_scraper.go +++ b/obsreport/obsreport_scraper.go @@ -21,7 +21,7 @@ import ( "go.opencensus.io/tag" "go.opencensus.io/trace" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/receiver/scrapererror" ) @@ -120,7 +120,7 @@ func EndMetricsScrapeOp( // end span according to errors if span.IsRecordingEvents() { span.AddAttributes( - trace.StringAttribute(FormatKey, string(configmodels.MetricsDataType)), + trace.StringAttribute(FormatKey, string(config.MetricsDataType)), trace.Int64Attribute(ScrapedMetricPointsKey, int64(numScrapedMetrics)), trace.Int64Attribute(ErroredMetricPointsKey, int64(numErroredMetrics)), ) diff --git a/processor/attributesprocessor/config.go b/processor/attributesprocessor/config.go index 6e4b10b3bd4..9ccda8f5ecb 100644 --- a/processor/attributesprocessor/config.go +++ b/processor/attributesprocessor/config.go @@ -15,7 +15,7 @@ package attributesprocessor import ( - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/internal/processor/filterconfig" "go.opentelemetry.io/collector/processor/processorhelper" ) @@ -28,7 +28,7 @@ import ( // This determines if a span is to be processed or not. // The list of actions is applied in order specified in the configuration. type Config struct { - configmodels.ProcessorSettings `mapstructure:",squash"` + config.ProcessorSettings `mapstructure:",squash"` filterconfig.MatchConfig `mapstructure:",squash"` diff --git a/processor/attributesprocessor/config_test.go b/processor/attributesprocessor/config_test.go index 7ab8b26e0e4..d781b5b6210 100644 --- a/processor/attributesprocessor/config_test.go +++ b/processor/attributesprocessor/config_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/internal/processor/filterconfig" "go.opentelemetry.io/collector/internal/processor/filterset" @@ -41,7 +41,7 @@ func TestLoadingConfig(t *testing.T) { p0 := cfg.Processors["attributes/insert"] assert.Equal(t, p0, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ NameVal: "attributes/insert", TypeVal: typeStr, }, @@ -55,7 +55,7 @@ func TestLoadingConfig(t *testing.T) { p1 := cfg.Processors["attributes/update"] assert.Equal(t, p1, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ NameVal: "attributes/update", TypeVal: typeStr, }, @@ -69,7 +69,7 @@ func TestLoadingConfig(t *testing.T) { p2 := cfg.Processors["attributes/upsert"] assert.Equal(t, p2, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ NameVal: "attributes/upsert", TypeVal: typeStr, }, @@ -83,7 +83,7 @@ func TestLoadingConfig(t *testing.T) { p3 := cfg.Processors["attributes/delete"] assert.Equal(t, p3, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ NameVal: "attributes/delete", TypeVal: typeStr, }, @@ -97,7 +97,7 @@ func TestLoadingConfig(t *testing.T) { p4 := cfg.Processors["attributes/hash"] assert.Equal(t, p4, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ NameVal: "attributes/hash", TypeVal: typeStr, }, @@ -110,7 +110,7 @@ func TestLoadingConfig(t *testing.T) { p5 := cfg.Processors["attributes/excludemulti"] assert.Equal(t, p5, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ NameVal: "attributes/excludemulti", TypeVal: typeStr, }, @@ -134,7 +134,7 @@ func TestLoadingConfig(t *testing.T) { p6 := cfg.Processors["attributes/includeservices"] assert.Equal(t, p6, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ NameVal: "attributes/includeservices", TypeVal: typeStr, }, @@ -154,7 +154,7 @@ func TestLoadingConfig(t *testing.T) { p7 := cfg.Processors["attributes/selectiveprocessing"] assert.Equal(t, p7, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ NameVal: "attributes/selectiveprocessing", TypeVal: typeStr, }, @@ -180,7 +180,7 @@ func TestLoadingConfig(t *testing.T) { p8 := cfg.Processors["attributes/complex"] assert.Equal(t, p8, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ NameVal: "attributes/complex", TypeVal: typeStr, }, @@ -195,7 +195,7 @@ func TestLoadingConfig(t *testing.T) { p9 := cfg.Processors["attributes/example"] assert.Equal(t, p9, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ NameVal: "attributes/example", TypeVal: typeStr, }, @@ -212,7 +212,7 @@ func TestLoadingConfig(t *testing.T) { p10 := cfg.Processors["attributes/regexp"] assert.Equal(t, p10, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ NameVal: "attributes/regexp", TypeVal: typeStr, }, diff --git a/processor/attributesprocessor/factory.go b/processor/attributesprocessor/factory.go index 919e76d1906..aa13930ec5b 100644 --- a/processor/attributesprocessor/factory.go +++ b/processor/attributesprocessor/factory.go @@ -19,7 +19,7 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/internal/processor/filterlog" "go.opentelemetry.io/collector/internal/processor/filterspan" @@ -43,9 +43,9 @@ func NewFactory() component.ProcessorFactory { } // Note: This isn't a valid configuration because the processor would do no work. -func createDefaultConfig() configmodels.Processor { +func createDefaultConfig() config.Processor { return &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -55,7 +55,7 @@ func createDefaultConfig() configmodels.Processor { func createTraceProcessor( _ context.Context, _ component.ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { oCfg := cfg.(*Config) @@ -85,7 +85,7 @@ func createTraceProcessor( func createLogProcessor( _ context.Context, _ component.ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Logs, ) (component.LogsProcessor, error) { oCfg := cfg.(*Config) diff --git a/processor/attributesprocessor/factory_test.go b/processor/attributesprocessor/factory_test.go index a8fa6b9549f..cff14978e2a 100644 --- a/processor/attributesprocessor/factory_test.go +++ b/processor/attributesprocessor/factory_test.go @@ -22,23 +22,23 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/config/configerror" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/processor/processorhelper" ) func TestFactory_Type(t *testing.T) { factory := NewFactory() - assert.Equal(t, factory.Type(), configmodels.Type(typeStr)) + assert.Equal(t, factory.Type(), config.Type(typeStr)) } func TestFactory_CreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.Equal(t, cfg, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ NameVal: typeStr, TypeVal: typeStr, }, diff --git a/processor/batchprocessor/config.go b/processor/batchprocessor/config.go index ed66435ba15..90a14f0234a 100644 --- a/processor/batchprocessor/config.go +++ b/processor/batchprocessor/config.go @@ -17,12 +17,12 @@ package batchprocessor import ( "time" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" ) // Config defines configuration for batch processor. type Config struct { - configmodels.ProcessorSettings `mapstructure:",squash"` + config.ProcessorSettings `mapstructure:",squash"` // Timeout sets the time after which a batch will be sent regardless of size. Timeout time.Duration `mapstructure:"timeout,omitempty"` diff --git a/processor/batchprocessor/config_test.go b/processor/batchprocessor/config_test.go index 9557531720a..7c1790313b0 100644 --- a/processor/batchprocessor/config_test.go +++ b/processor/batchprocessor/config_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" ) @@ -49,7 +49,7 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, p1, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: "batch", NameVal: "batch/2", }, diff --git a/processor/batchprocessor/factory.go b/processor/batchprocessor/factory.go index 0ef1bac8288..99f5fb34971 100644 --- a/processor/batchprocessor/factory.go +++ b/processor/batchprocessor/factory.go @@ -19,7 +19,7 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/processor/processorhelper" @@ -43,9 +43,9 @@ func NewFactory() component.ProcessorFactory { processorhelper.WithLogs(createLogsProcessor)) } -func createDefaultConfig() configmodels.Processor { +func createDefaultConfig() config.Processor { return &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -57,7 +57,7 @@ func createDefaultConfig() configmodels.Processor { func createTraceProcessor( _ context.Context, params component.ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { oCfg := cfg.(*Config) @@ -68,7 +68,7 @@ func createTraceProcessor( func createMetricsProcessor( _ context.Context, params component.ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { oCfg := cfg.(*Config) @@ -79,7 +79,7 @@ func createMetricsProcessor( func createLogsProcessor( _ context.Context, params component.ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Logs, ) (component.LogsProcessor, error) { oCfg := cfg.(*Config) diff --git a/processor/filterprocessor/config.go b/processor/filterprocessor/config.go index f434f2295a7..7b65ec728a1 100644 --- a/processor/filterprocessor/config.go +++ b/processor/filterprocessor/config.go @@ -15,14 +15,14 @@ package filterprocessor import ( - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/internal/processor/filtermetric" ) // Config defines configuration for Resource processor. type Config struct { - configmodels.ProcessorSettings `mapstructure:",squash"` - Metrics MetricFilters `mapstructure:"metrics"` + config.ProcessorSettings `mapstructure:",squash"` + Metrics MetricFilters `mapstructure:"metrics"` } // MetricFilter filters by Metric properties. diff --git a/processor/filterprocessor/config_test.go b/processor/filterprocessor/config_test.go index 75cff3a1e13..2f46d23956f 100644 --- a/processor/filterprocessor/config_test.go +++ b/processor/filterprocessor/config_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + config2 "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/internal/processor/filtermetric" fsregexp "go.opentelemetry.io/collector/internal/processor/filterset/regexp" @@ -45,7 +45,7 @@ func TestLoadingConfigStrict(t *testing.T) { assert.Nil(t, err) factory := NewFactory() - factories.Processors[configmodels.Type(typeStr)] = factory + factories.Processors[config2.Type(typeStr)] = factory config, err := configtest.LoadConfigFile(t, path.Join(".", "testdata", "config_strict.yaml"), factories) assert.Nil(t, err) @@ -58,7 +58,7 @@ func TestLoadingConfigStrict(t *testing.T) { { filterName: "filter/empty", expCfg: &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config2.ProcessorSettings{ NameVal: "filter/empty", TypeVal: typeStr, }, @@ -71,7 +71,7 @@ func TestLoadingConfigStrict(t *testing.T) { }, { filterName: "filter/include", expCfg: &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config2.ProcessorSettings{ NameVal: "filter/include", TypeVal: typeStr, }, @@ -82,7 +82,7 @@ func TestLoadingConfigStrict(t *testing.T) { }, { filterName: "filter/exclude", expCfg: &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config2.ProcessorSettings{ NameVal: "filter/exclude", TypeVal: typeStr, }, @@ -93,7 +93,7 @@ func TestLoadingConfigStrict(t *testing.T) { }, { filterName: "filter/includeexclude", expCfg: &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config2.ProcessorSettings{ NameVal: "filter/includeexclude", TypeVal: typeStr, }, @@ -152,7 +152,7 @@ func TestLoadingConfigRegexp(t *testing.T) { { filterName: "filter/include", expCfg: &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config2.ProcessorSettings{ NameVal: "filter/include", TypeVal: typeStr, }, @@ -163,7 +163,7 @@ func TestLoadingConfigRegexp(t *testing.T) { }, { filterName: "filter/exclude", expCfg: &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config2.ProcessorSettings{ NameVal: "filter/exclude", TypeVal: typeStr, }, @@ -174,7 +174,7 @@ func TestLoadingConfigRegexp(t *testing.T) { }, { filterName: "filter/unlimitedcache", expCfg: &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config2.ProcessorSettings{ NameVal: "filter/unlimitedcache", TypeVal: typeStr, }, @@ -191,7 +191,7 @@ func TestLoadingConfigRegexp(t *testing.T) { }, { filterName: "filter/limitedcache", expCfg: &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config2.ProcessorSettings{ NameVal: "filter/limitedcache", TypeVal: typeStr, }, @@ -221,19 +221,19 @@ func TestLoadingConfigExpr(t *testing.T) { factories, err := componenttest.NopFactories() require.NoError(t, err) factory := NewFactory() - factories.Processors[configmodels.Type(typeStr)] = factory + factories.Processors[config2.Type(typeStr)] = factory config, err := configtest.LoadConfigFile(t, path.Join(".", "testdata", "config_expr.yaml"), factories) require.NoError(t, err) require.NotNil(t, config) tests := []struct { filterName string - expCfg configmodels.Processor + expCfg config2.Processor }{ { filterName: "filter/empty", expCfg: &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config2.ProcessorSettings{ NameVal: "filter/empty", TypeVal: typeStr, }, @@ -247,7 +247,7 @@ func TestLoadingConfigExpr(t *testing.T) { { filterName: "filter/include", expCfg: &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config2.ProcessorSettings{ NameVal: "filter/include", TypeVal: typeStr, }, @@ -265,7 +265,7 @@ func TestLoadingConfigExpr(t *testing.T) { { filterName: "filter/exclude", expCfg: &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config2.ProcessorSettings{ NameVal: "filter/exclude", TypeVal: typeStr, }, @@ -283,7 +283,7 @@ func TestLoadingConfigExpr(t *testing.T) { { filterName: "filter/includeexclude", expCfg: &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config2.ProcessorSettings{ NameVal: "filter/includeexclude", TypeVal: typeStr, }, diff --git a/processor/filterprocessor/expr_test.go b/processor/filterprocessor/expr_test.go index 70f127506a0..f7590d89d63 100644 --- a/processor/filterprocessor/expr_test.go +++ b/processor/filterprocessor/expr_test.go @@ -26,7 +26,7 @@ import ( "go.uber.org/zap/zaptest/observer" "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" "go.opentelemetry.io/collector/internal/goldendataset" @@ -165,7 +165,7 @@ func testProcessor(t *testing.T, include []string, exclude []string) (component. return proc, next, logs } -func exprConfig(factory component.ProcessorFactory, include []string, exclude []string) configmodels.Processor { +func exprConfig(factory component.ProcessorFactory, include []string, exclude []string) config.Processor { cfg := factory.CreateDefaultConfig() pCfg := cfg.(*Config) pCfg.Metrics = MetricFilters{} diff --git a/processor/filterprocessor/factory.go b/processor/filterprocessor/factory.go index 6ae0d5ee2d9..d0d38ae9131 100644 --- a/processor/filterprocessor/factory.go +++ b/processor/filterprocessor/factory.go @@ -18,7 +18,7 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/processor/processorhelper" ) @@ -38,9 +38,9 @@ func NewFactory() component.ProcessorFactory { processorhelper.WithMetrics(createMetricsProcessor)) } -func createDefaultConfig() configmodels.Processor { +func createDefaultConfig() config.Processor { return &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -50,7 +50,7 @@ func createDefaultConfig() configmodels.Processor { func createMetricsProcessor( _ context.Context, params component.ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { fp, err := newFilterMetricProcessor(params.Logger, cfg.(*Config)) diff --git a/processor/filterprocessor/factory_test.go b/processor/filterprocessor/factory_test.go index 01018e3b537..e7687a890c7 100644 --- a/processor/filterprocessor/factory_test.go +++ b/processor/filterprocessor/factory_test.go @@ -25,8 +25,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -35,14 +35,14 @@ func TestType(t *testing.T) { factory := NewFactory() pType := factory.Type() - assert.Equal(t, pType, configmodels.Type("filter")) + assert.Equal(t, pType, config.Type("filter")) } func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.Equal(t, cfg, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ NameVal: typeStr, TypeVal: typeStr, }, diff --git a/processor/filterprocessor/filter_processor_test.go b/processor/filterprocessor/filter_processor_test.go index fca58e4993c..2f5fb4190c1 100644 --- a/processor/filterprocessor/filter_processor_test.go +++ b/processor/filterprocessor/filter_processor_test.go @@ -28,7 +28,7 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "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" "go.opentelemetry.io/collector/internal/goldendataset" @@ -306,7 +306,7 @@ func TestFilterMetricProcessor(t *testing.T) { // next stores the results of the filter metric processor next := new(consumertest.MetricsSink) cfg := &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: typeStr, NameVal: typeStr, }, diff --git a/processor/memorylimiter/config.go b/processor/memorylimiter/config.go index f750d902378..a45cebc981b 100644 --- a/processor/memorylimiter/config.go +++ b/processor/memorylimiter/config.go @@ -20,12 +20,12 @@ package memorylimiter import ( "time" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" ) // Config defines configuration for memory memoryLimiter processor. type Config struct { - configmodels.ProcessorSettings `mapstructure:",squash"` + config.ProcessorSettings `mapstructure:",squash"` // CheckInterval is the time between measurements of memory usage for the // purposes of avoiding going over the limits. Defaults to zero, so no diff --git a/processor/memorylimiter/config_test.go b/processor/memorylimiter/config_test.go index edea569ba49..b67022c3a93 100644 --- a/processor/memorylimiter/config_test.go +++ b/processor/memorylimiter/config_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" ) @@ -45,7 +45,7 @@ func TestLoadConfig(t *testing.T) { p0 := cfg.Processors["memory_limiter"] assert.Equal(t, p0, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: "memory_limiter", NameVal: "memory_limiter", }, @@ -54,7 +54,7 @@ func TestLoadConfig(t *testing.T) { p1 := cfg.Processors["memory_limiter/with-settings"] assert.Equal(t, p1, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: "memory_limiter", NameVal: "memory_limiter/with-settings", }, diff --git a/processor/memorylimiter/factory.go b/processor/memorylimiter/factory.go index b8a6c4062ee..0ba78ed6286 100644 --- a/processor/memorylimiter/factory.go +++ b/processor/memorylimiter/factory.go @@ -18,7 +18,7 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/processor/processorhelper" ) @@ -42,9 +42,9 @@ func NewFactory() component.ProcessorFactory { // CreateDefaultConfig creates the default configuration for processor. Notice // that the default configuration is expected to fail for this processor. -func createDefaultConfig() configmodels.Processor { +func createDefaultConfig() config.Processor { return &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -54,7 +54,7 @@ func createDefaultConfig() configmodels.Processor { func createTraceProcessor( _ context.Context, params component.ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { ml, err := newMemoryLimiter(params.Logger, cfg.(*Config)) @@ -72,7 +72,7 @@ func createTraceProcessor( func createMetricsProcessor( _ context.Context, params component.ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { ml, err := newMemoryLimiter(params.Logger, cfg.(*Config)) @@ -90,7 +90,7 @@ func createMetricsProcessor( func createLogsProcessor( _ context.Context, params component.ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Logs, ) (component.LogsProcessor, error) { ml, err := newMemoryLimiter(params.Logger, cfg.(*Config)) diff --git a/processor/memorylimiter/memorylimiter_test.go b/processor/memorylimiter/memorylimiter_test.go index 84268ed0059..9d6e9237864 100644 --- a/processor/memorylimiter/memorylimiter_test.go +++ b/processor/memorylimiter/memorylimiter_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" @@ -119,7 +119,7 @@ func TestMetricsMemoryPressureResponse(t *testing.T) { } mp, err := processorhelper.NewMetricsProcessor( &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -193,7 +193,7 @@ func TestTraceMemoryPressureResponse(t *testing.T) { } tp, err := processorhelper.NewTraceProcessor( &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -267,7 +267,7 @@ func TestLogMemoryPressureResponse(t *testing.T) { } lp, err := processorhelper.NewLogsProcessor( &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: typeStr, NameVal: typeStr, }, diff --git a/processor/probabilisticsamplerprocessor/config.go b/processor/probabilisticsamplerprocessor/config.go index 12a2407b0af..ed7eccfa90c 100644 --- a/processor/probabilisticsamplerprocessor/config.go +++ b/processor/probabilisticsamplerprocessor/config.go @@ -14,11 +14,13 @@ package probabilisticsamplerprocessor -import "go.opentelemetry.io/collector/config/configmodels" +import ( + "go.opentelemetry.io/collector/config" +) // Config has the configuration guiding the trace sampler processor. type Config struct { - configmodels.ProcessorSettings `mapstructure:",squash"` + config.ProcessorSettings `mapstructure:",squash"` // SamplingPercentage is the percentage rate at which traces are going to be sampled. Defaults to zero, i.e.: no sample. // Values greater or equal 100 are treated as "sample all traces". SamplingPercentage float32 `mapstructure:"sampling_percentage"` diff --git a/processor/probabilisticsamplerprocessor/config_test.go b/processor/probabilisticsamplerprocessor/config_test.go index b47db105ff5..cc5676a19f4 100644 --- a/processor/probabilisticsamplerprocessor/config_test.go +++ b/processor/probabilisticsamplerprocessor/config_test.go @@ -23,7 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" ) @@ -41,7 +41,7 @@ func TestLoadConfig(t *testing.T) { p0 := cfg.Processors["probabilistic_sampler"] assert.Equal(t, p0, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: "probabilistic_sampler", NameVal: "probabilistic_sampler", }, diff --git a/processor/probabilisticsamplerprocessor/factory.go b/processor/probabilisticsamplerprocessor/factory.go index c9ea05c7d8b..f0cfef8b4dd 100644 --- a/processor/probabilisticsamplerprocessor/factory.go +++ b/processor/probabilisticsamplerprocessor/factory.go @@ -18,7 +18,7 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/processor/processorhelper" ) @@ -36,9 +36,9 @@ func NewFactory() component.ProcessorFactory { processorhelper.WithTraces(createTraceProcessor)) } -func createDefaultConfig() configmodels.Processor { +func createDefaultConfig() config.Processor { return &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -49,7 +49,7 @@ func createDefaultConfig() configmodels.Processor { func createTraceProcessor( _ context.Context, _ component.ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { oCfg := cfg.(*Config) diff --git a/processor/processorhelper/factory.go b/processor/processorhelper/factory.go index 2cc5c56ebb5..cd7dd16ac8e 100644 --- a/processor/processorhelper/factory.go +++ b/processor/processorhelper/factory.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/viper" "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" ) @@ -29,19 +29,19 @@ import ( type FactoryOption func(o *factory) // CreateDefaultConfig is the equivalent of component.ProcessorFactory.CreateDefaultConfig() -type CreateDefaultConfig func() configmodels.Processor +type CreateDefaultConfig func() config.Processor // CreateTraceProcessor is the equivalent of component.ProcessorFactory.CreateTracesProcessor() -type CreateTraceProcessor func(context.Context, component.ProcessorCreateParams, configmodels.Processor, consumer.Traces) (component.TracesProcessor, error) +type CreateTraceProcessor func(context.Context, component.ProcessorCreateParams, config.Processor, consumer.Traces) (component.TracesProcessor, error) // CreateMetricsProcessor is the equivalent of component.ProcessorFactory.CreateMetricsProcessor() -type CreateMetricsProcessor func(context.Context, component.ProcessorCreateParams, configmodels.Processor, consumer.Metrics) (component.MetricsProcessor, error) +type CreateMetricsProcessor func(context.Context, component.ProcessorCreateParams, config.Processor, consumer.Metrics) (component.MetricsProcessor, error) // CreateLogsProcessor is the equivalent of component.ProcessorFactory.CreateLogsProcessor() -type CreateLogsProcessor func(context.Context, component.ProcessorCreateParams, configmodels.Processor, consumer.Logs) (component.LogsProcessor, error) +type CreateLogsProcessor func(context.Context, component.ProcessorCreateParams, config.Processor, consumer.Logs) (component.LogsProcessor, error) type factory struct { - cfgType configmodels.Type + cfgType config.Type customUnmarshaler component.CustomUnmarshaler createDefaultConfig CreateDefaultConfig createTraceProcessor CreateTraceProcessor @@ -79,7 +79,7 @@ func WithLogs(createLogsProcessor CreateLogsProcessor) FactoryOption { // NewFactory returns a component.ProcessorFactory. func NewFactory( - cfgType configmodels.Type, + cfgType config.Type, createDefaultConfig CreateDefaultConfig, options ...FactoryOption) component.ProcessorFactory { f := &factory{ @@ -99,12 +99,12 @@ func NewFactory( } // Type gets the type of the Processor config created by this factory. -func (f *factory) Type() configmodels.Type { +func (f *factory) Type() config.Type { return f.cfgType } // CreateDefaultConfig creates the default configuration for processor. -func (f *factory) CreateDefaultConfig() configmodels.Processor { +func (f *factory) CreateDefaultConfig() config.Processor { return f.createDefaultConfig() } @@ -112,7 +112,7 @@ func (f *factory) CreateDefaultConfig() configmodels.Processor { func (f *factory) CreateTracesProcessor( ctx context.Context, params component.ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { if f.createTraceProcessor != nil { @@ -125,7 +125,7 @@ func (f *factory) CreateTracesProcessor( func (f *factory) CreateMetricsProcessor( ctx context.Context, params component.ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { if f.createMetricsProcessor != nil { @@ -138,7 +138,7 @@ func (f *factory) CreateMetricsProcessor( func (f *factory) CreateLogsProcessor( ctx context.Context, params component.ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Logs, ) (component.LogsProcessor, error) { if f.createLogsProcessor != nil { diff --git a/processor/processorhelper/factory_test.go b/processor/processorhelper/factory_test.go index 03e7960aa8b..6bc5651190f 100644 --- a/processor/processorhelper/factory_test.go +++ b/processor/processorhelper/factory_test.go @@ -23,13 +23,13 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" ) const typeStr = "test" -var defaultCfg = &configmodels.ProcessorSettings{ +var defaultCfg = &config.ProcessorSettings{ TypeVal: typeStr, NameVal: typeStr, } @@ -75,19 +75,19 @@ func TestNewMetrics_WithConstructors(t *testing.T) { assert.NoError(t, err) } -func defaultConfig() configmodels.Processor { +func defaultConfig() config.Processor { return defaultCfg } -func createTraceProcessor(context.Context, component.ProcessorCreateParams, configmodels.Processor, consumer.Traces) (component.TracesProcessor, error) { +func createTraceProcessor(context.Context, component.ProcessorCreateParams, config.Processor, consumer.Traces) (component.TracesProcessor, error) { return nil, nil } -func createMetricsProcessor(context.Context, component.ProcessorCreateParams, configmodels.Processor, consumer.Metrics) (component.MetricsProcessor, error) { +func createMetricsProcessor(context.Context, component.ProcessorCreateParams, config.Processor, consumer.Metrics) (component.MetricsProcessor, error) { return nil, nil } -func createLogsProcessor(context.Context, component.ProcessorCreateParams, configmodels.Processor, consumer.Logs) (component.LogsProcessor, error) { +func createLogsProcessor(context.Context, component.ProcessorCreateParams, config.Processor, consumer.Logs) (component.LogsProcessor, error) { return nil, nil } diff --git a/processor/processorhelper/processor.go b/processor/processorhelper/processor.go index 54d40a968ff..c505e36e528 100644 --- a/processor/processorhelper/processor.go +++ b/processor/processorhelper/processor.go @@ -23,7 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenterror" "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/pdata" "go.opentelemetry.io/collector/obsreport" @@ -149,7 +149,7 @@ func (tp *tracesProcessor) ConsumeTraces(ctx context.Context, td pdata.Traces) e // NewTraceProcessor creates a TracesProcessor that ensure context propagation and the right tags are set. // TODO: Add observability metrics support func NewTraceProcessor( - config configmodels.Processor, + config config.Processor, nextConsumer consumer.Traces, processor TProcessor, options ...Option, @@ -193,7 +193,7 @@ func (mp *metricsProcessor) ConsumeMetrics(ctx context.Context, md pdata.Metrics // NewMetricsProcessor creates a MetricsProcessor that ensure context propagation and the right tags are set. // TODO: Add observability metrics support func NewMetricsProcessor( - config configmodels.Processor, + config config.Processor, nextConsumer consumer.Metrics, processor MProcessor, options ...Option, @@ -234,7 +234,7 @@ func (lp *logProcessor) ConsumeLogs(ctx context.Context, ld pdata.Logs) error { // NewLogsProcessor creates a LogsProcessor that ensure context propagation and the right tags are set. // TODO: Add observability metrics support func NewLogsProcessor( - config configmodels.Processor, + config config.Processor, nextConsumer consumer.Logs, processor LProcessor, options ...Option, diff --git a/processor/processorhelper/processor_test.go b/processor/processorhelper/processor_test.go index ae5fe637c04..dba91f65fc5 100644 --- a/processor/processorhelper/processor_test.go +++ b/processor/processorhelper/processor_test.go @@ -25,7 +25,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenterror" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" @@ -33,7 +33,7 @@ import ( const testFullName = "testFullName" -var testCfg = &configmodels.ProcessorSettings{ +var testCfg = &config.ProcessorSettings{ TypeVal: testFullName, NameVal: testFullName, } diff --git a/processor/resourceprocessor/config.go b/processor/resourceprocessor/config.go index ed578f533c6..15cb3c7bb95 100644 --- a/processor/resourceprocessor/config.go +++ b/processor/resourceprocessor/config.go @@ -15,13 +15,13 @@ package resourceprocessor import ( - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/processor/processorhelper" ) // Config defines configuration for Resource processor. type Config struct { - configmodels.ProcessorSettings `mapstructure:",squash"` + config.ProcessorSettings `mapstructure:",squash"` // AttributesActions specifies the list of actions to be applied on resource attributes. // The set of actions are {INSERT, UPDATE, UPSERT, DELETE, HASH, EXTRACT}. diff --git a/processor/resourceprocessor/config_test.go b/processor/resourceprocessor/config_test.go index 45b98025156..357ef7f944e 100644 --- a/processor/resourceprocessor/config_test.go +++ b/processor/resourceprocessor/config_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/processor/processorhelper" ) @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { assert.NotNil(t, cfg) assert.Equal(t, cfg.Processors["resource"], &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: "resource", NameVal: "resource", }, @@ -49,7 +49,7 @@ func TestLoadConfig(t *testing.T) { }) assert.Equal(t, cfg.Processors["resource/invalid"], &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: "resource", NameVal: "resource/invalid", }, diff --git a/processor/resourceprocessor/factory.go b/processor/resourceprocessor/factory.go index 5aab38b1b0d..478978d8eec 100644 --- a/processor/resourceprocessor/factory.go +++ b/processor/resourceprocessor/factory.go @@ -19,7 +19,7 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/processor/processorhelper" ) @@ -42,9 +42,9 @@ func NewFactory() component.ProcessorFactory { } // Note: This isn't a valid configuration because the processor would do no work. -func createDefaultConfig() configmodels.Processor { +func createDefaultConfig() config.Processor { return &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -54,7 +54,7 @@ func createDefaultConfig() configmodels.Processor { func createTraceProcessor( _ context.Context, _ component.ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Traces) (component.TracesProcessor, error) { attrProc, err := createAttrProcessor(cfg.(*Config)) if err != nil { @@ -70,7 +70,7 @@ func createTraceProcessor( func createMetricsProcessor( _ context.Context, _ component.ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Metrics) (component.MetricsProcessor, error) { attrProc, err := createAttrProcessor(cfg.(*Config)) if err != nil { @@ -86,7 +86,7 @@ func createMetricsProcessor( func createLogsProcessor( _ context.Context, _ component.ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Logs) (component.LogsProcessor, error) { attrProc, err := createAttrProcessor(cfg.(*Config)) if err != nil { diff --git a/processor/resourceprocessor/factory_test.go b/processor/resourceprocessor/factory_test.go index 78d503b1a72..8626e4d62f6 100644 --- a/processor/resourceprocessor/factory_test.go +++ b/processor/resourceprocessor/factory_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/processor/processorhelper" ) @@ -37,7 +37,7 @@ func TestCreateDefaultConfig(t *testing.T) { func TestCreateProcessor(t *testing.T) { factory := NewFactory() cfg := &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: "resource", NameVal: "resource", }, @@ -69,7 +69,7 @@ func TestInvalidEmptyActions(t *testing.T) { func TestInvalidAttributeActions(t *testing.T) { factory := NewFactory() cfg := &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: "resource", NameVal: "resource", }, diff --git a/processor/resourceprocessor/resource_processor_test.go b/processor/resourceprocessor/resource_processor_test.go index 50eccd0d79a..9eb1b2792d3 100644 --- a/processor/resourceprocessor/resource_processor_test.go +++ b/processor/resourceprocessor/resource_processor_test.go @@ -22,14 +22,14 @@ 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" "go.opentelemetry.io/collector/internal/testdata" "go.opentelemetry.io/collector/processor/processorhelper" ) var ( - processorSettings = configmodels.ProcessorSettings{ + processorSettings = config.ProcessorSettings{ TypeVal: "resource", NameVal: "resource", } diff --git a/processor/spanprocessor/config.go b/processor/spanprocessor/config.go index eadd9f6f904..591579b56c2 100644 --- a/processor/spanprocessor/config.go +++ b/processor/spanprocessor/config.go @@ -15,7 +15,7 @@ package spanprocessor import ( - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/internal/processor/filterconfig" ) @@ -24,7 +24,7 @@ import ( // the include properties and then the exclude properties if they are specified. // This determines if a span is to be processed or not. type Config struct { - configmodels.ProcessorSettings `mapstructure:",squash"` + config.ProcessorSettings `mapstructure:",squash"` filterconfig.MatchConfig `mapstructure:",squash"` diff --git a/processor/spanprocessor/config_test.go b/processor/spanprocessor/config_test.go index 2f954854c26..bdffbd736d3 100644 --- a/processor/spanprocessor/config_test.go +++ b/processor/spanprocessor/config_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/internal/processor/filterconfig" "go.opentelemetry.io/collector/internal/processor/filterset" @@ -41,7 +41,7 @@ func TestLoadConfig(t *testing.T) { p0 := cfg.Processors["span/custom"] assert.Equal(t, p0, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: typeStr, NameVal: "span/custom", }, @@ -53,7 +53,7 @@ func TestLoadConfig(t *testing.T) { p1 := cfg.Processors["span/no-separator"] assert.Equal(t, p1, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: typeStr, NameVal: "span/no-separator", }, @@ -65,7 +65,7 @@ func TestLoadConfig(t *testing.T) { p2 := cfg.Processors["span/to_attributes"] assert.Equal(t, p2, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: typeStr, NameVal: "span/to_attributes", }, @@ -78,7 +78,7 @@ func TestLoadConfig(t *testing.T) { p3 := cfg.Processors["span/includeexclude"] assert.Equal(t, p3, &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: typeStr, NameVal: "span/includeexclude", }, diff --git a/processor/spanprocessor/factory.go b/processor/spanprocessor/factory.go index 6271490e6bb..1d039a5351b 100644 --- a/processor/spanprocessor/factory.go +++ b/processor/spanprocessor/factory.go @@ -19,7 +19,7 @@ import ( "errors" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/processor/processorhelper" ) @@ -45,9 +45,9 @@ func NewFactory() component.ProcessorFactory { processorhelper.WithTraces(createTraceProcessor)) } -func createDefaultConfig() configmodels.Processor { +func createDefaultConfig() config.Processor { return &Config{ - ProcessorSettings: configmodels.ProcessorSettings{ + ProcessorSettings: config.ProcessorSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -57,7 +57,7 @@ func createDefaultConfig() configmodels.Processor { func createTraceProcessor( _ context.Context, _ component.ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { diff --git a/processor/spanprocessor/factory_test.go b/processor/spanprocessor/factory_test.go index 692795dd359..7a41a7d046e 100644 --- a/processor/spanprocessor/factory_test.go +++ b/processor/spanprocessor/factory_test.go @@ -24,15 +24,15 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/config/configerror" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/consumer/consumertest" ) func TestFactory_Type(t *testing.T) { factory := NewFactory() - assert.Equal(t, factory.Type(), configmodels.Type(typeStr)) + assert.Equal(t, factory.Type(), config.Type(typeStr)) } func TestFactory_CreateDefaultConfig(t *testing.T) { @@ -42,7 +42,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { // Check the values of the default configuration. assert.NotNil(t, cfg) - assert.Equal(t, configmodels.Type(typeStr), cfg.Type()) + assert.Equal(t, config.Type(typeStr), cfg.Type()) assert.Equal(t, typeStr, cfg.Name()) } diff --git a/receiver/fluentforwardreceiver/config.go b/receiver/fluentforwardreceiver/config.go index 37af82ae14f..c54fe27c50f 100644 --- a/receiver/fluentforwardreceiver/config.go +++ b/receiver/fluentforwardreceiver/config.go @@ -15,12 +15,12 @@ package fluentforwardreceiver import ( - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" ) // Config defines configuration for the SignalFx receiver. type Config struct { - configmodels.ReceiverSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + config.ReceiverSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct // The address to listen on for incoming Fluent Forward events. Should be // of the form `:` (TCP) or `unix://` (Unix diff --git a/receiver/fluentforwardreceiver/config_test.go b/receiver/fluentforwardreceiver/config_test.go index 1ab081e63d6..a0ccc4adacd 100644 --- a/receiver/fluentforwardreceiver/config_test.go +++ b/receiver/fluentforwardreceiver/config_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" ) @@ -31,7 +31,7 @@ func TestLoadConfig(t *testing.T) { assert.Nil(t, err) factory := NewFactory() - factories.Receivers[configmodels.Type(typeStr)] = factory + factories.Receivers[config.Type(typeStr)] = factory cfg, err := configtest.LoadConfigFile( t, path.Join(".", "testdata", "config.yaml"), factories, ) diff --git a/receiver/fluentforwardreceiver/factory.go b/receiver/fluentforwardreceiver/factory.go index 965a5fa27a9..33b0757a422 100644 --- a/receiver/fluentforwardreceiver/factory.go +++ b/receiver/fluentforwardreceiver/factory.go @@ -18,7 +18,7 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" ) @@ -36,9 +36,9 @@ func NewFactory() component.ReceiverFactory { receiverhelper.WithLogs(createLogsReceiver)) } -func createDefaultConfig() configmodels.Receiver { +func createDefaultConfig() config.Receiver { return &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -48,7 +48,7 @@ func createDefaultConfig() configmodels.Receiver { func createLogsReceiver( _ context.Context, params component.ReceiverCreateParams, - cfg configmodels.Receiver, + cfg config.Receiver, consumer consumer.Logs, ) (component.LogsReceiver, error) { diff --git a/receiver/fluentforwardreceiver/factory_test.go b/receiver/fluentforwardreceiver/factory_test.go index 9b6581465c0..0649eff12bf 100644 --- a/receiver/fluentforwardreceiver/factory_test.go +++ b/receiver/fluentforwardreceiver/factory_test.go @@ -23,8 +23,8 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -40,7 +40,7 @@ func TestCreateReceiver(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.ListenAddress = "localhost:0" // Endpoint is required, not going to be used here. - require.Equal(t, configmodels.Type("fluentforward"), factory.Type()) + require.Equal(t, config.Type("fluentforward"), factory.Type()) tReceiver, err := factory.CreateLogsReceiver(context.Background(), component.ReceiverCreateParams{Logger: zap.NewNop()}, cfg, consumertest.NewLogsNop()) assert.Nil(t, err, "receiver creation failed") diff --git a/receiver/hostmetricsreceiver/config_test.go b/receiver/hostmetricsreceiver/config_test.go index 6664cad4bb2..171bd1ce6ca 100644 --- a/receiver/hostmetricsreceiver/config_test.go +++ b/receiver/hostmetricsreceiver/config_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/internal/processor/filterset" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal" @@ -63,7 +63,7 @@ func TestLoadConfig(t *testing.T) { r1 := cfg.Receivers["hostmetrics/customname"].(*Config) expectedConfig := &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "hostmetrics/customname", }, diff --git a/receiver/hostmetricsreceiver/factory.go b/receiver/hostmetricsreceiver/factory.go index d68d1e41378..e19a4f172b2 100644 --- a/receiver/hostmetricsreceiver/factory.go +++ b/receiver/hostmetricsreceiver/factory.go @@ -25,7 +25,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/scraper/cpuscraper" @@ -136,7 +135,7 @@ func getScraperFactory(key string) (internal.BaseFactory, bool) { } // createDefaultConfig creates the default configuration for receiver. -func createDefaultConfig() configmodels.Receiver { +func createDefaultConfig() config.Receiver { return &Config{ScraperControllerSettings: scraperhelper.DefaultScraperControllerSettings(typeStr)} } @@ -144,7 +143,7 @@ func createDefaultConfig() configmodels.Receiver { func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateParams, - cfg configmodels.Receiver, + cfg config.Receiver, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { oCfg := cfg.(*Config) diff --git a/receiver/hostmetricsreceiver/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/metadata/generated_metrics.go index 479dcea18f4..cfc7373706c 100644 --- a/receiver/hostmetricsreceiver/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/metadata/generated_metrics.go @@ -17,12 +17,12 @@ package metadata import ( - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/pdata" ) // Type is the component type name. -const Type configmodels.Type = "hostmetricsreceiver" +const Type config.Type = "hostmetricsreceiver" // MetricIntf is an interface to generically interact with generated metric. type MetricIntf interface { diff --git a/receiver/jaegerreceiver/config.go b/receiver/jaegerreceiver/config.go index 8df7bee3fe8..4efa9658c14 100644 --- a/receiver/jaegerreceiver/config.go +++ b/receiver/jaegerreceiver/config.go @@ -15,9 +15,9 @@ package jaegerreceiver import ( + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" ) const ( @@ -68,7 +68,7 @@ func DefaultServerConfigUDP() ServerConfigUDP { // Config defines configuration for Jaeger receiver. type Config struct { - configmodels.ReceiverSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct - Protocols `mapstructure:"protocols"` - RemoteSampling *RemoteSamplingConfig `mapstructure:"remote_sampling"` + config.ReceiverSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + Protocols `mapstructure:"protocols"` + RemoteSampling *RemoteSamplingConfig `mapstructure:"remote_sampling"` } diff --git a/receiver/jaegerreceiver/config_test.go b/receiver/jaegerreceiver/config_test.go index c105ce5b328..6fd333d4d17 100644 --- a/receiver/jaegerreceiver/config_test.go +++ b/receiver/jaegerreceiver/config_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/config/configtls" @@ -46,7 +46,7 @@ func TestLoadConfig(t *testing.T) { r1 := cfg.Receivers["jaeger/customname"].(*Config) assert.Equal(t, r1, &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "jaeger/customname", }, @@ -91,7 +91,7 @@ func TestLoadConfig(t *testing.T) { rDefaults := cfg.Receivers["jaeger/defaults"].(*Config) assert.Equal(t, rDefaults, &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "jaeger/defaults", }, @@ -119,7 +119,7 @@ func TestLoadConfig(t *testing.T) { rMixed := cfg.Receivers["jaeger/mixed"].(*Config) assert.Equal(t, rMixed, &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "jaeger/mixed", }, @@ -141,7 +141,7 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, tlsConfig, &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "jaeger/tls", }, diff --git a/receiver/jaegerreceiver/factory.go b/receiver/jaegerreceiver/factory.go index ca66ff52b5c..3fd506b7d36 100644 --- a/receiver/jaegerreceiver/factory.go +++ b/receiver/jaegerreceiver/factory.go @@ -29,7 +29,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" @@ -113,9 +112,9 @@ func customUnmarshaler(componentViperSection *viper.Viper, intoCfg interface{}) } // CreateDefaultConfig creates the default configuration for Jaeger receiver. -func createDefaultConfig() configmodels.Receiver { +func createDefaultConfig() config.Receiver { return &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -145,7 +144,7 @@ func createDefaultConfig() configmodels.Receiver { func createTraceReceiver( _ context.Context, params component.ReceiverCreateParams, - cfg configmodels.Receiver, + cfg config.Receiver, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { diff --git a/receiver/kafkareceiver/config.go b/receiver/kafkareceiver/config.go index fe03de1bb45..3e1050ce25a 100644 --- a/receiver/kafkareceiver/config.go +++ b/receiver/kafkareceiver/config.go @@ -15,13 +15,13 @@ package kafkareceiver import ( - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/kafkaexporter" ) // Config defines configuration for Kafka receiver. type Config struct { - configmodels.ReceiverSettings `mapstructure:",squash"` + config.ReceiverSettings `mapstructure:",squash"` // The list of kafka brokers (default localhost:9092) Brokers []string `mapstructure:"brokers"` // Kafka protocol version diff --git a/receiver/kafkareceiver/config_test.go b/receiver/kafkareceiver/config_test.go index ca9ef1ac524..4d09dca5625 100644 --- a/receiver/kafkareceiver/config_test.go +++ b/receiver/kafkareceiver/config_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/exporter/kafkaexporter" @@ -41,7 +41,7 @@ func TestLoadConfig(t *testing.T) { r := cfg.Receivers[typeStr].(*Config) assert.Equal(t, &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ NameVal: typeStr, TypeVal: typeStr, }, diff --git a/receiver/kafkareceiver/factory.go b/receiver/kafkareceiver/factory.go index b5a28ee3a8f..5bc33f4b38e 100644 --- a/receiver/kafkareceiver/factory.go +++ b/receiver/kafkareceiver/factory.go @@ -19,7 +19,7 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/exporter/kafkaexporter" "go.opentelemetry.io/collector/receiver/receiverhelper" @@ -67,9 +67,9 @@ func NewFactory(options ...FactoryOption) component.ReceiverFactory { receiverhelper.WithTraces(f.createTraceReceiver)) } -func createDefaultConfig() configmodels.Receiver { +func createDefaultConfig() config.Receiver { return &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -95,7 +95,7 @@ type kafkaReceiverFactory struct { func (f *kafkaReceiverFactory) createTraceReceiver( _ context.Context, params component.ReceiverCreateParams, - cfg configmodels.Receiver, + cfg config.Receiver, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { c := cfg.(*Config) diff --git a/receiver/opencensusreceiver/config.go b/receiver/opencensusreceiver/config.go index 52be610bd15..fbe379a3f5c 100644 --- a/receiver/opencensusreceiver/config.go +++ b/receiver/opencensusreceiver/config.go @@ -15,13 +15,13 @@ package opencensusreceiver import ( + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configmodels" ) // Config defines configuration for OpenCensus receiver. type Config struct { - configmodels.ReceiverSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + config.ReceiverSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct // Configures the receiver server protocol. configgrpc.GRPCServerSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct diff --git a/receiver/opencensusreceiver/config_test.go b/receiver/opencensusreceiver/config_test.go index acd8ae2d413..2937b9761b7 100644 --- a/receiver/opencensusreceiver/config_test.go +++ b/receiver/opencensusreceiver/config_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/config/configtls" @@ -49,7 +49,7 @@ func TestLoadConfig(t *testing.T) { r1 := cfg.Receivers["opencensus/customname"].(*Config) assert.Equal(t, r1, &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "opencensus/customname", }, @@ -65,7 +65,7 @@ func TestLoadConfig(t *testing.T) { r2 := cfg.Receivers["opencensus/keepalive"].(*Config) assert.Equal(t, r2, &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "opencensus/keepalive", }, @@ -94,7 +94,7 @@ func TestLoadConfig(t *testing.T) { r3 := cfg.Receivers["opencensus/msg-size-conc-connect-max-idle"].(*Config) assert.Equal(t, r3, &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "opencensus/msg-size-conc-connect-max-idle", }, @@ -120,7 +120,7 @@ func TestLoadConfig(t *testing.T) { r4 := cfg.Receivers["opencensus/tlscredentials"].(*Config) assert.Equal(t, r4, &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "opencensus/tlscredentials", }, @@ -142,7 +142,7 @@ func TestLoadConfig(t *testing.T) { r5 := cfg.Receivers["opencensus/cors"].(*Config) assert.Equal(t, r5, &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "opencensus/cors", }, @@ -159,7 +159,7 @@ func TestLoadConfig(t *testing.T) { r6 := cfg.Receivers["opencensus/uds"].(*Config) assert.Equal(t, r6, &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "opencensus/uds", }, @@ -175,7 +175,7 @@ func TestLoadConfig(t *testing.T) { func TestBuildOptions_TLSCredentials(t *testing.T) { cfg := Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ NameVal: "IncorrectTLS", }, GRPCServerSettings: configgrpc.GRPCServerSettings{ diff --git a/receiver/opencensusreceiver/factory.go b/receiver/opencensusreceiver/factory.go index 02ac5996b50..9eee62ddbba 100644 --- a/receiver/opencensusreceiver/factory.go +++ b/receiver/opencensusreceiver/factory.go @@ -18,8 +18,8 @@ import ( "context" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" @@ -38,9 +38,9 @@ func NewFactory() component.ReceiverFactory { receiverhelper.WithMetrics(createMetricsReceiver)) } -func createDefaultConfig() configmodels.Receiver { +func createDefaultConfig() config.Receiver { return &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -58,7 +58,7 @@ func createDefaultConfig() configmodels.Receiver { func createTraceReceiver( _ context.Context, _ component.ReceiverCreateParams, - cfg configmodels.Receiver, + cfg config.Receiver, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { r, err := createReceiver(cfg) @@ -74,7 +74,7 @@ func createTraceReceiver( func createMetricsReceiver( _ context.Context, _ component.ReceiverCreateParams, - cfg configmodels.Receiver, + cfg config.Receiver, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { r, err := createReceiver(cfg) @@ -87,7 +87,7 @@ func createMetricsReceiver( return r, nil } -func createReceiver(cfg configmodels.Receiver) (*ocReceiver, error) { +func createReceiver(cfg config.Receiver) (*ocReceiver, error) { rCfg := cfg.(*Config) // There must be one receiver for both metrics and traces. We maintain a map of diff --git a/receiver/opencensusreceiver/factory_test.go b/receiver/opencensusreceiver/factory_test.go index fe70a32e447..9536cc3a8f9 100644 --- a/receiver/opencensusreceiver/factory_test.go +++ b/receiver/opencensusreceiver/factory_test.go @@ -25,9 +25,9 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/testutil" @@ -56,7 +56,7 @@ func TestCreateReceiver(t *testing.T) { } func TestCreateTraceReceiver(t *testing.T) { - defaultReceiverSettings := configmodels.ReceiverSettings{ + defaultReceiverSettings := config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, } @@ -82,7 +82,7 @@ func TestCreateTraceReceiver(t *testing.T) { { name: "invalid_port", cfg: &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -125,7 +125,7 @@ func TestCreateTraceReceiver(t *testing.T) { } func TestCreateMetricReceiver(t *testing.T) { - defaultReceiverSettings := configmodels.ReceiverSettings{ + defaultReceiverSettings := config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, } @@ -152,7 +152,7 @@ func TestCreateMetricReceiver(t *testing.T) { { name: "invalid_address", cfg: &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, }, diff --git a/receiver/otlpreceiver/config.go b/receiver/otlpreceiver/config.go index 85d4ca3f48c..25c5a5b05b1 100644 --- a/receiver/otlpreceiver/config.go +++ b/receiver/otlpreceiver/config.go @@ -15,9 +15,9 @@ package otlpreceiver import ( + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" ) type Protocols struct { @@ -27,7 +27,7 @@ type Protocols struct { // Config defines configuration for OTLP receiver. type Config struct { - configmodels.ReceiverSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + config.ReceiverSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct // Protocols is the configuration for the supported protocols, currently gRPC and HTTP (Proto and JSON). Protocols `mapstructure:"protocols"` diff --git a/receiver/otlpreceiver/config_test.go b/receiver/otlpreceiver/config_test.go index 708f79f3912..53f55735aef 100644 --- a/receiver/otlpreceiver/config_test.go +++ b/receiver/otlpreceiver/config_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/config/configtls" @@ -58,7 +58,7 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, cfg.Receivers["otlp/customname"], &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "otlp/customname", }, @@ -75,7 +75,7 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, cfg.Receivers["otlp/keepalive"], &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "otlp/keepalive", }, @@ -105,7 +105,7 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, cfg.Receivers["otlp/msg-size-conc-connect-max-idle"], &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "otlp/msg-size-conc-connect-max-idle", }, @@ -132,7 +132,7 @@ func TestLoadConfig(t *testing.T) { // use of fake cert/key for test purposes. assert.Equal(t, cfg.Receivers["otlp/tlscredentials"], &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "otlp/tlscredentials", }, @@ -164,7 +164,7 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, cfg.Receivers["otlp/cors"], &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "otlp/cors", }, @@ -178,7 +178,7 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, cfg.Receivers["otlp/corsheader"], &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "otlp/corsheader", }, @@ -193,7 +193,7 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, cfg.Receivers["otlp/uds"], &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "otlp/uds", }, diff --git a/receiver/otlpreceiver/factory.go b/receiver/otlpreceiver/factory.go index 9b0afca2f35..a9ec08078ff 100644 --- a/receiver/otlpreceiver/factory.go +++ b/receiver/otlpreceiver/factory.go @@ -26,7 +26,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" @@ -57,9 +56,9 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig creates the default configuration for receiver. -func createDefaultConfig() configmodels.Receiver { +func createDefaultConfig() config.Receiver { return &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -126,7 +125,7 @@ func customUnmarshaler(componentViperSection *viper.Viper, intoCfg interface{}) func createTraceReceiver( ctx context.Context, params component.ReceiverCreateParams, - cfg configmodels.Receiver, + cfg config.Receiver, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { r, err := createReceiver(cfg, params.Logger) @@ -143,7 +142,7 @@ func createTraceReceiver( func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateParams, - cfg configmodels.Receiver, + cfg config.Receiver, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { r, err := createReceiver(cfg, params.Logger) @@ -160,7 +159,7 @@ func createMetricsReceiver( func createLogReceiver( ctx context.Context, params component.ReceiverCreateParams, - cfg configmodels.Receiver, + cfg config.Receiver, consumer consumer.Logs, ) (component.LogsReceiver, error) { r, err := createReceiver(cfg, params.Logger) @@ -173,7 +172,7 @@ func createLogReceiver( return r, nil } -func createReceiver(cfg configmodels.Receiver, logger *zap.Logger) (*otlpReceiver, error) { +func createReceiver(cfg config.Receiver, logger *zap.Logger) (*otlpReceiver, error) { rCfg := cfg.(*Config) // There must be one receiver for both metrics and traces. We maintain a map of diff --git a/receiver/otlpreceiver/factory_test.go b/receiver/otlpreceiver/factory_test.go index d4fb010bbbb..adbed9afe72 100644 --- a/receiver/otlpreceiver/factory_test.go +++ b/receiver/otlpreceiver/factory_test.go @@ -24,10 +24,10 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" @@ -61,7 +61,7 @@ func TestCreateReceiver(t *testing.T) { func TestCreateTraceReceiver(t *testing.T) { factory := NewFactory() - defaultReceiverSettings := configmodels.ReceiverSettings{ + defaultReceiverSettings := config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, } @@ -93,7 +93,7 @@ func TestCreateTraceReceiver(t *testing.T) { { name: "invalid_grpc_port", cfg: &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -112,7 +112,7 @@ func TestCreateTraceReceiver(t *testing.T) { { name: "invalid_http_port", cfg: &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -146,7 +146,7 @@ func TestCreateTraceReceiver(t *testing.T) { func TestCreateMetricReceiver(t *testing.T) { factory := NewFactory() - defaultReceiverSettings := configmodels.ReceiverSettings{ + defaultReceiverSettings := config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, } @@ -178,7 +178,7 @@ func TestCreateMetricReceiver(t *testing.T) { { name: "invalid_grpc_address", cfg: &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -197,7 +197,7 @@ func TestCreateMetricReceiver(t *testing.T) { { name: "invalid_http_address", cfg: &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -231,7 +231,7 @@ func TestCreateMetricReceiver(t *testing.T) { func TestCreateLogReceiver(t *testing.T) { factory := NewFactory() - defaultReceiverSettings := configmodels.ReceiverSettings{ + defaultReceiverSettings := config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, } @@ -266,7 +266,7 @@ func TestCreateLogReceiver(t *testing.T) { { name: "invalid_grpc_address", cfg: &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -286,7 +286,7 @@ func TestCreateLogReceiver(t *testing.T) { { name: "invalid_http_address", cfg: &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -303,7 +303,7 @@ func TestCreateLogReceiver(t *testing.T) { { name: "no_next_consumer", cfg: &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -320,7 +320,7 @@ func TestCreateLogReceiver(t *testing.T) { { name: "no_http_or_grcp_config", cfg: &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, }, diff --git a/receiver/otlpreceiver/otlp_test.go b/receiver/otlpreceiver/otlp_test.go index bb8e4266e94..78b9a559b9c 100644 --- a/receiver/otlpreceiver/otlp_test.go +++ b/receiver/otlpreceiver/otlp_test.go @@ -39,9 +39,9 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" @@ -666,7 +666,7 @@ func TestOTLPReceiverTrace_HandleNextConsumerResponse(t *testing.T) { func TestGRPCInvalidTLSCredentials(t *testing.T) { cfg := &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ NameVal: "IncorrectTLS", }, Protocols: Protocols{ @@ -692,7 +692,7 @@ func TestGRPCInvalidTLSCredentials(t *testing.T) { func TestHTTPInvalidTLSCredentials(t *testing.T) { cfg := &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ NameVal: "IncorrectTLS", }, Protocols: Protocols{ diff --git a/receiver/prometheusreceiver/config.go b/receiver/prometheusreceiver/config.go index 992ceb59269..d63745eeae3 100644 --- a/receiver/prometheusreceiver/config.go +++ b/receiver/prometheusreceiver/config.go @@ -19,17 +19,17 @@ import ( "github.com/prometheus/prometheus/config" - "go.opentelemetry.io/collector/config/configmodels" + config2 "go.opentelemetry.io/collector/config" ) // Config defines configuration for Prometheus receiver. type Config struct { - configmodels.ReceiverSettings `mapstructure:",squash"` - PrometheusConfig *config.Config `mapstructure:"-"` - BufferPeriod time.Duration `mapstructure:"buffer_period"` - BufferCount int `mapstructure:"buffer_count"` - UseStartTimeMetric bool `mapstructure:"use_start_time_metric"` - StartTimeMetricRegex string `mapstructure:"start_time_metric_regex"` + config2.ReceiverSettings `mapstructure:",squash"` + PrometheusConfig *config.Config `mapstructure:"-"` + BufferPeriod time.Duration `mapstructure:"buffer_period"` + BufferCount int `mapstructure:"buffer_count"` + UseStartTimeMetric bool `mapstructure:"use_start_time_metric"` + StartTimeMetricRegex string `mapstructure:"start_time_metric_regex"` // ConfigPlaceholder is just an entry to make the configuration pass a check // that requires that all keys present in the config actually exist on the diff --git a/receiver/prometheusreceiver/config_test.go b/receiver/prometheusreceiver/config_test.go index 4a8d73c4d95..0affb5a19c6 100644 --- a/receiver/prometheusreceiver/config_test.go +++ b/receiver/prometheusreceiver/config_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" ) @@ -47,7 +47,7 @@ func TestLoadConfig(t *testing.T) { r1 := cfg.Receivers["prometheus/customname"].(*Config) assert.Equal(t, r1.ReceiverSettings, - configmodels.ReceiverSettings{ + config.ReceiverSettings{ TypeVal: typeStr, NameVal: "prometheus/customname", }) @@ -73,7 +73,7 @@ func TestLoadConfigWithEnvVar(t *testing.T) { r := cfg.Receivers["prometheus"].(*Config) assert.Equal(t, r.ReceiverSettings, - configmodels.ReceiverSettings{ + config.ReceiverSettings{ TypeVal: typeStr, NameVal: "prometheus", }) @@ -98,7 +98,7 @@ func TestLoadConfigK8s(t *testing.T) { r := cfg.Receivers["prometheus"].(*Config) assert.Equal(t, r.ReceiverSettings, - configmodels.ReceiverSettings{ + config.ReceiverSettings{ TypeVal: typeStr, NameVal: "prometheus", }) diff --git a/receiver/prometheusreceiver/factory.go b/receiver/prometheusreceiver/factory.go index 3e3f58d5157..c195497ce73 100644 --- a/receiver/prometheusreceiver/factory.go +++ b/receiver/prometheusreceiver/factory.go @@ -26,7 +26,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" ) @@ -87,9 +86,9 @@ func customUnmarshaler(componentViperSection *viper.Viper, intoCfg interface{}) return nil } -func createDefaultConfig() configmodels.Receiver { +func createDefaultConfig() config.Receiver { return &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -99,7 +98,7 @@ func createDefaultConfig() configmodels.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateParams, - cfg configmodels.Receiver, + cfg config.Receiver, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { config := cfg.(*Config) diff --git a/receiver/receiverhelper/factory.go b/receiver/receiverhelper/factory.go index f583aabfbc1..f902273ed5d 100644 --- a/receiver/receiverhelper/factory.go +++ b/receiver/receiverhelper/factory.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/viper" "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" ) @@ -57,19 +57,19 @@ func WithLogs(createLogsReceiver CreateLogsReceiver) FactoryOption { } // CreateDefaultConfig is the equivalent of component.ReceiverFactory.CreateDefaultConfig() -type CreateDefaultConfig func() configmodels.Receiver +type CreateDefaultConfig func() config.Receiver // CreateTraceReceiver is the equivalent of component.ReceiverFactory.CreateTracesReceiver() -type CreateTraceReceiver func(context.Context, component.ReceiverCreateParams, configmodels.Receiver, consumer.Traces) (component.TracesReceiver, error) +type CreateTraceReceiver func(context.Context, component.ReceiverCreateParams, config.Receiver, consumer.Traces) (component.TracesReceiver, error) // CreateMetricsReceiver is the equivalent of component.ReceiverFactory.CreateMetricsReceiver() -type CreateMetricsReceiver func(context.Context, component.ReceiverCreateParams, configmodels.Receiver, consumer.Metrics) (component.MetricsReceiver, error) +type CreateMetricsReceiver func(context.Context, component.ReceiverCreateParams, config.Receiver, consumer.Metrics) (component.MetricsReceiver, error) // CreateLogsReceiver is the equivalent of component.ReceiverFactory.CreateLogsReceiver() -type CreateLogsReceiver func(context.Context, component.ReceiverCreateParams, configmodels.Receiver, consumer.Logs) (component.LogsReceiver, error) +type CreateLogsReceiver func(context.Context, component.ReceiverCreateParams, config.Receiver, consumer.Logs) (component.LogsReceiver, error) type factory struct { - cfgType configmodels.Type + cfgType config.Type customUnmarshaler component.CustomUnmarshaler createDefaultConfig CreateDefaultConfig createTraceReceiver CreateTraceReceiver @@ -79,7 +79,7 @@ type factory struct { // NewFactory returns a component.ReceiverFactory. func NewFactory( - cfgType configmodels.Type, + cfgType config.Type, createDefaultConfig CreateDefaultConfig, options ...FactoryOption) component.ReceiverFactory { f := &factory{ @@ -99,12 +99,12 @@ func NewFactory( } // Type gets the type of the Receiver config created by this factory. -func (f *factory) Type() configmodels.Type { +func (f *factory) Type() config.Type { return f.cfgType } // CreateDefaultConfig creates the default configuration for receiver. -func (f *factory) CreateDefaultConfig() configmodels.Receiver { +func (f *factory) CreateDefaultConfig() config.Receiver { return f.createDefaultConfig() } @@ -112,7 +112,7 @@ func (f *factory) CreateDefaultConfig() configmodels.Receiver { func (f *factory) CreateTracesReceiver( ctx context.Context, params component.ReceiverCreateParams, - cfg configmodels.Receiver, + cfg config.Receiver, nextConsumer consumer.Traces) (component.TracesReceiver, error) { if f.createTraceReceiver != nil { return f.createTraceReceiver(ctx, params, cfg, nextConsumer) @@ -124,7 +124,7 @@ func (f *factory) CreateTracesReceiver( func (f *factory) CreateMetricsReceiver( ctx context.Context, params component.ReceiverCreateParams, - cfg configmodels.Receiver, + cfg config.Receiver, nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { if f.createMetricsReceiver != nil { return f.createMetricsReceiver(ctx, params, cfg, nextConsumer) @@ -136,7 +136,7 @@ func (f *factory) CreateMetricsReceiver( func (f *factory) CreateLogsReceiver( ctx context.Context, params component.ReceiverCreateParams, - cfg configmodels.Receiver, + cfg config.Receiver, nextConsumer consumer.Logs, ) (component.LogsReceiver, error) { if f.createLogsReceiver != nil { diff --git a/receiver/receiverhelper/factory_test.go b/receiver/receiverhelper/factory_test.go index 9a7ceecbdf5..900fee3af34 100644 --- a/receiver/receiverhelper/factory_test.go +++ b/receiver/receiverhelper/factory_test.go @@ -23,13 +23,13 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" ) const typeStr = "test" -var defaultCfg = &configmodels.ReceiverSettings{ +var defaultCfg = &config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, } @@ -75,19 +75,19 @@ func TestNewFactory_WithConstructors(t *testing.T) { assert.NoError(t, err) } -func defaultConfig() configmodels.Receiver { +func defaultConfig() config.Receiver { return defaultCfg } -func createTraceReceiver(context.Context, component.ReceiverCreateParams, configmodels.Receiver, consumer.Traces) (component.TracesReceiver, error) { +func createTraceReceiver(context.Context, component.ReceiverCreateParams, config.Receiver, consumer.Traces) (component.TracesReceiver, error) { return nil, nil } -func createMetricsReceiver(context.Context, component.ReceiverCreateParams, configmodels.Receiver, consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(context.Context, component.ReceiverCreateParams, config.Receiver, consumer.Metrics) (component.MetricsReceiver, error) { return nil, nil } -func createLogsReceiver(context.Context, component.ReceiverCreateParams, configmodels.Receiver, consumer.Logs) (component.LogsReceiver, error) { +func createLogsReceiver(context.Context, component.ReceiverCreateParams, config.Receiver, consumer.Logs) (component.LogsReceiver, error) { return nil, nil } diff --git a/receiver/scraperhelper/scrapercontroller.go b/receiver/scraperhelper/scrapercontroller.go index 7758a4ba457..c3f62efab18 100644 --- a/receiver/scraperhelper/scrapercontroller.go +++ b/receiver/scraperhelper/scrapercontroller.go @@ -23,7 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenterror" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/pdata" @@ -35,15 +35,15 @@ import ( // configuration. Scraper controller receivers can embed this struct, instead // of configmodels.ReceiverSettings, and extend it with more fields if needed. type ScraperControllerSettings struct { - configmodels.ReceiverSettings `mapstructure:"squash"` - CollectionInterval time.Duration `mapstructure:"collection_interval"` + config.ReceiverSettings `mapstructure:"squash"` + CollectionInterval time.Duration `mapstructure:"collection_interval"` } // DefaultScraperControllerSettings returns default scraper controller // settings with a collection interval of one minute. -func DefaultScraperControllerSettings(cfgType configmodels.Type) ScraperControllerSettings { +func DefaultScraperControllerSettings(cfgType config.Type) ScraperControllerSettings { return ScraperControllerSettings{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ NameVal: string(cfgType), TypeVal: cfgType, }, diff --git a/receiver/zipkinreceiver/config.go b/receiver/zipkinreceiver/config.go index 9df6c11df11..2914c220b15 100644 --- a/receiver/zipkinreceiver/config.go +++ b/receiver/zipkinreceiver/config.go @@ -15,13 +15,13 @@ package zipkinreceiver import ( + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" ) // Config defines configuration for Zipkin receiver. type Config struct { - configmodels.ReceiverSettings `mapstructure:",squash"` + config.ReceiverSettings `mapstructure:",squash"` // Configures the receiver server protocol. confighttp.HTTPServerSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct diff --git a/receiver/zipkinreceiver/config_test.go b/receiver/zipkinreceiver/config_test.go index e507ad9afe9..879be8e152a 100644 --- a/receiver/zipkinreceiver/config_test.go +++ b/receiver/zipkinreceiver/config_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/configtest" ) @@ -46,7 +46,7 @@ func TestLoadConfig(t *testing.T) { r1 := cfg.Receivers["zipkin/customname"].(*Config) assert.Equal(t, r1, &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "zipkin/customname", }, @@ -58,7 +58,7 @@ func TestLoadConfig(t *testing.T) { r2 := cfg.Receivers["zipkin/parse_strings"].(*Config) assert.Equal(t, r2, &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: "zipkin/parse_strings", }, diff --git a/receiver/zipkinreceiver/factory.go b/receiver/zipkinreceiver/factory.go index 2940323b0c9..cf027a813f0 100644 --- a/receiver/zipkinreceiver/factory.go +++ b/receiver/zipkinreceiver/factory.go @@ -18,8 +18,8 @@ import ( "context" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" ) @@ -43,9 +43,9 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig creates the default configuration for Zipkin receiver. -func createDefaultConfig() configmodels.Receiver { +func createDefaultConfig() config.Receiver { return &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ TypeVal: typeStr, NameVal: typeStr, }, @@ -60,7 +60,7 @@ func createDefaultConfig() configmodels.Receiver { func createTraceReceiver( _ context.Context, _ component.ReceiverCreateParams, - cfg configmodels.Receiver, + cfg config.Receiver, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { rCfg := cfg.(*Config) diff --git a/receiver/zipkinreceiver/trace_receiver_test.go b/receiver/zipkinreceiver/trace_receiver_test.go index b70ba8aee6e..f085cb24272 100644 --- a/receiver/zipkinreceiver/trace_receiver_test.go +++ b/receiver/zipkinreceiver/trace_receiver_test.go @@ -39,8 +39,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenterror" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/consumer/pdata" @@ -76,7 +76,7 @@ func TestNew(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { cfg := &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ NameVal: zipkinReceiverName, }, HTTPServerSettings: confighttp.HTTPServerSettings{ @@ -101,7 +101,7 @@ func TestZipkinReceiverPortAlreadyInUse(t *testing.T) { _, portStr, err := net.SplitHostPort(l.Addr().String()) require.NoError(t, err, "failed to split listener address: %v", err) cfg := &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ NameVal: zipkinReceiverName, }, HTTPServerSettings: confighttp.HTTPServerSettings{ @@ -288,7 +288,7 @@ func TestStartTraceReception(t *testing.T) { t.Run(tt.name, func(t *testing.T) { sink := new(consumertest.TracesSink) cfg := &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ NameVal: zipkinReceiverName, }, HTTPServerSettings: confighttp.HTTPServerSettings{ @@ -386,7 +386,7 @@ func TestReceiverContentTypes(t *testing.T) { ch: make(chan pdata.Traces, 10), } cfg := &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ NameVal: zipkinReceiverName, }, HTTPServerSettings: confighttp.HTTPServerSettings{ @@ -423,7 +423,7 @@ func TestReceiverInvalidContentType(t *testing.T) { ch: make(chan pdata.Traces, 10), } cfg := &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ NameVal: zipkinReceiverName, }, HTTPServerSettings: confighttp.HTTPServerSettings{ @@ -452,7 +452,7 @@ func TestReceiverConsumerError(t *testing.T) { err: errors.New("consumer error"), } cfg := &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ NameVal: zipkinReceiverName, }, HTTPServerSettings: confighttp.HTTPServerSettings{ @@ -556,7 +556,7 @@ func TestReceiverConvertsStringsToTypes(t *testing.T) { ch: make(chan pdata.Traces, 10), } cfg := &Config{ - ReceiverSettings: configmodels.ReceiverSettings{ + ReceiverSettings: config.ReceiverSettings{ NameVal: zipkinReceiverName, }, HTTPServerSettings: confighttp.HTTPServerSettings{ diff --git a/service/application.go b/service/application.go index bba0c501e94..98d96b92af2 100644 --- a/service/application.go +++ b/service/application.go @@ -32,7 +32,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/configparser" "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/consumer/consumererror" @@ -96,11 +95,11 @@ type Parameters struct { // The ConfigFactory implementation should call AddSetFlagProperties to enable configuration passed via `--set` flag. // Viper and command instances are passed from the Application. // The factories also belong to the Application and are equal to the factories passed via Parameters. -type ConfigFactory func(cmd *cobra.Command, factories component.Factories) (*configmodels.Config, error) +type ConfigFactory func(cmd *cobra.Command, factories component.Factories) (*config.Config, error) // FileLoaderConfigFactory implements ConfigFactory and it creates configuration from file // and from --set command line flag (if the flag is present). -func FileLoaderConfigFactory(cmd *cobra.Command, factories component.Factories) (*configmodels.Config, error) { +func FileLoaderConfigFactory(cmd *cobra.Command, factories component.Factories) (*config.Config, error) { file := builder.GetConfigFile() if file == "" { return nil, errors.New("config file not specified") diff --git a/service/application_test.go b/service/application_test.go index d71d98be346..fb97528cbfb 100644 --- a/service/application_test.go +++ b/service/application_test.go @@ -37,7 +37,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/configparser" "go.opentelemetry.io/collector/processor/attributesprocessor" "go.opentelemetry.io/collector/processor/batchprocessor" @@ -144,7 +143,7 @@ func TestApplication_StartAsGoRoutine(t *testing.T) { params := Parameters{ ApplicationStartInfo: component.DefaultApplicationStartInfo(), - ConfigFactory: func(_ *cobra.Command, factories component.Factories) (*configmodels.Config, error) { + ConfigFactory: func(_ *cobra.Command, factories component.Factories) (*config.Config, error) { return constructMimumalOpConfig(t, factories), nil }, Factories: factories, @@ -318,7 +317,7 @@ func TestSetFlag_component_does_not_exist(t *testing.T) { require.NotNil(t, cfg) } -func constructMimumalOpConfig(t *testing.T, factories component.Factories) *configmodels.Config { +func constructMimumalOpConfig(t *testing.T, factories component.Factories) *config.Config { configStr := ` receivers: otlp: diff --git a/service/builder.go b/service/builder.go index 59d8c3d6785..c4bf2066c69 100644 --- a/service/builder.go +++ b/service/builder.go @@ -21,7 +21,7 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/service/internal/builder" ) @@ -35,7 +35,7 @@ type settings struct { StartInfo component.ApplicationStartInfo // Config represents the configuration of the service. - Config *configmodels.Config + Config *config.Config // Logger represents the logger used for all the components. Logger *zap.Logger @@ -48,7 +48,7 @@ type settings struct { type service struct { factories component.Factories startInfo component.ApplicationStartInfo - config *configmodels.Config + config *config.Config logger *zap.Logger asyncErrorChannel chan error @@ -120,7 +120,7 @@ func (srv *service) ReportFatalError(err error) { srv.asyncErrorChannel <- err } -func (srv *service) GetFactory(kind component.Kind, componentType configmodels.Type) component.Factory { +func (srv *service) GetFactory(kind component.Kind, componentType config.Type) component.Factory { switch kind { case component.KindReceiver: return srv.factories.Receivers[componentType] @@ -134,11 +134,11 @@ func (srv *service) GetFactory(kind component.Kind, componentType configmodels.T return nil } -func (srv *service) GetExtensions() map[configmodels.NamedEntity]component.Extension { +func (srv *service) GetExtensions() map[config.NamedEntity]component.Extension { return srv.builtExtensions.ToMap() } -func (srv *service) GetExporters() map[configmodels.DataType]map[configmodels.NamedEntity]component.Exporter { +func (srv *service) GetExporters() map[config.DataType]map[config.NamedEntity]component.Exporter { return srv.builtExporters.ToMapByDataType() } diff --git a/service/builder_test.go b/service/builder_test.go index 450d22c1183..1b7092418bd 100644 --- a/service/builder_test.go +++ b/service/builder_test.go @@ -25,7 +25,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" ) @@ -76,7 +76,7 @@ func TestService_GetExtensions(t *testing.T) { extMap := srv.GetExtensions() assert.Len(t, extMap, 1) - assert.Contains(t, extMap, &configmodels.ExtensionSettings{TypeVal: "nop", NameVal: "nop"}) + assert.Contains(t, extMap, &config.ExtensionSettings{TypeVal: "nop", NameVal: "nop"}) } func TestService_GetExporters(t *testing.T) { @@ -89,12 +89,12 @@ func TestService_GetExporters(t *testing.T) { expMap := srv.GetExporters() assert.Len(t, expMap, 3) - assert.Len(t, expMap[configmodels.TracesDataType], 1) - assert.Contains(t, expMap[configmodels.TracesDataType], &configmodels.ExporterSettings{TypeVal: "nop", NameVal: "nop"}) - assert.Len(t, expMap[configmodels.MetricsDataType], 1) - assert.Contains(t, expMap[configmodels.MetricsDataType], &configmodels.ExporterSettings{TypeVal: "nop", NameVal: "nop"}) - assert.Len(t, expMap[configmodels.LogsDataType], 1) - assert.Contains(t, expMap[configmodels.LogsDataType], &configmodels.ExporterSettings{TypeVal: "nop", NameVal: "nop"}) + assert.Len(t, expMap[config.TracesDataType], 1) + assert.Contains(t, expMap[config.TracesDataType], &config.ExporterSettings{TypeVal: "nop", NameVal: "nop"}) + assert.Len(t, expMap[config.MetricsDataType], 1) + assert.Contains(t, expMap[config.MetricsDataType], &config.ExporterSettings{TypeVal: "nop", NameVal: "nop"}) + assert.Len(t, expMap[config.LogsDataType], 1) + assert.Contains(t, expMap[config.LogsDataType], &config.ExporterSettings{TypeVal: "nop", NameVal: "nop"}) } func createExampleService(t *testing.T) *service { diff --git a/service/defaultcomponents/default_exporters_test.go b/service/defaultcomponents/default_exporters_test.go index ede68051c01..665c7c100d6 100644 --- a/service/defaultcomponents/default_exporters_test.go +++ b/service/defaultcomponents/default_exporters_test.go @@ -26,9 +26,9 @@ 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/configgrpc" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/exporter/fileexporter" "go.opentelemetry.io/collector/exporter/jaegerexporter" "go.opentelemetry.io/collector/exporter/kafkaexporter" @@ -48,13 +48,13 @@ func TestDefaultExporters(t *testing.T) { endpoint := testutil.GetAvailableLocalAddress(t) tests := []struct { - exporter configmodels.Type + exporter config.Type getConfigFn getExporterConfigFn skipLifecycle bool }{ { exporter: "file", - getConfigFn: func() configmodels.Exporter { + getConfigFn: func() config.Exporter { cfg := expFactories["file"].CreateDefaultConfig().(*fileexporter.Config) f, err := ioutil.TempFile("", "otelcol_defaults_file_exporter_test*.tmp") require.NoError(t, err) @@ -65,7 +65,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "jaeger", - getConfigFn: func() configmodels.Exporter { + getConfigFn: func() config.Exporter { cfg := expFactories["jaeger"].CreateDefaultConfig().(*jaegerexporter.Config) cfg.Endpoint = endpoint return cfg @@ -73,7 +73,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "kafka", - getConfigFn: func() configmodels.Exporter { + getConfigFn: func() config.Exporter { cfg := expFactories["kafka"].CreateDefaultConfig().(*kafkaexporter.Config) cfg.Brokers = []string{"invalid:9092"} // this disables contacting the broker so we can successfully create the exporter @@ -87,7 +87,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "opencensus", - getConfigFn: func() configmodels.Exporter { + getConfigFn: func() config.Exporter { cfg := expFactories["opencensus"].CreateDefaultConfig().(*opencensusexporter.Config) cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ Endpoint: endpoint, @@ -97,7 +97,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "otlp", - getConfigFn: func() configmodels.Exporter { + getConfigFn: func() config.Exporter { cfg := expFactories["otlp"].CreateDefaultConfig().(*otlpexporter.Config) cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ Endpoint: endpoint, @@ -107,7 +107,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "otlphttp", - getConfigFn: func() configmodels.Exporter { + getConfigFn: func() config.Exporter { cfg := expFactories["otlphttp"].CreateDefaultConfig().(*otlphttpexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -115,7 +115,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "prometheus", - getConfigFn: func() configmodels.Exporter { + getConfigFn: func() config.Exporter { cfg := expFactories["prometheus"].CreateDefaultConfig().(*prometheusexporter.Config) cfg.Endpoint = endpoint return cfg @@ -126,7 +126,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "zipkin", - getConfigFn: func() configmodels.Exporter { + getConfigFn: func() config.Exporter { cfg := expFactories["zipkin"].CreateDefaultConfig().(*zipkinexporter.Config) cfg.Endpoint = endpoint return cfg @@ -155,7 +155,7 @@ func TestDefaultExporters(t *testing.T) { // GetExporterConfigFn is used customize the configuration passed to the verification. // This is used to change ports or provide values required but not provided by the // default configuration. -type getExporterConfigFn func() configmodels.Exporter +type getExporterConfigFn func() config.Exporter // verifyExporterLifecycle is used to test if an exporter type can handle the typical // lifecycle of a component. The getConfigFn parameter only need to be specified if @@ -197,23 +197,23 @@ func verifyExporterLifecycle(t *testing.T, factory component.ExporterFactory, ge type createExporterFn func( ctx context.Context, params component.ExporterCreateParams, - cfg configmodels.Exporter, + cfg config.Exporter, ) (component.Exporter, error) func wrapCreateLogsExp(factory component.ExporterFactory) createExporterFn { - return func(ctx context.Context, params component.ExporterCreateParams, cfg configmodels.Exporter) (component.Exporter, error) { + return func(ctx context.Context, params component.ExporterCreateParams, cfg config.Exporter) (component.Exporter, error) { return factory.CreateLogsExporter(ctx, params, cfg) } } func wrapCreateTracesExp(factory component.ExporterFactory) createExporterFn { - return func(ctx context.Context, params component.ExporterCreateParams, cfg configmodels.Exporter) (component.Exporter, error) { + return func(ctx context.Context, params component.ExporterCreateParams, cfg config.Exporter) (component.Exporter, error) { return factory.CreateTracesExporter(ctx, params, cfg) } } func wrapCreateMetricsExp(factory component.ExporterFactory) createExporterFn { - return func(ctx context.Context, params component.ExporterCreateParams, cfg configmodels.Exporter) (component.Exporter, error) { + return func(ctx context.Context, params component.ExporterCreateParams, cfg config.Exporter) (component.Exporter, error) { return factory.CreateMetricsExporter(ctx, params, cfg) } } diff --git a/service/defaultcomponents/default_extensions_test.go b/service/defaultcomponents/default_extensions_test.go index f9cbf2f8f07..1f79054fcbc 100644 --- a/service/defaultcomponents/default_extensions_test.go +++ b/service/defaultcomponents/default_extensions_test.go @@ -24,7 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/extension/healthcheckextension" "go.opentelemetry.io/collector/extension/pprofextension" "go.opentelemetry.io/collector/extension/zpagesextension" @@ -39,12 +39,12 @@ func TestDefaultExtensions(t *testing.T) { endpoint := testutil.GetAvailableLocalAddress(t) tests := []struct { - extension configmodels.Type + extension config.Type getConfigFn getExtensionConfigFn }{ { extension: "health_check", - getConfigFn: func() configmodels.Extension { + getConfigFn: func() config.Extension { cfg := extFactories["health_check"].CreateDefaultConfig().(*healthcheckextension.Config) cfg.TCPAddr.Endpoint = endpoint return cfg @@ -52,7 +52,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "pprof", - getConfigFn: func() configmodels.Extension { + getConfigFn: func() config.Extension { cfg := extFactories["pprof"].CreateDefaultConfig().(*pprofextension.Config) cfg.Endpoint = endpoint return cfg @@ -60,7 +60,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "zpages", - getConfigFn: func() configmodels.Extension { + getConfigFn: func() config.Extension { cfg := extFactories["zpages"].CreateDefaultConfig().(*zpagesextension.Config) cfg.Endpoint = endpoint return cfg @@ -84,7 +84,7 @@ func TestDefaultExtensions(t *testing.T) { // getExtensionConfigFn is used customize the configuration passed to the verification. // This is used to change ports or provide values required but not provided by the // default configuration. -type getExtensionConfigFn func() configmodels.Extension +type getExtensionConfigFn func() config.Extension // verifyExtensionLifecycle is used to test if an extension type can handle the typical // lifecycle of a component. The getConfigFn parameter only need to be specified if diff --git a/service/defaultcomponents/default_processors_test.go b/service/defaultcomponents/default_processors_test.go index 612a15d1732..a2d0e7863b7 100644 --- a/service/defaultcomponents/default_processors_test.go +++ b/service/defaultcomponents/default_processors_test.go @@ -25,8 +25,8 @@ 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/processor/attributesprocessor" "go.opentelemetry.io/collector/processor/memorylimiter" @@ -42,12 +42,12 @@ func TestDefaultProcessors(t *testing.T) { procFactories := allFactories.Processors tests := []struct { - processor configmodels.Type + processor config.Type getConfigFn getProcessorConfigFn }{ { processor: "attributes", - getConfigFn: func() configmodels.Processor { + getConfigFn: func() config.Processor { cfg := procFactories["attributes"].CreateDefaultConfig().(*attributesprocessor.Config) cfg.Actions = []processorhelper.ActionKeyValue{ {Key: "attribute1", Action: processorhelper.INSERT, Value: 123}, @@ -63,7 +63,7 @@ func TestDefaultProcessors(t *testing.T) { }, { processor: "memory_limiter", - getConfigFn: func() configmodels.Processor { + getConfigFn: func() config.Processor { cfg := procFactories["memory_limiter"].CreateDefaultConfig().(*memorylimiter.Config) cfg.CheckInterval = 100 * time.Millisecond cfg.MemoryLimitMiB = 1024 * 1024 @@ -75,7 +75,7 @@ func TestDefaultProcessors(t *testing.T) { }, { processor: "resource", - getConfigFn: func() configmodels.Processor { + getConfigFn: func() config.Processor { cfg := procFactories["resource"].CreateDefaultConfig().(*resourceprocessor.Config) cfg.AttributesActions = []processorhelper.ActionKeyValue{ {Key: "attribute1", Action: processorhelper.INSERT, Value: 123}, @@ -85,7 +85,7 @@ func TestDefaultProcessors(t *testing.T) { }, { processor: "span", - getConfigFn: func() configmodels.Processor { + getConfigFn: func() config.Processor { cfg := procFactories["span"].CreateDefaultConfig().(*spanprocessor.Config) cfg.Rename.FromAttributes = []string{"test-key"} return cfg @@ -109,7 +109,7 @@ func TestDefaultProcessors(t *testing.T) { // getProcessorConfigFn is used customize the configuration passed to the verification. // This is used to change ports or provide values required but not provided by the // default configuration. -type getProcessorConfigFn func() configmodels.Processor +type getProcessorConfigFn func() config.Processor // verifyProcessorLifecycle is used to test if an processor type can handle the typical // lifecycle of a component. The getConfigFn parameter only need to be specified if @@ -151,23 +151,23 @@ func verifyProcessorLifecycle(t *testing.T, factory component.ProcessorFactory, type createProcessorFn func( ctx context.Context, params component.ProcessorCreateParams, - cfg configmodels.Processor, + cfg config.Processor, ) (component.Processor, error) func wrapCreateLogsProc(factory component.ProcessorFactory) createProcessorFn { - return func(ctx context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor) (component.Processor, error) { + return func(ctx context.Context, params component.ProcessorCreateParams, cfg config.Processor) (component.Processor, error) { return factory.CreateLogsProcessor(ctx, params, cfg, consumertest.NewLogsNop()) } } func wrapCreateMetricsProc(factory component.ProcessorFactory) createProcessorFn { - return func(ctx context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor) (component.Processor, error) { + return func(ctx context.Context, params component.ProcessorCreateParams, cfg config.Processor) (component.Processor, error) { return factory.CreateMetricsProcessor(ctx, params, cfg, consumertest.NewMetricsNop()) } } func wrapCreateTracesProc(factory component.ProcessorFactory) createProcessorFn { - return func(ctx context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor) (component.Processor, error) { + return func(ctx context.Context, params component.ProcessorCreateParams, cfg config.Processor) (component.Processor, error) { return factory.CreateTracesProcessor(ctx, params, cfg, consumertest.NewTracesNop()) } } diff --git a/service/defaultcomponents/default_receivers_test.go b/service/defaultcomponents/default_receivers_test.go index f8702332dc9..c517e359bdf 100644 --- a/service/defaultcomponents/default_receivers_test.go +++ b/service/defaultcomponents/default_receivers_test.go @@ -25,8 +25,8 @@ 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/receiver/prometheusreceiver" ) @@ -38,7 +38,7 @@ func TestDefaultReceivers(t *testing.T) { rcvrFactories := allFactories.Receivers tests := []struct { - receiver configmodels.Type + receiver config.Type skipLifecyle bool getConfigFn getReceiverConfigFn }{ @@ -64,7 +64,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "prometheus", - getConfigFn: func() configmodels.Receiver { + getConfigFn: func() config.Receiver { cfg := rcvrFactories["prometheus"].CreateDefaultConfig().(*prometheusreceiver.Config) cfg.PrometheusConfig = &promconfig.Config{ ScrapeConfigs: []*promconfig.ScrapeConfig{ @@ -100,7 +100,7 @@ func TestDefaultReceivers(t *testing.T) { // getReceiverConfigFn is used customize the configuration passed to the verification. // This is used to change ports or provide values required but not provided by the // default configuration. -type getReceiverConfigFn func() configmodels.Receiver +type getReceiverConfigFn func() config.Receiver // verifyReceiverLifecycle is used to test if a receiver type can handle the typical // lifecycle of a component. The getConfigFn parameter only need to be specified if @@ -143,23 +143,23 @@ func verifyReceiverLifecycle(t *testing.T, factory component.ReceiverFactory, ge type createReceiverFn func( ctx context.Context, params component.ReceiverCreateParams, - cfg configmodels.Receiver, + cfg config.Receiver, ) (component.Receiver, error) func wrapCreateLogsRcvr(factory component.ReceiverFactory) createReceiverFn { - return func(ctx context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver) (component.Receiver, error) { + return func(ctx context.Context, params component.ReceiverCreateParams, cfg config.Receiver) (component.Receiver, error) { return factory.CreateLogsReceiver(ctx, params, cfg, consumertest.NewLogsNop()) } } func wrapCreateMetricsRcvr(factory component.ReceiverFactory) createReceiverFn { - return func(ctx context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver) (component.Receiver, error) { + return func(ctx context.Context, params component.ReceiverCreateParams, cfg config.Receiver) (component.Receiver, error) { return factory.CreateMetricsReceiver(ctx, params, cfg, consumertest.NewMetricsNop()) } } func wrapCreateTracesRcvr(factory component.ReceiverFactory) createReceiverFn { - return func(ctx context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver) (component.Receiver, error) { + return func(ctx context.Context, params component.ReceiverCreateParams, cfg config.Receiver) (component.Receiver, error) { return factory.CreateTracesReceiver(ctx, params, cfg, consumertest.NewTracesNop()) } } diff --git a/service/internal/builder/exporters_builder.go b/service/internal/builder/exporters_builder.go index ec1d5e5e0a8..1fb48524c2e 100644 --- a/service/internal/builder/exporters_builder.go +++ b/service/internal/builder/exporters_builder.go @@ -21,8 +21,8 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" + config2 "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configerror" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/consumer/consumererror" ) @@ -30,7 +30,7 @@ import ( // a trace and/or a metrics consumer and have a shutdown function. type builtExporter struct { logger *zap.Logger - expByDataType map[configmodels.DataType]component.Exporter + expByDataType map[config2.DataType]component.Exporter } // Start the exporter. @@ -60,7 +60,7 @@ func (bexp *builtExporter) Shutdown(ctx context.Context) error { } func (bexp *builtExporter) getTraceExporter() component.TracesExporter { - exp := bexp.expByDataType[configmodels.TracesDataType] + exp := bexp.expByDataType[config2.TracesDataType] if exp == nil { return nil } @@ -68,7 +68,7 @@ func (bexp *builtExporter) getTraceExporter() component.TracesExporter { } func (bexp *builtExporter) getMetricExporter() component.MetricsExporter { - exp := bexp.expByDataType[configmodels.MetricsDataType] + exp := bexp.expByDataType[config2.MetricsDataType] if exp == nil { return nil } @@ -76,7 +76,7 @@ func (bexp *builtExporter) getMetricExporter() component.MetricsExporter { } func (bexp *builtExporter) getLogExporter() component.LogsExporter { - exp := bexp.expByDataType[configmodels.LogsDataType] + exp := bexp.expByDataType[config2.LogsDataType] if exp == nil { return nil } @@ -84,7 +84,7 @@ func (bexp *builtExporter) getLogExporter() component.LogsExporter { } // Exporters is a map of exporters created from exporter configs. -type Exporters map[configmodels.Exporter]*builtExporter +type Exporters map[config2.Exporter]*builtExporter // StartAll starts all exporters. func (exps Exporters) StartAll(ctx context.Context, host component.Host) error { @@ -112,13 +112,13 @@ func (exps Exporters) ShutdownAll(ctx context.Context) error { return consumererror.Combine(errs) } -func (exps Exporters) ToMapByDataType() map[configmodels.DataType]map[configmodels.NamedEntity]component.Exporter { +func (exps Exporters) ToMapByDataType() map[config2.DataType]map[config2.NamedEntity]component.Exporter { - exportersMap := make(map[configmodels.DataType]map[configmodels.NamedEntity]component.Exporter) + exportersMap := make(map[config2.DataType]map[config2.NamedEntity]component.Exporter) - exportersMap[configmodels.TracesDataType] = make(map[configmodels.NamedEntity]component.Exporter, len(exps)) - exportersMap[configmodels.MetricsDataType] = make(map[configmodels.NamedEntity]component.Exporter, len(exps)) - exportersMap[configmodels.LogsDataType] = make(map[configmodels.NamedEntity]component.Exporter, len(exps)) + exportersMap[config2.TracesDataType] = make(map[config2.NamedEntity]component.Exporter, len(exps)) + exportersMap[config2.MetricsDataType] = make(map[config2.NamedEntity]component.Exporter, len(exps)) + exportersMap[config2.LogsDataType] = make(map[config2.NamedEntity]component.Exporter, len(exps)) for cfg, bexp := range exps { for t, exp := range bexp.expByDataType { @@ -131,29 +131,29 @@ func (exps Exporters) ToMapByDataType() map[configmodels.DataType]map[configmode type dataTypeRequirement struct { // Pipeline that requires the data type. - requiredBy *configmodels.Pipeline + requiredBy *config2.Pipeline } // Map of data type requirements. -type dataTypeRequirements map[configmodels.DataType]dataTypeRequirement +type dataTypeRequirements map[config2.DataType]dataTypeRequirement // Data type requirements for all exporters. -type exportersRequiredDataTypes map[configmodels.Exporter]dataTypeRequirements +type exportersRequiredDataTypes map[config2.Exporter]dataTypeRequirements // exportersBuilder builds exporters from config. type exportersBuilder struct { logger *zap.Logger appInfo component.ApplicationStartInfo - config *configmodels.Config - factories map[configmodels.Type]component.ExporterFactory + config *config2.Config + factories map[config2.Type]component.ExporterFactory } // BuildExporters builds Exporters from config. func BuildExporters( logger *zap.Logger, appInfo component.ApplicationStartInfo, - config *configmodels.Config, - factories map[configmodels.Type]component.ExporterFactory, + config *config2.Config, + factories map[config2.Type]component.ExporterFactory, ) (Exporters, error) { eb := &exportersBuilder{logger.With(zap.String(kindLogKey, kindLogsExporter)), appInfo, config, factories} @@ -213,7 +213,7 @@ func (eb *exportersBuilder) buildExporter( ctx context.Context, logger *zap.Logger, appInfo component.ApplicationStartInfo, - config configmodels.Exporter, + config config2.Exporter, exportersInputDataTypes exportersRequiredDataTypes, ) (*builtExporter, error) { factory := eb.factories[config.Type()] @@ -223,7 +223,7 @@ func (eb *exportersBuilder) buildExporter( exporter := &builtExporter{ logger: logger, - expByDataType: make(map[configmodels.DataType]component.Exporter, 3), + expByDataType: make(map[config2.DataType]component.Exporter, 3), } inputDataTypes := exportersInputDataTypes[config] @@ -239,7 +239,7 @@ func (eb *exportersBuilder) buildExporter( for dataType, requirement := range inputDataTypes { switch dataType { - case configmodels.TracesDataType: + case config2.TracesDataType: // Traces data type is required. Create a trace exporter based on config. te, err := factory.CreateTracesExporter(ctx, creationParams, config) if err != nil { @@ -255,9 +255,9 @@ func (eb *exportersBuilder) buildExporter( return nil, fmt.Errorf("factory for %q produced a nil exporter", config.Name()) } - exporter.expByDataType[configmodels.TracesDataType] = te + exporter.expByDataType[config2.TracesDataType] = te - case configmodels.MetricsDataType: + case config2.MetricsDataType: // Metrics data type is required. Create a trace exporter based on config. me, err := factory.CreateMetricsExporter(ctx, creationParams, config) if err != nil { @@ -274,9 +274,9 @@ func (eb *exportersBuilder) buildExporter( return nil, fmt.Errorf("factory for %q produced a nil exporter", config.Name()) } - exporter.expByDataType[configmodels.MetricsDataType] = me + exporter.expByDataType[config2.MetricsDataType] = me - case configmodels.LogsDataType: + case config2.LogsDataType: le, err := factory.CreateLogsExporter(ctx, creationParams, config) if err != nil { if err == configerror.ErrDataTypeIsNotSupported { @@ -291,7 +291,7 @@ func (eb *exportersBuilder) buildExporter( return nil, fmt.Errorf("factory for %q produced a nil exporter", config.Name()) } - exporter.expByDataType[configmodels.LogsDataType] = le + exporter.expByDataType[config2.LogsDataType] = le default: // Could not create because this exporter does not support this data type. @@ -305,9 +305,9 @@ func (eb *exportersBuilder) buildExporter( } func exporterTypeMismatchErr( - config configmodels.Exporter, - requiredByPipeline *configmodels.Pipeline, - dataType configmodels.DataType, + config config2.Exporter, + requiredByPipeline *config2.Pipeline, + dataType config2.DataType, ) error { return fmt.Errorf("pipeline %q of data type %q has an exporter %q, which does not support that data type", requiredByPipeline.Name, dataType, diff --git a/service/internal/builder/exporters_builder_test.go b/service/internal/builder/exporters_builder_test.go index 84c6f976e84..5e236b1d3cd 100644 --- a/service/internal/builder/exporters_builder_test.go +++ b/service/internal/builder/exporters_builder_test.go @@ -25,8 +25,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/exporter/opencensusexporter" "go.opentelemetry.io/collector/internal/testcomponents" @@ -38,10 +38,10 @@ func TestBuildExporters(t *testing.T) { oceFactory := opencensusexporter.NewFactory() factories.Exporters[oceFactory.Type()] = oceFactory - cfg := &configmodels.Config{ - Exporters: map[string]configmodels.Exporter{ + cfg := &config.Config{ + Exporters: map[string]config.Exporter{ "opencensus": &opencensusexporter.Config{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ NameVal: "opencensus", TypeVal: "opencensus", }, @@ -52,11 +52,11 @@ func TestBuildExporters(t *testing.T) { }, }, - Service: configmodels.Service{ - Pipelines: map[string]*configmodels.Pipeline{ + Service: config.Service{ + Pipelines: map[string]*config.Pipeline{ "trace": { Name: "trace", - InputType: configmodels.TracesDataType, + InputType: config.TracesDataType, Exporters: []string{"opencensus"}, }, }, @@ -112,18 +112,18 @@ func TestBuildExporters_BuildLogs(t *testing.T) { factories, err := testcomponents.ExampleComponents() assert.Nil(t, err) - cfg := &configmodels.Config{ - Exporters: map[string]configmodels.Exporter{ + cfg := &config.Config{ + Exporters: map[string]config.Exporter{ "exampleexporter": &testcomponents.ExampleExporter{ - ExporterSettings: configmodels.ExporterSettings{ + ExporterSettings: config.ExporterSettings{ NameVal: "exampleexporter", TypeVal: "exampleexporter", }, }, }, - Service: configmodels.Service{ - Pipelines: map[string]*configmodels.Pipeline{ + Service: config.Service{ + Pipelines: map[string]*config.Pipeline{ "logs": { Name: "logs", InputType: "logs", @@ -174,16 +174,16 @@ func TestBuildExporters_BuildLogs(t *testing.T) { func TestBuildExporters_StartAll(t *testing.T) { exporters := make(Exporters) - expCfg := &configmodels.ExporterSettings{} + expCfg := &config.ExporterSettings{} traceExporter := &testcomponents.ExampleExporterConsumer{} metricExporter := &testcomponents.ExampleExporterConsumer{} logsExporter := &testcomponents.ExampleExporterConsumer{} exporters[expCfg] = &builtExporter{ logger: zap.NewNop(), - expByDataType: map[configmodels.DataType]component.Exporter{ - configmodels.TracesDataType: traceExporter, - configmodels.MetricsDataType: metricExporter, - configmodels.LogsDataType: logsExporter, + expByDataType: map[config.DataType]component.Exporter{ + config.TracesDataType: traceExporter, + config.MetricsDataType: metricExporter, + config.LogsDataType: logsExporter, }, } assert.False(t, traceExporter.ExporterStarted) @@ -199,16 +199,16 @@ func TestBuildExporters_StartAll(t *testing.T) { func TestBuildExporters_StopAll(t *testing.T) { exporters := make(Exporters) - expCfg := &configmodels.ExporterSettings{} + expCfg := &config.ExporterSettings{} traceExporter := &testcomponents.ExampleExporterConsumer{} metricExporter := &testcomponents.ExampleExporterConsumer{} logsExporter := &testcomponents.ExampleExporterConsumer{} exporters[expCfg] = &builtExporter{ logger: zap.NewNop(), - expByDataType: map[configmodels.DataType]component.Exporter{ - configmodels.TracesDataType: traceExporter, - configmodels.MetricsDataType: metricExporter, - configmodels.LogsDataType: logsExporter, + expByDataType: map[config.DataType]component.Exporter{ + config.TracesDataType: traceExporter, + config.MetricsDataType: metricExporter, + config.LogsDataType: logsExporter, }, } assert.False(t, traceExporter.ExporterShutdown) diff --git a/service/internal/builder/extensions_builder.go b/service/internal/builder/extensions_builder.go index 041922d0049..31050291857 100644 --- a/service/internal/builder/extensions_builder.go +++ b/service/internal/builder/extensions_builder.go @@ -21,7 +21,7 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumererror" ) @@ -45,7 +45,7 @@ func (ext *builtExtension) Shutdown(ctx context.Context) error { var _ component.Extension = (*builtExtension)(nil) // Exporters is a map of exporters created from exporter configs. -type Extensions map[configmodels.Extension]*builtExtension +type Extensions map[config.Extension]*builtExtension // StartAll starts all exporters. func (exts Extensions) StartAll(ctx context.Context, host component.Host) error { @@ -102,8 +102,8 @@ func (exts Extensions) NotifyPipelineNotReady() error { return consumererror.Combine(errs) } -func (exts Extensions) ToMap() map[configmodels.NamedEntity]component.Extension { - result := make(map[configmodels.NamedEntity]component.Extension, len(exts)) +func (exts Extensions) ToMap() map[config.NamedEntity]component.Extension { + result := make(map[config.NamedEntity]component.Extension, len(exts)) for k, v := range exts { result[k] = v.extension } @@ -114,16 +114,16 @@ func (exts Extensions) ToMap() map[configmodels.NamedEntity]component.Extension type extensionsBuilder struct { logger *zap.Logger appInfo component.ApplicationStartInfo - config *configmodels.Config - factories map[configmodels.Type]component.ExtensionFactory + config *config.Config + factories map[config.Type]component.ExtensionFactory } // BuildExtensions builds Extensions from config. func BuildExtensions( logger *zap.Logger, appInfo component.ApplicationStartInfo, - config *configmodels.Config, - factories map[configmodels.Type]component.ExtensionFactory, + config *config.Config, + factories map[config.Type]component.ExtensionFactory, ) (Extensions, error) { eb := &extensionsBuilder{logger.With(zap.String(kindLogKey, kindLogExtension)), appInfo, config, factories} @@ -146,7 +146,7 @@ func BuildExtensions( return extensions, nil } -func (eb *extensionsBuilder) buildExtension(logger *zap.Logger, appInfo component.ApplicationStartInfo, cfg configmodels.Extension) (*builtExtension, error) { +func (eb *extensionsBuilder) buildExtension(logger *zap.Logger, appInfo component.ApplicationStartInfo, cfg config.Extension) (*builtExtension, error) { factory := eb.factories[cfg.Type()] if factory == nil { return nil, fmt.Errorf("extension factory for type %q is not configured", cfg.Type()) diff --git a/service/internal/builder/extensions_builder_test.go b/service/internal/builder/extensions_builder_test.go index c6c552053af..81186745800 100644 --- a/service/internal/builder/extensions_builder_test.go +++ b/service/internal/builder/extensions_builder_test.go @@ -23,19 +23,19 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/extension/extensionhelper" ) func TestService_setupExtensions(t *testing.T) { errExtensionFactory := extensionhelper.NewFactory( "err", - func() configmodels.Extension { - return &configmodels.ExporterSettings{ + func() config.Extension { + return &config.ExporterSettings{ TypeVal: "err", } }, - func(ctx context.Context, params component.ExtensionCreateParams, extension configmodels.Extension) (component.Extension, error) { + func(ctx context.Context, params component.ExtensionCreateParams, extension config.Extension) (component.Extension, error) { return nil, fmt.Errorf("cannot create \"err\" extension type") }, ) @@ -49,13 +49,13 @@ func TestService_setupExtensions(t *testing.T) { tests := []struct { name string factories component.Factories - config *configmodels.Config + config *config.Config wantErrMsg string }{ { name: "extension_not_configured", - config: &configmodels.Config{ - Service: configmodels.Service{ + config: &config.Config{ + Service: config.Service{ Extensions: []string{ "myextension", }, @@ -65,11 +65,11 @@ func TestService_setupExtensions(t *testing.T) { }, { name: "missing_extension_factory", - config: &configmodels.Config{ - Extensions: map[string]configmodels.Extension{ + config: &config.Config{ + Extensions: map[string]config.Extension{ string(errExtensionFactory.Type()): errExtensionConfig, }, - Service: configmodels.Service{ + Service: config.Service{ Extensions: []string{ string(errExtensionFactory.Type()), }, @@ -80,15 +80,15 @@ func TestService_setupExtensions(t *testing.T) { { name: "error_on_create_extension", factories: component.Factories{ - Extensions: map[configmodels.Type]component.ExtensionFactory{ + Extensions: map[config.Type]component.ExtensionFactory{ errExtensionFactory.Type(): errExtensionFactory, }, }, - config: &configmodels.Config{ - Extensions: map[string]configmodels.Extension{ + config: &config.Config{ + Extensions: map[string]config.Extension{ string(errExtensionFactory.Type()): errExtensionConfig, }, - Service: configmodels.Service{ + Service: config.Service{ Extensions: []string{ string(errExtensionFactory.Type()), }, @@ -99,15 +99,15 @@ func TestService_setupExtensions(t *testing.T) { { name: "bad_factory", factories: component.Factories{ - Extensions: map[configmodels.Type]component.ExtensionFactory{ + Extensions: map[config.Type]component.ExtensionFactory{ badExtensionFactory.Type(): badExtensionFactory, }, }, - config: &configmodels.Config{ - Extensions: map[string]configmodels.Extension{ + config: &config.Config{ + Extensions: map[string]config.Extension{ string(badExtensionFactory.Type()): badExtensionCfg, }, - Service: configmodels.Service{ + Service: config.Service{ Extensions: []string{ string(badExtensionFactory.Type()), }, diff --git a/service/internal/builder/factories_test.go b/service/internal/builder/factories_test.go index f4d6a49679c..f4aded13ff1 100644 --- a/service/internal/builder/factories_test.go +++ b/service/internal/builder/factories_test.go @@ -18,7 +18,7 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/extension/extensionhelper" "go.opentelemetry.io/collector/internal/testcomponents" @@ -36,18 +36,18 @@ func createTestFactories() component.Factories { badExporterFactory := newBadExporterFactory() factories := component.Factories{ - Extensions: map[configmodels.Type]component.ExtensionFactory{ + Extensions: map[config.Type]component.ExtensionFactory{ badExtensionFactory.Type(): badExtensionFactory, }, - Receivers: map[configmodels.Type]component.ReceiverFactory{ + Receivers: map[config.Type]component.ReceiverFactory{ exampleReceiverFactory.Type(): exampleReceiverFactory, badReceiverFactory.Type(): badReceiverFactory, }, - Processors: map[configmodels.Type]component.ProcessorFactory{ + Processors: map[config.Type]component.ProcessorFactory{ exampleProcessorFactory.Type(): exampleProcessorFactory, badProcessorFactory.Type(): badProcessorFactory, }, - Exporters: map[configmodels.Type]component.ExporterFactory{ + Exporters: map[config.Type]component.ExporterFactory{ exampleExporterFactory.Type(): exampleExporterFactory, badExporterFactory.Type(): badExporterFactory, }, @@ -57,24 +57,24 @@ func createTestFactories() component.Factories { } func newBadReceiverFactory() component.ReceiverFactory { - return receiverhelper.NewFactory("bf", func() configmodels.Receiver { - return &configmodels.ReceiverSettings{ + return receiverhelper.NewFactory("bf", func() config.Receiver { + return &config.ReceiverSettings{ TypeVal: "bf", } }) } func newBadProcessorFactory() component.ProcessorFactory { - return processorhelper.NewFactory("bf", func() configmodels.Processor { - return &configmodels.ProcessorSettings{ + return processorhelper.NewFactory("bf", func() config.Processor { + return &config.ProcessorSettings{ TypeVal: "bf", } }) } func newBadExporterFactory() component.ExporterFactory { - return exporterhelper.NewFactory("bf", func() configmodels.Exporter { - return &configmodels.ExporterSettings{ + return exporterhelper.NewFactory("bf", func() config.Exporter { + return &config.ExporterSettings{ TypeVal: "bf", } }) @@ -83,12 +83,12 @@ func newBadExporterFactory() component.ExporterFactory { func newBadExtensionFactory() component.ExtensionFactory { return extensionhelper.NewFactory( "bf", - func() configmodels.Extension { - return &configmodels.ExporterSettings{ + func() config.Extension { + return &config.ExporterSettings{ TypeVal: "bf", } }, - func(ctx context.Context, params component.ExtensionCreateParams, extension configmodels.Extension) (component.Extension, error) { + func(ctx context.Context, params component.ExtensionCreateParams, extension config.Extension) (component.Extension, error) { return nil, nil }, ) diff --git a/service/internal/builder/pipelines_builder.go b/service/internal/builder/pipelines_builder.go index d19a0204bb0..4f70858a6e6 100644 --- a/service/internal/builder/pipelines_builder.go +++ b/service/internal/builder/pipelines_builder.go @@ -21,7 +21,7 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + config2 "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/fanoutconsumer" @@ -44,7 +44,7 @@ type builtPipeline struct { } // BuiltPipelines is a map of build pipelines created from pipeline configs. -type BuiltPipelines map[*configmodels.Pipeline]*builtPipeline +type BuiltPipelines map[*config2.Pipeline]*builtPipeline func (bps BuiltPipelines) StartProcessors(ctx context.Context, host component.Host) error { for _, bp := range bps { @@ -83,9 +83,9 @@ func (bps BuiltPipelines) ShutdownProcessors(ctx context.Context) error { type pipelinesBuilder struct { logger *zap.Logger appInfo component.ApplicationStartInfo - config *configmodels.Config + config *config2.Config exporters Exporters - factories map[configmodels.Type]component.ProcessorFactory + factories map[config2.Type]component.ProcessorFactory } // BuildPipelines builds pipeline processors from config. Requires exporters to be already @@ -93,9 +93,9 @@ type pipelinesBuilder struct { func BuildPipelines( logger *zap.Logger, appInfo component.ApplicationStartInfo, - config *configmodels.Config, + config *config2.Config, exporters Exporters, - factories map[configmodels.Type]component.ProcessorFactory, + factories map[config2.Type]component.ProcessorFactory, ) (BuiltPipelines, error) { pb := &pipelinesBuilder{logger, appInfo, config, exporters, factories} @@ -114,7 +114,7 @@ func BuildPipelines( // Builds a pipeline of processors. Returns the first processor in the pipeline. // The last processor in the pipeline will be plugged to fan out the data into exporters // that are configured for this pipeline. -func (pb *pipelinesBuilder) buildPipeline(ctx context.Context, pipelineCfg *configmodels.Pipeline) (*builtPipeline, error) { +func (pb *pipelinesBuilder) buildPipeline(ctx context.Context, pipelineCfg *config2.Pipeline) (*builtPipeline, error) { // BuildProcessors the pipeline backwards. @@ -124,11 +124,11 @@ func (pb *pipelinesBuilder) buildPipeline(ctx context.Context, pipelineCfg *conf var lc consumer.Logs switch pipelineCfg.InputType { - case configmodels.TracesDataType: + case config2.TracesDataType: tc = pb.buildFanoutExportersTraceConsumer(pipelineCfg.Exporters) - case configmodels.MetricsDataType: + case config2.MetricsDataType: mc = pb.buildFanoutExportersMetricsConsumer(pipelineCfg.Exporters) - case configmodels.LogsDataType: + case config2.LogsDataType: lc = pb.buildFanoutExportersLogConsumer(pipelineCfg.Exporters) } @@ -157,7 +157,7 @@ func (pb *pipelinesBuilder) buildPipeline(ctx context.Context, pipelineCfg *conf } switch pipelineCfg.InputType { - case configmodels.TracesDataType: + case config2.TracesDataType: var proc component.TracesProcessor proc, err = factory.CreateTracesProcessor(ctx, creationParams, procCfg, tc) if proc != nil { @@ -165,7 +165,7 @@ func (pb *pipelinesBuilder) buildPipeline(ctx context.Context, pipelineCfg *conf } processors[i] = proc tc = proc - case configmodels.MetricsDataType: + case config2.MetricsDataType: var proc component.MetricsProcessor proc, err = factory.CreateMetricsProcessor(ctx, creationParams, procCfg, mc) if proc != nil { @@ -174,7 +174,7 @@ func (pb *pipelinesBuilder) buildPipeline(ctx context.Context, pipelineCfg *conf processors[i] = proc mc = proc - case configmodels.LogsDataType: + case config2.LogsDataType: var proc component.LogsProcessor proc, err = factory.CreateLogsProcessor(ctx, creationParams, procCfg, lc) if proc != nil { diff --git a/service/internal/builder/pipelines_builder_test.go b/service/internal/builder/pipelines_builder_test.go index 89bc68c1f00..87643ca383e 100644 --- a/service/internal/builder/pipelines_builder_test.go +++ b/service/internal/builder/pipelines_builder_test.go @@ -25,7 +25,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/pdata" @@ -58,26 +58,26 @@ func TestBuildPipelines(t *testing.T) { } } -func createExampleConfig(dataType string) *configmodels.Config { +func createExampleConfig(dataType string) *config.Config { exampleReceiverFactory := testcomponents.ExampleReceiverFactory exampleProcessorFactory := testcomponents.ExampleProcessorFactory exampleExporterFactory := testcomponents.ExampleExporterFactory - cfg := &configmodels.Config{ - Receivers: map[string]configmodels.Receiver{ + cfg := &config.Config{ + Receivers: map[string]config.Receiver{ string(exampleReceiverFactory.Type()): exampleReceiverFactory.CreateDefaultConfig(), }, - Processors: map[string]configmodels.Processor{ + Processors: map[string]config.Processor{ string(exampleProcessorFactory.Type()): exampleProcessorFactory.CreateDefaultConfig(), }, - Exporters: map[string]configmodels.Exporter{ + Exporters: map[string]config.Exporter{ string(exampleExporterFactory.Type()): exampleExporterFactory.CreateDefaultConfig(), }, - Service: configmodels.Service{ - Pipelines: map[string]*configmodels.Pipeline{ + Service: config.Service{ + Pipelines: map[string]*config.Pipeline{ dataType: { Name: dataType, - InputType: configmodels.DataType(dataType), + InputType: config.DataType(dataType), Receivers: []string{string(exampleReceiverFactory.Type())}, Processors: []string{string(exampleProcessorFactory.Type())}, Exporters: []string{string(exampleExporterFactory.Type())}, diff --git a/service/internal/builder/receivers_builder.go b/service/internal/builder/receivers_builder.go index 54f27a9e6df..da9d3981079 100644 --- a/service/internal/builder/receivers_builder.go +++ b/service/internal/builder/receivers_builder.go @@ -22,8 +22,8 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" + config2 "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configerror" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/fanoutconsumer" @@ -49,7 +49,7 @@ func (rcv *builtReceiver) Shutdown(ctx context.Context) error { } // Receivers is a map of receivers created from receiver configs. -type Receivers map[configmodels.Receiver]*builtReceiver +type Receivers map[config2.Receiver]*builtReceiver // StopAll stops all receivers. func (rcvs Receivers) ShutdownAll(ctx context.Context) error { @@ -81,18 +81,18 @@ func (rcvs Receivers) StartAll(ctx context.Context, host component.Host) error { type receiversBuilder struct { logger *zap.Logger appInfo component.ApplicationStartInfo - config *configmodels.Config + config *config2.Config builtPipelines BuiltPipelines - factories map[configmodels.Type]component.ReceiverFactory + factories map[config2.Type]component.ReceiverFactory } // BuildReceivers builds Receivers from config. func BuildReceivers( logger *zap.Logger, appInfo component.ApplicationStartInfo, - config *configmodels.Config, + config *config2.Config, builtPipelines BuiltPipelines, - factories map[configmodels.Type]component.ReceiverFactory, + factories map[config2.Type]component.ReceiverFactory, ) (Receivers, error) { rb := &receiversBuilder{logger.With(zap.String(kindLogKey, kindLogsReceiver)), appInfo, config, builtPipelines, factories} @@ -114,7 +114,7 @@ func BuildReceivers( } // hasReceiver returns true if the pipeline is attached to specified receiver. -func hasReceiver(pipeline *configmodels.Pipeline, receiverName string) bool { +func hasReceiver(pipeline *config2.Pipeline, receiverName string) bool { for _, name := range pipeline.Receivers { if name == receiverName { return true @@ -123,16 +123,16 @@ func hasReceiver(pipeline *configmodels.Pipeline, receiverName string) bool { return false } -type attachedPipelines map[configmodels.DataType][]*builtPipeline +type attachedPipelines map[config2.DataType][]*builtPipeline -func (rb *receiversBuilder) findPipelinesToAttach(config configmodels.Receiver) (attachedPipelines, error) { +func (rb *receiversBuilder) findPipelinesToAttach(config config2.Receiver) (attachedPipelines, error) { // A receiver may be attached to multiple pipelines. Pipelines may consume different // data types. We need to compile the list of pipelines of each type that must be // attached to this receiver according to configuration. pipelinesToAttach := make(attachedPipelines) - pipelinesToAttach[configmodels.TracesDataType] = make([]*builtPipeline, 0) - pipelinesToAttach[configmodels.MetricsDataType] = make([]*builtPipeline, 0) + pipelinesToAttach[config2.TracesDataType] = make([]*builtPipeline, 0) + pipelinesToAttach[config2.MetricsDataType] = make([]*builtPipeline, 0) // Iterate over all pipelines. for _, pipelineCfg := range rb.config.Service.Pipelines { @@ -163,8 +163,8 @@ func (rb *receiversBuilder) attachReceiverToPipelines( logger *zap.Logger, appInfo component.ApplicationStartInfo, factory component.ReceiverFactory, - dataType configmodels.DataType, - config configmodels.Receiver, + dataType config2.DataType, + config config2.Receiver, rcv *builtReceiver, builtPipelines []*builtPipeline, ) error { @@ -179,15 +179,15 @@ func (rb *receiversBuilder) attachReceiverToPipelines( } switch dataType { - case configmodels.TracesDataType: + case config2.TracesDataType: junction := buildFanoutTraceConsumer(builtPipelines) createdReceiver, err = factory.CreateTracesReceiver(ctx, creationParams, config, junction) - case configmodels.MetricsDataType: + case config2.MetricsDataType: junction := buildFanoutMetricConsumer(builtPipelines) createdReceiver, err = factory.CreateMetricsReceiver(ctx, creationParams, config, junction) - case configmodels.LogsDataType: + case config2.LogsDataType: junction := buildFanoutLogConsumer(builtPipelines) createdReceiver, err = factory.CreateLogsReceiver(ctx, creationParams, config, junction) @@ -232,7 +232,7 @@ func (rb *receiversBuilder) attachReceiverToPipelines( return nil } -func (rb *receiversBuilder) buildReceiver(ctx context.Context, logger *zap.Logger, appInfo component.ApplicationStartInfo, config configmodels.Receiver) (*builtReceiver, error) { +func (rb *receiversBuilder) buildReceiver(ctx context.Context, logger *zap.Logger, appInfo component.ApplicationStartInfo, config config2.Receiver) (*builtReceiver, error) { // First find pipelines that must be attached to this receiver. pipelinesToAttach, err := rb.findPipelinesToAttach(config) diff --git a/service/internal/builder/receivers_builder_test.go b/service/internal/builder/receivers_builder_test.go index 586c00fd10e..d3cda88caee 100644 --- a/service/internal/builder/receivers_builder_test.go +++ b/service/internal/builder/receivers_builder_test.go @@ -25,7 +25,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testcomponents" @@ -261,7 +261,7 @@ func TestBuildReceivers_BuildCustom(t *testing.T) { func TestBuildReceivers_StartAll(t *testing.T) { receivers := make(Receivers) - rcvCfg := &configmodels.ReceiverSettings{} + rcvCfg := &config.ReceiverSettings{} receiver := &testcomponents.ExampleReceiverProducer{} @@ -280,7 +280,7 @@ func TestBuildReceivers_StartAll(t *testing.T) { func TestBuildReceivers_StopAll(t *testing.T) { receivers := make(Receivers) - rcvCfg := &configmodels.ReceiverSettings{} + rcvCfg := &config.ReceiverSettings{} receiver := &testcomponents.ExampleReceiverProducer{} diff --git a/testbed/testbed/data_providers.go b/testbed/testbed/data_providers.go index 74964ed0c3a..0e021df3c80 100644 --- a/testbed/testbed/data_providers.go +++ b/testbed/testbed/data_providers.go @@ -27,7 +27,7 @@ import ( "github.com/gogo/protobuf/proto" "go.uber.org/atomic" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal" otlplogscol "go.opentelemetry.io/collector/internal/data/protogen/collector/logs/v1" @@ -327,7 +327,7 @@ type FileDataProvider struct { // NewFileDataProvider creates an instance of FileDataProvider which generates test data // loaded from a file. -func NewFileDataProvider(filePath string, dataType configmodels.DataType) (*FileDataProvider, error) { +func NewFileDataProvider(filePath string, dataType config.DataType) (*FileDataProvider, error) { file, err := os.OpenFile(filepath.Clean(filePath), os.O_RDONLY, 0) if err != nil { return nil, err @@ -339,7 +339,7 @@ func NewFileDataProvider(filePath string, dataType configmodels.DataType) (*File // Load the message from the file and count the data points. switch dataType { - case configmodels.TracesDataType: + case config.TracesDataType: var msg otlptracecol.ExportTraceServiceRequest if err := protobufJSONUnmarshaler.Unmarshal(file, &msg); err != nil { return nil, err @@ -349,7 +349,7 @@ func NewFileDataProvider(filePath string, dataType configmodels.DataType) (*File md := pdata.TracesFromInternalRep(internal.TracesFromOtlp(&msg)) dataPointCount = md.SpanCount() - case configmodels.MetricsDataType: + case config.MetricsDataType: var msg otlpmetricscol.ExportMetricsServiceRequest if err := protobufJSONUnmarshaler.Unmarshal(file, &msg); err != nil { return nil, err @@ -359,7 +359,7 @@ func NewFileDataProvider(filePath string, dataType configmodels.DataType) (*File md := pdata.MetricsFromInternalRep(internal.MetricsFromOtlp(&msg)) _, dataPointCount = md.MetricAndDataPointCount() - case configmodels.LogsDataType: + case config.LogsDataType: var msg otlplogscol.ExportLogsServiceRequest if err := protobufJSONUnmarshaler.Unmarshal(file, &msg); err != nil { return nil, err diff --git a/testbed/testbed/otelcol_runner.go b/testbed/testbed/otelcol_runner.go index cdaa1c17472..6070362fc42 100644 --- a/testbed/testbed/otelcol_runner.go +++ b/testbed/testbed/otelcol_runner.go @@ -25,7 +25,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/configparser" "go.opentelemetry.io/collector/internal/version" "go.opentelemetry.io/collector/service" @@ -59,7 +58,7 @@ type OtelcolRunner interface { type InProcessCollector struct { logger *zap.Logger factories component.Factories - config *configmodels.Config + config *config.Config svc *service.Application appDone chan struct{} stopped bool @@ -105,7 +104,7 @@ func (ipp *InProcessCollector) Start(args StartParams) error { Version: version.Version, GitHash: version.GitHash, }, - ConfigFactory: func(_ *cobra.Command, _ component.Factories) (*configmodels.Config, error) { + ConfigFactory: func(_ *cobra.Command, _ component.Factories) (*config.Config, error) { return ipp.config, nil }, Factories: ipp.factories, diff --git a/testbed/testbed/receivers.go b/testbed/testbed/receivers.go index af0d901e416..04d51c813f1 100644 --- a/testbed/testbed/receivers.go +++ b/testbed/testbed/receivers.go @@ -26,8 +26,8 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" + config2 "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/jaegerreceiver" @@ -67,16 +67,16 @@ func (mb *DataReceiverBase) ReportFatalError(err error) { } // GetFactory of the specified kind. Returns the factory for a component type. -func (mb *DataReceiverBase) GetFactory(_ component.Kind, _ configmodels.Type) component.Factory { +func (mb *DataReceiverBase) GetFactory(_ component.Kind, _ config2.Type) component.Factory { return nil } // Return map of extensions. Only enabled and created extensions will be returned. -func (mb *DataReceiverBase) GetExtensions() map[configmodels.NamedEntity]component.Extension { +func (mb *DataReceiverBase) GetExtensions() map[config2.NamedEntity]component.Extension { return nil } -func (mb *DataReceiverBase) GetExporters() map[configmodels.DataType]map[configmodels.NamedEntity]component.Exporter { +func (mb *DataReceiverBase) GetExporters() map[config2.DataType]map[config2.NamedEntity]component.Exporter { return nil } diff --git a/testbed/testbed/senders.go b/testbed/testbed/senders.go index 328ea2eb2a3..08a5d6805a1 100644 --- a/testbed/testbed/senders.go +++ b/testbed/testbed/senders.go @@ -27,7 +27,7 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/pdata" @@ -97,16 +97,16 @@ func (dsb *DataSenderBase) ReportFatalError(err error) { } // GetFactory of the specified kind. Returns the factory for a component type. -func (dsb *DataSenderBase) GetFactory(_ component.Kind, _ configmodels.Type) component.Factory { +func (dsb *DataSenderBase) GetFactory(_ component.Kind, _ config.Type) component.Factory { return nil } // Return map of extensions. Only enabled and created extensions will be returned. -func (dsb *DataSenderBase) GetExtensions() map[configmodels.NamedEntity]component.Extension { +func (dsb *DataSenderBase) GetExtensions() map[config.NamedEntity]component.Extension { return nil } -func (dsb *DataSenderBase) GetExporters() map[configmodels.DataType]map[configmodels.NamedEntity]component.Exporter { +func (dsb *DataSenderBase) GetExporters() map[config.DataType]map[config.NamedEntity]component.Exporter { return nil } diff --git a/testbed/tests/trace_test.go b/testbed/tests/trace_test.go index 0f4b30844c4..7f7ee43cee4 100644 --- a/testbed/tests/trace_test.go +++ b/testbed/tests/trace_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/testbed/testbed" "go.opentelemetry.io/collector/translator/conventions" @@ -482,7 +482,7 @@ func TestMetricsFromFile(t *testing.T) { require.NoError(t, err) // Use metrics previously recorded using "file" exporter and "k8scluster" receiver. - dataProvider, err := testbed.NewFileDataProvider("testdata/k8s-metrics.json", configmodels.MetricsDataType) + dataProvider, err := testbed.NewFileDataProvider("testdata/k8s-metrics.json", config.MetricsDataType) assert.NoError(t, err) options := testbed.LoadOptions{