Skip to content

Commit 659304e

Browse files
committed
fix webkit test
1 parent 2c092eb commit 659304e

File tree

2 files changed

+14
-12
lines changed
  • dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans
  • packages/browser-utils/src/metrics

2 files changed

+14
-12
lines changed

dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/test.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,7 @@ sentryTest('adds resource spans to pageload transaction', async ({ getLocalTestU
8585
'http.request.secure_connection_start': expect.any(Number),
8686
'http.request.worker_start': expect.any(Number),
8787
'http.response.end': expect.any(Number),
88-
'http.response.final_response_headers_start': expect.any(Number),
89-
'http.response.first_interim_response_start': expect.any(Number),
9088
'http.response.start': expect.any(Number),
91-
'http.response.status_code': expect.any(Number),
9289
'network.protocol.name': '',
9390
'network.protocol.version': 'unknown',
9491
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.img',
@@ -97,6 +94,9 @@ sentryTest('adds resource spans to pageload transaction', async ({ getLocalTestU
9794
'url.same_origin': false,
9895
'url.scheme': 'https',
9996
...(!isWebkitRun && {
97+
'http.response.status_code': expect.any(Number),
98+
'http.response.final_response_headers_start': expect.any(Number),
99+
'http.response.first_interim_response_start': expect.any(Number),
100100
'resource.render_blocking_status': 'non-blocking',
101101
'http.response_delivery_type': '',
102102
}),
@@ -127,10 +127,7 @@ sentryTest('adds resource spans to pageload transaction', async ({ getLocalTestU
127127
'http.request.secure_connection_start': expect.any(Number),
128128
'http.request.worker_start': expect.any(Number),
129129
'http.response.end': expect.any(Number),
130-
'http.response.final_response_headers_start': expect.any(Number),
131-
'http.response.first_interim_response_start': expect.any(Number),
132130
'http.response.start': expect.any(Number),
133-
'http.response.status_code': expect.any(Number),
134131
'network.protocol.name': '',
135132
'network.protocol.version': 'unknown',
136133
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.link',
@@ -139,6 +136,9 @@ sentryTest('adds resource spans to pageload transaction', async ({ getLocalTestU
139136
'url.same_origin': false,
140137
'url.scheme': 'https',
141138
...(!isWebkitRun && {
139+
'http.response.status_code': expect.any(Number),
140+
'http.response.final_response_headers_start': expect.any(Number),
141+
'http.response.first_interim_response_start': expect.any(Number),
142142
'resource.render_blocking_status': 'non-blocking',
143143
'http.response_delivery_type': '',
144144
}),
@@ -169,10 +169,7 @@ sentryTest('adds resource spans to pageload transaction', async ({ getLocalTestU
169169
'http.request.secure_connection_start': expect.any(Number),
170170
'http.request.worker_start': expect.any(Number),
171171
'http.response.end': expect.any(Number),
172-
'http.response.final_response_headers_start': expect.any(Number),
173-
'http.response.first_interim_response_start': expect.any(Number),
174172
'http.response.start': expect.any(Number),
175-
'http.response.status_code': expect.any(Number),
176173
'network.protocol.name': '',
177174
'network.protocol.version': 'unknown',
178175
'sentry.op': 'resource.script',
@@ -181,6 +178,9 @@ sentryTest('adds resource spans to pageload transaction', async ({ getLocalTestU
181178
'url.same_origin': false,
182179
'url.scheme': 'https',
183180
...(!isWebkitRun && {
181+
'http.response.status_code': expect.any(Number),
182+
'http.response.final_response_headers_start': expect.any(Number),
183+
'http.response.first_interim_response_start': expect.any(Number),
184184
'resource.render_blocking_status': 'non-blocking',
185185
'http.response_delivery_type': '',
186186
}),

packages/browser-utils/src/metrics/browserMetrics.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ export function _addResourceSpans(
675675
}
676676

677677
_setResourceRequestAttributes(entry, attributes, [
678-
// Resource request response status
678+
// https://developer.mozilla.org/en-US/docs/Web/API/PerformanceResourceTiming/responseStatus
679679
['responseStatus', 'http.response.status_code'],
680680

681681
// Timing attributes (request/response lifecycle)
@@ -809,8 +809,10 @@ type ExperimentalResourceTimingProperty =
809809
| 'finalResponseHeadersStart'
810810
| 'renderBlockingStatus'
811811
| 'deliveryType'
812-
// for some reason, TS during build things this is not a property of PerformanceResourceTiming
813-
// while it actually is. Hence, we're adding it here
812+
// For some reason, TS during build, errors on `responseStatus` not being a property of
813+
// PerformanceResourceTiming while it actually is. Hence, we're adding it here.
814+
// Perhaps because response status is not yet available in Webkit/Safari.
815+
// https://developer.mozilla.org/en-US/docs/Web/API/PerformanceResourceTiming/responseStatus
814816
| 'responseStatus';
815817

816818
/**

0 commit comments

Comments
 (0)