From f90c3dbc6ac5f2246f2fdc3b0bccd9a1ac81619b Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 20 Jun 2024 15:34:59 -0600
Subject: [PATCH 01/12] Skip test case when running in Windows or Pypy

Fixes #3985
---
 opentelemetry-sdk/tests/trace/export/test_export.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opentelemetry-sdk/tests/trace/export/test_export.py b/opentelemetry-sdk/tests/trace/export/test_export.py
index 2ba76e9b41..52bc071204 100644
--- a/opentelemetry-sdk/tests/trace/export/test_export.py
+++ b/opentelemetry-sdk/tests/trace/export/test_export.py
@@ -462,7 +462,7 @@ def _target():
         span_processor.shutdown()
 
     @mark.skipif(
-        python_implementation() == "PyPy" and system() == "Windows",
+        python_implementation() == "PyPy" or system() == "Windows",
         reason="This test randomly fails with huge delta in Windows with PyPy",
     )
     def test_batch_span_processor_scheduled_delay(self):

From 65edcd379db280519cd033c85c93e38b529db3d0 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Wed, 3 Jul 2024 10:18:29 -0600
Subject: [PATCH 02/12] Use pytest-retry on flaky test case

---
 opentelemetry-sdk/test-requirements.txt             | 2 ++
 opentelemetry-sdk/tests/trace/export/test_export.py | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/opentelemetry-sdk/test-requirements.txt b/opentelemetry-sdk/test-requirements.txt
index 1edbe85961..c387aa38d2 100644
--- a/opentelemetry-sdk/test-requirements.txt
+++ b/opentelemetry-sdk/test-requirements.txt
@@ -12,6 +12,8 @@ tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
 zipp==3.19.2
+zipp==3.17.0
+pytest-retry==1.6.3
 -e tests/opentelemetry-test-utils
 -e opentelemetry-api
 -e opentelemetry-semantic-conventions
diff --git a/opentelemetry-sdk/tests/trace/export/test_export.py b/opentelemetry-sdk/tests/trace/export/test_export.py
index 52bc071204..afbcb375cf 100644
--- a/opentelemetry-sdk/tests/trace/export/test_export.py
+++ b/opentelemetry-sdk/tests/trace/export/test_export.py
@@ -461,9 +461,10 @@ def _target():
 
         span_processor.shutdown()
 
-    @mark.skipif(
-        python_implementation() == "PyPy" or system() == "Windows",
-        reason="This test randomly fails with huge delta in Windows with PyPy",
+    @mark.flaky(
+        retries=3,
+        only_on=[AssertionError],
+        condition=(python_implementation == "PyPy" or system() == "Windows"),
     )
     def test_batch_span_processor_scheduled_delay(self):
         """Test that spans are exported each schedule_delay_millis"""
@@ -486,7 +487,7 @@ def test_batch_span_processor_scheduled_delay(self):
         self.assertTrue(export_event.wait(2))
         export_time = time.time()
         self.assertEqual(len(spans_names_list), 1)
-        self.assertAlmostEqual((export_time - start_time) * 1e3, 500, delta=25)
+        self.assertAlmostEqual((export_time - start_time) * 1e3, 500, delta=40)
 
         span_processor.shutdown()
 

From 1a15945ee12002121eec2fd7f7db7e5b5b09e7da Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Wed, 3 Jul 2024 10:58:43 -0600
Subject: [PATCH 03/12] Remove flaky

---
 opentelemetry-sdk/test-requirements.txt                       | 1 -
 .../tests/metrics/test_periodic_exporting_metric_reader.py    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/opentelemetry-sdk/test-requirements.txt b/opentelemetry-sdk/test-requirements.txt
index c387aa38d2..26f0549e06 100644
--- a/opentelemetry-sdk/test-requirements.txt
+++ b/opentelemetry-sdk/test-requirements.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py b/opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py
index 98f59526ef..b39e797087 100644
--- a/opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py
+++ b/opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py
@@ -18,7 +18,7 @@
 from typing import Optional, Sequence
 from unittest.mock import Mock
 
-from flaky import flaky
+from pytest import mark
 
 from opentelemetry.sdk.metrics import Counter, MetricsTimeoutError
 from opentelemetry.sdk.metrics._internal import _Counter
@@ -190,7 +190,7 @@ def test_ticker_value_exception_on_negative(self):
             export_interval_millis=-100,
         )
 
-    @flaky(max_runs=3, min_passes=1)
+    @mark.flaky(retries=3)
     def test_ticker_collects_metrics(self):
         exporter = FakeMetricsExporter()
 

From cb94b87f71d35f297845451cda38e47747e58239 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Wed, 3 Jul 2024 11:12:28 -0600
Subject: [PATCH 04/12] Use flaky instead

---
 opentelemetry-sdk/test-requirements.txt                    | 2 +-
 .../tests/metrics/test_periodic_exporting_metric_reader.py | 4 ++--
 opentelemetry-sdk/tests/trace/export/test_export.py        | 7 ++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/opentelemetry-sdk/test-requirements.txt b/opentelemetry-sdk/test-requirements.txt
index 26f0549e06..2bfb48ce50 100644
--- a/opentelemetry-sdk/test-requirements.txt
+++ b/opentelemetry-sdk/test-requirements.txt
@@ -12,7 +12,7 @@ typing_extensions==4.10.0
 wrapt==1.16.0
 zipp==3.19.2
 zipp==3.17.0
-pytest-retry==1.6.3
+flaky==3.8.1
 -e tests/opentelemetry-test-utils
 -e opentelemetry-api
 -e opentelemetry-semantic-conventions
diff --git a/opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py b/opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py
index b39e797087..98f59526ef 100644
--- a/opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py
+++ b/opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py
@@ -18,7 +18,7 @@
 from typing import Optional, Sequence
 from unittest.mock import Mock
 
-from pytest import mark
+from flaky import flaky
 
 from opentelemetry.sdk.metrics import Counter, MetricsTimeoutError
 from opentelemetry.sdk.metrics._internal import _Counter
@@ -190,7 +190,7 @@ def test_ticker_value_exception_on_negative(self):
             export_interval_millis=-100,
         )
 
-    @mark.flaky(retries=3)
+    @flaky(max_runs=3, min_passes=1)
     def test_ticker_collects_metrics(self):
         exporter = FakeMetricsExporter()
 
diff --git a/opentelemetry-sdk/tests/trace/export/test_export.py b/opentelemetry-sdk/tests/trace/export/test_export.py
index afbcb375cf..40283d3e4b 100644
--- a/opentelemetry-sdk/tests/trace/export/test_export.py
+++ b/opentelemetry-sdk/tests/trace/export/test_export.py
@@ -23,6 +23,7 @@
 from unittest import mock
 
 from pytest import mark
+from flaky import flaky
 
 from opentelemetry import trace as trace_api
 from opentelemetry.context import Context
@@ -461,11 +462,7 @@ def _target():
 
         span_processor.shutdown()
 
-    @mark.flaky(
-        retries=3,
-        only_on=[AssertionError],
-        condition=(python_implementation == "PyPy" or system() == "Windows"),
-    )
+    @flaky(max_runs=3, min_passes=1)
     def test_batch_span_processor_scheduled_delay(self):
         """Test that spans are exported each schedule_delay_millis"""
         spans_names_list = []

From 379a2141663378ca859e65a46c60c8a3034bee31 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Wed, 3 Jul 2024 11:51:34 -0600
Subject: [PATCH 05/12] Revert "Use flaky instead"

This reverts commit 4d433d658eb9eab0b9684ed58d7c7ca1e0ad3127.
---
 opentelemetry-sdk/test-requirements.txt                    | 2 +-
 .../tests/metrics/test_periodic_exporting_metric_reader.py | 4 ++--
 opentelemetry-sdk/tests/trace/export/test_export.py        | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/opentelemetry-sdk/test-requirements.txt b/opentelemetry-sdk/test-requirements.txt
index 2bfb48ce50..26f0549e06 100644
--- a/opentelemetry-sdk/test-requirements.txt
+++ b/opentelemetry-sdk/test-requirements.txt
@@ -12,7 +12,7 @@ typing_extensions==4.10.0
 wrapt==1.16.0
 zipp==3.19.2
 zipp==3.17.0
-flaky==3.8.1
+pytest-retry==1.6.3
 -e tests/opentelemetry-test-utils
 -e opentelemetry-api
 -e opentelemetry-semantic-conventions
diff --git a/opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py b/opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py
index 98f59526ef..b39e797087 100644
--- a/opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py
+++ b/opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py
@@ -18,7 +18,7 @@
 from typing import Optional, Sequence
 from unittest.mock import Mock
 
-from flaky import flaky
+from pytest import mark
 
 from opentelemetry.sdk.metrics import Counter, MetricsTimeoutError
 from opentelemetry.sdk.metrics._internal import _Counter
@@ -190,7 +190,7 @@ def test_ticker_value_exception_on_negative(self):
             export_interval_millis=-100,
         )
 
-    @flaky(max_runs=3, min_passes=1)
+    @mark.flaky(retries=3)
     def test_ticker_collects_metrics(self):
         exporter = FakeMetricsExporter()
 
diff --git a/opentelemetry-sdk/tests/trace/export/test_export.py b/opentelemetry-sdk/tests/trace/export/test_export.py
index 40283d3e4b..afbcb375cf 100644
--- a/opentelemetry-sdk/tests/trace/export/test_export.py
+++ b/opentelemetry-sdk/tests/trace/export/test_export.py
@@ -23,7 +23,6 @@
 from unittest import mock
 
 from pytest import mark
-from flaky import flaky
 
 from opentelemetry import trace as trace_api
 from opentelemetry.context import Context
@@ -462,7 +461,11 @@ def _target():
 
         span_processor.shutdown()
 
-    @flaky(max_runs=3, min_passes=1)
+    @mark.flaky(
+        retries=3,
+        only_on=[AssertionError],
+        condition=(python_implementation == "PyPy" or system() == "Windows"),
+    )
     def test_batch_span_processor_scheduled_delay(self):
         """Test that spans are exported each schedule_delay_millis"""
         spans_names_list = []

From 965d82a41ccab564a69f20b258fd110842b83339 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Wed, 3 Jul 2024 11:51:45 -0600
Subject: [PATCH 06/12] Revert "Remove flaky"

This reverts commit cc26486d272d44240d55fbd442099e9f3187258b.
---
 dev-requirements.txt                                          | 1 +
 docs/getting_started/tests/requirements.txt                   | 1 +
 .../opentelemetry-exporter-opencensus/test-requirements.txt   | 1 +
 .../test-requirements-0.txt                                   | 1 +
 .../test-requirements-1.txt                                   | 1 +
 .../test-requirements-0.txt                                   | 1 +
 .../test-requirements-1.txt                                   | 1 +
 .../test-requirements-0.txt                                   | 1 +
 .../test-requirements-1.txt                                   | 1 +
 exporter/opentelemetry-exporter-otlp/test-requirements.txt    | 1 +
 .../opentelemetry-exporter-prometheus/test-requirements.txt   | 1 +
 .../opentelemetry-exporter-zipkin-json/test-requirements.txt  | 1 +
 .../test-requirements.txt                                     | 1 +
 exporter/opentelemetry-exporter-zipkin/test-requirements.txt  | 1 +
 opentelemetry-api/test-requirements.txt                       | 1 +
 opentelemetry-proto/test-requirements-0.txt                   | 1 +
 opentelemetry-proto/test-requirements-1.txt                   | 1 +
 opentelemetry-sdk/test-requirements.txt                       | 1 +
 .../tests/metrics/test_periodic_exporting_metric_reader.py    | 4 ++--
 opentelemetry-semantic-conventions/test-requirements.txt      | 1 +
 propagator/opentelemetry-propagator-b3/test-requirements.txt  | 1 +
 .../opentelemetry-propagator-jaeger/test-requirements.txt     | 1 +
 shim/opentelemetry-opencensus-shim/test-requirements.txt      | 1 +
 shim/opentelemetry-opentracing-shim/test-requirements.txt     | 1 +
 tests/opentelemetry-test-utils/test-requirements.txt          | 1 +
 25 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/dev-requirements.txt b/dev-requirements.txt
index 0e63f79d1a..ea8c8430bb 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -18,5 +18,6 @@ ruamel.yaml==0.17.21
 asgiref==3.7.2
 psutil==5.9.6
 GitPython==3.1.41
+flaky==3.7.0
 pre-commit==3.7.0; python_version >= '3.9'
 pre-commit==3.5.0; python_version < '3.9'
diff --git a/docs/getting_started/tests/requirements.txt b/docs/getting_started/tests/requirements.txt
index 41880ca863..b15be2f403 100644
--- a/docs/getting_started/tests/requirements.txt
+++ b/docs/getting_started/tests/requirements.txt
@@ -4,6 +4,7 @@ certifi==2024.7.4
 charset-normalizer==2.0.12
 click==8.1.7
 Deprecated==1.2.14
+flaky==3.7.0
 Flask==2.3.3
 idna==3.7
 importlib-metadata==6.8.0
diff --git a/exporter/opentelemetry-exporter-opencensus/test-requirements.txt b/exporter/opentelemetry-exporter-opencensus/test-requirements.txt
index aad1363f39..c120d71c14 100644
--- a/exporter/opentelemetry-exporter-opencensus/test-requirements.txt
+++ b/exporter/opentelemetry-exporter-opencensus/test-requirements.txt
@@ -1,5 +1,6 @@
 asgiref==3.7.2
 Deprecated==1.2.14
+flaky==3.7.0
 grpcio==1.62.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt b/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt
index 093b69f3fe..5d501e9c1d 100644
--- a/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt
+++ b/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt
@@ -1,5 +1,6 @@
 asgiref==3.7.2
 Deprecated==1.2.14
+flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-1.txt b/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-1.txt
index 27e61810db..e9c41da266 100644
--- a/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-1.txt
+++ b/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-1.txt
@@ -1,5 +1,6 @@
 asgiref==3.7.2
 Deprecated==1.2.14
+flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt b/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt
index 5c9bd04d4d..d57442bd9b 100644
--- a/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt
+++ b/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt
@@ -1,5 +1,6 @@
 asgiref==3.7.2
 Deprecated==1.2.14
+flaky==3.7.0
 googleapis-common-protos==1.62.0
 grpcio==1.62.0
 importlib-metadata==6.11.0
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt b/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt
index 50cbb0c2fe..eec67c23c8 100644
--- a/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt
+++ b/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt
@@ -1,5 +1,6 @@
 asgiref==3.7.2
 Deprecated==1.2.14
+flaky==3.7.0
 googleapis-common-protos==1.62.0
 grpcio==1.62.0
 importlib-metadata==6.11.0
diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt b/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt
index 6d83270f10..65833c4b81 100644
--- a/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt
+++ b/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt
@@ -2,6 +2,7 @@ asgiref==3.7.2
 certifi==2024.7.4
 charset-normalizer==3.3.2
 Deprecated==1.2.14
+flaky==3.7.0
 googleapis-common-protos==1.62.0
 idna==3.7
 importlib-metadata==6.11.0
diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt b/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt
index 28e23c5edf..3ad553296d 100644
--- a/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt
+++ b/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt
@@ -2,6 +2,7 @@ asgiref==3.7.2
 certifi==2024.7.4
 charset-normalizer==3.3.2
 Deprecated==1.2.14
+flaky==3.7.0
 googleapis-common-protos==1.62.0
 idna==3.7
 importlib-metadata==6.11.0
diff --git a/exporter/opentelemetry-exporter-otlp/test-requirements.txt b/exporter/opentelemetry-exporter-otlp/test-requirements.txt
index bdb237ab62..b15094b6bb 100644
--- a/exporter/opentelemetry-exporter-otlp/test-requirements.txt
+++ b/exporter/opentelemetry-exporter-otlp/test-requirements.txt
@@ -1,5 +1,6 @@
 asgiref==3.7.2
 Deprecated==1.2.14
+flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/exporter/opentelemetry-exporter-prometheus/test-requirements.txt b/exporter/opentelemetry-exporter-prometheus/test-requirements.txt
index 7116753406..bf5e9114fc 100644
--- a/exporter/opentelemetry-exporter-prometheus/test-requirements.txt
+++ b/exporter/opentelemetry-exporter-prometheus/test-requirements.txt
@@ -1,5 +1,6 @@
 asgiref==3.7.2
 Deprecated==1.2.14
+flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt b/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt
index 6b304a56dd..6cf94234bb 100644
--- a/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt
+++ b/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt
@@ -2,6 +2,7 @@ asgiref==3.7.2
 certifi==2024.7.4
 charset-normalizer==3.3.2
 Deprecated==1.2.14
+flaky==3.7.0
 idna==3.7
 importlib-metadata==6.11.0
 iniconfig==2.0.0
diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt b/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt
index c1913e6928..26c3d2f46a 100644
--- a/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt
+++ b/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt
@@ -2,6 +2,7 @@ asgiref==3.7.2
 certifi==2024.7.4
 charset-normalizer==3.3.2
 Deprecated==1.2.14
+flaky==3.7.0
 idna==3.7
 importlib-metadata==6.11.0
 iniconfig==2.0.0
diff --git a/exporter/opentelemetry-exporter-zipkin/test-requirements.txt b/exporter/opentelemetry-exporter-zipkin/test-requirements.txt
index 6174e79ba3..b0013e7a9f 100644
--- a/exporter/opentelemetry-exporter-zipkin/test-requirements.txt
+++ b/exporter/opentelemetry-exporter-zipkin/test-requirements.txt
@@ -1,5 +1,6 @@
 asgiref==3.7.2
 Deprecated==1.2.14
+flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/opentelemetry-api/test-requirements.txt b/opentelemetry-api/test-requirements.txt
index 9dbb8596c7..1da3319703 100644
--- a/opentelemetry-api/test-requirements.txt
+++ b/opentelemetry-api/test-requirements.txt
@@ -1,5 +1,6 @@
 asgiref==3.7.2
 Deprecated==1.2.14
+flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/opentelemetry-proto/test-requirements-0.txt b/opentelemetry-proto/test-requirements-0.txt
index 671756980c..e3f5b9ce6e 100644
--- a/opentelemetry-proto/test-requirements-0.txt
+++ b/opentelemetry-proto/test-requirements-0.txt
@@ -1,5 +1,6 @@
 asgiref==3.7.2
 Deprecated==1.2.14
+flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/opentelemetry-proto/test-requirements-1.txt b/opentelemetry-proto/test-requirements-1.txt
index b598b4f172..7f961a6e44 100644
--- a/opentelemetry-proto/test-requirements-1.txt
+++ b/opentelemetry-proto/test-requirements-1.txt
@@ -1,5 +1,6 @@
 asgiref==3.7.2
 Deprecated==1.2.14
+flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/opentelemetry-sdk/test-requirements.txt b/opentelemetry-sdk/test-requirements.txt
index 26f0549e06..c387aa38d2 100644
--- a/opentelemetry-sdk/test-requirements.txt
+++ b/opentelemetry-sdk/test-requirements.txt
@@ -1,5 +1,6 @@
 asgiref==3.7.2
 Deprecated==1.2.14
+flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py b/opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py
index b39e797087..98f59526ef 100644
--- a/opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py
+++ b/opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py
@@ -18,7 +18,7 @@
 from typing import Optional, Sequence
 from unittest.mock import Mock
 
-from pytest import mark
+from flaky import flaky
 
 from opentelemetry.sdk.metrics import Counter, MetricsTimeoutError
 from opentelemetry.sdk.metrics._internal import _Counter
@@ -190,7 +190,7 @@ def test_ticker_value_exception_on_negative(self):
             export_interval_millis=-100,
         )
 
-    @mark.flaky(retries=3)
+    @flaky(max_runs=3, min_passes=1)
     def test_ticker_collects_metrics(self):
         exporter = FakeMetricsExporter()
 
diff --git a/opentelemetry-semantic-conventions/test-requirements.txt b/opentelemetry-semantic-conventions/test-requirements.txt
index cada74f699..4405c5f2f9 100644
--- a/opentelemetry-semantic-conventions/test-requirements.txt
+++ b/opentelemetry-semantic-conventions/test-requirements.txt
@@ -1,5 +1,6 @@
 asgiref==3.7.2
 Deprecated==1.2.14
+flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/propagator/opentelemetry-propagator-b3/test-requirements.txt b/propagator/opentelemetry-propagator-b3/test-requirements.txt
index a86ca788ed..55580dd2f7 100644
--- a/propagator/opentelemetry-propagator-b3/test-requirements.txt
+++ b/propagator/opentelemetry-propagator-b3/test-requirements.txt
@@ -1,5 +1,6 @@
 asgiref==3.7.2
 Deprecated==1.2.14
+flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/propagator/opentelemetry-propagator-jaeger/test-requirements.txt b/propagator/opentelemetry-propagator-jaeger/test-requirements.txt
index f1200ed9ee..b5fb9b796f 100644
--- a/propagator/opentelemetry-propagator-jaeger/test-requirements.txt
+++ b/propagator/opentelemetry-propagator-jaeger/test-requirements.txt
@@ -1,5 +1,6 @@
 asgiref==3.7.2
 Deprecated==1.2.14
+flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/shim/opentelemetry-opencensus-shim/test-requirements.txt b/shim/opentelemetry-opencensus-shim/test-requirements.txt
index 22810bf4d6..2aa1741b42 100644
--- a/shim/opentelemetry-opencensus-shim/test-requirements.txt
+++ b/shim/opentelemetry-opencensus-shim/test-requirements.txt
@@ -3,6 +3,7 @@ cachetools==5.3.3
 certifi==2024.7.4
 charset-normalizer==3.3.2
 Deprecated==1.2.14
+flaky==3.7.0
 google-api-core==2.17.1
 google-auth==2.28.1
 googleapis-common-protos==1.62.0
diff --git a/shim/opentelemetry-opentracing-shim/test-requirements.txt b/shim/opentelemetry-opentracing-shim/test-requirements.txt
index af2b495543..dd983b6cce 100644
--- a/shim/opentelemetry-opentracing-shim/test-requirements.txt
+++ b/shim/opentelemetry-opentracing-shim/test-requirements.txt
@@ -1,5 +1,6 @@
 asgiref==3.7.2
 Deprecated==1.2.14
+flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 opentracing==2.4.0
diff --git a/tests/opentelemetry-test-utils/test-requirements.txt b/tests/opentelemetry-test-utils/test-requirements.txt
index 8e9c26e925..a1fc5602d6 100644
--- a/tests/opentelemetry-test-utils/test-requirements.txt
+++ b/tests/opentelemetry-test-utils/test-requirements.txt
@@ -1,5 +1,6 @@
 asgiref==3.7.2
 Deprecated==1.2.14
+flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0

From b960282bcbd9ebf7e572494e63133cce4e7076ae Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Wed, 3 Jul 2024 11:52:03 -0600
Subject: [PATCH 07/12] Revert "Use pytest-retry on flaky test case"

This reverts commit e96ea890086bf818bc5435f1ea32b0386c8f8231.
---
 opentelemetry-sdk/test-requirements.txt             | 1 -
 opentelemetry-sdk/tests/trace/export/test_export.py | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/opentelemetry-sdk/test-requirements.txt b/opentelemetry-sdk/test-requirements.txt
index c387aa38d2..04a7a61d21 100644
--- a/opentelemetry-sdk/test-requirements.txt
+++ b/opentelemetry-sdk/test-requirements.txt
@@ -13,7 +13,6 @@ typing_extensions==4.10.0
 wrapt==1.16.0
 zipp==3.19.2
 zipp==3.17.0
-pytest-retry==1.6.3
 -e tests/opentelemetry-test-utils
 -e opentelemetry-api
 -e opentelemetry-semantic-conventions
diff --git a/opentelemetry-sdk/tests/trace/export/test_export.py b/opentelemetry-sdk/tests/trace/export/test_export.py
index afbcb375cf..52bc071204 100644
--- a/opentelemetry-sdk/tests/trace/export/test_export.py
+++ b/opentelemetry-sdk/tests/trace/export/test_export.py
@@ -461,10 +461,9 @@ def _target():
 
         span_processor.shutdown()
 
-    @mark.flaky(
-        retries=3,
-        only_on=[AssertionError],
-        condition=(python_implementation == "PyPy" or system() == "Windows"),
+    @mark.skipif(
+        python_implementation() == "PyPy" or system() == "Windows",
+        reason="This test randomly fails with huge delta in Windows with PyPy",
     )
     def test_batch_span_processor_scheduled_delay(self):
         """Test that spans are exported each schedule_delay_millis"""
@@ -487,7 +486,7 @@ def test_batch_span_processor_scheduled_delay(self):
         self.assertTrue(export_event.wait(2))
         export_time = time.time()
         self.assertEqual(len(spans_names_list), 1)
-        self.assertAlmostEqual((export_time - start_time) * 1e3, 500, delta=40)
+        self.assertAlmostEqual((export_time - start_time) * 1e3, 500, delta=25)
 
         span_processor.shutdown()
 

From cdda5b29eb1d67956d018a46fe4abfdb2dd92eca Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Wed, 3 Jul 2024 13:37:03 -0600
Subject: [PATCH 08/12] One last attempt with a forced delay

---
 opentelemetry-sdk/tests/trace/export/test_export.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/opentelemetry-sdk/tests/trace/export/test_export.py b/opentelemetry-sdk/tests/trace/export/test_export.py
index 52bc071204..5cde9ec9e9 100644
--- a/opentelemetry-sdk/tests/trace/export/test_export.py
+++ b/opentelemetry-sdk/tests/trace/export/test_export.py
@@ -21,8 +21,10 @@
 from logging import WARNING
 from platform import python_implementation, system
 from unittest import mock
+from time import sleep
 
 from pytest import mark
+from flaky import flaky
 
 from opentelemetry import trace as trace_api
 from opentelemetry.context import Context
@@ -461,12 +463,10 @@ def _target():
 
         span_processor.shutdown()
 
-    @mark.skipif(
-        python_implementation() == "PyPy" or system() == "Windows",
-        reason="This test randomly fails with huge delta in Windows with PyPy",
-    )
+    @flaky(max_runs=3)
     def test_batch_span_processor_scheduled_delay(self):
         """Test that spans are exported each schedule_delay_millis"""
+        sleep(1)
         spans_names_list = []
 
         export_event = threading.Event()

From c5f023189927b8b2cda83ac43311aae0c645ee10 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Wed, 3 Jul 2024 13:55:31 -0600
Subject: [PATCH 09/12] Revert "One last attempt with a forced delay"

This reverts commit 75717d9fa0bf6a34ec1cca9f2624fb398d197b3d.
---
 opentelemetry-sdk/tests/trace/export/test_export.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/opentelemetry-sdk/tests/trace/export/test_export.py b/opentelemetry-sdk/tests/trace/export/test_export.py
index 5cde9ec9e9..52bc071204 100644
--- a/opentelemetry-sdk/tests/trace/export/test_export.py
+++ b/opentelemetry-sdk/tests/trace/export/test_export.py
@@ -21,10 +21,8 @@
 from logging import WARNING
 from platform import python_implementation, system
 from unittest import mock
-from time import sleep
 
 from pytest import mark
-from flaky import flaky
 
 from opentelemetry import trace as trace_api
 from opentelemetry.context import Context
@@ -463,10 +461,12 @@ def _target():
 
         span_processor.shutdown()
 
-    @flaky(max_runs=3)
+    @mark.skipif(
+        python_implementation() == "PyPy" or system() == "Windows",
+        reason="This test randomly fails with huge delta in Windows with PyPy",
+    )
     def test_batch_span_processor_scheduled_delay(self):
         """Test that spans are exported each schedule_delay_millis"""
-        sleep(1)
         spans_names_list = []
 
         export_event = threading.Event()

From 26f6d684b57e51e0a01c34eae67c98b7f90a123f Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Wed, 3 Jul 2024 14:07:51 -0600
Subject: [PATCH 10/12] Fix comment

---
 opentelemetry-sdk/tests/trace/export/test_export.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opentelemetry-sdk/tests/trace/export/test_export.py b/opentelemetry-sdk/tests/trace/export/test_export.py
index 52bc071204..7a29ef3c42 100644
--- a/opentelemetry-sdk/tests/trace/export/test_export.py
+++ b/opentelemetry-sdk/tests/trace/export/test_export.py
@@ -463,7 +463,7 @@ def _target():
 
     @mark.skipif(
         python_implementation() == "PyPy" or system() == "Windows",
-        reason="This test randomly fails with huge delta in Windows with PyPy",
+        reason="This test randomly fails with huge delta in Windows or PyPy",
     )
     def test_batch_span_processor_scheduled_delay(self):
         """Test that spans are exported each schedule_delay_millis"""

From 8da4966950fb4c2c89f72f2d235897c5dec38cfd Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 11 Jul 2024 12:52:15 -0600
Subject: [PATCH 11/12] Fix zipp requirements

---
 opentelemetry-sdk/test-requirements.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/opentelemetry-sdk/test-requirements.txt b/opentelemetry-sdk/test-requirements.txt
index 04a7a61d21..1edbe85961 100644
--- a/opentelemetry-sdk/test-requirements.txt
+++ b/opentelemetry-sdk/test-requirements.txt
@@ -12,7 +12,6 @@ tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
 zipp==3.19.2
-zipp==3.17.0
 -e tests/opentelemetry-test-utils
 -e opentelemetry-api
 -e opentelemetry-semantic-conventions

From 0cb8b3236289823685994c4ab47e527b89ec2cb0 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 11 Jul 2024 12:57:40 -0600
Subject: [PATCH 12/12] Remove flaky

---
 dev-requirements.txt                                             | 1 -
 docs/getting_started/tests/requirements.txt                      | 1 -
 exporter/opentelemetry-exporter-opencensus/test-requirements.txt | 1 -
 .../test-requirements-0.txt                                      | 1 -
 .../test-requirements-1.txt                                      | 1 -
 .../test-requirements-0.txt                                      | 1 -
 .../test-requirements-1.txt                                      | 1 -
 .../test-requirements-0.txt                                      | 1 -
 .../test-requirements-1.txt                                      | 1 -
 exporter/opentelemetry-exporter-otlp/test-requirements.txt       | 1 -
 exporter/opentelemetry-exporter-prometheus/test-requirements.txt | 1 -
 .../opentelemetry-exporter-zipkin-json/test-requirements.txt     | 1 -
 .../test-requirements.txt                                        | 1 -
 exporter/opentelemetry-exporter-zipkin/test-requirements.txt     | 1 -
 opentelemetry-api/test-requirements.txt                          | 1 -
 opentelemetry-proto/test-requirements-0.txt                      | 1 -
 opentelemetry-proto/test-requirements-1.txt                      | 1 -
 opentelemetry-semantic-conventions/test-requirements.txt         | 1 -
 propagator/opentelemetry-propagator-b3/test-requirements.txt     | 1 -
 propagator/opentelemetry-propagator-jaeger/test-requirements.txt | 1 -
 shim/opentelemetry-opencensus-shim/test-requirements.txt         | 1 -
 shim/opentelemetry-opentracing-shim/test-requirements.txt        | 1 -
 tests/opentelemetry-test-utils/test-requirements.txt             | 1 -
 23 files changed, 23 deletions(-)

diff --git a/dev-requirements.txt b/dev-requirements.txt
index ea8c8430bb..0e63f79d1a 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -18,6 +18,5 @@ ruamel.yaml==0.17.21
 asgiref==3.7.2
 psutil==5.9.6
 GitPython==3.1.41
-flaky==3.7.0
 pre-commit==3.7.0; python_version >= '3.9'
 pre-commit==3.5.0; python_version < '3.9'
diff --git a/docs/getting_started/tests/requirements.txt b/docs/getting_started/tests/requirements.txt
index b15be2f403..41880ca863 100644
--- a/docs/getting_started/tests/requirements.txt
+++ b/docs/getting_started/tests/requirements.txt
@@ -4,7 +4,6 @@ certifi==2024.7.4
 charset-normalizer==2.0.12
 click==8.1.7
 Deprecated==1.2.14
-flaky==3.7.0
 Flask==2.3.3
 idna==3.7
 importlib-metadata==6.8.0
diff --git a/exporter/opentelemetry-exporter-opencensus/test-requirements.txt b/exporter/opentelemetry-exporter-opencensus/test-requirements.txt
index c120d71c14..aad1363f39 100644
--- a/exporter/opentelemetry-exporter-opencensus/test-requirements.txt
+++ b/exporter/opentelemetry-exporter-opencensus/test-requirements.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 grpcio==1.62.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt b/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt
index 5d501e9c1d..093b69f3fe 100644
--- a/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt
+++ b/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-1.txt b/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-1.txt
index e9c41da266..27e61810db 100644
--- a/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-1.txt
+++ b/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-1.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt b/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt
index d57442bd9b..5c9bd04d4d 100644
--- a/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt
+++ b/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 googleapis-common-protos==1.62.0
 grpcio==1.62.0
 importlib-metadata==6.11.0
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt b/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt
index eec67c23c8..50cbb0c2fe 100644
--- a/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt
+++ b/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 googleapis-common-protos==1.62.0
 grpcio==1.62.0
 importlib-metadata==6.11.0
diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt b/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt
index 65833c4b81..6d83270f10 100644
--- a/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt
+++ b/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt
@@ -2,7 +2,6 @@ asgiref==3.7.2
 certifi==2024.7.4
 charset-normalizer==3.3.2
 Deprecated==1.2.14
-flaky==3.7.0
 googleapis-common-protos==1.62.0
 idna==3.7
 importlib-metadata==6.11.0
diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt b/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt
index 3ad553296d..28e23c5edf 100644
--- a/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt
+++ b/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt
@@ -2,7 +2,6 @@ asgiref==3.7.2
 certifi==2024.7.4
 charset-normalizer==3.3.2
 Deprecated==1.2.14
-flaky==3.7.0
 googleapis-common-protos==1.62.0
 idna==3.7
 importlib-metadata==6.11.0
diff --git a/exporter/opentelemetry-exporter-otlp/test-requirements.txt b/exporter/opentelemetry-exporter-otlp/test-requirements.txt
index b15094b6bb..bdb237ab62 100644
--- a/exporter/opentelemetry-exporter-otlp/test-requirements.txt
+++ b/exporter/opentelemetry-exporter-otlp/test-requirements.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/exporter/opentelemetry-exporter-prometheus/test-requirements.txt b/exporter/opentelemetry-exporter-prometheus/test-requirements.txt
index bf5e9114fc..7116753406 100644
--- a/exporter/opentelemetry-exporter-prometheus/test-requirements.txt
+++ b/exporter/opentelemetry-exporter-prometheus/test-requirements.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt b/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt
index 6cf94234bb..6b304a56dd 100644
--- a/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt
+++ b/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt
@@ -2,7 +2,6 @@ asgiref==3.7.2
 certifi==2024.7.4
 charset-normalizer==3.3.2
 Deprecated==1.2.14
-flaky==3.7.0
 idna==3.7
 importlib-metadata==6.11.0
 iniconfig==2.0.0
diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt b/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt
index 26c3d2f46a..c1913e6928 100644
--- a/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt
+++ b/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt
@@ -2,7 +2,6 @@ asgiref==3.7.2
 certifi==2024.7.4
 charset-normalizer==3.3.2
 Deprecated==1.2.14
-flaky==3.7.0
 idna==3.7
 importlib-metadata==6.11.0
 iniconfig==2.0.0
diff --git a/exporter/opentelemetry-exporter-zipkin/test-requirements.txt b/exporter/opentelemetry-exporter-zipkin/test-requirements.txt
index b0013e7a9f..6174e79ba3 100644
--- a/exporter/opentelemetry-exporter-zipkin/test-requirements.txt
+++ b/exporter/opentelemetry-exporter-zipkin/test-requirements.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/opentelemetry-api/test-requirements.txt b/opentelemetry-api/test-requirements.txt
index 1da3319703..9dbb8596c7 100644
--- a/opentelemetry-api/test-requirements.txt
+++ b/opentelemetry-api/test-requirements.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/opentelemetry-proto/test-requirements-0.txt b/opentelemetry-proto/test-requirements-0.txt
index e3f5b9ce6e..671756980c 100644
--- a/opentelemetry-proto/test-requirements-0.txt
+++ b/opentelemetry-proto/test-requirements-0.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/opentelemetry-proto/test-requirements-1.txt b/opentelemetry-proto/test-requirements-1.txt
index 7f961a6e44..b598b4f172 100644
--- a/opentelemetry-proto/test-requirements-1.txt
+++ b/opentelemetry-proto/test-requirements-1.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/opentelemetry-semantic-conventions/test-requirements.txt b/opentelemetry-semantic-conventions/test-requirements.txt
index 4405c5f2f9..cada74f699 100644
--- a/opentelemetry-semantic-conventions/test-requirements.txt
+++ b/opentelemetry-semantic-conventions/test-requirements.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/propagator/opentelemetry-propagator-b3/test-requirements.txt b/propagator/opentelemetry-propagator-b3/test-requirements.txt
index 55580dd2f7..a86ca788ed 100644
--- a/propagator/opentelemetry-propagator-b3/test-requirements.txt
+++ b/propagator/opentelemetry-propagator-b3/test-requirements.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/propagator/opentelemetry-propagator-jaeger/test-requirements.txt b/propagator/opentelemetry-propagator-jaeger/test-requirements.txt
index b5fb9b796f..f1200ed9ee 100644
--- a/propagator/opentelemetry-propagator-jaeger/test-requirements.txt
+++ b/propagator/opentelemetry-propagator-jaeger/test-requirements.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
diff --git a/shim/opentelemetry-opencensus-shim/test-requirements.txt b/shim/opentelemetry-opencensus-shim/test-requirements.txt
index 2aa1741b42..22810bf4d6 100644
--- a/shim/opentelemetry-opencensus-shim/test-requirements.txt
+++ b/shim/opentelemetry-opencensus-shim/test-requirements.txt
@@ -3,7 +3,6 @@ cachetools==5.3.3
 certifi==2024.7.4
 charset-normalizer==3.3.2
 Deprecated==1.2.14
-flaky==3.7.0
 google-api-core==2.17.1
 google-auth==2.28.1
 googleapis-common-protos==1.62.0
diff --git a/shim/opentelemetry-opentracing-shim/test-requirements.txt b/shim/opentelemetry-opentracing-shim/test-requirements.txt
index dd983b6cce..af2b495543 100644
--- a/shim/opentelemetry-opentracing-shim/test-requirements.txt
+++ b/shim/opentelemetry-opentracing-shim/test-requirements.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 opentracing==2.4.0
diff --git a/tests/opentelemetry-test-utils/test-requirements.txt b/tests/opentelemetry-test-utils/test-requirements.txt
index a1fc5602d6..8e9c26e925 100644
--- a/tests/opentelemetry-test-utils/test-requirements.txt
+++ b/tests/opentelemetry-test-utils/test-requirements.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0