@@ -41,10 +41,10 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-grpc"
-      - name: Test httpx
+      - name: Test httpx0
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh "py${{ matrix.python-version }}-httpx"
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-httpx0"
       - name: Test httpx2
         run: |
           set -x # print commands that are executed
 
@@ -1,5 +1,109 @@
 # Changelog
 
+## 2.69.1
+
+### New Features ✨
+
+- (django) Add `http.route` attribute by @alexander-alderman-webb in [#7428](https://github.com/getsentry/sentry-python/pull/7428)
+
+### Bug Fixes 🐛
+
+- (aiohttp) Preserve SigV4-signed propagation headers by @Robinbinu in [#7427](https://github.com/getsentry/sentry-python/pull/7427)
+
+### Internal Changes 🔧
+
+#### Mcp
+
+- Parametrize tests on the streaming trace lifecycle by @alexander-alderman-webb in [#7424](https://github.com/getsentry/sentry-python/pull/7424)
+- Remove vacuous tests by @alexander-alderman-webb in [#7420](https://github.com/getsentry/sentry-python/pull/7420)
+
+#### Other
+
+- (cohere) Parametrize tests on the streaming trace lifecycle by @alexander-alderman-webb in [#7419](https://github.com/getsentry/sentry-python/pull/7419)
+- (openai-agents) Parametrize tests on `stream_gen_ai_spans` and the streaming trace lifecycle by @alexander-alderman-webb in [#7405](https://github.com/getsentry/sentry-python/pull/7405)
+
+## 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`
 
@@ -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.1"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
 
@@ -77,6 +77,9 @@ typing = [
     "anthropic>=1.2.0",
     "google-genai>=2.21.0",
     "openai>=3.7.0",
+    "tiktoken>=0.14.0",
+    "aiohttp>=3.14.3",
+    "openai-agents>=0.22.0",
 ]
 test = [
     "dataclasses ; python_full_version < '3.7'",
 
@@ -146,7 +146,7 @@ a Python version older than 3.9 if the HTTPX version is 0.28 or higher, you can
 say:
 
 ```python
-"httpx": {
+"httpx0": {
     "python": {
         # run the test suite for httpx v0.28+ on Python 3.9+ only
         ">=0.28": ">=3.9",
 
@@ -205,8 +205,9 @@
         },
         "python": ">=3.7",
     },
-    "httpx": {
+    "httpx0": {
         "package": "httpx",
+        "integration_name": "httpx",
         "deps": {
             "*": ["anyio>=3,<5", "pytest-asyncio"],
             "<0.24": ["anyio<4"],
 
@@ -128,7 +128,7 @@
     ],
     "Network": [
         "grpc",
-        "httpx",
+        "httpx0",
         "httpx2",
         "pyreqwest",
         "requests",
 
@@ -42,7 +42,8 @@
 from sentry_sdk.serializer import serialize
 from sentry_sdk.sessions import SessionFlusher
 from sentry_sdk.traces import SpanStatus, StreamedSpan
-from sentry_sdk.tracing import trace
+from sentry_sdk.traces import trace as streaming_trace
+from sentry_sdk.tracing import trace as legacy_trace
 from sentry_sdk.tracing_utils import has_span_streaming_enabled
 from sentry_sdk.transport import (
     AsyncHttpTransport,
@@ -533,8 +534,14 @@ def _setup_instrumentation(
         self, functions_to_trace: "Sequence[Dict[str, str]]"
     ) -> None:
         """
-        Instruments the functions given in the list `functions_to_trace` with the `@sentry_sdk.tracing.trace` decorator.
+        Instruments the functions given in the list `functions_to_trace` with a trace decorator.
         """
+        trace = (
+            streaming_trace
+            if has_span_streaming_enabled(self.options)
+            else legacy_trace
+        )
+
         for function in functions_to_trace:
             class_name = None
             function_qualname = function["qualified_name"]
 
@@ -7,6 +7,8 @@
 DEFAULT_MAX_STACK_FRAMES = 100
 DEFAULT_ADD_FULL_STACK = False
 
+_SENTRY_HEADER_NAMES = frozenset(("baggage", "sentry-trace"))
+
 
 # Also needs to be at the top to prevent circular import
 class EndpointType(Enum):
@@ -1846,4 +1848,4 @@ def _get_default_options() -> "dict[str, Any]":
 del _get_default_options
 
 
-VERSION = "2.68.1"
+VERSION = "2.69.1"
@@ -4,7 +4,7 @@
 
 import sentry_sdk
 from sentry_sdk.api import continue_trace
-from sentry_sdk.consts import OP, SPANDATA, SPANSTATUS
+from sentry_sdk.consts import _SENTRY_HEADER_NAMES, OP, SPANDATA, SPANSTATUS
 from sentry_sdk.data_collection import (
     _apply_data_collection_filtering_to_query_string,
 )
@@ -29,6 +29,7 @@
 )
 from sentry_sdk.tracing import (
     BAGGAGE_HEADER_NAME,
+    SENTRY_TRACE_HEADER_NAME,
     SOURCE_FOR_STYLE,
     TransactionSource,
 )
@@ -43,6 +44,8 @@
     HAS_REAL_CONTEXTVARS,
     SENSITIVE_DATA_SUBSTITUTE,
     AnnotatedValue,
+    _get_aws_sigv4_signed_headers_from_authorization_header,
+    _get_aws_sigv4_signed_headers_from_url_query_string,
     _register_control_flow_exception,
     capture_internal_exceptions,
     ensure_integration_enabled,
@@ -310,7 +313,7 @@ async def sentry_app_handle(
 
                         return response
 
-        Application._handle = sentry_app_handle
+        Application._handle = sentry_app_handle  # type: ignore[method-assign]
 
         old_urldispatcher_resolve = UrlDispatcher.resolve
 
@@ -350,7 +353,7 @@ async def sentry_urldispatcher_resolve(
 
             return rv
 
-        UrlDispatcher.resolve = sentry_urldispatcher_resolve
+        UrlDispatcher.resolve = sentry_urldispatcher_resolve  # type: ignore[method-assign]
 
         old_client_session_init = ClientSession.__init__
 
@@ -363,7 +366,7 @@ def init(*args: "Any", **kwargs: "Any") -> None:
             kwargs["trace_configs"] = client_trace_configs
             return old_client_session_init(*args, **kwargs)
 
-        ClientSession.__init__ = init
+        ClientSession.__init__ = init  # type: ignore[method-assign]
 
 
 def create_trace_config() -> "TraceConfig":
@@ -464,12 +467,50 @@ async def on_request_start(
             span = legacy_span
 
         if should_propagate_trace(client, str(params.url)):
+            # existing `sentry-trace`: skip so it is not duplicated.
+            headers_to_skip: "set[str]" = set()
+            if SENTRY_TRACE_HEADER_NAME in params.headers:
+                headers_to_skip.add(SENTRY_TRACE_HEADER_NAME)
+
+            with capture_internal_exceptions():
+                authorization = params.headers.get("Authorization")
+                if authorization:
+                    if isinstance(authorization, bytes):
+                        authorization = authorization.decode("latin-1")
+                    # `SignedHeaders` lists fields covered by SigV4.
+                    signed_headers = (
+                        _get_aws_sigv4_signed_headers_from_authorization_header(
+                            authorization
+                        )
+                    )
+                    # skip signed `sentry-trace` and `baggage`.
+                    headers_to_skip.update(
+                        _SENTRY_HEADER_NAMES.intersection(signed_headers)
+                    )
+
+                # presigned URLs list signed names in the query string.
+                query_signed_headers = (
+                    _get_aws_sigv4_signed_headers_from_url_query_string(str(params.url))
+                )
+                headers_to_skip.update(
+                    _SENTRY_HEADER_NAMES.intersection(query_signed_headers)
+                )
+
             for (
                 key,
                 value,
             ) in sentry_sdk.get_current_scope().iter_trace_propagation_headers(
                 span=span
             ):
+                # skip signed headers and an existing `sentry-trace`.
+                if key.lower() in headers_to_skip:
+                    logger.debug(
+                        "[Tracing] Not adding `{key}` header to outgoing request "
+                        "to {url}: it already exists or is covered by the AWS "
+                        "SigV4 signature.".format(key=key, url=params.url)
+                    )
+                    continue
+
                 logger.debug(
                     "[Tracing] Adding `{key}` header {value} to outgoing request to {url}.".format(
                         key=key, value=value, url=params.url