Skip to content

Commit 8c43c8a

Browse files
committed
Adjust tests to look at trace continuation via request handler spans
1 parent ac6f9ae commit 8c43c8a

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ test.describe('Trace propagation', () => {
3131
const clientTx = await clientTxPromise;
3232

3333
expect(clientTx.contexts?.trace?.trace_id).toEqual(serverTx.contexts?.trace?.trace_id);
34-
expect(clientTx.contexts?.trace?.parent_span_id).toBe(serverTx.contexts?.trace?.span_id);
34+
35+
const requestHandlerSpan = serverTx.spans?.find(span => span.op === 'request_handler.express');
36+
37+
expect(requestHandlerSpan).toBeDefined();
38+
expect(clientTx.contexts?.trace?.parent_span_id).toBe(requestHandlerSpan?.span_id);
3539
});
3640

3741
test('should not have trace connection for prerendered pages', async ({ page }) => {

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ test.describe('Trace propagation', () => {
3131
const clientTx = await clientTxPromise;
3232

3333
expect(clientTx.contexts?.trace?.trace_id).toEqual(serverTx.contexts?.trace?.trace_id);
34-
expect(clientTx.contexts?.trace?.parent_span_id).toBe(serverTx.contexts?.trace?.span_id);
34+
35+
const requestHandlerSpan = serverTx.spans?.find(span => span.op === 'request_handler.express');
36+
37+
expect(requestHandlerSpan).toBeDefined();
38+
expect(clientTx.contexts?.trace?.parent_span_id).toBe(requestHandlerSpan?.span_id);
3539
});
3640

3741
test('should not have trace connection for prerendered pages', async ({ page }) => {

dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/trace-propagation.test.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ test.describe('Trace propagation', () => {
3131
const clientTx = await clientTxPromise;
3232

3333
expect(clientTx.contexts?.trace?.trace_id).toEqual(serverTx.contexts?.trace?.trace_id);
34-
expect(clientTx.contexts?.trace?.parent_span_id).toBe(serverTx.contexts?.trace?.span_id);
34+
35+
const requestHandlerSpan = serverTx.spans?.find(span => span.op === 'request_handler.express');
36+
37+
expect(requestHandlerSpan).toBeDefined();
38+
expect(clientTx.contexts?.trace?.parent_span_id).toBe(requestHandlerSpan?.span_id);
3539
});
3640

3741
test('should not have trace connection for prerendered pages', async ({ page }) => {

0 commit comments

Comments
 (0)