Simplify code from review comments

Signed-off-by: György Krajcsovits <[email protected]>
grafana · Feb 7, 2023 · 6731606 · 6731606
1 parent 04be313
commit 6731606
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/pkg/distributor/distributor.go b/pkg/distributor/distributor.go
@@ -906,7 +906,6 @@ func (d *Distributor) prePushValidationMiddleware(next push.Func) push.Func {
 		validatedMetadata := 0
 		validatedSamples := 0
 		validatedExemplars := 0
-		validatedHistograms := 0
 
 		// Find the earliest and latest samples in the batch.
 		earliestSampleTimestampMs, latestSampleTimestampMs := int64(math.MaxInt64), int64(0)
@@ -959,9 +958,8 @@ func (d *Distributor) prePushValidationMiddleware(next push.Func) push.Func {
 				continue
 			}
 
-			validatedSamples += len(ts.Samples)
+			validatedSamples += len(ts.Samples) + len(ts.Histograms)
 			validatedExemplars += len(ts.Exemplars)
-			validatedHistograms += len(ts.Histograms)
 		}
 		if len(removeIndexes) > 0 {
 			for _, removeIndex := range removeIndexes {
@@ -989,14 +987,14 @@ func (d *Distributor) prePushValidationMiddleware(next push.Func) push.Func {
 			req.Metadata = util.RemoveSliceIndexes(req.Metadata, removeIndexes)
 		}
 
-		if validatedSamples == 0 && validatedHistograms == 0 && validatedMetadata == 0 {
+		if validatedSamples == 0 && validatedMetadata == 0 {
 			return &mimirpb.WriteResponse{}, firstPartialErr
 		}
 
-		totalN := validatedSamples + validatedExemplars + validatedHistograms + validatedMetadata
+		totalN := validatedSamples + validatedExemplars + validatedMetadata
 		if !d.ingestionRateLimiter.AllowN(now, userID, totalN) {
-			if validatedSamples+validatedHistograms > 0 {
-				d.discardedSamplesRateLimited.WithLabelValues(userID, group).Add(float64(validatedSamples + validatedHistograms))
+			if validatedSamples > 0 {
+				d.discardedSamplesRateLimited.WithLabelValues(userID, group).Add(float64(validatedSamples))
 			}
 			if validatedExemplars > 0 {
 				d.discardedExemplarsRateLimited.WithLabelValues(userID).Add(float64(validatedExemplars))
@@ -1145,16 +1143,14 @@ func (d *Distributor) metricsMiddleware(next push.Func) push.Func {
 
 		numSamples := 0
 		numExemplars := 0
-		numHistograms := 0
 		for _, ts := range req.Timeseries {
-			numSamples += len(ts.Samples)
+			numSamples += len(ts.Samples) + len(ts.Histograms)
 			numExemplars += len(ts.Exemplars)
-			numHistograms += len(ts.Histograms)
 		}
 
 		d.incomingRequests.WithLabelValues(userID).Inc()
-		if numSamples+numHistograms > 0 {
-			d.incomingSamples.WithLabelValues(userID).Add(float64(numSamples + numHistograms))
+		if numSamples > 0 {
+			d.incomingSamples.WithLabelValues(userID).Add(float64(numSamples))
 		}
 		if numExemplars > 0 {
 			d.incomingExemplars.WithLabelValues(userID).Add(float64(numExemplars))

diff --git a/pkg/distributor/forwarding/forwarding.go b/pkg/distributor/forwarding/forwarding.go
@@ -515,9 +515,7 @@ func (r *request) doHTTP(ctx context.Context, body []byte) error {
 	httpReq.Header.Set(user.OrgIDHeaderName, r.user)
 
 	r.requests.Inc()
-	if r.counts.SampleCount > 0 {
-		r.samples.Add(float64(r.counts.SampleCount))
-	}
+	r.samples.Add(float64(r.counts.SampleCount))
 	r.exemplars.Add(float64(r.counts.ExemplarCount))
 
 	beforeTs := time.Now()
@@ -594,9 +592,7 @@ func (r *request) doHTTPGrpc(ctx context.Context, body []byte) error {
 	h := c.(httpgrpc.HTTPClient)
 
 	r.requests.Inc()
-	if r.counts.SampleCount > 0 {
-		r.samples.Add(float64(r.counts.SampleCount))
-	}
+	r.samples.Add(float64(r.counts.SampleCount))
 	r.exemplars.Add(float64(r.counts.ExemplarCount))
 
 	beforeTs := time.Now()

diff --git a/pkg/distributor/forwarding/forwarding_test.go b/pkg/distributor/forwarding/forwarding_test.go
@@ -109,7 +109,7 @@ func TestForwardingSamplesSuccessfullyToSingleTarget(t *testing.T) {
 	cortex_distributor_forward_requests_total{} 1
 	# HELP cortex_distributor_forward_samples_total The total number of samples the Distributor forwarded.
 	# TYPE cortex_distributor_forward_samples_total counter
-	cortex_distributor_forward_samples_total 4
+	cortex_distributor_forward_samples_total{} 4
 `
 
 	require.NoError(t, testutil.GatherAndCompare(
@@ -926,7 +926,7 @@ func TestForwardingToHTTPGrpcTarget(t *testing.T) {
 	cortex_distributor_forward_requests_total{} 1
 	# HELP cortex_distributor_forward_samples_total The total number of samples the Distributor forwarded.
 	# TYPE cortex_distributor_forward_samples_total counter
-	cortex_distributor_forward_samples_total 4
+	cortex_distributor_forward_samples_total{} 4
 	# TYPE cortex_distributor_forward_grpc_clients gauge
 	# HELP cortex_distributor_forward_grpc_clients Number of gRPC clients used by Distributor forwarder.
 	cortex_distributor_forward_grpc_clients 1