[mq] [skip ddci] working branch - merge 60c9cff on top of master at 693449b

{"baseBranch":"master","baseCommit":"693449b6f0f31a5210309460ec162518d72bec87","createdAt":"2026-04-15T05:07:44.134018Z","headSha":"60c9cff55fa17167d4b92aaddb34b9196678d9b1","id":"c4224b06-04bb-42d7-b926-2355bf580ab5","priority":"200","pullRequestNumber":"11101","queuedAt":"2026-04-15T05:07:44.132487Z","retryAttempt":"3","status":"STATUS_QUEUED"}

Author: gh-worker-dd-mergequeue-cf854d[bot]

dd-trace-core/src/test/java/datadog/trace/core/baggage/BaggagePropagatorTelemetryTest.java

@@ -11,18 +11,25 @@
 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;
 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<String, String>> 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();
@@ -122,7 +129,6 @@ void shouldDirectlyIncrementAllBaggageMetrics() {
     assertEquals(1, itemsTruncatedMetric.value.longValue());
   }
 
-  @Flaky
   @Test
   void shouldNotIncrementTelemetryCounterWhenBaggageExtractionFails() {
     Config config = mock(Config.class);