Skip to content

Commit

Permalink
chore: use getParentSpanContext() where applicable (#1693)
Browse files Browse the repository at this point in the history 
Co-authored-by: Daniel Dyla <[email protected]>
  • Loading branch information
@Flarna @dyladan
Flarna and dyladan authored Dec 1, 2020
1 parent 3089665 commit ac686d4
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 70 deletions.
4 changes: 2 additions & 2 deletions packages/opentelemetry-api/src/trace/NoopTracer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { Span, SpanOptions, Tracer, SpanContext } from '..';
import { Context } from '@opentelemetry/context-base';
import { NoopSpan, NOOP_SPAN } from './NoopSpan';
import { isSpanContextValid } from './spancontext-utils';
import { getActiveSpan } from '../context/context';
import { getParentSpanContext } from '../context/context';

/**
* No-op implementations of {@link Tracer}.
Expand All @@ -35,7 +35,7 @@ export class NoopTracer implements Tracer {
return NOOP_SPAN;
}

const parentFromContext = context && getActiveSpan(context)?.context();
const parentFromContext = context && getParentSpanContext(context);

if (
isSpanContext(parentFromContext) &&
Expand Down
46 changes: 23 additions & 23 deletions packages/opentelemetry-core/test/context/HttpTraceContext.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
defaultTextMapSetter,
SpanContext,
TraceFlags,
getActiveSpan,
getParentSpanContext,
setExtractedSpanContext,
} from '@opentelemetry/api';
import { ROOT_CONTEXT } from '@opentelemetry/context-base';
Expand Down Expand Up @@ -84,9 +84,9 @@ describe('HttpTraceContext', () => {
it('should extract context of a sampled span from carrier', () => {
carrier[TRACE_PARENT_HEADER] =
'00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01';
const extractedSpanContext = getActiveSpan(
const extractedSpanContext = getParentSpanContext(
httpTraceContext.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context();
);

assert.deepStrictEqual(extractedSpanContext, {
spanId: 'b7ad6b7169203331',
Expand All @@ -99,9 +99,9 @@ describe('HttpTraceContext', () => {
it('should extract context of a sampled span from carrier using a future version', () => {
carrier[TRACE_PARENT_HEADER] =
'cc-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01';
const extractedSpanContext = getActiveSpan(
const extractedSpanContext = getParentSpanContext(
httpTraceContext.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context();
);

assert.deepStrictEqual(extractedSpanContext, {
spanId: 'b7ad6b7169203331',
Expand All @@ -114,9 +114,9 @@ describe('HttpTraceContext', () => {
it('should extract context of a sampled span from carrier using a future version and future fields', () => {
carrier[TRACE_PARENT_HEADER] =
'cc-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01-what-the-future-will-be-like';
const extractedSpanContext = getActiveSpan(
const extractedSpanContext = getParentSpanContext(
httpTraceContext.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context();
);

assert.deepStrictEqual(extractedSpanContext, {
spanId: 'b7ad6b7169203331',
Expand All @@ -128,19 +128,19 @@ describe('HttpTraceContext', () => {

it('returns null if traceparent header is missing', () => {
assert.deepStrictEqual(
getActiveSpan(
getParentSpanContext(
httpTraceContext.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context(),
),
undefined
);
});

it('returns null if traceparent header is invalid', () => {
carrier[TRACE_PARENT_HEADER] = 'invalid!';
assert.deepStrictEqual(
getActiveSpan(
getParentSpanContext(
httpTraceContext.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context(),
),
undefined
);
});
Expand All @@ -151,9 +151,9 @@ describe('HttpTraceContext', () => {
'00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01-extra';

assert.deepStrictEqual(
getActiveSpan(
getParentSpanContext(
httpTraceContext.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context(),
),
undefined
);
});
Expand All @@ -162,9 +162,9 @@ describe('HttpTraceContext', () => {
carrier[TRACE_PARENT_HEADER] = [
'00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
];
const extractedSpanContext = getActiveSpan(
const extractedSpanContext = getParentSpanContext(
httpTraceContext.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context();
);
assert.deepStrictEqual(extractedSpanContext, {
spanId: 'b7ad6b7169203331',
traceId: '0af7651916cd43dd8448eb211c80319c',
Expand All @@ -177,9 +177,9 @@ describe('HttpTraceContext', () => {
carrier[TRACE_PARENT_HEADER] =
'00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01';
carrier[TRACE_STATE_HEADER] = 'foo=bar,baz=qux';
const extractedSpanContext = getActiveSpan(
const extractedSpanContext = getParentSpanContext(
httpTraceContext.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context();
);

assert.deepStrictEqual(
extractedSpanContext!.traceState!.get('foo'),
Expand All @@ -195,9 +195,9 @@ describe('HttpTraceContext', () => {
carrier[TRACE_PARENT_HEADER] =
'00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01';
carrier[TRACE_STATE_HEADER] = ['foo=bar,baz=qux', 'quux=quuz'];
const extractedSpanContext = getActiveSpan(
const extractedSpanContext = getParentSpanContext(
httpTraceContext.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context();
);
assert.deepStrictEqual(extractedSpanContext, {
spanId: 'b7ad6b7169203331',
traceId: '0af7651916cd43dd8448eb211c80319c',
Expand Down Expand Up @@ -249,9 +249,9 @@ describe('HttpTraceContext', () => {
Object.getOwnPropertyNames(testCases).forEach(testCase => {
carrier[TRACE_PARENT_HEADER] = testCases[testCase];

const extractedSpanContext = getActiveSpan(
const extractedSpanContext = getParentSpanContext(
httpTraceContext.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context();
);
assert.deepStrictEqual(extractedSpanContext, undefined, testCase);
});
});
Expand All @@ -260,9 +260,9 @@ describe('HttpTraceContext', () => {
carrier[TRACE_PARENT_HEADER] =
'00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01';
carrier[TRACE_STATE_HEADER] = 'foo=1 \t , \t bar=2, \t baz=3 ';
const extractedSpanContext = getActiveSpan(
const extractedSpanContext = getParentSpanContext(
httpTraceContext.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context();
);

assert.deepStrictEqual(extractedSpanContext!.traceState!.get('foo'), '1');
assert.deepStrictEqual(extractedSpanContext!.traceState!.get('bar'), '2');
Expand Down
10 changes: 5 additions & 5 deletions packages/opentelemetry-core/test/context/composite.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
defaultTextMapSetter,
TextMapPropagator,
SpanContext,
getActiveSpan,
getParentSpanContext,
setExtractedSpanContext,
} from '@opentelemetry/api';
import { Context, ROOT_CONTEXT } from '@opentelemetry/context-base';
Expand Down Expand Up @@ -113,9 +113,9 @@ describe('Composite Propagator', () => {
const composite = new CompositePropagator({
propagators: [new B3MultiPropagator(), new HttpTraceContext()],
});
const spanContext = getActiveSpan(
const spanContext = getParentSpanContext(
composite.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context();
);

if (!spanContext) {
throw new Error('no extracted context');
Expand All @@ -132,9 +132,9 @@ describe('Composite Propagator', () => {
const composite = new CompositePropagator({
propagators: [new ThrowingPropagator(), new HttpTraceContext()],
});
const spanContext = getActiveSpan(
const spanContext = getParentSpanContext(
composite.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context();
);

if (!spanContext) {
throw new Error('no extracted context');
Expand Down
50 changes: 25 additions & 25 deletions packages/opentelemetry-propagator-b3/test/B3MultiPropagator.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import {
defaultTextMapGetter,
defaultTextMapSetter,
getActiveSpan,
getParentSpanContext,
setExtractedSpanContext,
SpanContext,
TraceFlags,
Expand Down Expand Up @@ -149,14 +149,14 @@ describe('B3MultiPropagator', () => {
carrier,
defaultTextMapGetter
);
const extractedSpanContext = getActiveSpan(context)?.context();
const extractedSpanContext = getParentSpanContext(context);
assert.deepStrictEqual(extractedSpanContext, {
spanId: 'b7ad6b7169203331',
traceId: '0af7651916cd43dd8448eb211c80319c',
isRemote: true,
traceFlags: TraceFlags.NONE,
});
assert.equal(context.getValue(B3_DEBUG_FLAG_KEY), undefined);
assert.strictEqual(context.getValue(B3_DEBUG_FLAG_KEY), undefined);
});

describe('when sampled flag is valid', () => {
Expand All @@ -170,7 +170,7 @@ describe('B3MultiPropagator', () => {
carrier,
defaultTextMapGetter
);
const extractedSpanContext = getActiveSpan(context)?.context();
const extractedSpanContext = getParentSpanContext(context);

assert.deepStrictEqual(extractedSpanContext, {
spanId: 'b7ad6b7169203331',
Expand All @@ -192,7 +192,7 @@ describe('B3MultiPropagator', () => {
carrier,
defaultTextMapGetter
);
const extractedSpanContext = getActiveSpan(context)?.context();
const extractedSpanContext = getParentSpanContext(context);

assert.deepStrictEqual(extractedSpanContext, {
spanId: 'b7ad6b7169203331',
Expand All @@ -214,7 +214,7 @@ describe('B3MultiPropagator', () => {
carrier,
defaultTextMapGetter
);
const extractedSpanContext = getActiveSpan(context)?.context();
const extractedSpanContext = getParentSpanContext(context);

assert.deepStrictEqual(extractedSpanContext, {
spanId: 'b7ad6b7169203331',
Expand All @@ -238,7 +238,7 @@ describe('B3MultiPropagator', () => {
carrier,
defaultTextMapGetter
);
const extractedSpanContext = getActiveSpan(context)?.context();
const extractedSpanContext = getParentSpanContext(context);

assert.deepStrictEqual(extractedSpanContext, {
spanId: 'b7ad6b7169203331',
Expand All @@ -263,7 +263,7 @@ describe('B3MultiPropagator', () => {
carrier,
defaultTextMapGetter
);
const extractedSpanContext = getActiveSpan(context)?.context();
const extractedSpanContext = getParentSpanContext(context);

assert.deepStrictEqual(extractedSpanContext, {
spanId: 'b7ad6b7169203331',
Expand All @@ -286,7 +286,7 @@ describe('B3MultiPropagator', () => {
carrier,
defaultTextMapGetter
);
const extractedSpanContext = getActiveSpan(context)?.context();
const extractedSpanContext = getParentSpanContext(context);

assert.deepStrictEqual(extractedSpanContext, {
spanId: 'b7ad6b7169203331',
Expand All @@ -309,7 +309,7 @@ describe('B3MultiPropagator', () => {
carrier,
defaultTextMapGetter
);
const extractedSpanContext = getActiveSpan(context)?.context();
const extractedSpanContext = getParentSpanContext(context);

assert.deepStrictEqual(extractedSpanContext, {
spanId: 'b7ad6b7169203331',
Expand All @@ -332,7 +332,7 @@ describe('B3MultiPropagator', () => {
carrier,
defaultTextMapGetter
);
const extractedSpanContext = getActiveSpan(context)?.context();
const extractedSpanContext = getParentSpanContext(context);

assert.deepStrictEqual(extractedSpanContext, {
spanId: 'b7ad6b7169203331',
Expand All @@ -350,9 +350,9 @@ describe('B3MultiPropagator', () => {
it('should return undefined', () => {
carrier[X_B3_TRACE_ID] = undefined;
carrier[X_B3_SPAN_ID] = 'b7ad6b7169203331';
const context = getActiveSpan(
const context = getParentSpanContext(
b3Propagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context();
);
assert.deepStrictEqual(context, undefined);
});
});
Expand All @@ -361,9 +361,9 @@ describe('B3MultiPropagator', () => {
it('should return undefined', () => {
carrier[X_B3_TRACE_ID] = '0af7651916cd43dd8448eb211c80319c';
carrier[X_B3_SPAN_ID] = undefined;
const context = getActiveSpan(
const context = getParentSpanContext(
b3Propagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context();
);
assert.deepStrictEqual(context, undefined);
});
});
Expand All @@ -373,18 +373,18 @@ describe('B3MultiPropagator', () => {
carrier[X_B3_TRACE_ID] = '0af7651916cd43dd8448eb211c80319c';
carrier[X_B3_SPAN_ID] = 'b7ad6b7169203331';
carrier[X_B3_SAMPLED] = '2';
const context = getActiveSpan(
const context = getParentSpanContext(
b3Propagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context();
);
assert.deepStrictEqual(context, undefined);
});
});

describe('AND b3 header is missing', () => {
it('should return undefined', () => {
const context = getActiveSpan(
const context = getParentSpanContext(
b3Propagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context();
);
assert.deepStrictEqual(context, undefined);
});
});
Expand All @@ -393,9 +393,9 @@ describe('B3MultiPropagator', () => {
it('should return undefined', () => {
carrier[X_B3_TRACE_ID] = 'invalid!';
carrier[X_B3_SPAN_ID] = 'b7ad6b7169203331';
const context = getActiveSpan(
const context = getParentSpanContext(
b3Propagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context();
);
assert.deepStrictEqual(context, undefined);
});
});
Expand All @@ -410,7 +410,7 @@ describe('B3MultiPropagator', () => {
carrier,
defaultTextMapGetter
);
const extractedSpanContext = getActiveSpan(context)?.context();
const extractedSpanContext = getParentSpanContext(context);
assert.deepStrictEqual(extractedSpanContext, {
spanId: 'b7ad6b7169203331',
traceId: '0af7651916cd43dd8448eb211c80319c',
Expand Down Expand Up @@ -459,9 +459,9 @@ describe('B3MultiPropagator', () => {

Object.getOwnPropertyNames(testCases).forEach(testCase => {
carrier[X_B3_TRACE_ID] = testCases[testCase];
const extractedSpanContext = getActiveSpan(
const extractedSpanContext = getParentSpanContext(
b3Propagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
)?.context();
);
assert.deepStrictEqual(extractedSpanContext, undefined, testCase);
});
});
Expand Down Expand Up @@ -495,7 +495,7 @@ describe('B3MultiPropagator', () => {
carrier,
defaultTextMapGetter
);
const extractedSpanContext = getActiveSpan(context)?.context();
const extractedSpanContext = getParentSpanContext(context);

assert.deepStrictEqual(extractedSpanContext, {
spanId: 'b7ad6b7169203331',
Expand Down
Loading

0 comments on commit ac686d4

Please sign in to comment.