Skip to content
This repository was archived by the owner on Oct 3, 2023. It is now read-only.

Commit 3d8f43b

Browse files
committed
fix review comments
1 parent d85dac0 commit 3d8f43b

File tree

2 files changed

+23
-31
lines changed

2 files changed

+23
-31
lines changed

packages/opencensus-propagation-jaeger/src/jaeger-format.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ export class JaegerFormat implements Propagation {
5353

5454
const traceId = tracerStateHeaderParts[0];
5555
const spanId = tracerStateHeaderParts[1];
56-
const jflags = Number('0x' + tracerStateHeaderParts[3]);
56+
const jflags = Number(
57+
'0x' +
58+
(isNaN(Number(tracerStateHeaderParts[3])) ?
59+
SAMPLED_VALUE :
60+
Number(tracerStateHeaderParts[3])));
5761
const sampled = jflags & SAMPLED_VALUE;
5862
const debug = (jflags & DEBUG_VALUE) || (debugId ? SAMPLED_VALUE : 0);
5963
const options = (sampled || debug) ? SAMPLED_VALUE : 0;

packages/opencensus-propagation-jaeger/test/test-jaeger-format.ts

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,31 @@ import {HeaderGetter, HeaderSetter} from '@opencensus/core';
1818
import * as assert from 'assert';
1919
import {JaegerFormat, SAMPLED_VALUE, TRACER_STATE_HEADER_NAME} from '../src/';
2020

21+
function helperGetter(value: string|string[]|undefined) {
22+
const headers: {[key: string]: string|string[]|undefined} = {};
23+
headers[TRACER_STATE_HEADER_NAME] = value;
24+
const getter: HeaderGetter = {
25+
getHeader(name: string) {
26+
return headers[name];
27+
}
28+
};
29+
return getter;
30+
}
31+
2132
const jaegerFormat = new JaegerFormat();
2233

2334
describe('JaegerPropagation', () => {
2435
describe('extract()', () => {
2536
it('should extract context of a sampled span from headers', () => {
2637
const spanContext = jaegerFormat.generate();
27-
// disable-next-line to disable no-any check
28-
// tslint:disable-next-line
29-
const headers = {} as any;
30-
headers[TRACER_STATE_HEADER_NAME] = `${spanContext.traceId}:${
31-
spanContext.spanId}::${spanContext.options}`;
32-
33-
const getter: HeaderGetter = {
34-
getHeader(name: string) {
35-
return headers[name];
36-
}
37-
};
38+
const getter = helperGetter(`${spanContext.traceId}:${
39+
spanContext.spanId}::${spanContext.options}`);
3840

3941
assert.deepEqual(jaegerFormat.extract(getter), spanContext);
4042
});
4143

4244
it('should return null when header is undefined', () => {
43-
// tslint:disable-next-line
44-
const headers = {} as any;
45+
const headers: {[key: string]: string|string[]|undefined} = {};
4546
headers[TRACER_STATE_HEADER_NAME] = undefined;
4647

4748
const getter: HeaderGetter = {
@@ -55,28 +56,16 @@ describe('JaegerPropagation', () => {
5556

5657
it('should extract data from an array', () => {
5758
const spanContext = jaegerFormat.generate();
58-
// tslint:disable-next-line
59-
const headers = {} as any;
60-
headers[TRACER_STATE_HEADER_NAME] = [
61-
`${spanContext.traceId}:${spanContext.spanId}::${spanContext.options}`
62-
];
63-
64-
const getter: HeaderGetter = {
65-
getHeader(name: string) {
66-
return headers[name];
67-
}
68-
};
69-
59+
const getter = helperGetter(`${spanContext.traceId}:${
60+
spanContext.spanId}::${spanContext.options}`);
7061
assert.deepEqual(jaegerFormat.extract(getter), spanContext);
7162
});
7263
});
7364

7465
describe('inject', () => {
7566
it('should inject a context of a sampled span', () => {
7667
const spanContext = jaegerFormat.generate();
77-
// disable-next-line to disable no-any check
78-
// tslint:disable-next-line
79-
const headers = {} as any;
68+
const headers: {[key: string]: string|string[]|undefined} = {};
8069
const setter: HeaderSetter = {
8170
setHeader(name: string, value: string) {
8271
headers[name] = value;
@@ -98,8 +87,7 @@ describe('JaegerPropagation', () => {
9887
spanId: '',
9988
options: SAMPLED_VALUE,
10089
};
101-
// tslint:disable-next-line
102-
const headers = {} as any;
90+
const headers: {[key: string]: string|string[]|undefined} = {};
10391
const setter: HeaderSetter = {
10492
setHeader(name: string, value: string) {
10593
headers[name] = value;

0 commit comments

Comments
 (0)