Create FilterMetricProcessor with processor.CreateSettings

This is required so that we can access metadata about the processor for telemetry tags/labels.
open-telemetry · Nov 19, 2023 · 0b6cbe1 · 0b6cbe1
1 parent d26d745
commit 0b6cbe1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/processor/filterprocessor/factory.go b/processor/filterprocessor/factory.go
@@ -45,7 +45,7 @@ func createMetricsProcessor(
 	cfg component.Config,
 	nextConsumer consumer.Metrics,
 ) (processor.Metrics, error) {
-	fp, err := newFilterMetricProcessor(set.TelemetrySettings, cfg.(*Config))
+	fp, err := newFilterMetricProcessor(set, cfg.(*Config))
 	if err != nil {
 		return nil, err
 	}

diff --git a/processor/filterprocessor/metrics.go b/processor/filterprocessor/metrics.go
@@ -7,9 +7,9 @@ import (
 	"context"
 	"fmt"
 
-	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/pmetric"
+	"go.opentelemetry.io/collector/processor"
 	"go.opentelemetry.io/collector/processor/processorhelper"
 	"go.uber.org/multierr"
 	"go.uber.org/zap"
@@ -33,7 +33,7 @@ type filterMetricProcessor struct {
 	logger            *zap.Logger
 }
 
-func newFilterMetricProcessor(set component.TelemetrySettings, cfg *Config) (*filterMetricProcessor, error) {
+func newFilterMetricProcessor(set processor.CreateSettings, cfg *Config) (*filterMetricProcessor, error) {
 	var err error
 	fsp := &filterMetricProcessor{
 		logger: set.Logger,
@@ -47,14 +47,14 @@ func newFilterMetricProcessor(set component.TelemetrySettings, cfg *Config) (*fi
 
 	if cfg.Metrics.MetricConditions != nil || cfg.Metrics.DataPointConditions != nil {
 		if cfg.Metrics.MetricConditions != nil {
-			fsp.skipMetricExpr, err = filterottl.NewBoolExprForMetric(cfg.Metrics.MetricConditions, filterottl.StandardMetricFuncs(), cfg.ErrorMode, set)
+			fsp.skipMetricExpr, err = filterottl.NewBoolExprForMetric(cfg.Metrics.MetricConditions, filterottl.StandardMetricFuncs(), cfg.ErrorMode, set.TelemetrySettings)
 			if err != nil {
 				return nil, err
 			}
 		}
 
 		if cfg.Metrics.DataPointConditions != nil {
-			fsp.skipDataPointExpr, err = filterottl.NewBoolExprForDataPoint(cfg.Metrics.DataPointConditions, filterottl.StandardDataPointFuncs(), cfg.ErrorMode, set)
+			fsp.skipDataPointExpr, err = filterottl.NewBoolExprForDataPoint(cfg.Metrics.DataPointConditions, filterottl.StandardDataPointFuncs(), cfg.ErrorMode, set.TelemetrySettings)
 			if err != nil {
 				return nil, err
 			}

diff --git a/processor/filterprocessor/metrics_test.go b/processor/filterprocessor/metrics_test.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/consumer/consumertest"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/pmetric"
@@ -728,7 +727,7 @@ func TestFilterMetricProcessorWithOTTL(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			processor, err := newFilterMetricProcessor(componenttest.NewNopTelemetrySettings(), &Config{Metrics: tt.conditions, ErrorMode: tt.errorMode})
+			processor, err := newFilterMetricProcessor(processortest.NewNopCreateSettings(), &Config{Metrics: tt.conditions, ErrorMode: tt.errorMode})
 			assert.NoError(t, err)
 
 			got, err := processor.processMetrics(context.Background(), constructMetrics())

diff --git a/processor/filterprocessor/telemetry.go b/processor/filterprocessor/telemetry.go
@@ -9,7 +9,7 @@ import (
 	"go.opencensus.io/stats"
 	"go.opencensus.io/stats/view"
 	"go.opencensus.io/tag"
-	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/processor"
 	"go.opentelemetry.io/collector/processor/processorhelper"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
@@ -55,17 +55,17 @@ type filterProcessorTelemetry struct {
 	droppedByFilter metric.Int64Counter
 }
 
-func newfilterProcessorTelemetry(set component.TelemetrySettings) (*filterProcessorTelemetry, error) {
-	id, _ := set.Resource.Attributes().Get("ID")
+func newfilterProcessorTelemetry(set processor.CreateSettings) (*filterProcessorTelemetry, error) {
+	processorID := set.ID.String()
 
-	exportCtx, err := tag.New(context.Background(), tag.Insert(processorTagKey, id.Str()))
+	exportCtx, err := tag.New(context.Background(), tag.Insert(processorTagKey, processorID))
 	if err != nil {
 		return nil, err
 	}
 
 	fpt := &filterProcessorTelemetry{
 		useOtel:       false,
-		processorAttr: []attribute.KeyValue{attribute.String(typeStr, id.Str())},
+		processorAttr: []attribute.KeyValue{attribute.String(typeStr, processorID)},
 		exportCtx:     exportCtx,
 	}