Skip to content

Commit 0ac6e23

Browse files
rlinozrlinoz
authored
Merge pull request Expensify#86488 from Expensify/cristi_guard-sentry-request-id-patch
[No QA] Fix "Refused to get unsafe header" console error on cross-origin requests
2 parents 48916e2 + fd797b9 commit 0ac6e23

2 files changed

Lines changed: 50 additions & 42 deletions

File tree

‎patches/sentry-browser/@sentry+browser+10.39.0+001+request-id-support.patch‎

Lines changed: 48 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,68 @@
1-
diff --git a/node_modules/@sentry/browser/build/npm/esm/dev/tracing/request.js b/node_modules/@sentry/browser/build/npm/esm/dev/tracing/request.js
2-
index da5822e..04f3c80 100644
3-
--- a/node_modules/@sentry/browser/build/npm/esm/dev/tracing/request.js
4-
+++ b/node_modules/@sentry/browser/build/npm/esm/dev/tracing/request.js
5-
@@ -225,6 +225,10 @@ function xhrCallback(
1+
diff --git a/node_modules/@sentry/browser/build/npm/cjs/dev/tracing/request.js b/node_modules/@sentry/browser/build/npm/cjs/dev/tracing/request.js
2+
index 6bfc053..21d2a37 100644
3+
--- a/node_modules/@sentry/browser/build/npm/cjs/dev/tracing/request.js
4+
+++ b/node_modules/@sentry/browser/build/npm/cjs/dev/tracing/request.js
5+
@@ -227,6 +227,12 @@ function xhrCallback(
66
const span = spans[spanId];
77
if (span && sentryXhrData.status_code !== undefined) {
8-
setHttpStatus(span, sentryXhrData.status_code);
9-
+ const requestId = handlerData.xhr.getResponseHeader('x-request-id');
10-
+ if (requestId) {
11-
+ span.setAttribute('request-id', requestId)
8+
core.setHttpStatus(span, sentryXhrData.status_code);
9+
+ if (handlerData.xhr.getAllResponseHeaders().toLowerCase().includes('x-request-id')) {
10+
+ const requestId = handlerData.xhr.getResponseHeader('x-request-id');
11+
+ if (requestId) {
12+
+ span.setAttribute('request-id', requestId)
13+
+ }
1214
+ }
1315
span.end();
14-
16+
1517
onRequestSpanEnd?.(span, {
16-
diff --git a/node_modules/@sentry/browser/build/npm/esm/prod/tracing/request.js b/node_modules/@sentry/browser/build/npm/esm/prod/tracing/request.js
17-
index da5822e..04f3c80 100644
18-
--- a/node_modules/@sentry/browser/build/npm/esm/prod/tracing/request.js
19-
+++ b/node_modules/@sentry/browser/build/npm/esm/prod/tracing/request.js
20-
@@ -225,6 +225,10 @@ function xhrCallback(
18+
diff --git a/node_modules/@sentry/browser/build/npm/cjs/prod/tracing/request.js b/node_modules/@sentry/browser/build/npm/cjs/prod/tracing/request.js
19+
index 6bfc053..21d2a37 100644
20+
--- a/node_modules/@sentry/browser/build/npm/cjs/prod/tracing/request.js
21+
+++ b/node_modules/@sentry/browser/build/npm/cjs/prod/tracing/request.js
22+
@@ -227,6 +227,12 @@ function xhrCallback(
2123
const span = spans[spanId];
2224
if (span && sentryXhrData.status_code !== undefined) {
23-
setHttpStatus(span, sentryXhrData.status_code);
24-
+ const requestId = handlerData.xhr.getResponseHeader('x-request-id');
25-
+ if (requestId) {
26-
+ span.setAttribute('request-id', requestId)
25+
core.setHttpStatus(span, sentryXhrData.status_code);
26+
+ if (handlerData.xhr.getAllResponseHeaders().toLowerCase().includes('x-request-id')) {
27+
+ const requestId = handlerData.xhr.getResponseHeader('x-request-id');
28+
+ if (requestId) {
29+
+ span.setAttribute('request-id', requestId)
30+
+ }
2731
+ }
2832
span.end();
29-
33+
3034
onRequestSpanEnd?.(span, {
31-
diff --git a/node_modules/@sentry/browser/build/npm/cjs/dev/tracing/request.js b/node_modules/@sentry/browser/build/npm/cjs/dev/tracing/request.js
32-
index da5822e..04f3c80 100644
33-
--- a/node_modules/@sentry/browser/build/npm/cjs/dev/tracing/request.js
34-
+++ b/node_modules/@sentry/browser/build/npm/cjs/dev/tracing/request.js
35-
@@ -227,6 +227,10 @@ function xhrCallback(
35+
diff --git a/node_modules/@sentry/browser/build/npm/esm/dev/tracing/request.js b/node_modules/@sentry/browser/build/npm/esm/dev/tracing/request.js
36+
index 57d2ae8..063b495 100644
37+
--- a/node_modules/@sentry/browser/build/npm/esm/dev/tracing/request.js
38+
+++ b/node_modules/@sentry/browser/build/npm/esm/dev/tracing/request.js
39+
@@ -225,6 +225,12 @@ function xhrCallback(
3640
const span = spans[spanId];
3741
if (span && sentryXhrData.status_code !== undefined) {
38-
core.setHttpStatus(span, sentryXhrData.status_code);
39-
+ const requestId = handlerData.xhr.getResponseHeader('x-request-id');
40-
+ if (requestId) {
41-
+ span.setAttribute('request-id', requestId)
42+
setHttpStatus(span, sentryXhrData.status_code);
43+
+ if (handlerData.xhr.getAllResponseHeaders().toLowerCase().includes('x-request-id')) {
44+
+ const requestId = handlerData.xhr.getResponseHeader('x-request-id');
45+
+ if (requestId) {
46+
+ span.setAttribute('request-id', requestId)
47+
+ }
4248
+ }
4349
span.end();
44-
50+
4551
onRequestSpanEnd?.(span, {
46-
diff --git a/node_modules/@sentry/browser/build/npm/cjs/prod/tracing/request.js b/node_modules/@sentry/browser/build/npm/cjs/prod/tracing/request.js
47-
index da5822e..04f3c80 100644
48-
--- a/node_modules/@sentry/browser/build/npm/cjs/prod/tracing/request.js
49-
+++ b/node_modules/@sentry/browser/build/npm/cjs/prod/tracing/request.js
50-
@@ -227,6 +227,10 @@ function xhrCallback(
52+
diff --git a/node_modules/@sentry/browser/build/npm/esm/prod/tracing/request.js b/node_modules/@sentry/browser/build/npm/esm/prod/tracing/request.js
53+
index 57d2ae8..063b495 100644
54+
--- a/node_modules/@sentry/browser/build/npm/esm/prod/tracing/request.js
55+
+++ b/node_modules/@sentry/browser/build/npm/esm/prod/tracing/request.js
56+
@@ -225,6 +225,12 @@ function xhrCallback(
5157
const span = spans[spanId];
5258
if (span && sentryXhrData.status_code !== undefined) {
53-
core.setHttpStatus(span, sentryXhrData.status_code);
54-
+ const requestId = handlerData.xhr.getResponseHeader('x-request-id');
55-
+ if (requestId) {
56-
+ span.setAttribute('request-id', requestId)
59+
setHttpStatus(span, sentryXhrData.status_code);
60+
+ if (handlerData.xhr.getAllResponseHeaders().toLowerCase().includes('x-request-id')) {
61+
+ const requestId = handlerData.xhr.getResponseHeader('x-request-id');
62+
+ if (requestId) {
63+
+ span.setAttribute('request-id', requestId)
64+
+ }
5765
+ }
5866
span.end();
59-
67+
6068
onRequestSpanEnd?.(span, {

‎patches/sentry-core/@sentry+core+10.39.0+002+request-id-support.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/node_modules/@sentry/core/build/esm/fetch.js b/node_modules/@sentry/core/build/esm/fetch.js
2-
index 3c6eafb..33481e8 100644
2+
index 27c5e79..9686203 100644
33
--- a/node_modules/@sentry/core/build/esm/fetch.js
44
+++ b/node_modules/@sentry/core/build/esm/fetch.js
5-
@@ -235,7 +235,10 @@ function _addTracingHeadersToFetchRequest(
5+
@@ -237,7 +237,10 @@ function _addTracingHeadersToFetchRequest(
66
function endSpan(span, handlerData) {
77
if (handlerData.response) {
88
setHttpStatus(span, handlerData.response.status);

0 commit comments

Comments
 (0)