Merge branch 'master' into webb/unraisable-integration

Author: alexander-alderman-webb

.github/workflows/test-integrations-ai.yml

@@ -22,85 +22,6 @@ env:
   CACHED_BUILD_PATHS: |
     ${{ github.workspace }}/dist-serverless
 jobs:
-  test-ai-latest:
-    name: AI (latest)
-    timeout-minutes: 30
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.9","3.11","3.12"]
-        # python3.6 reached EOL and is no longer being supported on
-        # new versions of hosted runners on Github Actions
-        # ubuntu-20.04 is the last version that supported python3.6
-        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
-        os: [ubuntu-22.04]
-    # Use Docker container only for Python 3.6
-    container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
-    steps:
-      - uses: actions/[email protected]
-      - uses: actions/setup-python@v5
-        if: ${{ matrix.python-version != '3.6' }}
-        with:
-          python-version: ${{ matrix.python-version }}
-          allow-prereleases: true
-      - name: Setup Test Env
-        run: |
-          pip install "coverage[toml]" tox
-      - name: Erase coverage
-        run: |
-          coverage erase
-      - name: Test anthropic latest
-        run: |
-          set -x # print commands that are executed
-          ./scripts/runtox.sh "py${{ matrix.python-version }}-anthropic-latest"
-      - name: Test cohere latest
-        run: |
-          set -x # print commands that are executed
-          ./scripts/runtox.sh "py${{ matrix.python-version }}-cohere-latest"
-      - name: Test langchain latest
-        run: |
-          set -x # print commands that are executed
-          ./scripts/runtox.sh "py${{ matrix.python-version }}-langchain-latest"
-      - name: Test openai latest
-        run: |
-          set -x # print commands that are executed
-          ./scripts/runtox.sh "py${{ matrix.python-version }}-openai-latest"
-      - name: Test openai_agents latest
-        run: |
-          set -x # print commands that are executed
-          ./scripts/runtox.sh "py${{ matrix.python-version }}-openai_agents-latest"
-      - name: Test huggingface_hub latest
-        run: |
-          set -x # print commands that are executed
-          ./scripts/runtox.sh "py${{ matrix.python-version }}-huggingface_hub-latest"
-      - name: Generate coverage XML (Python 3.6)
-        if: ${{ !cancelled() && matrix.python-version == '3.6' }}
-        run: |
-          export COVERAGE_RCFILE=.coveragerc36
-          coverage combine .coverage-sentry-*
-          coverage xml --ignore-errors
-      - name: Generate coverage XML
-        if: ${{ !cancelled() && matrix.python-version != '3.6' }}
-        run: |
-          coverage combine .coverage-sentry-*
-          coverage xml
-      - name: Upload coverage to Codecov
-        if: ${{ !cancelled() }}
-        uses: codecov/[email protected]
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: coverage.xml
-          # make sure no plugins alter our coverage reports
-          plugins: noop
-          verbose: true
-      - name: Upload test results to Codecov
-        if: ${{ !cancelled() }}
-        uses: codecov/test-results-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: .junitxml
-          verbose: true
   test-ai-pinned:
     name: AI (pinned)
     timeout-minutes: 30
@@ -137,14 +58,22 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-cohere"
-      - name: Test langchain pinned
+      - name: Test langchain-base pinned
+        run: |
+          set -x # print commands that are executed
+          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-langchain-base"
+      - name: Test langchain-notiktoken pinned
+        run: |
+          set -x # print commands that are executed
+          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-langchain-notiktoken"
+      - name: Test openai-base pinned
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-langchain"
-      - name: Test openai pinned
+          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-openai-base"
+      - name: Test openai-notiktoken pinned
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-openai"
+          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-openai-notiktoken"
       - name: Test openai_agents pinned
         run: |
           set -x # print commands that are executed

scripts/populate_tox/README.md

@@ -153,6 +153,14 @@ be expressed like so:
 }
 ```
 
+### `integration_name`
+
+Sometimes, the name of the test suite doesn't match the name of the integration.
+For example, we have the `openai_base` and `openai_notiktoken` test suites, both
+of which are actually testing the `openai` integration. If this is the case, you can use the `integration_name` key to define the name of the integration. If not provided, it will default to the name of the test suite.
+
+Linking an integration to a test suite allows the script to access integration configuration like for example the minimum version defined in `sentry_sdk/integrations/__init__.py`.
+
 
 ## How-Tos
 

scripts/populate_tox/config.py

@@ -126,6 +126,26 @@
     "huggingface_hub": {
         "package": "huggingface_hub",
     },
+    "langchain-base": {
+        "package": "langchain",
+        "integration_name": "langchain",
+        "deps": {
+            "*": ["openai", "tiktoken", "langchain-openai"],
+            "<=0.1": ["httpx<0.28.0"],
+            ">=0.3": ["langchain-community"],
+        },
+        "include": "<1.0",
+    },
+    "langchain-notiktoken": {
+        "package": "langchain",
+        "integration_name": "langchain",
+        "deps": {
+            "*": ["openai", "langchain-openai"],
+            "<=0.1": ["httpx<0.28.0"],
+            ">=0.3": ["langchain-community"],
+        },
+        "include": "<1.0",
+    },
     "launchdarkly": {
         "package": "launchdarkly-server-sdk",
     },
@@ -139,6 +159,24 @@
     "loguru": {
         "package": "loguru",
     },
+    "openai-base": {
+        "package": "openai",
+        "integration_name": "openai",
+        "deps": {
+            "*": ["pytest-asyncio", "tiktoken"],
+            "<1.55": ["httpx<0.28"],
+        },
+        "python": ">=3.8",
+    },
+    "openai-notiktoken": {
+        "package": "openai",
+        "integration_name": "openai",
+        "deps": {
+            "*": ["pytest-asyncio"],
+            "<1.55": ["httpx<0.28"],
+        },
+        "python": ">=3.8",
+    },
     "openai_agents": {
         "package": "openai-agents",
         "deps": {

scripts/populate_tox/populate_tox.py

@@ -76,8 +76,6 @@
     "httpx",
     "langchain",
     "langchain_notiktoken",
-    "openai",
-    "openai_notiktoken",
     "pure_eval",
     "quart",
     "ray",
@@ -141,7 +139,11 @@ def _prefilter_releases(
     - the list of prefiltered releases
     - an optional prerelease if there is one that should be tested
     """
-    min_supported = _MIN_VERSIONS.get(integration)
+    integration_name = (
+        TEST_SUITE_CONFIG[integration].get("integration_name") or integration
+    )
+
+    min_supported = _MIN_VERSIONS.get(integration_name)
     if min_supported is not None:
         min_supported = Version(".".join(map(str, min_supported)))
     else:

scripts/populate_tox/tox.jinja

@@ -77,19 +77,6 @@ envlist =
     {py3.9,py3.11,py3.12}-httpx-v{0.25,0.27}
     {py3.9,py3.12,py3.13}-httpx-latest
 
-    # Langchain
-    {py3.9,py3.11,py3.12}-langchain-v0.1
-    {py3.9,py3.11,py3.12}-langchain-v0.3
-    {py3.9,py3.11,py3.12}-langchain-latest
-    {py3.9,py3.11,py3.12}-langchain-notiktoken
-
-    # OpenAI
-    {py3.9,py3.11,py3.12}-openai-v1.0
-    {py3.9,py3.11,py3.12}-openai-v1.22
-    {py3.9,py3.11,py3.12}-openai-v1.55
-    {py3.9,py3.11,py3.12}-openai-latest
-    {py3.9,py3.11,py3.12}-openai-notiktoken
-
     # OpenTelemetry (OTel)
     {py3.7,py3.9,py3.12,py3.13}-opentelemetry
 
@@ -238,34 +225,6 @@ deps =
     httpx-v0.27: httpx~=0.27.0
     httpx-latest: httpx
 
-    # Langchain
-    langchain-v0.1: openai~=1.0.0
-    langchain-v0.1: langchain~=0.1.11
-    langchain-v0.1: tiktoken~=0.6.0
-    langchain-v0.1: httpx<0.28.0
-    langchain-v0.3: langchain~=0.3.0
-    langchain-v0.3: langchain-community
-    langchain-v0.3: tiktoken
-    langchain-v0.3: openai
-    langchain-{latest,notiktoken}: langchain
-    langchain-{latest,notiktoken}: langchain-openai
-    langchain-{latest,notiktoken}: openai>=1.6.1
-    langchain-latest: tiktoken~=0.6.0
-
-    # OpenAI
-    openai: pytest-asyncio
-    openai-v1.0: openai~=1.0.0
-    openai-v1.0: tiktoken
-    openai-v1.0: httpx<0.28.0
-    openai-v1.22: openai~=1.22.0
-    openai-v1.22: tiktoken
-    openai-v1.22: httpx<0.28.0
-    openai-v1.55: openai~=1.55.0
-    openai-v1.55: tiktoken
-    openai-latest: openai
-    openai-latest: tiktoken~=0.6.0
-    openai-notiktoken: openai
-
     # OpenTelemetry (OTel)
     opentelemetry: opentelemetry-distro
 
@@ -397,11 +356,13 @@ setenv =
     httpx: TESTPATH=tests/integrations/httpx
     huey: TESTPATH=tests/integrations/huey
     huggingface_hub: TESTPATH=tests/integrations/huggingface_hub
-    langchain: TESTPATH=tests/integrations/langchain
+    langchain-base: TESTPATH=tests/integrations/langchain
+    langchain-notiktoken: TESTPATH=tests/integrations/langchain
     launchdarkly: TESTPATH=tests/integrations/launchdarkly
     litestar: TESTPATH=tests/integrations/litestar
     loguru: TESTPATH=tests/integrations/loguru
-    openai: TESTPATH=tests/integrations/openai
+    openai-base: TESTPATH=tests/integrations/openai
+    openai-notiktoken: TESTPATH=tests/integrations/openai
     openai_agents: TESTPATH=tests/integrations/openai_agents
     openfeature: TESTPATH=tests/integrations/openfeature
     opentelemetry: TESTPATH=tests/integrations/opentelemetry

scripts/split_tox_gh_actions/split_tox_gh_actions.py

@@ -61,8 +61,10 @@
     "AI": [
         "anthropic",
         "cohere",
-        "langchain",
-        "openai",
+        "langchain-base",
+        "langchain-notiktoken",
+        "openai-base",
+        "openai-notiktoken",
         "openai_agents",
         "huggingface_hub",
     ],

sentry_sdk/integrations/__init__.py

@@ -147,7 +147,7 @@ def iter_default_integrations(with_auto_enabling_integrations):
     "graphene": (3, 3),
     "grpc": (1, 32, 0),  # grpcio
     "huggingface_hub": (0, 22),
-    "langchain": (0, 0, 210),
+    "langchain": (0, 1, 0),
     "launchdarkly": (9, 8, 0),
     "loguru": (0, 7, 0),
     "openai": (1, 0, 0),

sentry_sdk/integrations/openai.py

@@ -78,12 +78,12 @@ def count_tokens(self, s):
         return 0
 
 
-def _capture_exception(exc):
-    # type: (Any) -> None
+def _capture_exception(exc, manual_span_cleanup=True):
+    # type: (Any, bool) -> None
     # Close an eventually open span
     # We need to do this by hand because we are not using the start_span context manager
     current_span = sentry_sdk.get_current_span()
-    if current_span is not None:
+    if manual_span_cleanup and current_span is not None:
         current_span.__exit__(None, None, None)
 
     event, hint = event_from_exception(
@@ -516,7 +516,7 @@ def _execute_sync(f, *args, **kwargs):
             try:
                 result = f(*args, **kwargs)
             except Exception as e:
-                _capture_exception(e)
+                _capture_exception(e, manual_span_cleanup=False)
                 raise e from None
 
             return gen.send(result)
@@ -550,7 +550,7 @@ async def _execute_async(f, *args, **kwargs):
             try:
                 result = await f(*args, **kwargs)
             except Exception as e:
-                _capture_exception(e)
+                _capture_exception(e, manual_span_cleanup=False)
                 raise e from None
 
             return gen.send(result)