[RaphaelFakhri]

fix(tracing): Propagate the span of the hub passed to the Guzzle middleware

Description

GuzzleTracingMiddleware::trace() accepts a hub and starts the http.client span on it, but it built the sentry-trace and baggage headers with getTraceparent() and getBaggage(), which always read SentrySdk::getCurrentHub(). When the given hub is not the current hub, the outgoing request carried the trace of another hub, and the downstream service continued a trace that does not contain the http.client span.

getTraceparent() and getBaggage() now accept an optional hub and fall back to the current hub. Both functions use that hub consistently, and the middleware passes its hub to them.

The existing tests set the given hub as the current hub, so they did not cover this case. The new tests use two different hubs.

Issues

• resolves: GuzzleTracingMiddleware sends the trace headers of the current hub instead of the given hub #2288

Reminders

• Add GH Issue ID & Linear ID
• PR title should use conventional commit style (feat:, fix:, ref:, meta:)
• For external contributors: CONTRIBUTING.md, Sentry SDK development docs, Discord community

[Litarnus]

Thanks for the PR! I think it would be easier to update the top level functions to take a $hub = null parameters. Then the change would boil down to

function getTraceparent(HubInterface $hub = null): string
{
    $hub = $hub ?? SentrySdk::getCurrentHub();
    // the rest
}

same for getBaggage

edit: I noticed we call SentrySdk::getCurrentHub() twice in there, so this would also be a good opportunity to use $hub consistently

[RaphaelFakhri]

@Litarnus Thanks, that is simpler. The PR now takes that approach:

• getTraceparent() and getBaggage() accept an optional ?HubInterface $hub = null, fall back to SentrySdk::getCurrentHub(), and use $hub for the span lookup too.
• GuzzleTracingMiddleware passes its hub to both functions.
• A new FunctionsTest::testTraceHeadersUseTheGivenHub covers the functions directly, and the existing middleware test stays.

Both tests fail without the source change and pass with it. The unit suite passes (2007 tests).

CHANGELOG.md is not touched, since it is updated during releases.

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit c8a01c8. Configure here.}

[Litarnus]

The CI is unrelated to your changes, the recent PHP vulnerability seem to have changed behaviour around OOM. I will fix it in a different PR and merge it here

[Litarnus]

Very nice, thank you for fixing this