Skip to content

Commit 0b5edbd

Browse files
committed
fix tests & lint
1 parent c74c349 commit 0b5edbd

File tree

2 files changed

+5
-20
lines changed

2 files changed

+5
-20
lines changed

packages/nextjs/src/common/withServerActionInstrumentation.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { RequestEventData, getActiveSpan } from '@sentry/core';
1+
import type { RequestEventData } from '@sentry/core';
2+
import { getActiveSpan } from '@sentry/core';
23
import {
34
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
45
SPAN_STATUS_ERROR,

packages/opentelemetry/test/trace.test.ts

+3-19
Original file line numberDiff line numberDiff line change
@@ -1576,11 +1576,8 @@ describe('continueTrace', () => {
15761576
);
15771577

15781578
expect(scope.getPropagationContext()).toEqual({
1579-
dsc: {}, // DSC should be an empty object (frozen), because there was an incoming trace
1580-
sampled: false,
1581-
parentSpanId: '1121201211212012',
15821579
spanId: expect.any(String),
1583-
traceId: '12312012123120121231201212312012',
1580+
traceId: expect.any(String),
15841581
});
15851582

15861583
expect(scope.getScopeData().sdkProcessingMetadata).toEqual({});
@@ -1609,14 +1606,8 @@ describe('continueTrace', () => {
16091606
);
16101607

16111608
expect(scope.getPropagationContext()).toEqual({
1612-
dsc: {
1613-
environment: 'production',
1614-
version: '1.0',
1615-
},
1616-
sampled: true,
1617-
parentSpanId: '1121201211212012',
16181609
spanId: expect.any(String),
1619-
traceId: '12312012123120121231201212312012',
1610+
traceId: expect.any(String),
16201611
});
16211612

16221613
expect(scope.getScopeData().sdkProcessingMetadata).toEqual({});
@@ -1645,16 +1636,9 @@ describe('continueTrace', () => {
16451636
);
16461637

16471638
expect(scope.getPropagationContext()).toEqual({
1648-
dsc: {
1649-
environment: 'production',
1650-
version: '1.0',
1651-
},
1652-
sampled: true,
1653-
parentSpanId: '1121201211212012',
16541639
spanId: expect.any(String),
1655-
traceId: '12312012123120121231201212312012',
1640+
traceId: expect.any(String),
16561641
});
1657-
16581642
expect(scope.getScopeData().sdkProcessingMetadata).toEqual({});
16591643
});
16601644

0 commit comments

Comments
 (0)