From f369d41119e1e76c9c23d4af698992c11193ca52 Mon Sep 17 00:00:00 2001
From: Jacob Colvin <jacobcolvin1@gmail.com>
Date: Sat, 18 Nov 2023 20:54:33 -0500
Subject: [PATCH] Remove optional OTEL metrics from filterprocessor telemetry

This feature flag is not available for contrib packages.
---
 processor/filterprocessor/telemetry.go | 78 +-------------------------
 1 file changed, 3 insertions(+), 75 deletions(-)

diff --git a/processor/filterprocessor/telemetry.go b/processor/filterprocessor/telemetry.go
index f86a3bad3c53..f3eb984aa4f1 100644
--- a/processor/filterprocessor/telemetry.go
+++ b/processor/filterprocessor/telemetry.go
@@ -10,22 +10,11 @@ import (
 	"go.opencensus.io/stats/view"
 	"go.opencensus.io/tag"
 	"go.opentelemetry.io/collector/processor"
-	"go.opentelemetry.io/collector/processor/processorhelper"
 	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/metric"
-	"go.uber.org/multierr"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor/internal/metadata"
 )
 
-const (
-	scopeName = "go.opentelemetry.io/collector/processor/filterprocessor"
-
-	metricsFilteredDesc = "Number of metrics dropped by the filter processor"
-	logsFilteredDesc    = "Number of logs dropped by the filter processor"
-	spansFilteredDesc   = "Number of spans dropped by the filter processor"
-)
-
 type trigger int
 
 const (
@@ -37,9 +26,9 @@ const (
 var (
 	typeStr             = metadata.Type
 	processorTagKey     = tag.MustNewKey(typeStr)
-	statMetricsFiltered = stats.Int64("metrics.filtered", metricsFilteredDesc, stats.UnitDimensionless)
-	statLogsFiltered    = stats.Int64("logs.filtered", logsFilteredDesc, stats.UnitDimensionless)
-	statSpansFiltered   = stats.Int64("spans.filtered", spansFilteredDesc, stats.UnitDimensionless)
+	statMetricsFiltered = stats.Int64("metrics.filtered", "Number of metrics dropped by the filter processor", stats.UnitDimensionless)
+	statLogsFiltered    = stats.Int64("logs.filtered", "Number of logs dropped by the filter processor", stats.UnitDimensionless)
+	statSpansFiltered   = stats.Int64("spans.filtered", "Number of spans dropped by the filter processor", stats.UnitDimensionless)
 )
 
 func init() {
@@ -76,15 +65,9 @@ func metricViews() []*view.View {
 }
 
 type filterProcessorTelemetry struct {
-	useOtel bool
-
 	exportCtx context.Context
 
 	processorAttr []attribute.KeyValue
-
-	metricsFiltered metric.Int64Counter
-	logsFiltered    metric.Int64Counter
-	spansFiltered   metric.Int64Counter
 }
 
 func newfilterProcessorTelemetry(set processor.CreateSettings) (*filterProcessorTelemetry, error) {
@@ -94,59 +77,15 @@ func newfilterProcessorTelemetry(set processor.CreateSettings) (*filterProcessor
 	if err != nil {
 		return nil, err
 	}
-
 	fpt := &filterProcessorTelemetry{
-		useOtel:       false,
 		processorAttr: []attribute.KeyValue{attribute.String(typeStr, processorID)},
 		exportCtx:     exportCtx,
 	}
 
-	if err = fpt.createOtelMetrics(set.MeterProvider); err != nil {
-		return nil, err
-	}
-
 	return fpt, nil
 }
 
-func (fpt *filterProcessorTelemetry) createOtelMetrics(mp metric.MeterProvider) error {
-	if !fpt.useOtel {
-		return nil
-	}
-
-	var errors, err error
-	meter := mp.Meter(scopeName)
-
-	fpt.metricsFiltered, err = meter.Int64Counter(
-		processorhelper.BuildCustomMetricName(typeStr, "metrics_filtered"),
-		metric.WithDescription(metricsFilteredDesc),
-		metric.WithUnit("1"),
-	)
-	errors = multierr.Append(errors, err)
-	fpt.logsFiltered, err = meter.Int64Counter(
-		processorhelper.BuildCustomMetricName(typeStr, "logs_filtered"),
-		metric.WithDescription(logsFilteredDesc),
-		metric.WithUnit("1"),
-	)
-	errors = multierr.Append(errors, err)
-	fpt.spansFiltered, err = meter.Int64Counter(
-		processorhelper.BuildCustomMetricName(typeStr, "spans_filtered"),
-		metric.WithDescription(spansFilteredDesc),
-		metric.WithUnit("1"),
-	)
-	errors = multierr.Append(errors, err)
-
-	return errors
-}
-
 func (fpt *filterProcessorTelemetry) record(trigger trigger, dropped int64) {
-	if fpt.useOtel {
-		fpt.recordWithOtel(trigger, dropped)
-	} else {
-		fpt.recordWithOC(trigger, dropped)
-	}
-}
-
-func (fpt *filterProcessorTelemetry) recordWithOC(trigger trigger, dropped int64) {
 	var triggerMeasure *stats.Int64Measure
 	switch trigger {
 	case triggerMetricsDropped:
@@ -159,14 +98,3 @@ func (fpt *filterProcessorTelemetry) recordWithOC(trigger trigger, dropped int64
 
 	stats.Record(fpt.exportCtx, triggerMeasure.M(dropped))
 }
-
-func (fpt *filterProcessorTelemetry) recordWithOtel(trigger trigger, dropped int64) {
-	switch trigger {
-	case triggerMetricsDropped:
-		fpt.metricsFiltered.Add(fpt.exportCtx, dropped, metric.WithAttributes(fpt.processorAttr...))
-	case triggerLogsDropped:
-		fpt.logsFiltered.Add(fpt.exportCtx, dropped, metric.WithAttributes(fpt.processorAttr...))
-	case triggerSpansDropped:
-		fpt.spansFiltered.Add(fpt.exportCtx, dropped, metric.WithAttributes(fpt.processorAttr...))
-	}
-}