From d49695ef1731ece2a3acfd43e8f7aee6945cb853 Mon Sep 17 00:00:00 2001 From: jean-philippe bempel Date: Mon, 13 Apr 2026 16:58:24 +0200 Subject: [PATCH 1/3] fix flaky test drain metric collector singleton before each test --- .../core/baggage/BaggagePropagatorTelemetryTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTelemetryTest.java b/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTelemetryTest.java index 0b2b1943e06..b628c2440ed 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTelemetryTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTelemetryTest.java @@ -17,12 +17,20 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; class BaggagePropagatorTelemetryTest { private static final CarrierVisitor> MAP_VISITOR = Map::forEach; + @BeforeEach + void setup() { + // Drain any metrics accumulated by other tests + CoreMetricCollector.getInstance().prepareMetrics(); + CoreMetricCollector.getInstance().drain(); + } + @Test void shouldDirectlyIncrementBaggageMetrics() { BaggageMetrics baggageMetrics = BaggageMetrics.getInstance(); From 28509ea4da626fdb92e4b82ae649372780058f7a Mon Sep 17 00:00:00 2001 From: jean-philippe bempel Date: Mon, 13 Apr 2026 18:35:16 +0200 Subject: [PATCH 2/3] remove flaky annotation --- .../trace/core/baggage/BaggagePropagatorTelemetryTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTelemetryTest.java b/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTelemetryTest.java index b628c2440ed..383e3ec622f 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTelemetryTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTelemetryTest.java @@ -11,7 +11,6 @@ import datadog.trace.api.Config; import datadog.trace.api.metrics.BaggageMetrics; import datadog.trace.api.telemetry.CoreMetricCollector; -import datadog.trace.test.util.Flaky; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -130,7 +129,6 @@ void shouldDirectlyIncrementAllBaggageMetrics() { assertEquals(1, itemsTruncatedMetric.value.longValue()); } - @Flaky @Test void shouldNotIncrementTelemetryCounterWhenBaggageExtractionFails() { Config config = mock(Config.class); From a58f36c8a2b2b246c91c43bd811ac0c47e9e2eb0 Mon Sep 17 00:00:00 2001 From: jean-philippe bempel Date: Wed, 15 Apr 2026 14:43:36 +0200 Subject: [PATCH 3/3] remove flaky annotation --- .../trace/core/baggage/BaggagePropagatorTelemetryTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTelemetryTest.java b/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTelemetryTest.java index 383e3ec622f..1780f541c5f 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTelemetryTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTelemetryTest.java @@ -75,7 +75,6 @@ void shouldIncrementTelemetryCounterWhenBaggageIsSuccessfullyExtracted() { assertTrue(baggageMetric.tags.contains("header_style:baggage")); } - @Flaky @Test void shouldDirectlyIncrementAllBaggageMetrics() { BaggageMetrics baggageMetrics = BaggageMetrics.getInstance();