Do not count ignored histograms as failed.

Now that there is no typed counters, this makes no sense. Signed-off-by: György Krajcsovits <[email protected]>
grafana · Feb 7, 2023 · ca0d58b · ca0d58b
1 parent dad5684
commit ca0d58b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/pkg/ingester/ingester.go b/pkg/ingester/ingester.go
@@ -1137,8 +1137,6 @@ func (i *Ingester) pushSamplesToAppender(userID string, timeseries []mimirpb.Pre
 
 					return wrapWithUser(err, userID)
 				}
-			} else { // ignore histograms and increase counter
-				stats.histogramStats.failedSamplesCount++
 			}
 		}
 

diff --git a/pkg/ingester/ingester_test.go b/pkg/ingester/ingester_test.go
@@ -482,9 +482,6 @@ func TestIngester_Push(t *testing.T) {
 				# HELP cortex_ingester_ingested_samples_total The total number of samples ingested per user.
 				# TYPE cortex_ingester_ingested_samples_total counter
 				cortex_ingester_ingested_samples_total{user="test"} 2
-				# HELP cortex_ingester_ingested_samples_failures_total The total number of samples that errored on ingestion per user.
-				# TYPE cortex_ingester_ingested_samples_failures_total counter
-				cortex_ingester_ingested_samples_failures_total{user="test"} 1
 				# HELP cortex_ingester_memory_users The current number of users in memory.
 				# TYPE cortex_ingester_memory_users gauge
 				cortex_ingester_memory_users 1
@@ -7383,9 +7380,6 @@ func testIngesterCanEnableIngestAndQueryNativeHistograms(t *testing.T, sampleHis
 	require.NoError(t, err)
 
 	expectedMetrics := `
-		# HELP cortex_ingester_ingested_samples_failures_total The total number of samples that errored on ingestion per user.
-		# TYPE cortex_ingester_ingested_samples_failures_total counter
-		cortex_ingester_ingested_samples_failures_total{user="1"} 1
 		# HELP cortex_ingester_ingested_samples_total The total number of samples ingested per user.
 		# TYPE cortex_ingester_ingested_samples_total counter
 		cortex_ingester_ingested_samples_total{user="1"} 1
@@ -7435,9 +7429,6 @@ func testIngesterCanEnableIngestAndQueryNativeHistograms(t *testing.T, sampleHis
 	require.NoError(t, err)
 
 	expectedMetrics = `
-	# HELP cortex_ingester_ingested_samples_failures_total The total number of samples that errored on ingestion per user.
-	# TYPE cortex_ingester_ingested_samples_failures_total counter
-	cortex_ingester_ingested_samples_failures_total{user="1"} 1
 	# HELP cortex_ingester_ingested_samples_total The total number of samples ingested per user.
 	# TYPE cortex_ingester_ingested_samples_total counter
 	cortex_ingester_ingested_samples_total{user="1"} 2
-Original file line number
+Diff line change
@@ Expand Up @@
     					return wrapWithUser(err, userID)
     				}
-    			} else { // ignore histograms and increase counter
-    				stats.histogramStats.failedSamplesCount++
     			}
     		}
@@ Expand Down @@