Merge branch 'main' into fix_gevent_regression

Author: srprash

.github/actions/set_up/action.yml

@@ -27,8 +27,7 @@ runs:
 
     - name: Install tox
       shell: bash
-      run: |
-        pip install tox==4.30.3
+      run: pip install tox==3.27.1 tox-factor
 
     - name: Cache tox environment
       # Preserves .tox directory between runs for faster installs
@@ -42,7 +41,4 @@ runs:
     - name: Run unit tests/benchmarks with tox
       if: ${{ inputs.run_unit_tests == 'true' }}
       shell: bash
-      run: |
-        ENV_NAME="${{ inputs.python_version }}-test-${{ inputs.package_name }}"
-        echo "Running tox env: $ENV_NAME"
-        tox -e "$ENV_NAME" -- -ra
+      run: tox -f ${{ inputs.python_version }}-${{ inputs.package_name }} -- -ra

CHANGELOG.md

@@ -17,5 +17,3 @@ If your change does not need a CHANGELOG entry, add the "skip changelog" label t
     ([#497](https://github.com/aws-observability/aws-otel-python-instrumentation/pull/497))
 - Fix timeout handling for exceeded deadline in retry logic in OTLPAwsLogsExporter
   ([#501](https://github.com/aws-observability/aws-otel-python-instrumentation/pull/501))
-- Fix: Unable to run ADOT Python unit tests with latest Tox release
-  ([#521](https://github.com/aws-observability/aws-otel-python-instrumentation/pull/521))

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/aws_opentelemetry_distro.py

@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # flake8: noqa: E402
+# pylint: disable=wrong-import-position
 
 # Apply the Gevent's patching as the very first step in the distro.
 # IMPORTANT: Do not put any imports before the following 2 lines.

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/patches/_gevent_patches.py

@@ -25,9 +25,9 @@ def _is_gevent_installed() -> bool:
     req = Requirement("gevent")
     try:
         dist_version = version(req.name)
-        _logger.debug(f"Gevent is installed: {dist_version}")
+        _logger.debug("Gevent is installed: %s", dist_version)
     except PackageNotFoundError as exc:
-        _logger.debug(f"Gevent is not installed. {exc}")
+        _logger.debug("Gevent is not installed. %s", exc)
         return False
     return True
 

tox.ini

@@ -34,11 +34,11 @@ commands_pre =
 ; Install common packages for all the tests. These are not needed in all the
 ; cases but it saves a lot of boilerplate in this file.
   test: pip install botocore
-  test: pip install opentelemetry-api[test]@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
-  test: pip install opentelemetry-sdk[test]@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
-  test: pip install opentelemetry-instrumentation[test]@{env:CONTRIB_REPO}\#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation
-  test: pip install opentelemetry-exporter-otlp[test]@{env:CORE_REPO}\#egg=opentelemetry-exporter-otlp&subdirectory=exporter/opentelemetry-exporter-otlp
-  test: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
+  test: pip install "opentelemetry-api[test] @ {env:CORE_REPO}#egg=opentelemetry-api&subdirectory=opentelemetry-api"
+  test: pip install "opentelemetry-sdk[test] @ {env:CORE_REPO}#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk"
+  test: pip install "opentelemetry-instrumentation[test] @ {env:CONTRIB_REPO}#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation"
+  test: pip install "opentelemetry-exporter-otlp[test] @ {env:CORE_REPO}#egg=opentelemetry-exporter-otlp&subdirectory=exporter/opentelemetry-exporter-otlp"
+  test: pip install "opentelemetry-test-utils @ {env:CORE_REPO}#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils"
   aws-opentelemetry-distro: pip install {toxinidir}/aws-opentelemetry-distro
 
 commands =