Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify and speed up trace context parsing #708

Merged
merged 5 commits into from
Jan 22, 2020
Merged

Simplify and speed up trace context parsing #708

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b0cc392
chore: simplify and speed up trace context parsing
dyladan Jan 17, 2020
359eeaf
chore: lint
dyladan Jan 17, 2020
8340417
Merge remote-tracking branch 'origin/master' into trace-context-fast
dyladan Jan 21, 2020
0714cda
Merge branch 'master' into trace-context-fast
dyladan Jan 21, 2020
25e0c8c
Merge branch 'master' into trace-context-fast
dyladan Jan 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 10 additions & 27 deletions packages/opentelemetry-core/src/context/propagation/HttpTraceContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,12 @@
* limitations under the License.
*/

import { SpanContext, HttpTextFormat, TraceFlags } from '@opentelemetry/types';
import { HttpTextFormat, SpanContext, TraceFlags } from '@opentelemetry/types';
import { TraceState } from '../../trace/TraceState';

export const TRACE_PARENT_HEADER = 'traceparent';
export const TRACE_STATE_HEADER = 'tracestate';
const VALID_TRACE_PARENT_REGEX = /^[\da-f]{2}-[\da-f]{32}-[\da-f]{16}-[\da-f]{2}$/;
const VALID_TRACEID_REGEX = /^[0-9a-f]{32}$/i;
const VALID_SPANID_REGEX = /^[0-9a-f]{16}$/i;
const INVALID_ID_REGEX = /^0+$/i;
const VALID_TRACE_PARENT_REGEX = /^00-([\da-f]{32})-([\da-f]{16})-([\da-f]{2})$/;
const VERSION = '00';

/**
Expand All @@ -37,33 +34,19 @@ const VERSION = '00';
*/
export function parseTraceParent(traceParent: string): SpanContext | null {
const match = traceParent.match(VALID_TRACE_PARENT_REGEX);
if (!match) return null;
const parts = traceParent.split('-');
const [version, traceId, spanId, option] = parts;
// tslint:disable-next-line:ban Needed to parse hexadecimal.
const traceFlags = parseInt(option, 16);

if (
!isValidVersion(version) ||
!isValidTraceId(traceId) ||
!isValidSpanId(spanId)
!match ||
match[1] === '00000000000000000000000000000000' ||
match[2] === '0000000000000000'
) {
return null;
}

return { traceId, spanId, traceFlags };
}

function isValidVersion(version: string): boolean {
return version === VERSION;
}

function isValidTraceId(traceId: string): boolean {
return VALID_TRACEID_REGEX.test(traceId) && !INVALID_ID_REGEX.test(traceId);
}

function isValidSpanId(spanId: string): boolean {
return VALID_SPANID_REGEX.test(spanId) && !INVALID_ID_REGEX.test(spanId);
return {
traceId: match[1],
spanId: match[2],
traceFlags: parseInt(match[3], 16),
};
}

/**
Expand Down