Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[agent] Do not increment data loss counters on the first client batch #2028

Merged
merged 2 commits into from
Jan 17, 2020
Merged

[agent] Do not increment data loss counters on the first client batch #2028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e03787
[agent] Do not increment data loss counters on the first client batch
Jan 17, 2020
1a054d4
simplify tests;
Jan 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions cmd/agent/app/reporter/client_metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,21 +195,24 @@ func (s *lastReceivedClientStats) update(
// That makes the metrics slightly off in time, but accurate in aggregate.
return
}
// do not update counters on the first batch, because it may cause a huge spike in totals
// if the client has been running for a while already, but the agent just started.
if s.batchSeqNo > 0 {
metrics.BatchesSent.Inc(batchSeqNo - s.batchSeqNo)
if stats != nil {
metrics.FailedToEmitSpans.Inc(stats.FailedToEmitSpans - s.failedToEmitSpans)
metrics.TooLargeDroppedSpans.Inc(stats.TooLargeDroppedSpans - s.tooLargeDroppedSpans)
metrics.FullQueueDroppedSpans.Inc(stats.FullQueueDroppedSpans - s.fullQueueDroppedSpans)
}
}

metrics.BatchesSent.Inc(batchSeqNo - s.batchSeqNo)

s.lastUpdated = time.Now()
s.batchSeqNo = batchSeqNo
if stats != nil {
metrics.FailedToEmitSpans.Inc(stats.FailedToEmitSpans - s.failedToEmitSpans)
metrics.TooLargeDroppedSpans.Inc(stats.TooLargeDroppedSpans - s.tooLargeDroppedSpans)
metrics.FullQueueDroppedSpans.Inc(stats.FullQueueDroppedSpans - s.fullQueueDroppedSpans)

s.failedToEmitSpans = stats.FailedToEmitSpans
s.tooLargeDroppedSpans = stats.TooLargeDroppedSpans
s.fullQueueDroppedSpans = stats.FullQueueDroppedSpans
}

s.lastUpdated = time.Now()
s.batchSeqNo = batchSeqNo
}

func clientUUID(batch *jaeger.Batch) string {
Expand Down
44 changes: 30 additions & 14 deletions cmd/agent/app/reporter/client_metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,40 +104,58 @@ func TestClientMetricsReporter_Jaeger(t *testing.T) {
clientUUID: &clientUUID,
seqNo: nPtr(100),
expLog: clientUUID,
runExpire: true,
stats: &jaeger.ClientStats{
FullQueueDroppedSpans: 10,
TooLargeDroppedSpans: 10,
FailedToEmitSpans: 10,
},
runExpire: true,
// first batch cannot increment counters, only capture the baseline
expCounters: []metricstest.ExpectedMetric{
{Name: prefix + "batches_sent", Value: 100},
{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},
{Name: prefix + "spans_dropped", Tags: tag("cause", "send-failure"), Value: 0},
},
expGauges: []metricstest.ExpectedMetric{
{Name: prefix + "connected_clients", Value: 1},
},
},
{
clientUUID: &clientUUID,
seqNo: nPtr(101),
seqNo: nPtr(105),
stats: &jaeger.ClientStats{
FullQueueDroppedSpans: 15,
TooLargeDroppedSpans: 15,
FailedToEmitSpans: 15,
},
expCounters: []metricstest.ExpectedMetric{
{Name: prefix + "batches_sent", Value: 101},
{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},
{Name: prefix + "spans_dropped", Tags: tag("cause", "send-failure"), Value: 5},
},
},
{
clientUUID: &clientUUID,
seqNo: nPtr(90), // out of order batch will be ignored
expCounters: []metricstest.ExpectedMetric{
{Name: prefix + "batches_sent", Value: 101}, // unchanged!
{Name: prefix + "batches_sent", Value: 5}, // unchanged!
},
},
{
clientUUID: &clientUUID,
seqNo: nPtr(110),
// use different stats values to test the correct assignments
stats: &jaeger.ClientStats{
FullQueueDroppedSpans: 5,
TooLargeDroppedSpans: 6,
FailedToEmitSpans: 7,
FullQueueDroppedSpans: 17,
TooLargeDroppedSpans: 18,
FailedToEmitSpans: 19,
}, expCounters: []metricstest.ExpectedMetric{
{Name: prefix + "batches_sent", Value: 110},
{Name: prefix + "spans_dropped", Tags: tag("cause", "full-queue"), Value: 5},
{Name: prefix + "spans_dropped", Tags: tag("cause", "too-large"), Value: 6},
{Name: prefix + "spans_dropped", Tags: tag("cause", "send-failure"), Value: 7},
{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},
{Name: prefix + "spans_dropped", Tags: tag("cause", "send-failure"), Value: 9},
},
},
}
Expand Down Expand Up @@ -219,8 +237,6 @@ func TestClientMetricsReporter_Expire(t *testing.T) {
err := tr.r.EmitBatch(batch)
assert.NoError(t, err)
assert.Len(t, tr.mr.Spans(), 1)
tr.mb.AssertCounterMetrics(t,
metricstest.ExpectedMetric{Name: "client_stats.batches_sent", Value: 1})

// here we test that a connected-client gauge is updated to 1 by the auto-scheduled expire loop,
// and then reset to 0 once the client entry expires.
Expand Down