Fix rebase issues

obsreport/obsreport_exporter.go

@@ -83,7 +83,12 @@ func (eor *Exporter) EndMetricsOp(ctx context.Context, numMetricPoints int, err
 	endSpan(ctx, err, numSent, numFailedToSend, obsmetrics.SentMetricPointsKey, obsmetrics.FailedToSendMetricPointsKey)
 }
 
-// StartLogsExportOp is called at the start of an Export operation.
+// RecordMetricsEnqueueFailure records number of metric points that failed to be added to the sending queue.
+func (eor *Exporter) RecordMetricsEnqueueFailure(ctx context.Context, numMetricPoints int) {
+	_ = stats.RecordWithTags(ctx, eor.mutators, obsmetrics.ExporterFailedToEnqueueMetricPoints.M(int64(numMetricPoints)))
+}
+
+// StartLogsOp is called at the start of an Export operation.
 // The returned context should be used in other calls to the Exporter functions
 // dealing with the same export operation.
 func (eor *Exporter) StartLogsOp(ctx context.Context) context.Context {