Skip to content

Commit 30dd610

Browse files
onurtemizkanLms24
andauthored
fix(react-router): Use underscores in trace origin values (#18351)
Resolves: #18350 Fixes server validation errors for `contexts.trace.origin` values in the React Router SDK. --------- Co-authored-by: Lukas Stracke <lukas.stracke@sentry.io>
1 parent 63c4151 commit 30dd610

File tree

21 files changed

+89
-89
lines changed

21 files changed

+89
-89
lines changed

dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/navigation.client.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ test.describe('client - navigation performance', () => {
2020
span_id: expect.any(String),
2121
trace_id: expect.any(String),
2222
data: {
23-
'sentry.origin': 'auto.navigation.react-router',
23+
'sentry.origin': 'auto.navigation.react_router',
2424
'sentry.op': 'navigation',
2525
'sentry.source': 'route',
2626
},
2727
op: 'navigation',
28-
origin: 'auto.navigation.react-router',
28+
origin: 'auto.navigation.react_router',
2929
},
3030
},
3131
spans: expect.any(Array),
@@ -71,12 +71,12 @@ test.describe('client - navigation performance', () => {
7171
span_id: expect.any(String),
7272
trace_id: expect.any(String),
7373
data: {
74-
'sentry.origin': 'auto.navigation.react-router',
74+
'sentry.origin': 'auto.navigation.react_router',
7575
'sentry.op': 'navigation',
7676
'sentry.source': 'route',
7777
},
7878
op: 'navigation',
79-
origin: 'auto.navigation.react-router',
79+
origin: 'auto.navigation.react_router',
8080
},
8181
},
8282
spans: expect.any(Array),

dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/pageload.client.test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ test.describe('client - pageload performance', () => {
1818
span_id: expect.any(String),
1919
trace_id: expect.any(String),
2020
data: {
21-
'sentry.origin': 'auto.pageload.react-router',
21+
'sentry.origin': 'auto.pageload.react_router',
2222
'sentry.op': 'pageload',
2323
'sentry.source': 'route',
2424
},
2525
op: 'pageload',
26-
origin: 'auto.pageload.react-router',
26+
origin: 'auto.pageload.react_router',
2727
},
2828
},
2929
spans: expect.any(Array),
@@ -68,12 +68,12 @@ test.describe('client - pageload performance', () => {
6868
span_id: expect.any(String),
6969
trace_id: expect.any(String),
7070
data: {
71-
'sentry.origin': 'auto.pageload.react-router',
71+
'sentry.origin': 'auto.pageload.react_router',
7272
'sentry.op': 'pageload',
7373
'sentry.source': 'route',
7474
},
7575
op: 'pageload',
76-
origin: 'auto.pageload.react-router',
76+
origin: 'auto.pageload.react_router',
7777
},
7878
},
7979
spans: expect.any(Array),
@@ -119,12 +119,12 @@ test.describe('client - pageload performance', () => {
119119
span_id: expect.any(String),
120120
trace_id: expect.any(String),
121121
data: {
122-
'sentry.origin': 'auto.pageload.react-router',
122+
'sentry.origin': 'auto.pageload.react_router',
123123
'sentry.op': 'pageload',
124124
'sentry.source': 'route',
125125
},
126126
op: 'pageload',
127-
origin: 'auto.pageload.react-router',
127+
origin: 'auto.pageload.react_router',
128128
},
129129
},
130130
});

dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/performance.server.test.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ test.describe('server - performance', () => {
1919
trace_id: expect.any(String),
2020
data: {
2121
'sentry.op': 'http.server',
22-
'sentry.origin': 'auto.http.react-router.request-handler',
22+
'sentry.origin': 'auto.http.react_router.request_handler',
2323
'sentry.source': 'route',
2424
},
2525
op: 'http.server',
26-
origin: 'auto.http.react-router.request-handler',
26+
origin: 'auto.http.react_router.request_handler',
2727
},
2828
},
2929
spans: expect.any(Array),
@@ -70,11 +70,11 @@ test.describe('server - performance', () => {
7070
trace_id: expect.any(String),
7171
data: {
7272
'sentry.op': 'http.server',
73-
'sentry.origin': 'auto.http.react-router.request-handler',
73+
'sentry.origin': 'auto.http.react_router.request_handler',
7474
'sentry.source': 'route',
7575
},
7676
op: 'http.server',
77-
origin: 'auto.http.react-router.request-handler',
77+
origin: 'auto.http.react_router.request_handler',
7878
},
7979
},
8080
spans: expect.any(Array),
@@ -122,7 +122,7 @@ test.describe('server - performance', () => {
122122
span_id: expect.any(String),
123123
trace_id: expect.any(String),
124124
op: 'http.server',
125-
origin: 'auto.http.react-router.loader',
125+
origin: 'auto.http.react_router.loader',
126126
parent_span_id: expect.any(String),
127127
status: 'ok',
128128
data: expect.objectContaining({
@@ -133,7 +133,7 @@ test.describe('server - performance', () => {
133133
'http.target': '/performance/server-loader.data',
134134
'http.url': 'http://localhost:3030/performance/server-loader.data',
135135
'sentry.op': 'http.server',
136-
'sentry.origin': 'auto.http.react-router.loader',
136+
'sentry.origin': 'auto.http.react_router.loader',
137137
'sentry.source': 'url',
138138
url: 'http://localhost:3030/performance/server-loader.data',
139139
}),
@@ -152,7 +152,7 @@ test.describe('server - performance', () => {
152152
span_id: expect.any(String),
153153
trace_id: expect.any(String),
154154
data: {
155-
'sentry.origin': 'auto.http.react-router.loader',
155+
'sentry.origin': 'auto.http.react_router.loader',
156156
'sentry.op': 'function.react-router.loader',
157157
},
158158
description: 'Executing Server Loader',
@@ -161,7 +161,7 @@ test.describe('server - performance', () => {
161161
timestamp: expect.any(Number),
162162
status: 'ok',
163163
op: 'function.react-router.loader',
164-
origin: 'auto.http.react-router.loader',
164+
origin: 'auto.http.react_router.loader',
165165
});
166166
});
167167

@@ -182,7 +182,7 @@ test.describe('server - performance', () => {
182182
span_id: expect.any(String),
183183
trace_id: expect.any(String),
184184
op: 'http.server',
185-
origin: 'auto.http.react-router.action',
185+
origin: 'auto.http.react_router.action',
186186
parent_span_id: expect.any(String),
187187
status: 'ok',
188188
data: expect.objectContaining({
@@ -193,7 +193,7 @@ test.describe('server - performance', () => {
193193
'http.target': '/performance/server-action.data',
194194
'http.url': 'http://localhost:3030/performance/server-action.data',
195195
'sentry.op': 'http.server',
196-
'sentry.origin': 'auto.http.react-router.action',
196+
'sentry.origin': 'auto.http.react_router.action',
197197
'sentry.source': 'url',
198198
url: 'http://localhost:3030/performance/server-action.data',
199199
}),
@@ -212,7 +212,7 @@ test.describe('server - performance', () => {
212212
span_id: expect.any(String),
213213
trace_id: expect.any(String),
214214
data: {
215-
'sentry.origin': 'auto.http.react-router.action',
215+
'sentry.origin': 'auto.http.react_router.action',
216216
'sentry.op': 'function.react-router.action',
217217
},
218218
description: 'Executing Server Action',
@@ -221,7 +221,7 @@ test.describe('server - performance', () => {
221221
timestamp: expect.any(Number),
222222
status: 'ok',
223223
op: 'function.react-router.action',
224-
origin: 'auto.http.react-router.action',
224+
origin: 'auto.http.react_router.action',
225225
});
226226
});
227227
});

dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/navigation.client.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ test.describe('client - navigation performance', () => {
2020
span_id: expect.any(String),
2121
trace_id: expect.any(String),
2222
data: {
23-
'sentry.origin': 'auto.navigation.react-router',
23+
'sentry.origin': 'auto.navigation.react_router',
2424
'sentry.op': 'navigation',
2525
'sentry.source': 'route',
2626
},
2727
op: 'navigation',
28-
origin: 'auto.navigation.react-router',
28+
origin: 'auto.navigation.react_router',
2929
},
3030
},
3131
spans: expect.any(Array),
@@ -71,12 +71,12 @@ test.describe('client - navigation performance', () => {
7171
span_id: expect.any(String),
7272
trace_id: expect.any(String),
7373
data: {
74-
'sentry.origin': 'auto.navigation.react-router',
74+
'sentry.origin': 'auto.navigation.react_router',
7575
'sentry.op': 'navigation',
7676
'sentry.source': 'route',
7777
},
7878
op: 'navigation',
79-
origin: 'auto.navigation.react-router',
79+
origin: 'auto.navigation.react_router',
8080
},
8181
},
8282
spans: expect.any(Array),

dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/pageload.client.test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ test.describe('client - pageload performance', () => {
1818
span_id: expect.any(String),
1919
trace_id: expect.any(String),
2020
data: {
21-
'sentry.origin': 'auto.pageload.react-router',
21+
'sentry.origin': 'auto.pageload.react_router',
2222
'sentry.op': 'pageload',
2323
'sentry.source': 'route',
2424
},
2525
op: 'pageload',
26-
origin: 'auto.pageload.react-router',
26+
origin: 'auto.pageload.react_router',
2727
},
2828
},
2929
spans: expect.any(Array),
@@ -68,12 +68,12 @@ test.describe('client - pageload performance', () => {
6868
span_id: expect.any(String),
6969
trace_id: expect.any(String),
7070
data: {
71-
'sentry.origin': 'auto.pageload.react-router',
71+
'sentry.origin': 'auto.pageload.react_router',
7272
'sentry.op': 'pageload',
7373
'sentry.source': 'route',
7474
},
7575
op: 'pageload',
76-
origin: 'auto.pageload.react-router',
76+
origin: 'auto.pageload.react_router',
7777
},
7878
},
7979
spans: expect.any(Array),
@@ -119,12 +119,12 @@ test.describe('client - pageload performance', () => {
119119
span_id: expect.any(String),
120120
trace_id: expect.any(String),
121121
data: {
122-
'sentry.origin': 'auto.pageload.react-router',
122+
'sentry.origin': 'auto.pageload.react_router',
123123
'sentry.op': 'pageload',
124124
'sentry.source': 'route',
125125
},
126126
op: 'pageload',
127-
origin: 'auto.pageload.react-router',
127+
origin: 'auto.pageload.react_router',
128128
},
129129
},
130130
});

dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/performance.server.test.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ test.describe('server - performance', () => {
1919
trace_id: expect.any(String),
2020
data: {
2121
'sentry.op': 'http.server',
22-
'sentry.origin': 'auto.http.react-router.request-handler',
22+
'sentry.origin': 'auto.http.react_router.request_handler',
2323
'sentry.source': 'route',
2424
},
2525
op: 'http.server',
26-
origin: 'auto.http.react-router.request-handler',
26+
origin: 'auto.http.react_router.request_handler',
2727
},
2828
},
2929
spans: expect.any(Array),
@@ -70,11 +70,11 @@ test.describe('server - performance', () => {
7070
trace_id: expect.any(String),
7171
data: {
7272
'sentry.op': 'http.server',
73-
'sentry.origin': 'auto.http.react-router.request-handler',
73+
'sentry.origin': 'auto.http.react_router.request_handler',
7474
'sentry.source': 'route',
7575
},
7676
op: 'http.server',
77-
origin: 'auto.http.react-router.request-handler',
77+
origin: 'auto.http.react_router.request_handler',
7878
},
7979
},
8080
spans: expect.any(Array),
@@ -122,7 +122,7 @@ test.describe('server - performance', () => {
122122
span_id: expect.any(String),
123123
trace_id: expect.any(String),
124124
op: 'http.server',
125-
origin: 'auto.http.react-router.server',
125+
origin: 'auto.http.react_router.server',
126126
parent_span_id: expect.any(String),
127127
status: 'ok',
128128
data: expect.objectContaining({
@@ -133,7 +133,7 @@ test.describe('server - performance', () => {
133133
'http.target': '/performance/server-loader.data',
134134
'http.url': 'http://localhost:3030/performance/server-loader.data',
135135
'sentry.op': 'http.server',
136-
'sentry.origin': 'auto.http.react-router.server',
136+
'sentry.origin': 'auto.http.react_router.server',
137137
'sentry.source': 'url',
138138
url: 'http://localhost:3030/performance/server-loader.data',
139139
}),
@@ -154,11 +154,11 @@ test.describe('server - performance', () => {
154154
trace_id: expect.any(String),
155155
data: {
156156
'sentry.op': 'function.react-router.loader',
157-
'sentry.origin': 'auto.http.react-router.server',
157+
'sentry.origin': 'auto.http.react_router.server',
158158
},
159159
description: 'Executing Server Loader',
160160
op: 'function.react-router.loader',
161-
origin: 'auto.http.react-router.server',
161+
origin: 'auto.http.react_router.server',
162162
parent_span_id: expect.any(String),
163163
start_timestamp: expect.any(Number),
164164
status: 'ok',
@@ -183,7 +183,7 @@ test.describe('server - performance', () => {
183183
span_id: expect.any(String),
184184
trace_id: expect.any(String),
185185
op: 'http.server',
186-
origin: 'auto.http.react-router.server',
186+
origin: 'auto.http.react_router.server',
187187
parent_span_id: expect.any(String),
188188
status: 'ok',
189189
data: expect.objectContaining({
@@ -194,7 +194,7 @@ test.describe('server - performance', () => {
194194
'http.target': '/performance/server-action.data',
195195
'http.url': 'http://localhost:3030/performance/server-action.data',
196196
'sentry.op': 'http.server',
197-
'sentry.origin': 'auto.http.react-router.server',
197+
'sentry.origin': 'auto.http.react_router.server',
198198
'sentry.source': 'url',
199199
url: 'http://localhost:3030/performance/server-action.data',
200200
}),
@@ -214,11 +214,11 @@ test.describe('server - performance', () => {
214214
trace_id: expect.any(String),
215215
data: {
216216
'sentry.op': 'function.react-router.action',
217-
'sentry.origin': 'auto.http.react-router.server',
217+
'sentry.origin': 'auto.http.react_router.server',
218218
},
219219
description: 'Executing Server Action',
220220
op: 'function.react-router.action',
221-
origin: 'auto.http.react-router.server',
221+
origin: 'auto.http.react_router.server',
222222
parent_span_id: expect.any(String),
223223
start_timestamp: expect.any(Number),
224224
status: 'ok',

dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/tests/performance/navigation.client.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ test.describe('client - navigation performance', () => {
2020
span_id: expect.any(String),
2121
trace_id: expect.any(String),
2222
data: {
23-
'sentry.origin': 'auto.navigation.react-router',
23+
'sentry.origin': 'auto.navigation.react_router',
2424
'sentry.op': 'navigation',
2525
'sentry.source': 'route',
2626
},
2727
op: 'navigation',
28-
origin: 'auto.navigation.react-router',
28+
origin: 'auto.navigation.react_router',
2929
},
3030
},
3131
spans: expect.any(Array),

dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/tests/performance/pageload.client.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ test.describe('client - pageload performance', () => {
1818
span_id: expect.any(String),
1919
trace_id: expect.any(String),
2020
data: {
21-
'sentry.origin': 'auto.pageload.react-router',
21+
'sentry.origin': 'auto.pageload.react_router',
2222
'sentry.op': 'pageload',
2323
'sentry.source': 'route',
2424
},
2525
op: 'pageload',
26-
origin: 'auto.pageload.react-router',
26+
origin: 'auto.pageload.react_router',
2727
},
2828
},
2929
spans: expect.any(Array),
@@ -68,12 +68,12 @@ test.describe('client - pageload performance', () => {
6868
span_id: expect.any(String),
6969
trace_id: expect.any(String),
7070
data: {
71-
'sentry.origin': 'auto.pageload.react-router',
71+
'sentry.origin': 'auto.pageload.react_router',
7272
'sentry.op': 'pageload',
7373
'sentry.source': 'route',
7474
},
7575
op: 'pageload',
76-
origin: 'auto.pageload.react-router',
76+
origin: 'auto.pageload.react_router',
7777
},
7878
},
7979
spans: expect.any(Array),

0 commit comments

Comments
 (0)