cleanup

Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>

processor/batchprocessor/go.mod

@@ -22,7 +22,6 @@ require (
 	go.opentelemetry.io/otel/sdk/metric v1.27.0
 	go.opentelemetry.io/otel/trace v1.27.0
 	go.uber.org/goleak v1.3.0
-	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.27.0
 )
 
@@ -45,6 +44,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/procfs v0.15.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/net v0.25.0 // indirect
 	golang.org/x/sys v0.20.0 // indirect
 	golang.org/x/text v0.15.0 // indirect

processor/batchprocessor/metrics.go

@@ -8,15 +8,11 @@ import (
 
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
-	noopmetric "go.opentelemetry.io/otel/metric/noop"
-	"go.uber.org/multierr"
 
-	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/configtelemetry"
 	"go.opentelemetry.io/collector/internal/obsreportconfig/obsmetrics"
 	"go.opentelemetry.io/collector/processor"
 	"go.opentelemetry.io/collector/processor/batchprocessor/internal/metadata"
-	"go.opentelemetry.io/collector/processor/processorhelper"
 )
 
 type trigger int
@@ -28,62 +24,30 @@ const (
 )
 
 type batchProcessorTelemetry struct {
-	level    configtelemetry.Level
 	detailed bool
 
 	exportCtx context.Context
 
-	processorAttr            []attribute.KeyValue
-	telemetryBuilder         *metadata.TelemetryBuilder
-	batchMetadataCardinality metric.Int64ObservableUpDownCounter
+	processorAttr    []attribute.KeyValue
+	telemetryBuilder *metadata.TelemetryBuilder
 }
 
 func newBatchProcessorTelemetry(set processor.CreateSettings, currentMetadataCardinality func() int) (*batchProcessorTelemetry, error) {
-	bpt := &batchProcessorTelemetry{
-		processorAttr: []attribute.KeyValue{attribute.String(obsmetrics.ProcessorKey, set.ID.String())},
-		exportCtx:     context.Background(),
-		level:         set.MetricsLevel,
-		detailed:      set.MetricsLevel == configtelemetry.LevelDetailed,
-	}
-
-	if err := bpt.createOtelMetrics(set.TelemetrySettings, currentMetadataCardinality); err != nil {
-		return nil, err
-	}
-
-	return bpt, nil
-}
-
-func (bpt *batchProcessorTelemetry) createOtelMetrics(set component.TelemetrySettings, currentMetadataCardinality func() int) error {
-	var (
-		errors, err error
-		meter       metric.Meter
-	)
-
-	// BatchProcessor are emitted starting from Normal level only.
-	if bpt.level >= configtelemetry.LevelNormal {
-		meter = metadata.Meter(set)
-	} else {
-		meter = noopmetric.Meter{}
-	}
-
-	bpt.telemetryBuilder, err = metadata.NewTelemetryBuilder(set,
-		metadata.WithLevel(bpt.level),
+	telemetryBuilder, err := metadata.NewTelemetryBuilder(set.TelemetrySettings,
+		metadata.WithLevel(set.MetricsLevel),
 		metadata.WithProcessorBatchMetadataCardinalityCallback(func() int64 { return int64(currentMetadataCardinality()) }),
 	)
-	errors = multierr.Append(errors, err)
-
-	bpt.batchMetadataCardinality, err = meter.Int64ObservableUpDownCounter(
-		processorhelper.BuildCustomMetricName(typeStr, ""),
-		metric.WithDescription(""),
-		metric.WithUnit("1"),
-		metric.WithInt64Callback(func(_ context.Context, obs metric.Int64Observer) error {
 
-			return nil
-		}),
-	)
-	errors = multierr.Append(errors, err)
+	if err != nil {
+		return nil, err
+	}
 
-	return errors
+	return &batchProcessorTelemetry{
+		processorAttr:    []attribute.KeyValue{attribute.String(obsmetrics.ProcessorKey, set.ID.String())},
+		exportCtx:        context.Background(),
+		detailed:         set.MetricsLevel == configtelemetry.LevelDetailed,
+		telemetryBuilder: telemetryBuilder,
+	}, nil
 }
 
 func (bpt *batchProcessorTelemetry) record(trigger trigger, sent, bytes int64) {