Merge branch 'master' into feat/span-first-2

sentrivana · sentrivana · commit 136a8f93e59b · 2026-02-25T13:05:38.000+01:00
diff --git a/sentry_sdk/integrations/httpx.py b/sentry_sdk/integrations/httpx.py
@@ -183,11 +183,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
 

Original file line number	Diff line number	Diff line change
`@@ -183,11 +183,8 @@ async def send(`
`183`	`183`	`key=key, value=value, url=request.url`
`184`	`184`	`)`
`185`	`185`	`)`
`186`		`- if key == BAGGAGE_HEADER_NAME and request.headers.get(`
`187`		`- BAGGAGE_HEADER_NAME`
`188`		`- ):`
`189`		`- # do not overwrite any existing baggage, just append to it`
`190`		`- request.headers[key] += "," + value`
	`186`	`+ if key == BAGGAGE_HEADER_NAME:`
	`187`	`+ add_sentry_baggage_to_headers(request.headers, value)`
`191`	`188`	`else:`
`192`	`189`	`request.headers[key] = value`
`193`	`190`