Migrate filterprocessor from Collector core to Collector contrib (#4652)

* Migrate filterprocessor

* Add internal/coreinternal in go.mod

go.mod

@@ -43,6 +43,7 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-00010101000000-000000000000
  github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.0.0-00010101000000-000000000000
  github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.0.0-00010101000000-000000000000
+ github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.0.0-00010101000000-000000000000
  github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.0.0-00010101000000-000000000000
  github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.0.0-00010101000000-000000000000
  github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.0.0-00010101000000-000000000000
@@ -89,7 +90,7 @@ require (
 // Replace references to modules that are in this repository with their relateive paths
 // so that we always build with current (latest) version of the source code.
 
-replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ./internal/coreinternal
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ./internal/coreinternal
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ./internal/common
 
@@ -247,6 +248,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafka
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver => ./receiver/googlecloudpubsubreceiver
 
+replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor => ./processor/filterprocessor
+
 replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor => ./processor/groupbyattrsprocessor
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor => ./processor/groupbytraceprocessor

internal/components/components.go

@@ -54,6 +54,7 @@ import (
  "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage"
  "github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor"
  "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor"
+ "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor"
  "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor"
  "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor"
  "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor"
@@ -102,6 +103,7 @@ func Components() (component.Factories, error) {
  delete(factories.Extensions, "oidc")
  delete(factories.Extensions, "bearertokenauth")
  delete(factories.Processors, "probabilistic_sampler")
+ delete(factories.Processors, "filter")
 
  extensions := []component.ExtensionFactory{
  bearertokenauthextension.NewFactory(),
@@ -200,6 +202,7 @@ func Components() (component.Factories, error) {
  }
 
  processors := []component.ProcessorFactory{
+ filterprocessor.NewFactory(),
  groupbyattrsprocessor.NewFactory(),
  groupbytraceprocessor.NewFactory(),
  k8sprocessor.NewFactory(),

processor/filterprocessor/Makefile

@@ -0,0 +1 @@
+include ../../Makefile.Common

internal/core/processor/filterprocessor/config.go → processor/filterprocessor/config.go

@@ -16,8 +16,9 @@ package filterprocessor
 
 import (
  "go.opentelemetry.io/collector/config"
- "go.opentelemetry.io/collector/internal/processor/filterconfig"
- "go.opentelemetry.io/collector/internal/processor/filtermetric"
+
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/processor/filterconfig"
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/processor/filtermetric"
 )
 
 // Config defines configuration for Resource processor.

internal/core/processor/filterprocessor/config_test.go → processor/filterprocessor/config_test.go

@@ -24,8 +24,10 @@ import (
  "go.opentelemetry.io/collector/component/componenttest"
  "go.opentelemetry.io/collector/config"
  "go.opentelemetry.io/collector/config/configtest"
- "go.opentelemetry.io/collector/internal/processor/filtermetric"
- fsregexp "go.opentelemetry.io/collector/internal/processor/filterset/regexp"
+
+ fsregexp "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/processor/filterset/regexp"
+
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/processor/filtermetric"
 )
 
 // TestLoadingConfigRegexp tests loading testdata/config_strict.yaml

internal/core/processor/filterprocessor/expr_test.go → processor/filterprocessor/expr_test.go

@@ -28,9 +28,10 @@ import (
  "go.opentelemetry.io/collector/component"
  "go.opentelemetry.io/collector/config"
  "go.opentelemetry.io/collector/consumer/consumertest"
- "go.opentelemetry.io/collector/internal/goldendataset"
- "go.opentelemetry.io/collector/internal/processor/filtermetric"
  "go.opentelemetry.io/collector/model/pdata"
+
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/goldendataset"
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/processor/filtermetric"
 )
 
 const filteredMetric = "p0_metric_1"

internal/core/processor/filterprocessor/filter_processor.go → processor/filterprocessor/filter_processor.go

@@ -19,12 +19,13 @@ import (
 
  "go.uber.org/zap"
 
- "go.opentelemetry.io/collector/internal/processor/filterconfig"
- "go.opentelemetry.io/collector/internal/processor/filtermatcher"
- "go.opentelemetry.io/collector/internal/processor/filtermetric"
- "go.opentelemetry.io/collector/internal/processor/filterset"
  "go.opentelemetry.io/collector/model/pdata"
  "go.opentelemetry.io/collector/processor/processorhelper"
+
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/processor/filterconfig"
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/processor/filtermatcher"
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/processor/filtermetric"
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/processor/filterset"
 )
 
 type filterMetricProcessor struct {

internal/core/processor/filterprocessor/filter_processor_logs.go → processor/filterprocessor/filter_processor_logs.go

@@ -19,11 +19,12 @@ import (
 
  "go.uber.org/zap"
 
- "go.opentelemetry.io/collector/internal/processor/filterconfig"
- "go.opentelemetry.io/collector/internal/processor/filtermatcher"
- "go.opentelemetry.io/collector/internal/processor/filterset"
  "go.opentelemetry.io/collector/model/pdata"
  "go.opentelemetry.io/collector/processor/processorhelper"
+
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/processor/filterconfig"
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/processor/filtermatcher"
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/processor/filterset"
 )
 
 type filterLogProcessor struct {

internal/core/processor/filterprocessor/filter_processor_logs_test.go → processor/filterprocessor/filter_processor_logs_test.go

@@ -24,8 +24,9 @@ import (
  "go.opentelemetry.io/collector/component/componenttest"
  "go.opentelemetry.io/collector/config"
  "go.opentelemetry.io/collector/consumer/consumertest"
- "go.opentelemetry.io/collector/internal/processor/filterconfig"
  "go.opentelemetry.io/collector/model/pdata"
+
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/processor/filterconfig"
 )
 
 type logNameTest struct {

internal/core/processor/filterprocessor/filter_processor_test.go → processor/filterprocessor/filter_processor_test.go

@@ -26,10 +26,11 @@ import (
  "go.opentelemetry.io/collector/component/componenttest"
  "go.opentelemetry.io/collector/config"
  "go.opentelemetry.io/collector/consumer/consumertest"
- "go.opentelemetry.io/collector/internal/goldendataset"
- "go.opentelemetry.io/collector/internal/processor/filterconfig"
- "go.opentelemetry.io/collector/internal/processor/filtermetric"
  "go.opentelemetry.io/collector/model/pdata"
+
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/goldendataset"
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/processor/filterconfig"
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/processor/filtermetric"
 )
 
 type metricNameTest struct {

processor/filterprocessor/go.mod

@@ -0,0 +1,13 @@
+module github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor
+
+go 1.16
+
+require (
+ github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-00010101000000-000000000000
+ github.com/stretchr/testify v1.7.0
+ go.opentelemetry.io/collector v0.33.1-0.20210820002854-d3000232f8f6
+ go.opentelemetry.io/collector/model v0.33.1-0.20210820002854-d3000232f8f6
+ go.uber.org/zap v1.19.0
+)
+
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal