.github/CODEOWNERS

@@ -0,0 +1 @@
+*   @getsentry/owners-python-sdk

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
+        uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1.11.7
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 2.24.1
+
+### Various fixes & improvements
+
+- Always set `_spotlight_url` (#4186) by @BYK
+- Broader except in Django `parsed_body` (#4189) by @orhanhenrik
+- Add platform header to the `chunk` item-type in the envelope (#4178) by @viglia
+- Move `mypy` config into `pyproject.toml` (#4181) by @antonpirker
+- Move `flake8` config into `pyproject.toml` (#4185) by @antonpirker
+- Move `pytest` config into `pyproject.toml` (#4184) by @antonpirker
+- Bump `actions/create-github-app-token` from `1.11.6` to `1.11.7` (#4188) by @dependabot
+- Add `CODEOWNERS` (#4182) by @sentrivana
+
 ## 2.24.0
 
 ### Various fixes & improvements

docs/conf.py

@@ -31,7 +31,7 @@
 copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
 author = "Sentry Team and Contributors"
 
-release = "2.24.0"
+release = "2.24.1"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 

pyproject.toml

@@ -1,3 +1,7 @@
+#
+# Tool: Black
+#
+
 [tool.black]
 # 'extend-exclude' excludes files or directories in addition to the defaults
 extend-exclude = '''
@@ -9,6 +13,11 @@ extend-exclude = '''
 )
 '''
 
+
+#
+# Tool: Coverage
+#
+
 [tool.coverage.run]
 branch = true
 omit = [
@@ -20,4 +29,184 @@ omit = [
 [tool.coverage.report]
 exclude_also = [
     "if TYPE_CHECKING:",
-]
+]
+
+#
+# Tool: Pytest
+#
+
+[tool.pytest.ini_options]
+addopts = "-vvv -rfEs -s --durations=5 --cov=./sentry_sdk --cov-branch --cov-report= --tb=short --junitxml=.junitxml"
+asyncio_mode = "strict"
+asyncio_default_fixture_loop_scope = "function"
+markers = [
+    "tests_internal_exceptions: Handle internal exceptions just as the SDK does, to test it. (Otherwise internal exceptions are recorded and reraised.)",
+]
+
+[tool.pytest-watch]
+verbose = true
+nobeep = true
+
+#
+# Tool: Mypy
+#
+
+[tool.mypy]
+allow_redefinition = true
+check_untyped_defs = true
+disallow_any_generics = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+no_implicit_optional = true
+python_version = "3.11"
+strict_equality = true
+strict_optional = true
+warn_redundant_casts = true
+warn_unused_configs = true
+warn_unused_ignores = true
+
+# Relaxations for code written before mypy was introduced
+# Do not use wildcards in module paths, otherwise added modules will
+# automatically have the same set of relaxed rules as the rest
+[[tool.mypy.overrides]]
+module = "cohere.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "django.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "pyramid.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "psycopg2.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "pytest.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "aiohttp.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "anthropic.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "sanic.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "tornado.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "fakeredis.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "rq.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "pyspark.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "asgiref.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "langchain_core.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "executing.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "asttokens.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "pure_eval.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "blinker.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "sentry_sdk._queue"
+ignore_missing_imports = true
+disallow_untyped_defs = false
+
+[[tool.mypy.overrides]]
+module = "sentry_sdk._lru_cache"
+disallow_untyped_defs = false
+
+[[tool.mypy.overrides]]
+module = "celery.app.trace"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "flask.signals"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "huey.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "openai.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "openfeature.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "huggingface_hub.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "arq.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "grpc.*"
+ignore_missing_imports = true
+
+#
+# Tool: Flake8
+#
+
+[tool.flake8]
+extend-ignore = [
+  # Handled by black (Whitespace before ':' -- handled by black)
+  "E203",
+  # Handled by black (Line too long)
+  "E501",
+  # Sometimes not possible due to execution order (Module level import is not at top of file)
+  "E402",
+  # I don't care (Do not assign a lambda expression, use a def)
+  "E731",
+  # does not apply to Python 2 (redundant exception types by flake8-bugbear)
+  "B014",
+  # I don't care (Lowercase imported as non-lowercase by pep8-naming)
+  "N812",
+  # is a worse version of and conflicts with B902 (first argument of a classmethod should be named cls)
+  "N804",
+]
+extend-exclude = ["checkouts", "lol*"]
+exclude = [
+  # gRCP generated files
+  "grpc_test_service_pb2.py",
+  "grpc_test_service_pb2_grpc.py",
+]

requirements-devenv.txt

@@ -1,5 +1,6 @@
 -r requirements-linting.txt
 -r requirements-testing.txt
 mockupdb # required by `pymongo` tests that are enabled by `pymongo` from linter requirements
-pytest
+pytest>=6.0.0
+tomli;python_version<"3.11"  # Only needed for pytest on Python < 3.11
 pytest-asyncio

requirements-linting.txt

@@ -1,6 +1,9 @@
 mypy
 black
-flake8==5.0.4  # flake8 depends on pyflakes>=3.0.0 and this dropped support for Python 2 "# type:" comments
+flake8==5.0.4
+flake8-pyproject  # Flake8 plugin to support configuration in pyproject.toml
+flake8-bugbear  # Flake8 plugin
+pep8-naming  # Flake8 plugin
 types-certifi
 types-protobuf
 types-gevent
@@ -11,8 +14,6 @@ types-webob
 opentelemetry-distro
 pymongo # There is no separate types module.
 loguru # There is no separate types module.
-flake8-bugbear
-pep8-naming
 pre-commit # local linting
 httpcore
 launchdarkly-server-sdk

requirements-testing.txt

@@ -1,5 +1,6 @@
 pip
-pytest
+pytest>=6.0.0
+tomli;python_version<"3.11"  # Only needed for pytest on Python < 3.11
 pytest-cov
 pytest-forked
 pytest-localserver

sentry_sdk/consts.py

@@ -965,4 +965,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "2.24.0"
+VERSION = "2.24.1"

sentry_sdk/envelope.py

@@ -79,7 +79,11 @@ def add_profile_chunk(
     ):
         # type: (...) -> None
         self.add_item(
-            Item(payload=PayloadRef(json=profile_chunk), type="profile_chunk")
+            Item(
+                payload=PayloadRef(json=profile_chunk),
+                type="profile_chunk",
+                headers={"platform": profile_chunk.get("platform", "python")},
+            )
         )
 
     def add_checkin(

sentry_sdk/integrations/django/__init__.py

@@ -584,7 +584,7 @@ def parsed_body(self):
         # type: () -> Optional[Dict[str, Any]]
         try:
             return self.request.data
-        except AttributeError:
+        except Exception:
             return RequestExtractor.parsed_body(self)
 
 

sentry_sdk/spotlight.py

@@ -82,6 +82,7 @@ def capture_envelope(self, envelope):
 
     class SpotlightMiddleware(MiddlewareMixin):  # type: ignore[misc]
         _spotlight_script = None  # type: Optional[str]
+        _spotlight_url = None  # type: Optional[str]
 
         def __init__(self, get_response):
             # type: (Self, Callable[..., HttpResponse]) -> None
@@ -103,7 +104,7 @@ def __init__(self, get_response):
         @property
         def spotlight_script(self):
             # type: (Self) -> Optional[str]
-            if self._spotlight_script is None:
+            if self._spotlight_url is not None and self._spotlight_script is None:
                 try:
                     spotlight_js_url = urllib.parse.urljoin(
                         self._spotlight_url, SPOTLIGHT_JS_ENTRY_PATH
@@ -173,7 +174,7 @@ def process_response(self, _request, response):
 
         def process_exception(self, _request, exception):
             # type: (Self, HttpRequest, Exception) -> Optional[HttpResponseServerError]
-            if not settings.DEBUG:
+            if not settings.DEBUG or not self._spotlight_url:
                 return None
 
             try:

setup.py

@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="2.24.0",
+    version="2.24.1",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

tests/profiler/test_continuous_profiler.py

@@ -141,6 +141,11 @@ def assert_single_transaction_with_profile_chunks(
     if max_chunks is not None:
         assert len(items["profile_chunk"]) <= max_chunks
 
+    for chunk_item in items["profile_chunk"]:
+        chunk = chunk_item.payload.json
+        headers = chunk_item.headers
+        assert chunk["platform"] == headers["platform"]
+
     transaction = items["transaction"][0].payload.json
 
     trace_context = transaction["contexts"]["trace"]
@@ -215,12 +220,12 @@ def assert_single_transaction_without_profile_chunks(envelopes):
         pytest.param(
             start_profile_session,
             stop_profile_session,
-            id="start_profile_session/stop_profile_session",
+            id="start_profile_session/stop_profile_session (deprecated)",
         ),
         pytest.param(
             start_profiler,
             stop_profiler,
-            id="start_profiler/stop_profiler (deprecated)",
+            id="start_profiler/stop_profiler",
         ),
     ],
 )
@@ -292,12 +297,12 @@ def test_continuous_profiler_auto_start_and_manual_stop(
         pytest.param(
             start_profile_session,
             stop_profile_session,
-            id="start_profile_session/stop_profile_session",
+            id="start_profile_session/stop_profile_session  (deprecated)",
         ),
         pytest.param(
             start_profiler,
             stop_profiler,
-            id="start_profiler/stop_profiler (deprecated)",
+            id="start_profiler/stop_profiler",
         ),
     ],
 )
@@ -374,12 +379,12 @@ def test_continuous_profiler_manual_start_and_stop_sampled(
         pytest.param(
             start_profile_session,
             stop_profile_session,
-            id="start_profile_session/stop_profile_session",
+            id="start_profile_session/stop_profile_session (deprecated)",
         ),
         pytest.param(
             start_profiler,
             stop_profiler,
-            id="start_profiler/stop_profiler (deprecated)",
+            id="start_profiler/stop_profiler",
         ),
     ],
 )
@@ -544,12 +549,12 @@ def test_continuous_profiler_auto_start_and_stop_unsampled(
         pytest.param(
             start_profile_session,
             stop_profile_session,
-            id="start_profile_session/stop_profile_session",
+            id="start_profile_session/stop_profile_session (deprecated)",
         ),
         pytest.param(
             start_profiler,
             stop_profiler,
-            id="start_profiler/stop_profiler (deprecated)",
+            id="start_profiler/stop_profiler",
         ),
     ],
 )