fix remaining references

Author: crobert-1

exporter/exporterhelper/internal/obs_report_sender.go

@@ -39,13 +39,13 @@ type obsReportSender[K request.Request] struct {
 	component.StartFunc
 	component.ShutdownFunc
 
-	spanName         string
-	tracer           trace.Tracer
-	signal           pipeline.Signal
-	telemetryBuilder *metadata.TelemetryBuilder
-	spanAttrs        trace.SpanStartEventOption
-	metricAttr       metric.MeasurementOption
-	next             sender.Sender[K]
+	spanName   string
+	tracer     trace.Tracer
+	signal     pipeline.Signal
+	tb         *metadata.TelemetryBuilder
+	spanAttrs  trace.SpanStartEventOption
+	metricAttr metric.MeasurementOption
+	next       sender.Sender[K]
 }
 
 func newObsReportSender[K request.Request](set exporter.Settings, signal pipeline.Signal, next sender.Sender[K]) (sender.Sender[K], error) {
@@ -58,13 +58,13 @@ func newObsReportSender[K request.Request](set exporter.Settings, signal pipelin
 	expAttr := attribute.String(ExporterKey, idStr)
 
 	or := &obsReportSender[K]{
-		spanName:         ExporterKey + spanNameSep + idStr + spanNameSep + signal.String(),
-		tracer:           metadata.Tracer(set.TelemetrySettings),
-		signal:           signal,
-		spanAttrs:        trace.WithAttributes(expAttr, attribute.String(DataTypeKey, signal.String())),
-		metricAttr:       metric.WithAttributeSet(attribute.NewSet(expAttr)),
-		next:             next,
-		telemetryBuilder: telemetryBuilder,
+		spanName:   ExporterKey + spanNameSep + idStr + spanNameSep + signal.String(),
+		tracer:     metadata.Tracer(set.TelemetrySettings),
+		signal:     signal,
+		tb:         telemetryBuilder,
+		spanAttrs:  trace.WithAttributes(expAttr, attribute.String(DataTypeKey, signal.String())),
+		metricAttr: metric.WithAttributeSet(attribute.NewSet(expAttr)),
+		next:       next,
 	}
 
 	return or, nil
@@ -95,14 +95,14 @@ func (ors *obsReportSender[K]) endOp(ctx context.Context, numLogRecords int, err
 	// No metrics recorded for profiles.
 	switch ors.signal {
 	case pipeline.SignalTraces:
-		ors.telemetryBuilder.RecordExporterSentSpans(ctx, numSent, ors.metricAttr)
-		ors.telemetryBuilder.RecordExporterSendFailedSpans(ctx, numFailedToSend, ors.metricAttr)
+		ors.tb.RecordExporterSentSpans(ctx, numSent, ors.metricAttr)
+		ors.tb.RecordExporterSendFailedSpans(ctx, numFailedToSend, ors.metricAttr)
 	case pipeline.SignalMetrics:
-		ors.telemetryBuilder.RecordExporterSentMetricPoints(ctx, numSent, ors.metricAttr)
-		ors.telemetryBuilder.RecordExporterSendFailedMetricPoints(ctx, numFailedToSend, ors.metricAttr)
+		ors.tb.RecordExporterSentMetricPoints(ctx, numSent, ors.metricAttr)
+		ors.tb.RecordExporterSendFailedMetricPoints(ctx, numFailedToSend, ors.metricAttr)
 	case pipeline.SignalLogs:
-		ors.telemetryBuilder.RecordExporterSentLogRecords(ctx, numSent, ors.metricAttr)
-		ors.telemetryBuilder.RecordExporterSendFailedLogRecords(ctx, numFailedToSend, ors.metricAttr)
+		ors.tb.RecordExporterSentLogRecords(ctx, numSent, ors.metricAttr)
+		ors.tb.RecordExporterSendFailedLogRecords(ctx, numFailedToSend, ors.metricAttr)
 	}
 
 	span := trace.SpanFromContext(ctx)

exporter/exporterhelper/internal/queuebatch/obs_queue.go

@@ -25,9 +25,9 @@ const (
 // obsQueue is a helper to add observability to a queue.
 type obsQueue[T request.Request] struct {
 	Queue[T]
-	tb                *metadata.TelemetryBuilder
-	metricAttr        metric.MeasurementOption
-	enqueueFailedInst metric.Int64Counter
+	tb         *metadata.TelemetryBuilder
+	metricAttr metric.MeasurementOption
+	signal     pipeline.Signal
 }
 
 func newObsQueue[T request.Request](set Settings[T], delegate Queue[T]) (Queue[T], error) {
@@ -58,15 +58,7 @@ func newObsQueue[T request.Request](set Settings[T], delegate Queue[T]) (Queue[T
 		Queue:      delegate,
 		tb:         tb,
 		metricAttr: metric.WithAttributeSet(attribute.NewSet(exporterAttr)),
-	}
-
-	switch set.Signal {
-	case pipeline.SignalTraces:
-		or.enqueueFailedInst = tb.ExporterEnqueueFailedSpans
-	case pipeline.SignalMetrics:
-		or.enqueueFailedInst = tb.ExporterEnqueueFailedMetricPoints
-	case pipeline.SignalLogs:
-		or.enqueueFailedInst = tb.ExporterEnqueueFailedLogRecords
+		signal:     set.Signal,
 	}
 
 	return or, nil
@@ -83,8 +75,15 @@ func (or *obsQueue[T]) Offer(ctx context.Context, req T) error {
 	numItems := req.ItemsCount()
 	err := or.Queue.Offer(ctx, req)
 	// No metrics recorded for profiles, remove enqueueFailedInst check with nil when profiles metrics available.
-	if err != nil && or.enqueueFailedInst != nil {
-		or.enqueueFailedInst.Add(ctx, int64(numItems), or.metricAttr)
+	if err != nil {
+		switch or.signal {
+		case pipeline.SignalTraces:
+			or.tb.RecordExporterEnqueueFailedSpans(ctx, int64(numItems), or.metricAttr)
+		case pipeline.SignalMetrics:
+			or.tb.RecordExporterEnqueueFailedMetricPoints(ctx, int64(numItems), or.metricAttr)
+		case pipeline.SignalLogs:
+			or.tb.RecordExporterEnqueueFailedLogRecords(ctx, int64(numItems), or.metricAttr)
+		}
 	}
 	return err
 }