open-telemetry
/
opentelemetry-collector
mirror of https://github.com/open-telemetry/opentelemetry-collector.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move configmodels to config (#2808) 

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
This commit is contained in:
Bogdan Drutu 2021-03-26 12:14:35 -07:00 committed by GitHub
parent 4daf2a1530
commit e7c74eb2fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
189 changed files with 925 additions and 933 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/mdatagen/metrics.tmpl
View File

@ -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 {

6
cmd/schemagen/schemagen/cli_all.go
View File

@ -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())
}

6
cmd/schemagen/schemagen/cli_single.go
View File

@ -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]

4
component/component.go
View File

@ -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,

14
component/componenttest/nop_exporter.go
View File

@ -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
}

6
component/componenttest/nop_exporter_test.go
View File

@ -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)

10
component/componenttest/nop_extension.go
View File

@ -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
}

6
component/componenttest/nop_extension_test.go
View File

@ -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)

8
component/componenttest/nop_host.go
View File

@ -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
}

14
component/componenttest/nop_processor.go
View File

@ -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

6
component/componenttest/nop_processor_test.go
View File

@ -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)

14
component/componenttest/nop_receiver.go
View File

@ -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

6
component/componenttest/nop_receiver_test.go
View File

@ -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)

6
component/componenttest/shutdown_verifier.go
View File

@ -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.

10
component/exporter.go
View File

@ -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)
}

18
component/exporter_test.go
View File

@ -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"},
},

6
component/extension.go
View File

@ -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)
}

26
component/factories.go
View File

@ -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())

8
component/host.go
View File

@ -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
}

10
component/processor.go
View File

@ -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)
}

18
component/processor_test.go
View File

@ -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"},
},

10
component/receiver.go
View File

@ -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)
}

18
component/receiver_test.go
View File

@ -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"},
},

2
config/configmodels/config.go → config/config.go
View File

@ -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"

2
config/configmodels/config_test.go → config/config_test.go
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package configmodels
package config
import (
"errors"

10
config/configcheck/configcheck_test.go
View File

@ -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
}

47
config/configparser/config.go
View File

@ -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)
}

69
config/configparser/config_test.go
View File

@ -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

3
config/configtest/configtest.go
View File

@ -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)

6
config/configtest/configtest_test.go
View File

@ -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"},

2
config/configmodels/exporter.go → config/exporter.go
View File

@ -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 {

2
config/configmodels/extension.go → config/extension.go
View File

@ -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

2
config/configmodels/processor.go → config/processor.go
View File

@ -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.

2
config/configmodels/receiver.go → config/receiver.go
View File

@ -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.

6
exporter/exporterhelper/common.go
View File

@ -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...),

4
exporter/exporterhelper/common_test.go
View File

@ -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",
}

24
exporter/exporterhelper/factory.go
View File

@ -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)

12
exporter/exporterhelper/factory_test.go
View File

@ -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
}

4
exporter/exporterhelper/logshelper.go
View File

@ -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,

4
exporter/exporterhelper/logshelper_test.go
View File

@ -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,
}

4
exporter/exporterhelper/metricshelper.go
View File

@ -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,

4
exporter/exporterhelper/metricshelper_test.go
View File

@ -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,
}

4
exporter/exporterhelper/tracehelper.go
View File

@ -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,

4
exporter/exporterhelper/tracehelper_test.go
View File

@ -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,
}

4
exporter/fileexporter/config.go
View File

@ -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"`

4
exporter/fileexporter/config_test.go
View File

@ -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",
},

14
exporter/fileexporter/factory.go
View File

@ -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

4
exporter/jaegerexporter/config.go
View File

@ -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"`

4
exporter/jaegerexporter/config_test.go
View File

@ -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",
},

8
exporter/jaegerexporter/factory.go
View File

@ -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)

4
exporter/kafkaexporter/config.go
View File

@ -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"`

4
exporter/kafkaexporter/config_test.go
View File

@ -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,
},

10
exporter/kafkaexporter/factory.go
View File

@ -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 == "" {

4
exporter/loggingexporter/config.go
View File

@ -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"`

4
exporter/loggingexporter/config_test.go
View File

@ -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",
},

12
exporter/loggingexporter/factory.go
View File

@ -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)

8
exporter/loggingexporter/logging_exporter.go
View File

@ -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,

8
exporter/loggingexporter/logging_exporter_test.go
View File

@ -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)

4
exporter/opencensusexporter/config.go
View File

@ -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"`

4
exporter/opencensusexporter/config_test.go
View File

@ -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",
},

10
exporter/opencensusexporter/factory.go
View File

@ -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 {

4
exporter/otlpexporter/config.go
View File

@ -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"`

4
exporter/otlpexporter/config_test.go
View File

@ -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",
},

12
exporter/otlpexporter/factory.go
View File

@ -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 {

4
exporter/otlpexporter/otlp.go
View File

@ -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 == "" {

4
exporter/otlphttpexporter/config.go
View File

@ -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"`

4
exporter/otlphttpexporter/config_test.go
View File

@ -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",
},

12
exporter/otlphttpexporter/factory.go
View File

@ -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 {

4
exporter/otlphttpexporter/otlp.go
View File

@ -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 != "" {

6
exporter/otlphttpexporter/otlp_test.go
View File

@ -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

4
exporter/prometheusexporter/config.go
View File

@ -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"`

4
exporter/prometheusexporter/config_test.go
View File

@ -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",
},

8
exporter/prometheusexporter/factory.go
View File

@ -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)

4
exporter/prometheusremotewriteexporter/config.go
View File

@ -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"`

4
exporter/prometheusremotewriteexporter/config_test.go
View File

@ -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",
},

6
exporter/prometheusremotewriteexporter/exporter_test.go
View File

@ -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",
},

8
exporter/prometheusremotewriteexporter/factory.go
View File

@ -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,
},

4
exporter/prometheusremotewriteexporter/factory_test.go
View File

@ -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
}{

8
exporter/zipkinexporter/config.go
View File

@ -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).

4
exporter/zipkinexporter/config_test.go
View File

@ -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",
},

8
exporter/zipkinexporter/factory.go
View File

@ -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)

6
exporter/zipkinexporter/zipkin_test.go
View File

@ -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{

16
extension/extensionhelper/factory.go
View File

@ -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)
}

8
extension/extensionhelper/factory_test.go
View File

@ -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
}

4
extension/healthcheckextension/config.go
View File

@ -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.

4
extension/healthcheckextension/config_test.go
View File

@ -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",
},

8
extension/healthcheckextension/factory.go
View File

@ -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

4
extension/healthcheckextension/factory_test.go
View File

@ -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,
},

4
extension/pprofextension/config.go
View File

@ -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:<port> to make it available only locally, or ":<port>" to

4
extension/pprofextension/config_test.go
View File

@ -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",
},

8
extension/pprofextension/factory.go
View File

@ -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")

4
extension/pprofextension/factory_test.go
View File

@ -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,
},

4
extension/zpagesextension/config.go
View File

@ -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:<port> to make it available only locally, or ":<port>" to

4
extension/zpagesextension/config_test.go
View File

@ -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",
},

8
extension/zpagesextension/factory.go
View File

@ -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")

4
extension/zpagesextension/factory_test.go
View File

@ -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,
},

22
internal/testcomponents/example_exporter.go
View File

@ -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
}

16
internal/testcomponents/example_extension.go
View File

@ -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
}

20
internal/testcomponents/example_processor.go
View File

@ -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
}

18
internal/testcomponents/example_receiver.go
View File

@ -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{}

Some files were not shown because too many files have changed in this diff Show More