Remove old interfaces for processor component

component/factories.go

@@ -27,7 +27,7 @@ type Factories struct {
 	Receivers map[configmodels.Type]ReceiverFactory
 
 	// Processors maps processor type names in the config to the respective factory.
-	Processors map[configmodels.Type]ProcessorFactoryBase
+	Processors map[configmodels.Type]ProcessorFactory
 
 	// Exporters maps exporter type names in the config to the respective factory.
 	Exporters map[configmodels.Type]ExporterFactoryBase
@@ -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 ...ProcessorFactoryBase) (map[configmodels.Type]ProcessorFactoryBase, error) {
-	fMap := map[configmodels.Type]ProcessorFactoryBase{}
+func MakeProcessorFactoryMap(factories ...ProcessorFactory) (map[configmodels.Type]ProcessorFactory, error) {
+	fMap := map[configmodels.Type]ProcessorFactory{}
 	for _, f := range factories {
 		if _, ok := fMap[f.Type()]; ok {
 			return fMap, fmt.Errorf("duplicate processor factory %q", f.Type())

component/processor.go

@@ -32,38 +32,16 @@ type Processor interface {
 	GetCapabilities() ProcessorCapabilities
 }
 
-// TraceProcessorBase is a common interface for TraceProcessor and TraceProcessorOld
-type TraceProcessorBase interface {
-	Processor
-}
-
-// TraceProcessorOld is a processor that can consume old-style traces.
-type TraceProcessorOld interface {
-	consumer.TraceConsumerOld
-	TraceProcessorBase
-}
-
 // TraceProcessor is a processor that can consume traces.
 type TraceProcessor interface {
-	consumer.TraceConsumer
-	TraceProcessorBase
-}
-
-// MetricsProcessorBase is a common interface for MetricsProcessor and MetricsProcessorV2
-type MetricsProcessorBase interface {
 	Processor
-}
-
-// MetricsProcessor is a processor that can consume old-style metrics.
-type MetricsProcessorOld interface {
-	consumer.MetricsConsumerOld
-	MetricsProcessorBase
+	consumer.TraceConsumer
 }
 
 // MetricsProcessor is a processor that can consume metrics.
 type MetricsProcessor interface {
+	Processor
 	consumer.MetricsConsumer
-	MetricsProcessorBase
 }
 
 // LogsProcessor is a processor that can consume logs.
@@ -82,37 +60,6 @@ type ProcessorCapabilities struct {
 	MutatesConsumedData bool
 }
 
-// ProcessorFactoryBase defines the common functions for all processor factories.
-type ProcessorFactoryBase interface {
-	Factory
-
-	// CreateDefaultConfig creates the default configuration for the Processor.
-	// This method can be called multiple times depending on the pipeline
-	// configuration and should not cause side-effects that prevent the creation
-	// of multiple instances of the Processor.
-	// 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
-}
-
-// ProcessorFactoryOld is factory interface for processors.
-type ProcessorFactoryOld interface {
-	ProcessorFactoryBase
-
-	// CreateTraceProcessor creates a trace processor based on this config.
-	// If the processor type does not support tracing or if the config is not valid
-	// error will be returned instead.
-	CreateTraceProcessor(logger *zap.Logger, nextConsumer consumer.TraceConsumerOld,
-		cfg configmodels.Processor) (TraceProcessorOld, error)
-
-	// CreateMetricsProcessor creates a metrics processor based on this config.
-	// If the processor type does not support metrics or if the config is not valid
-	// error will be returned instead.
-	CreateMetricsProcessor(logger *zap.Logger, nextConsumer consumer.MetricsConsumerOld,
-		cfg configmodels.Processor) (MetricsProcessorOld, error)
-}
-
 // ProcessorCreateParams is passed to Create* functions in ProcessorFactory.
 type ProcessorCreateParams struct {
 	// Logger that the factory can use during creation and can pass to the created
@@ -123,7 +70,16 @@ type ProcessorCreateParams struct {
 // ProcessorFactory is factory interface for processors. This is the
 // new factory type that can create new style processors.
 type ProcessorFactory interface {
-	ProcessorFactoryBase
+	Factory
+
+	// CreateDefaultConfig creates the default configuration for the Processor.
+	// This method can be called multiple times depending on the pipeline
+	// configuration and should not cause side-effects that prevent the creation
+	// of multiple instances of the Processor.
+	// 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
 
 	// CreateTraceProcessor creates a trace processor based on this config.
 	// If the processor type does not support tracing or if the config is not valid
@@ -140,7 +96,16 @@ type ProcessorFactory interface {
 
 // LogsProcessorFactory can create LogsProcessor.
 type LogsProcessorFactory interface {
-	ProcessorFactoryBase
+	Factory
+
+	// CreateDefaultConfig creates the default configuration for the Processor.
+	// This method can be called multiple times depending on the pipeline
+	// configuration and should not cause side-effects that prevent the creation
+	// of multiple instances of the Processor.
+	// 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
 
 	// CreateLogsProcessor creates a processor based on the config.
 	// If the processor type does not support logs or if the config is not valid

component/processor_test.go

@@ -15,10 +15,10 @@
 package component
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"go.uber.org/zap"
 
 	"go.opentelemetry.io/collector/config/configerror"
 	"go.opentelemetry.io/collector/config/configmodels"
@@ -40,34 +40,34 @@ func (f *TestProcessorFactory) CreateDefaultConfig() configmodels.Processor {
 }
 
 // CreateTraceProcessor creates a trace processor based on this config.
-func (f *TestProcessorFactory) CreateTraceProcessor(*zap.Logger, consumer.TraceConsumerOld, configmodels.Processor) (TraceProcessorOld, error) {
+func (f *TestProcessorFactory) CreateTraceProcessor(context.Context, ProcessorCreateParams, consumer.TraceConsumer, configmodels.Processor) (TraceProcessor, error) {
 	return nil, configerror.ErrDataTypeIsNotSupported
 }
 
 // CreateMetricsProcessor creates a metrics processor based on this config.
-func (f *TestProcessorFactory) CreateMetricsProcessor(*zap.Logger, consumer.MetricsConsumerOld, configmodels.Processor) (MetricsProcessorOld, error) {
+func (f *TestProcessorFactory) CreateMetricsProcessor(context.Context, ProcessorCreateParams, consumer.MetricsConsumer, configmodels.Processor) (MetricsProcessor, error) {
 	return nil, configerror.ErrDataTypeIsNotSupported
 }
 
 func TestFactoriesBuilder(t *testing.T) {
 	type testCase struct {
-		in  []ProcessorFactoryBase
-		out map[configmodels.Type]ProcessorFactoryBase
+		in  []ProcessorFactory
+		out map[configmodels.Type]ProcessorFactory
 	}
 
 	testCases := []testCase{
 		{
-			in: []ProcessorFactoryBase{
+			in: []ProcessorFactory{
 				&TestProcessorFactory{"p1"},
 				&TestProcessorFactory{"p2"},
 			},
-			out: map[configmodels.Type]ProcessorFactoryBase{
+			out: map[configmodels.Type]ProcessorFactory{
 				"p1": &TestProcessorFactory{"p1"},
 				"p2": &TestProcessorFactory{"p2"},
 			},
 		},
 		{
-			in: []ProcessorFactoryBase{
+			in: []ProcessorFactory{
 				&TestProcessorFactory{"p1"},
 				&TestProcessorFactory{"p1"},
 			},

config/config.go

@@ -417,7 +417,7 @@ func loadExporters(v *viper.Viper, factories map[configmodels.Type]component.Exp
 	return exporters, nil
 }
 
-func loadProcessors(v *viper.Viper, factories map[configmodels.Type]component.ProcessorFactoryBase) (configmodels.Processors, error) {
+func loadProcessors(v *viper.Viper, factories map[configmodels.Type]component.ProcessorFactory) (configmodels.Processors, error) {
 	// Get the list of all "processors" sub vipers from config source.
 	processorsConfig := ViperSub(v, processorsKeyName)
 	expandEnvConfig(processorsConfig)