tox

Author: JWinermaSplunk

.github/workflows/test_1.yml

@@ -2121,6 +2121,25 @@ jobs:
       - name: Run tests
         run: tox -e py313-test-instrumentation-structlog -- -ra
 
+  py314-test-instrumentation-structlog_ubuntu-latest:
+    name: instrumentation-structlog 3.14 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.14
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.14"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py314-test-instrumentation-structlog -- -ra
+
   pypy3-test-instrumentation-structlog_ubuntu-latest:
     name: instrumentation-structlog pypy-3.9 Ubuntu
     runs-on: ubuntu-latest
@@ -4761,22 +4780,3 @@ jobs:
 
       - name: Run tests
         run: tox -e py39-test-instrumentation-asyncpg-wrapt1 -- -ra
-
-  py39-test-instrumentation-asyncpg-wrapt2_ubuntu-latest:
-    name: instrumentation-asyncpg-wrapt2 3.9 Ubuntu
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.9"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py39-test-instrumentation-asyncpg-wrapt2 -- -ra

.github/workflows/test_2.yml

@@ -31,6 +31,25 @@ env:
 
 jobs:
 
+  py39-test-instrumentation-asyncpg-wrapt2_ubuntu-latest:
+    name: instrumentation-asyncpg-wrapt2 3.9 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.9"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py39-test-instrumentation-asyncpg-wrapt2 -- -ra
+
   py310-test-instrumentation-asyncpg-wrapt1_ubuntu-latest:
     name: instrumentation-asyncpg-wrapt1 3.10 Ubuntu
     runs-on: ubuntu-latest
@@ -4761,22 +4780,3 @@ jobs:
 
       - name: Run tests
         run: tox -e py310-test-instrumentation-asyncio -- -ra
-
-  py311-test-instrumentation-asyncio_ubuntu-latest:
-    name: instrumentation-asyncio 3.11 Ubuntu
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py311-test-instrumentation-asyncio -- -ra

.github/workflows/test_3.yml

@@ -31,6 +31,25 @@ env:
 
 jobs:
 
+  py311-test-instrumentation-asyncio_ubuntu-latest:
+    name: instrumentation-asyncio 3.11 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py311-test-instrumentation-asyncio -- -ra
+
   py312-test-instrumentation-asyncio_ubuntu-latest:
     name: instrumentation-asyncio 3.12 Ubuntu
     runs-on: ubuntu-latest

instrumentation/opentelemetry-instrumentation-structlog/src/opentelemetry/instrumentation/structlog/__init__.py

@@ -330,6 +330,7 @@ def _patched_configure(*args, **kwargs):
             original = StructlogInstrumentor._original_configure
             if original is not None:
                 return original(*args, **kwargs)
+            return None
 
         structlog.configure = _patched_configure