fix otelcol_exporter_send_failed_requests count error

Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> fix otelcol_exporter_send_failed_requests count error Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> test and changelog Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> fix note fix otelcol_exporter_send_failed_requests count error Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> fix otelcol_exporter_send_failed_requests count error Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> test and changelog Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> fix otelcol_exporter_send_failed_requests count error Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> fix otelcol_exporter_send_failed_requests count error Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> test and changelog Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> fix note fix otelcol_exporter_send_failed_requests count error Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> fix otelcol_exporter_send_failed_requests count error Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> test and changelog Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> fix note new line Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> fix otelcol_exporter_send_failed_requests count error Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> fix otelcol_exporter_send_failed_requests count error Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> test and changelog Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> fix note fix otelcol_exporter_send_failed_requests count error Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> fix otelcol_exporter_send_failed_requests count error Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> test and changelog Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> fix otelcol_exporter_send_failed_requests count error Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> fix otelcol_exporter_send_failed_requests count error Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> test and changelog Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> fix note fix otelcol_exporter_send_failed_requests count error Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> fix otelcol_exporter_send_failed_requests count error Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> test and changelog Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> fix note new line Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io> new line！ Signed-off-by: guiyong.ou <guiyong.ou@daocloud.io>
open-telemetry · Apr 20, 2023 · 746473a · 746473a
1 parent a27fb4c
commit 746473a
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 11 deletions.
diff --git a/.chloggen/fix-send_failed_requests-counter.yaml b/.chloggen/fix-send_failed_requests-counter.yaml
@@ -0,0 +1,12 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: obsreport
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: fix issue where send_failed_requests counter was reporting an incorrect value.
+
+# One or more tracking issues or pull requests related to the change
+issues: [7456]
+
diff --git a/obsreport/obsreport_exporter.go b/obsreport/obsreport_exporter.go
@@ -229,11 +229,18 @@ func (exp *Exporter) recordWithOC(ctx context.Context, dataType component.DataTy
 		failedMeasure = obsmetrics.ExporterFailedToSendLogRecords
 	}
 
-	_ = stats.RecordWithTags(
-		ctx,
-		exp.mutators,
-		sentMeasure.M(sent),
-		failedMeasure.M(failed))
+	if failed > 0 {
+		_ = stats.RecordWithTags(
+			ctx,
+			exp.mutators,
+			sentMeasure.M(sent),
+			failedMeasure.M(failed))
+	} else {
+		_ = stats.RecordWithTags(
+			ctx,
+			exp.mutators,
+			sentMeasure.M(sent))
+	}
 }
 
 func endSpan(ctx context.Context, err error, numSent, numFailedToSend int64, sentItemsKey, failedToSendItemsKey string) {

diff --git a/obsreport/obsreporttest/otelprometheuschecker.go b/obsreport/obsreporttest/otelprometheuschecker.go
@@ -88,23 +88,35 @@ func (pc *prometheusChecker) checkProcessorLogs(processor component.ID, accepted
 
 func (pc *prometheusChecker) checkExporterTraces(exporter component.ID, sentSpans, sendFailedSpans int64) error {
 	exporterAttrs := attributesForExporterMetrics(exporter)
+	if sendFailedSpans > 0 {
+		return multierr.Combine(
+			pc.checkCounter("exporter_sent_spans", sentSpans, exporterAttrs),
+			pc.checkCounter("exporter_send_failed_spans", sendFailedSpans, exporterAttrs))
+	}
 	return multierr.Combine(
-		pc.checkCounter("exporter_sent_spans", sentSpans, exporterAttrs),
-		pc.checkCounter("exporter_send_failed_spans", sendFailedSpans, exporterAttrs))
+		pc.checkCounter("exporter_sent_spans", sentSpans, exporterAttrs))
 }
 
 func (pc *prometheusChecker) checkExporterLogs(exporter component.ID, sentLogRecords, sendFailedLogRecords int64) error {
 	exporterAttrs := attributesForExporterMetrics(exporter)
+	if sendFailedLogRecords > 0 {
+		return multierr.Combine(
+			pc.checkCounter("exporter_sent_log_records", sentLogRecords, exporterAttrs),
+			pc.checkCounter("exporter_send_failed_log_records", sendFailedLogRecords, exporterAttrs))
+	}
 	return multierr.Combine(
-		pc.checkCounter("exporter_sent_log_records", sentLogRecords, exporterAttrs),
-		pc.checkCounter("exporter_send_failed_log_records", sendFailedLogRecords, exporterAttrs))
+		pc.checkCounter("exporter_sent_log_records", sentLogRecords, exporterAttrs))
 }
 
 func (pc *prometheusChecker) checkExporterMetrics(exporter component.ID, sentMetricPoints, sendFailedMetricPoints int64) error {
 	exporterAttrs := attributesForExporterMetrics(exporter)
+	if sendFailedMetricPoints > 0 {
+		return multierr.Combine(
+			pc.checkCounter("exporter_sent_metric_points", sentMetricPoints, exporterAttrs),
+			pc.checkCounter("exporter_send_failed_metric_points", sendFailedMetricPoints, exporterAttrs))
+	}
 	return multierr.Combine(
-		pc.checkCounter("exporter_sent_metric_points", sentMetricPoints, exporterAttrs),
-		pc.checkCounter("exporter_send_failed_metric_points", sendFailedMetricPoints, exporterAttrs))
+		pc.checkCounter("exporter_sent_metric_points", sentMetricPoints, exporterAttrs))
 }
 
 func (pc *prometheusChecker) checkCounter(expectedMetric string, value int64, attrs []attribute.KeyValue) error {