PYINSTRUMENT_SHOW_CALLBACK should not be ignored if PYINSTRUMENT_PROFILE_DIR is defined

[maingoh]

I defined PYINSTRUMENT_PROFILE_DIR to record multiple requests, but I also would like to ignore some of them to avoid having too much reports being generated. So I would to be able to set PYINSTRUMENT_PROFILE_DIR and also PYINSTRUMENT_SHOW_CALLBACK. But according the the code, when PYINSTRUMENT_PROFILE_DIR is defined, all requests are recorded and PYINSTRUMENT_SHOW_CALLBACK is ignored.

Thus I think we could remove the or condition here

pyinstrument/pyinstrument/middleware.py

Line 52 in 4b37f8c

) or profile_dir:

as by default PYINSTRUMENT_SHOW_CALLBACK = True.

[maingoh]

It looks like and getattr(settings, "PYINSTRUMENT_URL_ARGUMENT", "profile") in request.GET also prevent from using the callback. I feel it should be:

if (
            show_pyinstrument(request)
            or getattr(settings, "PYINSTRUMENT_URL_ARGUMENT", "profile") in request.GET
        ):

If a user add the profile query param, it would activate it anyway, otherwise it would rely on show_pyinstrument.

If for some reason we don't want to allow ?profile to override all behaviors. We could thus do:

• If the callback is defined, rely on the callback, which could well have if request.query_params.get('profile')
• Or rely on the profile query param

[jonmooser]

I too would like to be able to use PYINSTRUMENT_SHOW_CALLBACK in conjunction with PYINSTRUMENT_PROFILE_DIR

My suggestion might be

if (
    show_pyinstrument(request)
    and ( getattr(settings, "PYINSTRUMENT_URL_ARGUMENT", "profile") in request.GET or profile_dir)
 ) :

That way show_pyinstrument can be used to gate the effects for either a url argument or a profile directory