Skip to content

Commit 2581011

Browse files
author
naseemkullah
committed
test: startActiveSpan ensure that ctx sent is used
also add commented out span equality assertions to be uncommented before merging Signed-off-by: naseemkullah <[email protected]>
1 parent d5c8131 commit 2581011

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

packages/opentelemetry-tracing/test/Tracer.test.ts

+14-4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
import {
1818
context,
19+
createContextKey,
20+
getSpan,
1921
INVALID_TRACEID,
2022
ROOT_CONTEXT,
2123
Sampler,
@@ -222,7 +224,7 @@ describe('Tracer', () => {
222224
span.end();
223225
});
224226

225-
it('should start an active span with name and function as args', () => {
227+
it('should start an active span with name and function args', () => {
226228
const tracer = new Tracer(
227229
{ name: 'default', version: '0.0.1' },
228230
{ sampler: new TestSampler() },
@@ -231,14 +233,15 @@ describe('Tracer', () => {
231233

232234
assert.strictEqual(tracer.startActiveSpan('my-span', span => {
233235
try {
236+
// assert.strictEqual(getSpan(context.active()), span)
234237
return 1
235238
} finally {
236239
span.end();
237240
}
238241
}), 1);
239242
});
240243

241-
it('should start an active span with name, options and functin as args', () => {
244+
it('should start an active span with name, options and function args', () => {
242245
const tracer = new Tracer(
243246
{ name: 'default', version: '0.0.1' },
244247
{ sampler: new TestSampler() },
@@ -247,22 +250,29 @@ describe('Tracer', () => {
247250

248251
assert.strictEqual(tracer.startActiveSpan('my-span', {}, span => {
249252
try {
253+
// assert.strictEqual(getSpan(context.active()), span)
250254
return 1
251255
} finally {
252256
span.end();
253257
}
254258
}), 1);
255259
});
256260

257-
it('should start an active span with name, options, context and function as args', () => {
261+
it('should start an active span with name, options, context and function args', () => {
258262
const tracer = new Tracer(
259263
{ name: 'default', version: '0.0.1' },
260264
{ sampler: new TestSampler() },
261265
tracerProvider
262266
);
263267

264-
assert.strictEqual(tracer.startActiveSpan('my-span', {}, context.active(), span => {
268+
const ctxKey = createContextKey('foo');
269+
270+
const ctx = context.active().setValue(ctxKey, 'bar')
271+
272+
assert.strictEqual(tracer.startActiveSpan('my-span', {}, ctx, span => {
265273
try {
274+
// assert.strictEqual(getSpan(context.active()), span)
275+
assert.strictEqual(ctx.getValue(ctxKey), 'bar')
266276
return 1
267277
} finally {
268278
span.end();

0 commit comments

Comments
 (0)