merge master

Author: alexander-alderman-webb

CONTRIBUTING.md

@@ -126,6 +126,20 @@ lldb -- ../../uwsgi/uwsgi --pythonpath "$PWD/.venv/lib/python3.14/site-packages"
   --need-app \
 ```
 
+### Troubleshooting "module not found" error in relation to the `sentry-sdk` when it's installed in editable mode
+
+If you are trying to debug a Django applicaton such as that described above, and have the Sentry SDK installed in editable mode in the Django project, you will likely encounter this error because the editable package is not being found in the uWSGI's python path. To fix this, the above command needs to be updated to include a `--pythonpath` argument that passes in where your local `sentry-python` codebase is:
+
+```bash
+lldb -- ../../uwsgi/uwsgi --pythonpath "$PWD/.venv/lib/python3.14/site-packages" \
+  --pythonpath "<path-to-local-sentry-python-directory>" \
+  --http :8000 \
+  --module mysite.wsgi:application \
+  --home "$PWD/.venv" \
+  --need-app \
+```
+
+
 ## Adding a New Integration
 
 ### SDK Contract

codecov.yml

@@ -2,15 +2,17 @@ coverage:
   status:
     project:
       default:
-        target: auto  # auto compares coverage to the previous base commit
-        threshold: 10%  # this allows a 10% drop from the previous base commit coverage
+        target: auto # auto compares coverage to the previous base commit
+        threshold: 10% # this allows a 10% drop from the previous base commit coverage
         informational: true
 
 ignore:
   - "tests"
   - "sentry_sdk/_types.py"
 
 comment: true
+config:
+  files: changed
 
 github_checks:
   annotations: false

sentry_sdk/__init__.py

@@ -37,6 +37,8 @@
     "last_event_id",
     "new_scope",
     "push_scope",
+    "remove_attribute",
+    "set_attribute",
     "set_context",
     "set_extra",
     "set_level",

sentry_sdk/api.py

@@ -70,6 +70,8 @@ def overload(x: "T") -> "T":
     "last_event_id",
     "new_scope",
     "push_scope",
+    "remove_attribute",
+    "set_attribute",
     "set_context",
     "set_extra",
     "set_level",
@@ -287,6 +289,28 @@ def push_scope(  # noqa: F811
     return _ScopeManager()
 
 
+@scopemethod
+def set_attribute(attribute: str, value: "Any") -> None:
+    """
+    Set an attribute.
+
+    Any attributes-based telemetry (logs, metrics) captured in this scope will
+    include this attribute.
+    """
+    return get_isolation_scope().set_attribute(attribute, value)
+
+
+@scopemethod
+def remove_attribute(attribute: str) -> None:
+    """
+    Remove an attribute.
+
+    If the attribute doesn't exist, this function will not have any effect and
+    it will also not raise an exception.
+    """
+    return get_isolation_scope().remove_attribute(attribute)
+
+
 @scopemethod
 def set_tag(key: str, value: "Any") -> None:
     return get_isolation_scope().set_tag(key, value)

sentry_sdk/integrations/httpx.py

@@ -135,11 +135,8 @@ async def send(
                             key=key, value=value, url=request.url
                         )
                     )
-                    if key == BAGGAGE_HEADER_NAME and request.headers.get(
-                        BAGGAGE_HEADER_NAME
-                    ):
-                        # do not overwrite any existing baggage, just append to it
-                        request.headers[key] += "," + value
+                    if key == BAGGAGE_HEADER_NAME:
+                        add_sentry_baggage_to_headers(request.headers, value)
                     else:
                         request.headers[key] = value
 

sentry_sdk/integrations/openai.py

@@ -462,7 +462,7 @@ def _set_embeddings_input_data(
     _commmon_set_input_data(span, kwargs)
 
 
-def _common_set_output_data(
+def _set_common_output_data(
     span: "Span",
     response: "Any",
     input: "Any",
@@ -723,7 +723,7 @@ def _set_completions_api_output_data(
     if messages is not None and isinstance(messages, str):
         messages = [messages]
 
-    _common_set_output_data(
+    _set_common_output_data(
         span,
         response,
         messages,
@@ -746,7 +746,7 @@ def _set_streaming_completions_api_output_data(
     if messages is not None and isinstance(messages, str):
         messages = [messages]
 
-    _common_set_output_data(
+    _set_common_output_data(
         span,
         response,
         messages,
@@ -769,7 +769,7 @@ def _set_responses_api_output_data(
     if input is not None and isinstance(input, str):
         input = [input]
 
-    _common_set_output_data(
+    _set_common_output_data(
         span,
         response,
         input,
@@ -792,7 +792,7 @@ def _set_streaming_responses_api_output_data(
     if input is not None and isinstance(input, str):
         input = [input]
 
-    _common_set_output_data(
+    _set_common_output_data(
         span,
         response,
         input,
@@ -815,7 +815,7 @@ def _set_embeddings_output_data(
     if input is not None and isinstance(input, str):
         input = [input]
 
-    _common_set_output_data(
+    _set_common_output_data(
         span,
         response,
         input,

sentry_sdk/integrations/wsgi.py

@@ -86,7 +86,7 @@ def __init__(
 
     def __call__(
         self, environ: "Dict[str, str]", start_response: "Callable[..., Any]"
-    ) -> "_ScopedResponse":
+    ) -> "Any":
         if _wsgi_middleware_applied.get(False):
             return self.app(environ, start_response)
 
@@ -135,6 +135,29 @@ def __call__(
         finally:
             _wsgi_middleware_applied.set(False)
 
+        # Within the uWSGI subhandler, the use of the "offload" mechanism for file responses
+        # is determined by a pointer equality check on the response object
+        # (see https://github.com/unbit/uwsgi/blob/8d116f7ea2b098c11ce54d0b3a561c54dcd11929/plugins/python/wsgi_subhandler.c#L278).
+        #
+        # If we were to return a _ScopedResponse, this would cause the check to always fail
+        # since it's checking the files are exactly the same.
+        #
+        # To avoid this and ensure that the offloading mechanism works as expected when it's
+        # enabled, we check if the response is a file-like object (determined by the presence
+        # of `fileno`), if the wsgi.file_wrapper is available in the environment (as if so,
+        # it would've been used in handling the file in the response).
+        #
+        # Even if the offload mechanism is not enabled, there are optimizations that uWSGI does for file-like objects,
+        # so we want to make sure we don't interfere with those either.
+        #
+        # If all conditions are met, we return the original response object directly,
+        # allowing uWSGI to handle it as intended.
+        if (
+            environ.get("wsgi.file_wrapper")
+            and getattr(response, "fileno", None) is not None
+        ):
+            return response
+
         return _ScopedResponse(scope, response)
 
 

tests/integrations/wsgi/test_wsgi.py

@@ -6,7 +6,7 @@
 
 import sentry_sdk
 from sentry_sdk import capture_message
-from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
+from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware, _ScopedResponse
 
 
 @pytest.fixture
@@ -500,3 +500,50 @@ def dogpark(environ, start_response):
     (event,) = events
 
     assert event["contexts"]["trace"]["origin"] == "auto.dogpark.deluxe"
+
+
+@pytest.mark.parametrize(
+    "has_file_wrapper, has_fileno, expect_wrapped",
+    [
+        (True, True, False),  # both conditions met → unwrapped
+        (False, True, True),  # no file_wrapper → wrapped
+        (True, False, True),  # no fileno → wrapped
+        (False, False, True),  # neither condition → wrapped
+    ],
+)
+def test_file_response_wrapping(
+    sentry_init, has_file_wrapper, has_fileno, expect_wrapped
+):
+    sentry_init()
+
+    response_mock = mock.MagicMock()
+    if not has_fileno:
+        del response_mock.fileno
+
+    def app(environ, start_response):
+        start_response("200 OK", [])
+        return response_mock
+
+    environ_extra = {}
+    if has_file_wrapper:
+        environ_extra["wsgi.file_wrapper"] = mock.MagicMock()
+
+    middleware = SentryWsgiMiddleware(app)
+
+    result = middleware(
+        {
+            "REQUEST_METHOD": "GET",
+            "PATH_INFO": "/",
+            "SERVER_NAME": "localhost",
+            "SERVER_PORT": "80",
+            "wsgi.url_scheme": "http",
+            "wsgi.input": mock.MagicMock(),
+            **environ_extra,
+        },
+        lambda status, headers: None,
+    )
+
+    if expect_wrapped:
+        assert isinstance(result, _ScopedResponse)
+    else:
+        assert result is response_mock

tests/test_attributes.py

@@ -3,6 +3,27 @@
 from tests.test_metrics import envelopes_to_metrics
 
 
+def test_top_level_api(sentry_init, capture_envelopes):
+    sentry_init()
+
+    envelopes = capture_envelopes()
+
+    sentry_sdk.set_attribute("set", "value")
+    sentry_sdk.set_attribute("removed", "value")
+    sentry_sdk.remove_attribute("removed")
+    # Attempting to remove a nonexistent attribute should not raise
+    sentry_sdk.remove_attribute("nonexistent")
+
+    sentry_sdk.metrics.count("test", 1)
+    sentry_sdk.get_client().flush()
+
+    metrics = envelopes_to_metrics(envelopes)
+    (metric,) = metrics
+
+    assert metric["attributes"]["set"] == "value"
+    assert "removed" not in metric["attributes"]
+
+
 def test_scope_precedence(sentry_init, capture_envelopes):
     # Order of precedence, from most important to least:
     # 1. telemetry attributes (directly supplying attributes on creation or using set_attribute)