Skip to content

Commit 9462231

Browse files
authored
internal/telemetry: fix flake in TestTelemetryEnabled (#3160)
1 parent 4a72a09 commit 9462231

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

ddtrace/tracer/telemetry_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func TestTelemetryEnabled(t *testing.T) {
6161
telemetry.Check(t, telemetryClient.Configuration, "span_sample_rules", "[]")
6262
if metrics, ok := telemetryClient.Metrics[telemetry.NamespaceGeneral]; ok {
6363
if initTime, ok := metrics["init_time"]; ok {
64-
assert.True(t, initTime > 0)
64+
assert.True(t, initTime > 0, "expected positive init time, but got %f", initTime)
6565
return
6666
}
6767
t.Fatalf("could not find general init time in telemetry client metrics")

internal/telemetry/telemetrytest/telemetrytest.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ func (c *MockClient) Record(ns telemetry.Namespace, _ telemetry.MetricKind, name
7373
c.On("Gauge", ns, name, val, tags, common).Return()
7474
c.On("Record", ns, name, val, tags, common).Return()
7575
_ = c.Called(ns, name, val, tags, common)
76+
77+
c.mu.Lock()
78+
defer c.mu.Unlock()
7679
// record the val for tests that assert based on the value
7780
if _, ok := c.Metrics[ns]; !ok {
7881
c.Metrics[ns] = map[string]float64{}

0 commit comments

Comments
 (0)