Remove unnecessary dependencies (#2663)

* Remove unnecessary dependencies Fixes #2661 * Separate runs * Remove dev-requirements from test environment * Try without negative if * Remove positive if * Remove if * Separate benchmark-containing packages in another file * Add missing test-requirements.txt file
open-telemetry · Jul 4, 2024 · 75faaad · 75faaad
1 parent c272e68
commit 75faaad
Show file tree

Hide file tree

Showing 82 changed files with 69 additions and 87 deletions.
diff --git a/.github/workflows/instrumentations_0.yml b/.github/workflows/instrumentations_0.yml
@@ -126,5 +126,5 @@ jobs:
             .tox
             ~/.cache/pip
           key: v7-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
-      - name: run tox
-        run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra  --benchmark-skip
+      - name: run pytest without --benchmark-skip
+        run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra
diff --git a/.github/workflows/instrumentations_1.yml b/.github/workflows/instrumentations_1.yml
@@ -25,15 +25,14 @@ jobs:
       matrix:
         python-version: [py38, py39, py310, py311, py312, pypy3]
         package:
+          # Only add here packages that do not have benchmark tests
           - "urllib"
           - "urllib3"
           - "wsgi"
           - "distro"
           - "richconsole"
           - "psycopg"
           - "prometheus-remote-write"
-          - "sdk-extension-aws"
-          - "propagator-aws-xray"
           - "propagator-ot-trace"
           - "resource-detector-azure"
           - "resource-detector-container"
@@ -59,5 +58,5 @@ jobs:
             .tox
             ~/.cache/pip
           key: v7-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
-      - name: run tox
-        run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-skip
+      - name: run pytest without --benchmark-skip
+        run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra
diff --git a/.github/workflows/instrumentations_2.yml b/.github/workflows/instrumentations_2.yml
@@ -0,0 +1,50 @@
+name: Contrib Repo Tests
+
+on:
+  push:
+    branches-ignore:
+    - 'release/*'
+  pull_request:
+env:
+  CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
+
+jobs:
+  instrumentations-2:
+    env:
+      # We use these variables to convert between tox and GHA version literals
+      py38: 3.8
+      py39: 3.9
+      py310: "3.10"
+      py311: "3.11"
+      py312: "3.12"
+      pypy3: pypy-3.8
+      RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false  # ensures the entire test matrix is run, even if one permutation fails
+      matrix:
+        python-version: [py38, py39, py310, py311, py312, pypy3]
+        package:
+          # Only add here packages that have benchmark tests
+          - "sdk-extension-aws"
+          - "propagator-aws-xray"
+        os: [ubuntu-20.04]
+    steps:
+      - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+      - name: Set up Python ${{ env[matrix.python-version] }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env[matrix.python-version] }}
+      - name: Install tox
+        run: pip install tox
+      - name: Cache tox environment
+        # Preserves .tox directory between runs for faster installs
+        uses: actions/cache@v4
+        with:
+          path: |
+            .tox
+            ~/.cache/pip
+          key: v7-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
+      - name: run pytest with --benchmark-skip
+        run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-skip
diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt b/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt
@@ -11,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
 python-snappy==0.7.1
 requests==2.32.3
 tomli==2.0.1

diff --git a/exporter/opentelemetry-exporter-richconsole/test-requirements.txt b/exporter/opentelemetry-exporter-richconsole/test-requirements.txt
@@ -10,7 +10,6 @@ pluggy==1.5.0
 py-cpuinfo==9.0.0
 Pygments==2.17.2
 pytest==7.4.4
-pytest-benchmark==4.0.0
 rich==13.7.1
 tomli==2.0.1
 typing_extensions==4.10.0

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt
@@ -11,7 +11,6 @@ pamqp==3.1.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.9.0
 wrapt==1.16.0

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt
@@ -11,7 +11,6 @@ pamqp==3.2.1
 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.9.0
 wrapt==1.16.0

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt
@@ -11,7 +11,6 @@ pamqp==3.2.1
 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.9.0
 wrapt==1.16.0

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-3.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-3.txt
@@ -11,7 +11,6 @@ pamqp==3.3.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.9.0
 wrapt==1.16.0

diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt
@@ -21,7 +21,6 @@ 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/instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt
@@ -14,7 +14,6 @@ py-cpuinfo==9.0.0
 pytest==7.4.4
 pytest-aiohttp==1.0.5
 pytest-asyncio==0.23.5
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0

diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt
@@ -10,7 +10,6 @@ pluggy==1.5.0
 psycopg2-binary==2.9.9
 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/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt
@@ -6,7 +6,6 @@ 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.9.0
 wrapt==1.16.0

diff --git a/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt
@@ -7,7 +7,6 @@ pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
 pytest-asyncio==0.23.5
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.9.0
 wrapt==1.16.0

diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt
@@ -8,7 +8,6 @@ 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.9.0
 wrapt==1.16.0

diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aws-lambda/test-requirements.txt
@@ -6,7 +6,6 @@ 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.9.0
 wrapt==1.16.0

diff --git a/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt
@@ -20,7 +20,6 @@ pluggy==1.5.0
 py-cpuinfo==9.0.0
 pycparser==2.21
 pytest==7.4.4
-pytest-benchmark==4.0.0
 python-dateutil==2.8.2
 pytz==2024.1
 PyYAML==6.0.1

diff --git a/instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt
@@ -9,7 +9,6 @@ packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 python-dateutil==2.8.2
 s3transfer==0.10.0
 six==1.16.0

diff --git a/instrumentation/opentelemetry-instrumentation-botocore/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-botocore/test-requirements.txt
@@ -20,7 +20,6 @@ pluggy==1.5.0
 py-cpuinfo==9.0.0
 pycparser==2.21
 pytest==7.4.4
-pytest-benchmark==4.0.0
 python-dateutil==2.8.2
 pytz==2024.1
 PyYAML==6.0.1

diff --git a/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt
@@ -9,7 +9,6 @@ packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 PyYAML==6.0.1
 scylla-driver==3.26.6
 six==1.16.0

diff --git a/instrumentation/opentelemetry-instrumentation-celery/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-celery/test-requirements-0.txt
@@ -16,7 +16,6 @@ pluggy==1.5.0
 prompt-toolkit==3.0.43
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 python-dateutil==2.8.2
 six==1.16.0
 tomli==2.0.1

diff --git a/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt
@@ -15,7 +15,6 @@ pluggy==1.5.0
 prompt-toolkit==3.0.43
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 python-dateutil==2.8.2
 six==1.16.0
 tomli==2.0.1

diff --git a/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt
@@ -7,7 +7,6 @@ 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.9.0
 wrapt==1.16.0

diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-dbapi/test-requirements.txt
@@ -6,7 +6,6 @@ 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.9.0
 wrapt==1.16.0

diff --git a/instrumentation/opentelemetry-instrumentation-django/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-django/test-requirements-0.txt
@@ -7,7 +7,6 @@ packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 pytz==2024.1
 sqlparse==0.5.0
 tomli==2.0.1

diff --git a/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt
@@ -7,7 +7,6 @@ packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 pytz==2024.1
 sqlparse==0.5.0
 tomli==2.0.1

diff --git a/instrumentation/opentelemetry-instrumentation-django/test-requirements-2.txt b/instrumentation/opentelemetry-instrumentation-django/test-requirements-2.txt
@@ -8,7 +8,6 @@ packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 sqlparse==0.5.0
 tomli==2.0.1
 typing_extensions==4.10.0

diff --git a/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt b/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt
@@ -7,7 +7,6 @@ packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 sqlparse==0.5.0
 tomli==2.0.1
 typing_extensions==4.10.0

diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-0.txt
@@ -8,7 +8,6 @@ packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 python-dateutil==2.8.2
 six==1.16.0
 tomli==2.0.1

diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-1.txt
@@ -8,7 +8,6 @@ packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 python-dateutil==2.8.2
 six==1.16.0
 tomli==2.0.1

diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-2.txt b/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-2.txt
@@ -9,7 +9,6 @@ packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 python-dateutil==2.8.2
 six==1.16.0
 tomli==2.0.1

diff --git a/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-0.txt
@@ -7,7 +7,6 @@ packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 python-mimeparse==1.6.0
 six==1.16.0
 tomli==2.0.1

diff --git a/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-1.txt
@@ -7,7 +7,6 @@ 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/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt b/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt
@@ -7,7 +7,6 @@ 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/instrumentation/opentelemetry-instrumentation-fastapi/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-fastapi/test-requirements.txt
@@ -18,7 +18,6 @@ py-cpuinfo==9.0.0
 pydantic==2.6.2
 pydantic_core==2.16.3
 pytest==7.4.4
-pytest-benchmark==4.0.0
 requests==2.32.3
 sniffio==1.3.0
 starlette==0.36.3

diff --git a/instrumentation/opentelemetry-instrumentation-flask/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-flask/test-requirements-0.txt
@@ -11,7 +11,6 @@ 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.9.0
 Werkzeug==2.3.8

diff --git a/instrumentation/opentelemetry-instrumentation-flask/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-flask/test-requirements-1.txt
@@ -11,7 +11,6 @@ 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.9.0
 Werkzeug==2.3.8

diff --git a/instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt b/instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt
@@ -12,7 +12,6 @@ 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.9.0
 Werkzeug==3.0.3

diff --git a/instrumentation/opentelemetry-instrumentation-grpc/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-grpc/test-requirements.txt
@@ -8,7 +8,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.9.0
 wrapt==1.16.0

diff --git a/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-0.txt
@@ -13,7 +13,6 @@ packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 respx==0.17.1
 rfc3986==1.5.0
 sniffio==1.3.1

diff --git a/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt
@@ -13,7 +13,6 @@ packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 respx==0.20.2
 sniffio==1.3.1
 tomli==2.0.1

diff --git a/instrumentation/opentelemetry-instrumentation-jinja2/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-jinja2/test-requirements.txt
@@ -8,7 +8,6 @@ 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.9.0
 wrapt==1.16.0