Skip to content

Commit c3467bf

Browse files
author
Luca Forstner
committed
sus
1 parent c4d227c commit c3467bf

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

packages/opentelemetry/test/integration/scope.test.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ describe('Integration | Scope', () => {
6969
? {
7070
span_id: spanId,
7171
trace_id: traceId,
72-
parent_span_id: undefined,
7372
}
7473
: expect.any(Object),
7574
}),
@@ -124,7 +123,7 @@ describe('Integration | Scope', () => {
124123
}
125124
});
126125

127-
it('isolates parallel root scopes', async () => {
126+
it.only('isolates parallel root scopes', async () => {
128127
const beforeSend = jest.fn(() => null);
129128
const beforeSendTransaction = jest.fn(() => null);
130129

@@ -152,7 +151,7 @@ describe('Integration | Scope', () => {
152151
withScope(scope2 => {
153152
scope2.setTag('tag3', 'val3a');
154153

155-
startSpan({ name: 'outer' }, span => {
154+
startSpan({ name: 'first' }, span => {
156155
spanId1 = span.spanContext().spanId;
157156
traceId1 = span.spanContext().traceId;
158157

@@ -169,7 +168,7 @@ describe('Integration | Scope', () => {
169168
withScope(scope2 => {
170169
scope2.setTag('tag3', 'val3b');
171170

172-
startSpan({ name: 'outer' }, span => {
171+
startSpan({ name: 'second' }, span => {
173172
spanId2 = span.spanContext().spanId;
174173
traceId2 = span.spanContext().traceId;
175174

@@ -190,7 +189,6 @@ describe('Integration | Scope', () => {
190189
? {
191190
span_id: spanId1,
192191
trace_id: traceId1,
193-
parent_span_id: undefined,
194192
}
195193
: expect.any(Object),
196194
}),

packages/opentelemetry/test/propagator.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ describe('SentryPropagator', () => {
310310
parentSpanId: '6e0c63257de34c92',
311311
spanId: expect.any(String),
312312
traceId: 'd4cda95b652f4a1592b449d5929fda1b',
313+
dsc: {}, // Frozen DSC
313314
});
314315

315316
// Ensure spanId !== parentSpanId - it should be a new random ID
@@ -321,10 +322,8 @@ describe('SentryPropagator', () => {
321322
carrier[SENTRY_TRACE_HEADER] = sentryTraceHeader;
322323
const context = propagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter);
323324
expect(getPropagationContextFromContext(context)).toEqual({
324-
sampled: undefined,
325325
spanId: expect.any(String),
326326
traceId: expect.any(String),
327-
dsc: {}, // Frozen DSC
328327
});
329328
});
330329

0 commit comments

Comments
 (0)