Merge branch 'rossetd/tracing-minor-cleanup' into 'master'

Tracing - Improving some tests + minor fixes

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137570



Merged-by: Lukas 'Eipi' Eipert <leipert@gitlab.com>
Approved-by: Lukas 'Eipi' Eipert <leipert@gitlab.com>
Approved-by: Paulina Sedlak-Jakubowska <psedlak-jakubowska@gitlab.com>
Reviewed-by: Daniele Rossetti <drossetti@gitlab.com>
Reviewed-by: Paulina Sedlak-Jakubowska <psedlak-jakubowska@gitlab.com>
Co-authored-by: Daniele Rossetti <drossetti@gitlab.com>