Merge branch 'master' into major/3.0

Author: alexander-alderman-webb

CHANGELOG.md

@@ -1,5 +1,87 @@
 # Changelog
 
+## 2.69.0
+
+### New Features ✨
+
+#### Other
+
+- (aiohttp) Add `http.route` attribute by @alexander-alderman-webb in [#7341](https://github.com/getsentry/sentry-python/pull/7341)
+- (bottle) Add `http.route` attribute by @alexander-alderman-webb in [#7343](https://github.com/getsentry/sentry-python/pull/7343)
+- (clickhouse_driver) Set breadcrumbs in the streaming trace lifecycle by @alexander-alderman-webb in [#7325](https://github.com/getsentry/sentry-python/pull/7325)
+- (docs) Add Plausible analytics to Sphinx docs by @ericapisani in [#7319](https://github.com/getsentry/sentry-python/pull/7319)
+- (falcon) Add `http.route` attribute by @alexander-alderman-webb in [#7340](https://github.com/getsentry/sentry-python/pull/7340)
+- (fastapi) Add `http.route` attribute by @alexander-alderman-webb in [#7322](https://github.com/getsentry/sentry-python/pull/7322)
+- (flask) Add `http.route` attribute by @alexander-alderman-webb in [#7344](https://github.com/getsentry/sentry-python/pull/7344)
+- (pyramid) Add `http.route` attribute by @alexander-alderman-webb in [#7347](https://github.com/getsentry/sentry-python/pull/7347)
+- (quart) Add `http.route` attribute by @alexander-alderman-webb in [#7348](https://github.com/getsentry/sentry-python/pull/7348)
+- (sqlalchemy) Add more db system names for span data by @ericapisani in [#7329](https://github.com/getsentry/sentry-python/pull/7329)
+- (starlette) Add `http.route` attribute by @alexander-alderman-webb in [#7338](https://github.com/getsentry/sentry-python/pull/7338)
+- (types) Export SpanJSON type by @ericapisani in [#7331](https://github.com/getsentry/sentry-python/pull/7331)
+- Add Python 3.15 to test matrix by @sentrivana in [#7326](https://github.com/getsentry/sentry-python/pull/7326)
+
+### Bug Fixes 🐛
+
+#### Mcp
+
+- Handle `None` arguments in tool and prompt handlers by @alexander-alderman-webb in [#7387](https://github.com/getsentry/sentry-python/pull/7387)
+- Don't report stateless StreamableHTTP servers as stdio by @Snaylaker in [#7224](https://github.com/getsentry/sentry-python/pull/7224)
+
+#### Openai
+
+- Read `input_text` parts for the Responses API by @alexander-alderman-webb in [#7333](https://github.com/getsentry/sentry-python/pull/7333)
+- Check `Response.output` is a `list` before iterating by @alexander-alderman-webb in [#7238](https://github.com/getsentry/sentry-python/pull/7238)
+
+#### Starlette
+
+- Use `url` transaction source for host routing by @mjq in [#7266](https://github.com/getsentry/sentry-python/pull/7266)
+- Set transaction name on current scope in sync handler by @mjq in [#7201](https://github.com/getsentry/sentry-python/pull/7201)
+
+#### Other
+
+- (batcher) Do not let a failed flush kill the flusher thread (#7138) by @zkasuran in [#7186](https://github.com/getsentry/sentry-python/pull/7186)
+- (boto3) Fix botocore SigV4 failures caused by post-sign trace propagation by @pabloDeputter in [#7050](https://github.com/getsentry/sentry-python/pull/7050)
+- (httpx,httpx2) Always capture breadcrumb by @sentrivana in [#7351](https://github.com/getsentry/sentry-python/pull/7351)
+- (mcp,langchain) Add mechanism to captured exceptions by @gmassello in [#7226](https://github.com/getsentry/sentry-python/pull/7226)
+- (openai-agents) Use `isinstance` to determine tool type by @alexander-alderman-webb in [#7412](https://github.com/getsentry/sentry-python/pull/7412)
+- (quart) Skip quart-flask-patch and adjust error test for quart>=0.23 by @ericapisani in [#7320](https://github.com/getsentry/sentry-python/pull/7320)
+- Allow to correctly compare parsed versions by @sentrivana in [#7184](https://github.com/getsentry/sentry-python/pull/7184)
+
+### Internal Changes 🔧
+
+#### Openai Agents
+
+- Capture spans instead of reading from span recorder by @alexander-alderman-webb in [#7404](https://github.com/getsentry/sentry-python/pull/7404)
+- Pin `openai` version when incompatible by @alexander-alderman-webb in [#7236](https://github.com/getsentry/sentry-python/pull/7236)
+
+#### Pydantic Ai
+
+- Replace individual hooks with `hooks.on.model_request` by @alexander-alderman-webb in [#7327](https://github.com/getsentry/sentry-python/pull/7327)
+- Fix instructions test for pydantic-ai >=2.36.0 by @ericapisani in [#7321](https://github.com/getsentry/sentry-python/pull/7321)
+
+#### Other
+
+- (aiohttp) Remove dead segment name code by @mjq in [#7284](https://github.com/getsentry/sentry-python/pull/7284)
+- (anthropic) Include `StreamedSpan` in type annotations by @alexander-alderman-webb in [#7373](https://github.com/getsentry/sentry-python/pull/7373)
+- (mcp) Inline `_extract_handler_data_from_args()` by @alexander-alderman-webb in [#7386](https://github.com/getsentry/sentry-python/pull/7386)
+- (quart) Fix flake caused by flushing spans on segment end by @alexander-alderman-webb in [#7240](https://github.com/getsentry/sentry-python/pull/7240)
+- (stdlib) Remove urllib3 workaround by @pabloDeputter in [#7283](https://github.com/getsentry/sentry-python/pull/7283)
+- Add `openai-agents` to uv typing group by @alexander-alderman-webb in [#7415](https://github.com/getsentry/sentry-python/pull/7415)
+- Add `aiohttp` to uv typing group by @alexander-alderman-webb in [#7395](https://github.com/getsentry/sentry-python/pull/7395)
+- Isolate `httpx` test suite from `httpx2` by @ZaafirRizwan in [#7398](https://github.com/getsentry/sentry-python/pull/7398)
+- Remove `test_langchain_embeddings_error_handling()` by @alexander-alderman-webb in [#7389](https://github.com/getsentry/sentry-python/pull/7389)
+- Add `tiktoken` to uv typing group by @alexander-alderman-webb in [#7394](https://github.com/getsentry/sentry-python/pull/7394)
+- Reference renamed coverage action by @MathurAditya724 in [#7371](https://github.com/getsentry/sentry-python/pull/7371)
+- Remove flaky detector by @sl0thentr0py in [#7363](https://github.com/getsentry/sentry-python/pull/7363)
+- Add `openai` to uv typing group by @alexander-alderman-webb in [#7334](https://github.com/getsentry/sentry-python/pull/7334)
+- 🤖 Update test matrix with new releases (08/31) by @github-actions in [#7303](https://github.com/getsentry/sentry-python/pull/7303)
+- Add `anthropic` to uv typing group by @alexander-alderman-webb in [#7324](https://github.com/getsentry/sentry-python/pull/7324)
+- Add `google-genai` to uv typing group by @alexander-alderman-webb in [#7323](https://github.com/getsentry/sentry-python/pull/7323)
+- Use tagged versions for `getsentry/codecov-action` by @alexander-alderman-webb in [#7241](https://github.com/getsentry/sentry-python/pull/7241)
+- Update test matrix with new releases (08/24) by @alexander-alderman-webb in [#7228](https://github.com/getsentry/sentry-python/pull/7228)
+- Add `httpx` dependency to tests relying on `get_model_response()` by @alexander-alderman-webb in [#7235](https://github.com/getsentry/sentry-python/pull/7235)
+- Access the 'type' in an event using `.get` by @ericapisani in [#7239](https://github.com/getsentry/sentry-python/pull/7239)
+
 ## 2.68.1
 
 ### `enable_logs`

docs/conf.py

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

sentry_sdk/consts.py

@@ -1802,4 +1802,4 @@ def _get_default_options() -> "dict[str, Any]":
 del _get_default_options
 
 
-VERSION = "2.68.1"
+VERSION = "2.69.0"

setup.py

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

tests/integrations/cohere/test_cohere.py

@@ -249,20 +249,43 @@ def test_streaming_chat(
         assert span["data"]["gen_ai.usage.total_tokens"] == 30
 
 
-def test_bad_chat(sentry_init, capture_events):
-    sentry_init(integrations=[CohereIntegration()], traces_sample_rate=1.0)
-    events = capture_events()
-
-    client = Client(api_key="z")
-    HTTPXClient.request = mock.Mock(
-        side_effect=httpx.HTTPError("API rate limit reached")
+@pytest.mark.parametrize("span_streaming", [True, False])
+def test_bad_chat(sentry_init, capture_events, capture_items, span_streaming):
+    sentry_init(
+        integrations=[CohereIntegration()],
+        traces_sample_rate=1.0,
+        trace_lifecycle="stream" if span_streaming else "static",
     )
-    with pytest.raises(httpx.HTTPError):
-        client.chat(model="some-model", message="hello")
 
-    (event, transaction) = events
-    assert event["level"] == "error"
-    assert transaction["contexts"]["trace"]["status"] == "internal_error"
+    if span_streaming:
+        items = capture_items("event", "span")
+
+        client = Client(api_key="z")
+        HTTPXClient.request = mock.Mock(
+            side_effect=httpx.HTTPError("API rate limit reached")
+        )
+        with pytest.raises(httpx.HTTPError):
+            client.chat(model="some-model", message="hello")
+
+        (event,) = (item.payload for item in items if item.type == "event")
+        assert event["level"] == "error"
+
+        sentry_sdk.flush()
+        (span,) = (item.payload for item in items if item.type == "span")
+        assert span["status"] == "error"
+    else:
+        events = capture_events()
+
+        client = Client(api_key="z")
+        HTTPXClient.request = mock.Mock(
+            side_effect=httpx.HTTPError("API rate limit reached")
+        )
+        with pytest.raises(httpx.HTTPError):
+            client.chat(model="some-model", message="hello")
+
+        (event, transaction) = events
+        assert event["level"] == "error"
+        assert transaction["contexts"]["trace"]["status"] == "internal_error"
 
 
 def test_span_status_error(sentry_init, capture_events):
@@ -386,74 +409,138 @@ def test_embed(
         assert span["data"]["gen_ai.usage.total_tokens"] == 10
 
 
-def test_span_origin_chat(sentry_init, capture_events):
+@pytest.mark.parametrize("span_streaming", [True, False])
+def test_span_origin_chat(sentry_init, capture_events, capture_items, span_streaming):
     sentry_init(
         integrations=[CohereIntegration()],
         traces_sample_rate=1.0,
+        trace_lifecycle="stream" if span_streaming else "static",
     )
-    events = capture_events()
 
-    client = Client(api_key="z")
-    HTTPXClient.request = mock.Mock(
-        return_value=httpx.Response(
-            200,
-            json={
-                "text": "the model response",
-                "meta": {
-                    "billed_units": {
-                        "output_tokens": 10,
-                        "input_tokens": 20,
-                    }
+    if span_streaming:
+        items = capture_items("span")
+
+        client = Client(api_key="z")
+        HTTPXClient.request = mock.Mock(
+            return_value=httpx.Response(
+                200,
+                json={
+                    "text": "the model response",
+                    "meta": {
+                        "billed_units": {
+                            "output_tokens": 10,
+                            "input_tokens": 20,
+                        }
+                    },
                 },
-            },
+            )
         )
-    )
 
-    with start_transaction(name="cohere tx"):
-        client.chat(
-            model="some-model",
-            chat_history=[ChatMessage(role="SYSTEM", message="some context")],
-            message="hello",
-        ).text
+        with start_transaction(name="cohere tx"):
+            client.chat(
+                model="some-model",
+                chat_history=[ChatMessage(role="SYSTEM", message="some context")],
+                message="hello",
+            ).text
 
-    (event,) = events
+        sentry_sdk.flush()
+        (span,) = (item.payload for item in items)
+        assert span["attributes"]["sentry.origin"] == "auto.ai.cohere"
+    else:
+        events = capture_events()
 
-    assert event["contexts"]["trace"]["origin"] == "manual"
-    assert event["spans"][0]["origin"] == "auto.ai.cohere"
+        client = Client(api_key="z")
+        HTTPXClient.request = mock.Mock(
+            return_value=httpx.Response(
+                200,
+                json={
+                    "text": "the model response",
+                    "meta": {
+                        "billed_units": {
+                            "output_tokens": 10,
+                            "input_tokens": 20,
+                        }
+                    },
+                },
+            )
+        )
+
+        with start_transaction(name="cohere tx"):
+            client.chat(
+                model="some-model",
+                chat_history=[ChatMessage(role="SYSTEM", message="some context")],
+                message="hello",
+            ).text
+
+        (event,) = events
+
+        assert event["contexts"]["trace"]["origin"] == "manual"
+        assert event["spans"][0]["origin"] == "auto.ai.cohere"
 
 
-def test_span_origin_embed(sentry_init, capture_events):
+@pytest.mark.parametrize("span_streaming", [True, False])
+def test_span_origin_embed(sentry_init, capture_events, capture_items, span_streaming):
     sentry_init(
         integrations=[CohereIntegration()],
         traces_sample_rate=1.0,
+        trace_lifecycle="stream" if span_streaming else "static",
     )
-    events = capture_events()
 
-    client = Client(api_key="z")
-    HTTPXClient.request = mock.Mock(
-        return_value=httpx.Response(
-            200,
-            json={
-                "response_type": "embeddings_floats",
-                "id": "1",
-                "texts": ["hello"],
-                "embeddings": [[1.0, 2.0, 3.0]],
-                "meta": {
-                    "billed_units": {
-                        "input_tokens": 10,
-                    }
+    if span_streaming:
+        items = capture_items("span")
+
+        client = Client(api_key="z")
+        HTTPXClient.request = mock.Mock(
+            return_value=httpx.Response(
+                200,
+                json={
+                    "response_type": "embeddings_floats",
+                    "id": "1",
+                    "texts": ["hello"],
+                    "embeddings": [[1.0, 2.0, 3.0]],
+                    "meta": {
+                        "billed_units": {
+                            "input_tokens": 10,
+                        }
+                    },
                 },
-            },
+            )
         )
-    )
 
-    with start_transaction(name="cohere tx"):
-        client.embed(texts=["hello"], model="text-embedding-3-large")
+        with start_transaction(name="cohere tx"):
+            client.embed(texts=["hello"], model="text-embedding-3-large")
+
+        sentry_sdk.flush()
+        (span,) = (item.payload for item in items)
+        assert span["attributes"]["sentry.origin"] == "auto.ai.cohere"
+    else:
+        events = capture_events()
+
+        client = Client(api_key="z")
+        HTTPXClient.request = mock.Mock(
+            return_value=httpx.Response(
+                200,
+                json={
+                    "response_type": "embeddings_floats",
+                    "id": "1",
+                    "texts": ["hello"],
+                    "embeddings": [[1.0, 2.0, 3.0]],
+                    "meta": {
+                        "billed_units": {
+                            "input_tokens": 10,
+                        }
+                    },
+                },
+            )
+        )
+
+        with start_transaction(name="cohere tx"):
+            client.embed(texts=["hello"], model="text-embedding-3-large")
 
-    (event,) = events
+        (event,) = events
 
-    assert event["contexts"]["trace"]["origin"] == "manual"
-    assert event["spans"][0]["origin"] == "auto.ai.cohere"
+        assert event["contexts"]["trace"]["origin"] == "manual"
+        assert event["spans"][0]["origin"] == "auto.ai.cohere"
 
 
 # data_collection config, send_default_pii, include_prompts, expect_inputs, expect_outputs