Tracing: Fix tracing headers causing CORS issue #640
Merged
Conversation
This file contains hidden or 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
AgnesToulet
force-pushed
the
tracing/fix-headers
branch
from
b156230 to
b457858
Compare
nmarrs
approved these changes
May 13, 2025
| await page.setExtraHTTPHeaders(options.headers as any); | ||
| if (options.headers && options.headers['Accept-Language']) { | ||
| const headers = { 'Accept-Language': options.headers['Accept-Language'] }; | ||
| this.log.debug(`Setting extra HTTP headers for page`, 'headers', headers); |
There was a problem hiding this comment.
do we want to keep these debug logs for future troubleshooting?
There was a problem hiding this comment.
I didn't add this one but yes I think it can be interesting for troubleshooting.
evictorero
approved these changes
May 13, 2025
There was a problem hiding this comment.
Pull Request Overview
This PR addresses a CORS issue by switching the approach from removing headers on certain requests to only adding tracing headers when appropriate. The main changes include passing header options to page listeners in reusable, clustered, and browser modules, updating the logic for adding tracing headers, and refining the extra HTTP headers setup.
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/browser/reusable.ts | Updated calls to addPageListeners to pass the headers from options. |
| src/browser/clustered.ts | Similar updates to pass header options to addPageListeners. |
| src/browser/browser.ts | Modified addPageListeners and tracing header logic to only add headers when conditions apply, and refined the HTTP header setup. |
Comments suppressed due to low confidence (1)
src/browser/browser.ts:630
- Update the error message in the catch block to reflect that the code is now adding tracing headers rather than removing them, e.g., 'Failed to add tracing headers'.
this.log.debug('Failed to remove tracing header', 'url', url, 'referer', referer, 'error', error.message);
evictorero
reviewed
May 13, 2025
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Ezequiel Victorero <ezequiel.victorero@grafana.com>
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.
It seems that
page.on('request', ...)isn't triggered on EVERY request so adding the headers for every request and removing them here wasn't working for some requests.This is achieving the same result, the other way around, only adding headers for requests we are sure we should add them.