diff --git a/dev-requirements.txt b/dev-requirements.txt index ea8c8430bb3..0e63f79d1ae 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 ba2a8c93f60..c7b1a671c98 100644 --- a/docs/getting_started/tests/requirements.txt +++ b/docs/getting_started/tests/requirements.txt @@ -4,7 +4,6 @@ certifi==2023.7.22 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 a1ba479481f..de964eeb6a2 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 2064aef53aa..60023950c0b 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 db9bb1a8461..721d0077517 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 cedf691d32e..f5bd68b42bd 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 48cf91eb3b3..3ab26295cb1 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 c7b0de072e3..43ac1902f19 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.2.2 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 389363e1416..2587d79fb1e 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.2.2 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 77abdc28939..db536bb32d4 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 1ece4378feb..c5d5233335e 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 58b16577132..fddf0cbe91a 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.2.2 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 1459830d2f5..f544f990534 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.2.2 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 58b36fd8dc4..4d385253cf7 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 3c84695a9f5..0f7008fe0e3 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 e0c81702d5c..438bec06f38 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 94ac76cd274..5f18b8b7695 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-sdk/test-requirements.txt b/opentelemetry-sdk/test-requirements.txt index 2835b3f191b..6d4461b041f 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 98f59526ef6..b39e7970875 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-semantic-conventions/test-requirements.txt b/opentelemetry-semantic-conventions/test-requirements.txt index 643c7020226..cd7ac570c04 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 11b66c927f0..8ffc454a196 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 4bf6e889fbb..a532680c65c 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 c086f3d0268..ab198170e9c 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.2.2 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 dd60feddaa7..fadad6075c8 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 951312645c1..5015fc2ee2d 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 diff --git a/tox.ini b/tox.ini index 1980dc18b51..ea1733e5417 100644 --- a/tox.ini +++ b/tox.ini @@ -94,7 +94,6 @@ deps = -c dev-requirements.txt opentelemetry: pytest opentelemetry: pytest-benchmark - opentelemetry: flaky coverage: pytest coverage: pytest-cov mypy,mypyinstalled: mypy