Skip to content

Commit f9dede0

Browse files
authored
fix: make sure all transmit metrics have correct libhoney prefix (#1661)
## Which problem is this PR solving? We would like to preserve all existing `libhoney` metric names so that users can compare the performance between version upgrades easily. ## Short description of the changes - add `libhoney_` prefix to all transmit metrics
1 parent 0fa1243 commit f9dede0

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

transmit/direct_transmit.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ func (d *DirectTransmission) EnqueueSpan(sp *types.Span) {
247247
// it should be called after the metrics object has been created.
248248
func (d *DirectTransmission) RegisterMetrics() {
249249
for _, m := range transmissionMetrics {
250-
fullName := d.transmitType.String() + m.Name
250+
fullName := "libhoney_" + d.transmitType.String() + m.Name
251251
switch m.Name {
252252
case updownQueuedItems:
253253
d.metricKeys.updownQueuedItems = fullName
@@ -259,25 +259,17 @@ func (d *DirectTransmission) RegisterMetrics() {
259259
d.metricKeys.counterResponse20x = fullName
260260
case counterResponseErrors:
261261
d.metricKeys.counterResponseErrors = fullName
262-
// Below are metrics previously associated with the libhoney transmission used to send data upstream or to peers.
263-
// Even though libhoney isn't used, include the prefix in these metric names to avoid breaking existing Refinery operations boards & queries.
264262
case gaugeQueueLength:
265-
fullName = "libhoney_" + fullName
266263
d.metricKeys.gaugeQueueLength = fullName
267264
case counterSendErrors:
268-
fullName = "libhoney_" + fullName
269265
d.metricKeys.counterSendErrors = fullName
270266
case counterSendRetries:
271-
fullName = "libhoney_" + fullName
272267
d.metricKeys.counterSendRetries = fullName
273268
case counterBatchesSent:
274-
fullName = "libhoney_" + fullName
275269
d.metricKeys.counterBatchesSent = fullName
276270
case counterMessagesSent:
277-
fullName = "libhoney_" + fullName
278271
d.metricKeys.counterMessagesSent = fullName
279272
case counterResponseDecodeErrors:
280-
fullName = "libhoney_" + fullName
281273
d.metricKeys.counterResponseDecodeErrors = fullName
282274
}
283275
m.Name = fullName // Update the metric name to include the transmit type

transmit/direct_transmit_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -509,11 +509,11 @@ func TestDirectTransmission(t *testing.T) {
509509
require.NoError(t, err)
510510
defer dt.Stop()
511511
dt.RegisterMetrics()
512-
assert.Equal(t, "upstream_queued_items", dt.metricKeys.updownQueuedItems)
513-
assert.Equal(t, "upstream_response_20x", dt.metricKeys.counterResponse20x)
514-
assert.Equal(t, "upstream_response_errors", dt.metricKeys.counterResponseErrors)
515-
assert.Equal(t, "upstream_enqueue_errors", dt.metricKeys.counterEnqueueErrors)
516-
assert.Equal(t, "upstream_queue_time", dt.metricKeys.histogramQueueTime)
512+
assert.Equal(t, "libhoney_upstream_queued_items", dt.metricKeys.updownQueuedItems)
513+
assert.Equal(t, "libhoney_upstream_response_20x", dt.metricKeys.counterResponse20x)
514+
assert.Equal(t, "libhoney_upstream_response_errors", dt.metricKeys.counterResponseErrors)
515+
assert.Equal(t, "libhoney_upstream_enqueue_errors", dt.metricKeys.counterEnqueueErrors)
516+
assert.Equal(t, "libhoney_upstream_queue_time", dt.metricKeys.histogramQueueTime)
517517

518518
assert.Equal(t, "libhoney_upstream_send_errors", dt.metricKeys.counterSendErrors)
519519
assert.Equal(t, "libhoney_upstream_send_retries", dt.metricKeys.counterSendRetries)
@@ -1126,9 +1126,9 @@ func TestDirectTransmissionRetryLogic(t *testing.T) {
11261126
requestMutex.Unlock()
11271127

11281128
if tt.expectSuccess {
1129-
assert.Contains(t, mockMetrics.CounterIncrements, "upstream_response_20x")
1129+
assert.Contains(t, mockMetrics.CounterIncrements, "libhoney_upstream_response_20x")
11301130
} else {
1131-
assert.Contains(t, mockMetrics.CounterIncrements, "upstream_response_errors")
1131+
assert.Contains(t, mockMetrics.CounterIncrements, "libhoney_upstream_response_errors")
11321132
}
11331133
})
11341134
}

0 commit comments

Comments
 (0)