From 47e30f8329f140ad9d6b41999a332e6144415ab3 Mon Sep 17 00:00:00 2001 From: Hannah Kim Date: Fri, 7 Feb 2025 11:24:55 -0500 Subject: [PATCH] internal/telemetry: fix flake in TestTelemetryEnabled (#3160) --- ddtrace/tracer/telemetry_test.go | 2 +- internal/telemetry/telemetrytest/telemetrytest.go | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ddtrace/tracer/telemetry_test.go b/ddtrace/tracer/telemetry_test.go index b8ef0fc895..8c91f58829 100644 --- a/ddtrace/tracer/telemetry_test.go +++ b/ddtrace/tracer/telemetry_test.go @@ -66,7 +66,7 @@ func TestTelemetryEnabled(t *testing.T) { telemetry.Check(t, telemetryClient.Configuration, "span_sample_rules", "[]") if metrics, ok := telemetryClient.Metrics[telemetry.NamespaceGeneral]; ok { if initTime, ok := metrics["init_time"]; ok { - assert.True(t, initTime > 0) + assert.True(t, initTime > 0, "expected positive init time, but got %f", initTime) return } t.Fatalf("could not find general init time in telemetry client metrics") diff --git a/internal/telemetry/telemetrytest/telemetrytest.go b/internal/telemetry/telemetrytest/telemetrytest.go index 90f0938bf3..426edd4832 100644 --- a/internal/telemetry/telemetrytest/telemetrytest.go +++ b/internal/telemetry/telemetrytest/telemetrytest.go @@ -73,6 +73,9 @@ func (c *MockClient) Record(ns telemetry.Namespace, _ telemetry.MetricKind, name c.On("Gauge", ns, name, val, tags, common).Return() c.On("Record", ns, name, val, tags, common).Return() _ = c.Called(ns, name, val, tags, common) + + c.mu.Lock() + defer c.mu.Unlock() // record the val for tests that assert based on the value if _, ok := c.Metrics[ns]; !ok { c.Metrics[ns] = map[string]float64{}