Merge branch 'master' into antonpirker/remove-hub-from-tests

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

@@ -0,0 +1,135 @@
+name: Test AI
+on:
+ push:
+ branches:
+ - master
+ - release/**
+ - sentry-sdk-2.0
+ pull_request:
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+ group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+ cancel-in-progress: true
+permissions:
+ contents: read
+env:
+ BUILD_CACHE_KEY: ${{ github.sha }}
+ 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.7","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-20.04]
+ steps:
+ - uses: actions/[email protected]
+ - uses: actions/setup-python@v5
+ with:
+ python-version: ${{ matrix.python-version }}
+ - name: Setup Test Env
+ run: |
+ pip install coverage 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" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+ - name: Test cohere latest
+ run: |
+ set -x # print commands that are executed
+ ./scripts/runtox.sh "py${{ matrix.python-version }}-cohere-latest" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+ - name: Test langchain latest
+ run: |
+ set -x # print commands that are executed
+ ./scripts/runtox.sh "py${{ matrix.python-version }}-langchain-latest" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+ - name: Test openai latest
+ run: |
+ set -x # print commands that are executed
+ ./scripts/runtox.sh "py${{ matrix.python-version }}-openai-latest" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+ - name: Test huggingface_hub latest
+ run: |
+ set -x # print commands that are executed
+ ./scripts/runtox.sh "py${{ matrix.python-version }}-huggingface_hub-latest" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+ - name: Generate coverage XML
+ run: |
+ coverage combine .coverage*
+ coverage xml -i
+ - uses: codecov/codecov-action@v4
+ with:
+ token: ${{ secrets.CODECOV_TOKEN }}
+ files: coverage.xml
+ test-ai-pinned:
+ name: AI (pinned)
+ timeout-minutes: 30
+ runs-on: ${{ matrix.os }}
+ strategy:
+ fail-fast: false
+ matrix:
+ python-version: ["3.7","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-20.04]
+ steps:
+ - uses: actions/[email protected]
+ - uses: actions/setup-python@v5
+ with:
+ python-version: ${{ matrix.python-version }}
+ - name: Setup Test Env
+ run: |
+ pip install coverage tox
+ - name: Erase coverage
+ run: |
+ coverage erase
+ - name: Test anthropic pinned
+ run: |
+ set -x # print commands that are executed
+ ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-anthropic" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+ - name: Test cohere pinned
+ run: |
+ set -x # print commands that are executed
+ ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-cohere" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+ - name: Test langchain pinned
+ run: |
+ set -x # print commands that are executed
+ ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-langchain" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+ - name: Test openai pinned
+ run: |
+ set -x # print commands that are executed
+ ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-openai" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+ - name: Test huggingface_hub pinned
+ run: |
+ set -x # print commands that are executed
+ ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-huggingface_hub" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+ - name: Generate coverage XML
+ run: |
+ coverage combine .coverage*
+ coverage xml -i
+ - uses: codecov/codecov-action@v4
+ with:
+ token: ${{ secrets.CODECOV_TOKEN }}
+ files: coverage.xml
+ check_required_tests:
+ name: All AI tests passed
+ needs: test-ai-pinned
+ # Always run this, even if a dependent job failed
+ if: always()
+ runs-on: ubuntu-20.04
+ steps:
+ - name: Check for failures
+ if: contains(needs.test-ai-pinned.result, 'failure') || contains(needs.test-ai-pinned.result, 'skipped')
+ run: |
+ echo "One of the dependent jobs has failed. You may need to re-run it." && exit 1

.github/workflows/test-integrations-data-processing.yml

@@ -25,7 +25,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- python-version: ["3.6","3.7","3.8","3.9","3.11","3.12"]
+ python-version: ["3.6","3.7","3.8","3.10","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
@@ -44,10 +44,6 @@ jobs:
  - 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" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
  - name: Test arq latest
  run: |
  set -x # print commands that are executed
@@ -60,30 +56,18 @@ jobs:
  run: |
  set -x # print commands that are executed
  ./scripts/runtox.sh "py${{ matrix.python-version }}-celery-latest" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
- - name: Test cohere latest
- run: |
- set -x # print commands that are executed
- ./scripts/runtox.sh "py${{ matrix.python-version }}-cohere-latest" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
  - name: Test huey latest
  run: |
  set -x # print commands that are executed
  ./scripts/runtox.sh "py${{ matrix.python-version }}-huey-latest" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
- - name: Test langchain latest
- run: |
- set -x # print commands that are executed
- ./scripts/runtox.sh "py${{ matrix.python-version }}-langchain-latest" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
- - name: Test openai latest
- run: |
- set -x # print commands that are executed
- ./scripts/runtox.sh "py${{ matrix.python-version }}-openai-latest" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
- - name: Test huggingface_hub latest
- run: |
- set -x # print commands that are executed
- ./scripts/runtox.sh "py${{ matrix.python-version }}-huggingface_hub-latest" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
  - name: Test rq latest
  run: |
  set -x # print commands that are executed
  ./scripts/runtox.sh "py${{ matrix.python-version }}-rq-latest" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+ - name: Test spark latest
+ run: |
+ set -x # print commands that are executed
+ ./scripts/runtox.sh "py${{ matrix.python-version }}-spark-latest" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
  - name: Generate coverage XML
  run: |
  coverage combine .coverage*
@@ -118,10 +102,6 @@ jobs:
  - name: Erase coverage
  run: |
  coverage erase
- - name: Test anthropic pinned
- run: |
- set -x # print commands that are executed
- ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-anthropic" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
  - name: Test arq pinned
  run: |
  set -x # print commands that are executed
@@ -134,30 +114,18 @@ jobs:
  run: |
  set -x # print commands that are executed
  ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-celery" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
- - name: Test cohere pinned
- run: |
- set -x # print commands that are executed
- ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-cohere" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
  - name: Test huey pinned
  run: |
  set -x # print commands that are executed
  ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-huey" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
- - name: Test langchain pinned
- run: |
- set -x # print commands that are executed
- ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-langchain" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
- - name: Test openai pinned
- run: |
- set -x # print commands that are executed
- ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-openai" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
- - name: Test huggingface_hub pinned
- run: |
- set -x # print commands that are executed
- ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-huggingface_hub" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
  - name: Test rq pinned
  run: |
  set -x # print commands that are executed
  ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-rq" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+ - name: Test spark pinned
+ run: |
+ set -x # print commands that are executed
+ ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-spark" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
  - name: Generate coverage XML
  run: |
  coverage combine .coverage*

requirements-docs.txt

@@ -1,3 +1,4 @@
+gevent
 shibuya
 sphinx==7.2.6
 sphinx-autodoc-typehints[type_comments]>=1.8.0

requirements-linting.txt

@@ -3,8 +3,11 @@ black
 flake8==5.0.4 # flake8 depends on pyflakes>=3.0.0 and this dropped support for Python 2 "# type:" comments
 types-certifi
 types-protobuf
+types-gevent
+types-greenlet
 types-redis
 types-setuptools
+types-webob
 pymongo # There is no separate types module.
 loguru # There is no separate types module.
 flake8-bugbear

scripts/split-tox-gh-actions/split-tox-gh-actions.py

@@ -58,6 +58,13 @@
  "Common": [
  "common",
  ],
+ "AI": [
+ "anthropic",
+ "cohere",
+ "langchain",
+ "openai",
+ "huggingface_hub",
+ ],
  "AWS Lambda": [
  # this is separate from Cloud Computing because only this one test suite
  # needs to run with access to GitHub secrets
@@ -70,16 +77,12 @@
  "gcp",
  ],
  "Data Processing": [
- "anthropic",
  "arq",
  "beam",
  "celery",
- "cohere",
  "huey",
- "langchain",
- "openai",
- "huggingface_hub",
  "rq",
+ "spark",
  ],
  "Databases": [
  "asyncpg",

sentry_sdk/integrations/_wsgi_common.py

@@ -16,6 +16,7 @@
  from typing import Any
  from typing import Dict
  from typing import Mapping
+ from typing import MutableMapping
  from typing import Optional
  from typing import Union
  from sentry_sdk._types import Event, HttpStatusCodeRange
@@ -114,7 +115,7 @@ def content_length(self):
  return 0
 
  def cookies(self):
- # type: () -> Dict[str, Any]
+ # type: () -> MutableMapping[str, Any]
  raise NotImplementedError()
 
  def raw_data(self):

sentry_sdk/integrations/pyramid.py

@@ -30,8 +30,8 @@
  from typing import Callable
  from typing import Dict
  from typing import Optional
- from webob.cookies import RequestCookies # type: ignore
- from webob.compat import cgi_FieldStorage # type: ignore
+ from webob.cookies import RequestCookies
+ from webob.request import _FieldStorageWithFile
 
  from sentry_sdk.utils import ExcInfo
  from sentry_sdk._types import Event, EventProcessor
@@ -189,15 +189,15 @@ def form(self):
  }
 
  def files(self):
- # type: () -> Dict[str, cgi_FieldStorage]
+ # type: () -> Dict[str, _FieldStorageWithFile]
  return {
  key: value
  for key, value in self.request.POST.items()
  if getattr(value, "filename", None)
  }
 
  def size_of_file(self, postdata):
- # type: (cgi_FieldStorage) -> int
+ # type: (_FieldStorageWithFile) -> int
  file = postdata.file
  try:
  return os.fstat(file.fileno()).st_size

sentry_sdk/profiler/continuous_profiler.py

@@ -28,6 +28,7 @@
  from typing import Dict
  from typing import List
  from typing import Optional
+ from typing import Type
  from typing import Union
  from typing_extensions import TypedDict
  from sentry_sdk._types import ContinuousProfilerMode
@@ -51,9 +52,10 @@
 
 
 try:
- from gevent.monkey import get_original # type: ignore
- from gevent.threadpool import ThreadPool  # type: ignore
+ from gevent.monkey import get_original
+ from gevent.threadpool import ThreadPool as _ThreadPool
 
+ ThreadPool = _ThreadPool # type: Optional[Type[_ThreadPool]]
  thread_sleep = get_original("time", "sleep")
 except ImportError:
  thread_sleep = time.sleep
@@ -347,7 +349,7 @@ def __init__(self, frequency, options, capture_func):
 
  super().__init__(frequency, options, capture_func)
 
- self.thread = None # type: Optional[ThreadPool]
+ self.thread = None # type: Optional[_ThreadPool]
  self.pid = None # type: Optional[int]
  self.lock = threading.Lock()
 
@@ -377,7 +379,7 @@ def ensure_running(self):
  # we should create a new buffer along with it
  self.reset_buffer()
 
- self.thread = ThreadPool(1)
+ self.thread = ThreadPool(1) # type: ignore[misc]
  try:
  self.thread.spawn(self.run)
  except RuntimeError: