Fix delayed SSL server trace cleanup #942
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
grcevski
commented
Jun 17, 2024
| @@ -279,7 +279,9 @@ static __always_inline void finish_http(http_info_t *info, pid_connection_info_t | |||
| bpf_ringbuf_submit(trace, get_flags()); | |||
| } | |||
|
|
|||
| delete_server_trace(); | |||
| if (info->type == EVENT_HTTP_REQUEST) { | |||
There was a problem hiding this comment.
This was another bug, we were calling cleanup on the server traces even for client requests. So for Python applications (where everything happens on a single thread), if the server span made more than one client request we'd not propagate the trace id correctly on the second request.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #942 +/- ##
==========================================
+ Coverage 75.74% 79.35% +3.61%
==========================================
Files 131 131
Lines 10154 10154
==========================================
+ Hits 7691 8058 +367
+ Misses 1939 1580 -359
+ Partials 524 516 -8
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I found one more bug related to the cleanup of server traces for SSL black-box propagation. Since we now delay requests generation for SSL too, so that we can produce accurate response times, we were cleaning up at the time of request generation, which with HTTP keep-alive might be on the next SSL request. This new SSL request might have different *ssl pointer and we won't cleanup the correct server ID, causing context propagation to fail.
With this PR I clean-up the SSL trace info immediately as the request is captured, not waiting for the delayed generation.