Count received batches from conforming clients (#2030)

Signed-off-by: Yuri Shkuro <ys@uber.com>

Author: yurishkuro

cmd/agent/app/reporter/client_metrics.go

@@ -33,6 +33,7 @@ const (
 
 // clientMetrics are maintained only for data submitted in Jaeger Thrift format.
 type clientMetrics struct {
+	BatchesReceived  metrics.Counter `metric:"batches_received" help:"Total count of batches received from conforming clients"`
 	BatchesSent      metrics.Counter `metric:"batches_sent" help:"Total count of batches sent by clients"`
 	ConnectedClients metrics.Gauge   `metric:"connected_clients" help:"Total count of unique clients sending data to the agent"`
 
@@ -189,6 +190,8 @@ func (s *lastReceivedClientStats) update(
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
+	metrics.BatchesReceived.Inc(1)
+
 	if s.batchSeqNo >= batchSeqNo {
 		// Ignore out of order batches. Once we receive a batch with a larger-than-seen number,
 		// it will contain new cumulative counts, which we will use to update the metrics.

cmd/agent/app/reporter/client_metrics_test.go

@@ -112,6 +112,7 @@ func TestClientMetricsReporter_Jaeger(t *testing.T) {
 				runExpire: true,
 				// first batch cannot increment counters, only capture the baseline
 				expCounters: []metricstest.ExpectedMetric{
+					{Name: prefix + "batches_received", Value: 1},
 					{Name: prefix + "batches_sent", Value: 0},
 					{Name: prefix + "spans_dropped", Tags: tag("cause", "full-queue"), Value: 0},
 					{Name: prefix + "spans_dropped", Tags: tag("cause", "too-large"), Value: 0},
@@ -130,6 +131,7 @@ func TestClientMetricsReporter_Jaeger(t *testing.T) {
 					FailedToEmitSpans:     15,
 				},
 				expCounters: []metricstest.ExpectedMetric{
+					{Name: prefix + "batches_received", Value: 2},
 					{Name: prefix + "batches_sent", Value: 5},
 					{Name: prefix + "spans_dropped", Tags: tag("cause", "full-queue"), Value: 5},
 					{Name: prefix + "spans_dropped", Tags: tag("cause", "too-large"), Value: 5},
@@ -140,6 +142,7 @@ func TestClientMetricsReporter_Jaeger(t *testing.T) {
 				clientUUID: &clientUUID,
 				seqNo:      nPtr(90), // out of order batch will be ignored
 				expCounters: []metricstest.ExpectedMetric{
+					{Name: prefix + "batches_received", Value: 3},
 					{Name: prefix + "batches_sent", Value: 5}, // unchanged!
 				},
 			},
@@ -152,6 +155,7 @@ func TestClientMetricsReporter_Jaeger(t *testing.T) {
 					TooLargeDroppedSpans:  18,
 					FailedToEmitSpans:     19,
 				}, expCounters: []metricstest.ExpectedMetric{
+					{Name: prefix + "batches_received", Value: 4},
 					{Name: prefix + "batches_sent", Value: 10},
 					{Name: prefix + "spans_dropped", Tags: tag("cause", "full-queue"), Value: 7},
 					{Name: prefix + "spans_dropped", Tags: tag("cause", "too-large"), Value: 8},