Merge branch 'main' into main

open-telemetry · Jul 5, 2024 · 6ad9d1a · 6ad9d1a
2 parents 79ce99a + de8b9e0
commit 6ad9d1a
Show file tree

Hide file tree

Showing 26 changed files with 8 additions and 48 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -92,8 +92,12 @@ jobs:
     - name: Windows does not let git check out files with long names
       if: ${{ matrix.os == 'windows-2019'}}
       run: git config --system core.longpaths true
-    - name: run tox
+    - name: run pytest with --benchmark-skip
+      if: ${{ matrix.package == 'sdk' || matrix.package == 'exporter-otlp-proto-grpc' }}
       run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-skip
+    - name: run pytest without --benchmark-skip
+      if: ${{ !(matrix.package == 'sdk' || matrix.package == 'exporter-otlp-proto-grpc') }}
+      run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra
   misc:
     strategy:
       fail-fast: false

diff --git 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
@@ -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
@@ -16,7 +15,6 @@ packaging==24.0
 pluggy==1.3.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 requests==2.32.3
 tomli==2.0.1
 typing_extensions==4.8.0

diff --git 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
@@ -10,7 +9,6 @@ pluggy==1.5.0
 protobuf==3.20.3
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.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
@@ -1,14 +1,12 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
 protobuf==3.20.3
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.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
@@ -1,14 +1,12 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
 protobuf==4.25.3
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.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
@@ -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
@@ -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
@@ -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
@@ -12,7 +11,6 @@ pluggy==1.5.0
 protobuf==3.20.3
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 PyYAML==6.0.1
 requests==2.32.3
 responses==0.24.1

diff --git 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
@@ -12,7 +11,6 @@ pluggy==1.5.0
 protobuf==4.25.3
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 PyYAML==6.0.1
 requests==2.32.3
 responses==0.24.1

diff --git a/exporter/opentelemetry-exporter-otlp/test-requirements.txt b/exporter/opentelemetry-exporter-otlp/test-requirements.txt
@@ -1,13 +1,11 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0

diff --git a/exporter/opentelemetry-exporter-prometheus/test-requirements.txt b/exporter/opentelemetry-exporter-prometheus/test-requirements.txt
@@ -1,14 +1,12 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
 prometheus_client==0.20.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0

diff --git a/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt b/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt
@@ -2,15 +2,13 @@ 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
 packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 requests==2.32.3
 tomli==2.0.1
 typing_extensions==4.10.0

diff --git 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
@@ -11,7 +10,6 @@ pluggy==1.5.0
 protobuf==3.20.3
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 requests==2.32.3
 tomli==2.0.1
 typing_extensions==4.10.0

diff --git a/exporter/opentelemetry-exporter-zipkin/test-requirements.txt b/exporter/opentelemetry-exporter-zipkin/test-requirements.txt
@@ -1,13 +1,11 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0

diff --git a/mypy-requirements.txt b/mypy-requirements.txt
@@ -0,0 +1 @@
+mypy==1.9.0
diff --git a/opentelemetry-api/test-requirements.txt b/opentelemetry-api/test-requirements.txt
@@ -1,13 +1,11 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0

diff --git a/opentelemetry-proto/test-requirements-0.txt b/opentelemetry-proto/test-requirements-0.txt
@@ -1,14 +1,12 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
 protobuf==3.20.3
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0

diff --git a/opentelemetry-proto/test-requirements-1.txt b/opentelemetry-proto/test-requirements-1.txt
@@ -1,14 +1,12 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
 protobuf==4.25.3
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0

diff --git a/opentelemetry-semantic-conventions/test-requirements.txt b/opentelemetry-semantic-conventions/test-requirements.txt
@@ -1,13 +1,11 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0

diff --git 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
@@ -1,13 +1,11 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0

diff --git 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
@@ -21,7 +20,6 @@ py-cpuinfo==9.0.0
 pyasn1==0.5.1
 pyasn1-modules==0.3.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 requests==2.32.3
 rsa==4.9
 six==1.16.0

diff --git a/shim/opentelemetry-opentracing-shim/test-requirements.txt b/shim/opentelemetry-opentracing-shim/test-requirements.txt
@@ -1,14 +1,12 @@
 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
 packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0

diff --git a/tests/opentelemetry-test-utils/test-requirements.txt b/tests/opentelemetry-test-utils/test-requirements.txt
@@ -1,13 +1,11 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0

diff --git a/tox.ini b/tox.ini
@@ -91,13 +91,8 @@ envlist =
 
 [testenv]
 deps =
-  -c dev-requirements.txt
-  opentelemetry: pytest
-  opentelemetry: pytest-benchmark
-  opentelemetry: flaky
   coverage: pytest
   coverage: pytest-cov
-  mypy,mypyinstalled: mypy
 
   ; proto 3 and 4 tests install the respective version of protobuf
   proto3: protobuf~=3.19.0
@@ -113,6 +108,8 @@ setenv =
 
 commands_pre =
 
+  mypy,mypyinstalled: pip install -r {toxinidir}/mypy-requirements.txt
+
   api: pip install -r {toxinidir}/opentelemetry-api/test-requirements.txt
 
   sdk: pip install -r {toxinidir}/opentelemetry-sdk/test-requirements.txt