Test back to OpenTelemetry SDK 1.30 (#1125)

Author: alexmojaki

.github/workflows/daily_deps_test.yml

@@ -7,32 +7,56 @@ on:
   # Can be triggered manually from the actions tab, if needed
   workflow_dispatch:
 
+
 jobs:
   test:
-    name: test on Python ${{ matrix.python-version }} and pydantic ${{ matrix.pydantic-version }}
+    name: test on Python ${{ matrix.python-version }}, pydantic ${{ matrix.pydantic-version }}, otel ${{ matrix.otel-version }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         pydantic-version: ['main']
+        otel-version: ['1']  # i.e. the latest
         include:
+          # Pydantic versions
           - python-version: '3.12'
             pydantic-version: '2.4'
+            otel-version: '1'
           - python-version: '3.12'
             pydantic-version: '2.5'
+            otel-version: '1'
           - python-version: '3.12'
             pydantic-version: '2.6'
+            otel-version: '1'
           - python-version: '3.12'
             pydantic-version: '2.7'
+            otel-version: '1'
           - python-version: '3.13'
             pydantic-version: '2.8'
+            otel-version: '1'
           - python-version: '3.13'
             pydantic-version: '2.9'
+            otel-version: '1'
           - python-version: '3.13'
             pydantic-version: '2.10'
+            otel-version: '1'
           - python-version: '3.13'
             pydantic-version: '2.11'
+            otel-version: '1'
+          # OpenTelemetry versions
+          - python-version: '3.13'
+            pydantic-version: 'main'
+            otel-version: '1.33'
+          - python-version: '3.13'
+            pydantic-version: 'main'
+            otel-version: '1.32'
+          - python-version: '3.13'
+            pydantic-version: 'main'
+            otel-version: '1.31'
+          - python-version: '3.13'
+            pydantic-version: 'main'
+            otel-version: '1.30'
     env:
       PYTHON: ${{ matrix.python-version }}
     steps:
@@ -59,6 +83,12 @@ jobs:
         # installs the most recent patch on the minor version's track, ex 2.6.0 -> 2.6.4
         run: uv pip install 'pydantic==${{ matrix.pydantic-version }}.*'
 
+      - name: Install OTel SDK ${{ matrix.otel-version }}
+        # installs the most recent patch on the minor version's track, ex 2.6.* -> 2.6.4
+        run: |
+          uv pip install 'opentelemetry-sdk==${{ matrix.otel-version }}.*'
+          uv pip install 'opentelemetry-exporter-otlp-proto-http==${{ matrix.otel-version }}.*'
+
       - run: uv run --no-sync pytest
 
   notify-on-failure:

.github/workflows/main.yml

@@ -68,9 +68,9 @@ jobs:
             - python-version: '3.12'
               pydantic-version: '2.4'
               otel-version: '1'  # i.e. the latest
-            - python-version: '3.12'
+            - python-version: '3.13'
               pydantic-version: '2'  # i.e. the latest
-              otel-version: '1.33'
+              otel-version: '1.30'
     env:
       PYTHON: ${{ matrix.python-version }}
     steps:
@@ -97,7 +97,9 @@ jobs:
 
       - name: Install OTel SDK ${{ matrix.otel-version }}
         # installs the most recent patch on the minor version's track, ex 2.6.* -> 2.6.4
-        run: uv pip install 'opentelemetry-sdk==${{ matrix.otel-version }}.*'
+        run: |
+          uv pip install 'opentelemetry-sdk==${{ matrix.otel-version }}.*'
+          uv pip install 'opentelemetry-exporter-otlp-proto-http==${{ matrix.otel-version }}.*'
 
       - run: mkdir coverage
       - run: uv run --no-sync coverage run -m pytest --junitxml=coverage/test-results.xml

tests/test_logfire_api.py

@@ -171,7 +171,7 @@ def func() -> None: ...
     logfire__all__.remove('instrument_pydantic_ai')
 
     assert hasattr(logfire_api, 'instrument_mcp')
-    if sys.version_info >= (3, 10) and not pydantic_pre_2_5:
+    if sys.version_info >= (3, 10) and get_version(pydantic_version) >= get_version('2.7.0'):
         logfire_api.instrument_mcp()
     logfire__all__.remove('instrument_mcp')