Allow instrumenting a single httpx client, fix tests for OTel 1.28

[alexmojaki]

No description provided.

[cloudflare-workers-and-pages]

Deploying logfire-docs with    Cloudflare Pages

Latest commit:	a85e4c4
Status:	✅  Deploy successful!
Preview URL:	https://1340ee60.logfire-docs.pages.dev
Branch Preview URL:	https://alex-otel-1-28.logfire-docs.pages.dev

View logs

[samuelcolvin]

The failure is a key error here:

    @pytest.mark.anyio
    async def test_httpx_instrumentation(exporter: TestExporter):
        # The purpose of this mock transport is to ensure that the traceparent header is provided
        # without needing to actually make a network request
        def handler(request: Request):
            return httpx.Response(200, headers=request.headers)
    
        transport = httpx.MockTransport(handler)
    
        with logfire.span('test span') as span:
            assert span.context
            trace_id = span.context.trace_id
            with httpx.Client(transport=transport) as client:
                response = client.get('https://example.org/')
                # Validation of context propagation: ensure that the traceparent header contains the trace ID
                print(list(response.headers.keys()))
>               traceparent_header = response.headers['traceparent']

It looks like the traceparent really isn't being set. Could it be that the httpx instrumentation really isn't compatible with the most recent release?

[sydney-runkle]

Could this be related to #529?

[alexmojaki]

Pyright was failing to parse this file because of the emojis: microsoft/pyright#9412

[Kludex]

This is sad.

[alexmojaki]

The issue is closed, upgrading pyright should allow reverting this.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 100.00%. Comparing base (15ff969) to head (a85e4c4).
Report is 1 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff            @@
##              main      #575   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          133       133           
  Lines        10257     10263    +6     
  Branches      1399      1399           
=========================================
+ Hits         10257     10263    +6     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[alexmojaki]

Yes, OTEL fixed #529, and in the process that broke tests, but in a test-specific way. They now patch the HTTPTransport class if you don't pass a client, and we are using MockTransport in the test. So I added the ability to instrument a single client, meaning that its transport gets patched directly. The problem wasn't specifically about traceparent, there just wasn't any instrumentation at all without the test change.

[Kludex]

This is sad.

[Kludex]

Maybe we want to test with AsyncClient as well?

But all good. Thanks.

[Kludex]

I've created #581 to document this. I can handle that. 👍