Default trace/span IDs to random in getInitialLoadRootSpan (with correct base now) (#21)

Author: draffensperger

…opencensus-web-core/src/internal/util.ts …pencensus-web-core/src/common/id-util.tspackages/opencensus-web-core/src/internal/util.ts renamed to packages/opencensus-web-core/src/common/id-util.ts packages/opencensus-web-core/src/internal/util.ts renamed to packages/opencensus-web-core/src/common/id-util.ts

@@ -27,6 +27,7 @@ export {Annotation, Attributes, Config, Exporter, Link, MessageEvent, Propagatio
 
 export * from './common/time-util';
 export * from './common/url-util';
+export * from './common/id-util';
 
 // Export global tracing instance.
 import {Tracing} from './trace/model/tracing';

packages/opencensus-web-core/src/index.ts

@@ -15,7 +15,7 @@
  */
 
 import * as coreTypes from '@opencensus/core';
-import {randomTraceId} from '../../internal/util';
+import {randomTraceId} from '../../common/id-util';
 import {SpanKind} from './enums';
 import {Span} from './span';
 

packages/opencensus-web-core/src/trace/model/root-span.ts

@@ -16,8 +16,8 @@
 
 import * as coreTypes from '@opencensus/core';
 
+import {randomSpanId} from '../../common/id-util';
 import {getDateForPerfTime} from '../../common/time-util';
-import {randomSpanId} from '../../internal/util';
 
 import {CanonicalCode, LinkType, MessageEventType, SpanKind} from './enums';
 

packages/opencensus-web-core/src/trace/model/span.ts

@@ -15,7 +15,7 @@
  */
 
 import * as coreTypes from '@opencensus/core';
-import {randomSpanId, randomTraceId} from '../../internal/util';
+import {randomSpanId, randomTraceId} from '../../common/id-util';
 
 /** Propagation implementation that does not set or get headers. */
 export class NoHeadersPropagation implements coreTypes.Propagation {

packages/opencensus-web-core/src/trace/propagation/no_headers_propagation.ts

@@ -17,7 +17,7 @@
 // This file is an entry point for the webpack test configuration, so this
 // should import from all test files.
 
-import './test-internal-util';
+import './test-id-util';
 import './test-root-span';
 import './test-span';
 import './test-time-util';

packages/opencensus-web-core/test/index.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {randomSpanId, randomTraceId} from '../src/internal/util';
+import {randomSpanId, randomTraceId} from '../src/common/id-util';
 
 const NUM_VERIFY_TRIALS = 10;
 

…nsus-web-core/test/test-internal-util.ts …opencensus-web-core/test/test-id-util.tspackages/opencensus-web-core/test/test-internal-util.ts renamed to packages/opencensus-web-core/test/test-id-util.ts packages/opencensus-web-core/test/test-internal-util.ts renamed to packages/opencensus-web-core/test/test-id-util.ts

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import {Annotation, ATTRIBUTE_HTTP_URL, ATTRIBUTE_HTTP_USER_AGENT, ATTRIBUTE_LONG_TASK_ATTRIBUTION, ATTRIBUTE_NAV_TYPE, parseUrl, RootSpan, Span, SpanKind, Tracer} from '@opencensus/web-core';
+import {Annotation, ATTRIBUTE_HTTP_URL, ATTRIBUTE_HTTP_USER_AGENT, ATTRIBUTE_LONG_TASK_ATTRIBUTION, ATTRIBUTE_NAV_TYPE, parseUrl, randomSpanId, randomTraceId, RootSpan, Span, SpanKind, Tracer} from '@opencensus/web-core';
+
 import {GroupedPerfEntries} from './perf-grouper';
 import {PerformanceLongTaskTiming, PerformanceNavigationTimingExtended} from './perf-types';
 import {getResourceSpan} from './resource-span';
@@ -53,7 +54,8 @@ const NAVIGATION_TIMING_EVENTS = [
  */
 export function getInitialLoadRootSpan(
     tracer: Tracer, perfEntries: GroupedPerfEntries,
-    navigationFetchSpanId: string, traceId: string): RootSpan {
+    navigationFetchSpanId: string = randomSpanId(),
+    traceId: string = randomTraceId()): RootSpan {
   const navTiming = perfEntries.navigationTiming;
   const navigationUrl = navTiming ? navTiming.name : location.href;
   const parsedNavigationUrl = parseUrl(navigationUrl);

packages/opencensus-web-instrumentation-perf/src/initial-load-root-span.ts

@@ -19,6 +19,7 @@ import {getInitialLoadRootSpan} from '../src/initial-load-root-span';
 import {GroupedPerfEntries} from '../src/perf-grouper';
 
 const SPAN_ID_REGEX = /[0-9a-f]{16}/;
+const TRACE_ID_REGEX = /[0-9a-f]{32}/;
 const USER_AGENT = 'Mozilla/5.0 TEST';
 
 const PERF_ENTRIES: GroupedPerfEntries = {
@@ -299,4 +300,12 @@ describe('getInitialLoadRootSpan', () => {
     });
     expect(longTaskSpan.annotations).toEqual([]);
   });
+
+  it('defaults trace and span ID to random values if not specified', () => {
+    const root = getInitialLoadRootSpan(new Tracer(), PERF_ENTRIES);
+
+    expect(root.traceId).toMatch(TRACE_ID_REGEX);
+    const navigationFetchSpan = root.spans[0];
+    expect(navigationFetchSpan.id).toMatch(SPAN_ID_REGEX);
+  });
 });