Continuation of open-telemetry#206 (open-telemetry#279)

* fix: performance.now() is relative from start time * fix: grpc plugin tests * fix: import performance
srikanthccv · Sep 18, 2019 · 7fff538 · 7fff538
1 parent 4ff14da
commit 7fff538
Show file tree

Hide file tree

Showing 12 changed files with 70 additions and 21 deletions.
diff --git a/packages/opentelemetry-core/src/common/time.ts b/packages/opentelemetry-core/src/common/time.ts
@@ -1,4 +1,4 @@
-/**
+/*!
  * Copyright 2019, OpenTelemetry Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
  */
 
 import * as types from '@opentelemetry/types';
-import { performance } from 'perf_hooks';
+import { otperformance as performance } from '../platform';
 
 const NANOSECOND_DIGITS = 9;
 const SECOND_TO_NANOSECONDS = Math.pow(10, NANOSECOND_DIGITS);

diff --git a/packages/opentelemetry-core/src/platform/browser/index.ts b/packages/opentelemetry-core/src/platform/browser/index.ts
@@ -15,3 +15,4 @@
  */
 
 export * from './id';
+export * from './performance';
diff --git a/packages/opentelemetry-core/src/platform/browser/performance.ts b/packages/opentelemetry-core/src/platform/browser/performance.ts
@@ -0,0 +1,17 @@
+/*!
+ * Copyright 2019, OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export const otperformance = performance;
diff --git a/packages/opentelemetry-core/src/platform/node/index.ts b/packages/opentelemetry-core/src/platform/node/index.ts
@@ -15,3 +15,4 @@
  */
 
 export * from './id';
+export * from './performance';
diff --git a/packages/opentelemetry-core/src/platform/node/performance.ts b/packages/opentelemetry-core/src/platform/node/performance.ts
@@ -0,0 +1,19 @@
+/*!
+ * Copyright 2019, OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { performance } from 'perf_hooks';
+
+export const otperformance = performance;
diff --git a/packages/opentelemetry-core/test/common/time.test.ts b/packages/opentelemetry-core/test/common/time.test.ts
@@ -1,4 +1,4 @@
-/**
+/*!
  * Copyright 2019, OpenTelemetry Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
  */
 
 import * as assert from 'assert';
-import { performance } from 'perf_hooks';
+import { otperformance as performance } from '../../src/platform';
 import * as sinon from 'sinon';
 import * as types from '@opentelemetry/types';
 import {

diff --git a/packages/opentelemetry-exporter-jaeger/src/transform.ts b/packages/opentelemetry-exporter-jaeger/src/transform.ts
@@ -16,6 +16,7 @@
 
 import { Link, CanonicalCode } from '@opentelemetry/types';
 import { ReadableSpan } from '@opentelemetry/basic-tracer';
+import { hrTimeToMilliseconds } from '@opentelemetry/core';
 import {
   ThriftSpan,
   Tag,
@@ -67,7 +68,7 @@ export function spanToThrift(span: ReadableSpan): ThriftSpan {
           fields.push({ key: attr, value: toTagValue(attrs[attr]) })
         );
       }
-      return { timestamp: event.time, fields };
+      return { timestamp: hrTimeToMilliseconds(event.time), fields };
     }
   );
   const spanLogs: ThriftLog[] = ThriftUtils.getThriftLogs(logs);
@@ -80,9 +81,11 @@ export function spanToThrift(span: ReadableSpan): ThriftSpan {
     operationName: span.name,
     references: spanLinksToThriftRefs(span.links, span.parentSpanId),
     flags: span.spanContext.traceFlags || DEFAULT_FLAGS,
-    startTime: Utils.encodeInt64(span.startTime * MICROS_PER_MILLI),
+    startTime: Utils.encodeInt64(
+      hrTimeToMilliseconds(span.startTime) * MICROS_PER_MILLI
+    ),
     duration: Utils.encodeInt64(
-      Math.round((span.endTime - span.startTime) * MICROS_PER_MILLI)
+      Math.round(hrTimeToMilliseconds(span.duration) * MICROS_PER_MILLI)
     ),
     tags: spanTags,
     logs: spanLogs,

diff --git a/packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts b/packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts
@@ -79,14 +79,15 @@ describe('JaegerExporter', () => {
         name: 'my-span1',
         kind: types.SpanKind.CLIENT,
         spanContext,
-        startTime: 1566156729709,
-        endTime: 1566156729709 + 2000,
+        startTime: [1566156729, 709],
+        endTime: [1566156731, 709],
         status: {
           code: types.CanonicalCode.DATA_LOSS,
         },
         attributes: {},
         links: [],
         events: [],
+        duration: [32, 800000000],
       };
 
       exporter.export([readableSpan], (result: ExportResult) => {

diff --git a/packages/opentelemetry-exporter-jaeger/test/transform.test.ts b/packages/opentelemetry-exporter-jaeger/test/transform.test.ts
@@ -19,6 +19,7 @@ import { spanToThrift } from '../src/transform';
 import { ReadableSpan } from '@opentelemetry/basic-tracer';
 import * as types from '@opentelemetry/types';
 import { ThriftUtils, Utils, ThriftReferenceType } from '../src/types';
+import { hrTimeToMilliseconds } from '@opentelemetry/core';
 
 describe('transform', () => {
   const spanContext = {
@@ -32,8 +33,8 @@ describe('transform', () => {
         name: 'my-span',
         kind: types.SpanKind.INTERNAL,
         spanContext,
-        startTime: 1566156729709,
-        endTime: 1566156729709 + 2000,
+        startTime: [1566156729, 709],
+        endTime: [1566156731, 709],
         status: {
           code: types.CanonicalCode.OK,
         },
@@ -61,9 +62,10 @@ describe('transform', () => {
             attributes: {
               error: true,
             },
-            time: 1566156729709 + 100,
+            time: [1566156729, 809],
           },
         ],
+        duration: [32, 800000000],
       };
 
       const thriftSpan = spanToThrift(readableSpan);
@@ -86,7 +88,7 @@ describe('transform', () => {
       assert.deepStrictEqual(thriftSpan.flags, 1);
       assert.deepStrictEqual(
         thriftSpan.startTime,
-        Utils.encodeInt64(readableSpan.startTime * 1000)
+        Utils.encodeInt64(hrTimeToMilliseconds(readableSpan.startTime) * 1000)
       );
       assert.strictEqual(thriftSpan.tags.length, 5);
       const [tag1, tag2, tag3, tag4, tag5] = thriftSpan.tags;
@@ -124,15 +126,16 @@ describe('transform', () => {
         name: 'my-span1',
         kind: types.SpanKind.CLIENT,
         spanContext,
-        startTime: 1566156729709,
-        endTime: 1566156729709 + 2000,
+        startTime: [1566156729, 709],
+        endTime: [1566156731, 709],
         status: {
           code: types.CanonicalCode.DATA_LOSS,
           message: 'data loss',
         },
         attributes: {},
         links: [],
         events: [],
+        duration: [32, 800000000],
       };
 
       const thriftSpan = spanToThrift(readableSpan);
@@ -176,8 +179,8 @@ describe('transform', () => {
         name: 'my-span',
         kind: types.SpanKind.INTERNAL,
         spanContext,
-        startTime: 1566156729709,
-        endTime: 1566156729709 + 2000,
+        startTime: [1566156729, 709],
+        endTime: [1566156731, 709],
         status: {
           code: types.CanonicalCode.OK,
         },
@@ -192,6 +195,7 @@ describe('transform', () => {
           },
         ],
         events: [],
+        duration: [32, 800000000],
       };
 
       const thriftSpan = spanToThrift(readableSpan);

diff --git a/packages/opentelemetry-plugin-grpc/test/utils/assertionUtils.ts b/packages/opentelemetry-plugin-grpc/test/utils/assertionUtils.ts
@@ -20,6 +20,7 @@ import { AttributeNames } from '../../src/enums/AttributeNames';
 import { GrpcPlugin } from '../../src/grpc';
 import * as grpc from 'grpc';
 import { ReadableSpan } from '@opentelemetry/basic-tracer';
+import { hrTimeToMilliseconds } from '@opentelemetry/core';
 
 export const assertSpan = (
   span: ReadableSpan,
@@ -38,8 +39,10 @@ export const assertSpan = (
   assert.strictEqual(span.links.length, 0);
   assert.strictEqual(span.events.length, 1);
 
-  assert.ok(span.startTime < span.endTime);
-  assert.ok(span.endTime > 0);
+  assert.ok(
+    hrTimeToMilliseconds(span.startTime) < hrTimeToMilliseconds(span.endTime)
+  );
+  assert.ok(hrTimeToMilliseconds(span.endTime) > 0);
 
   if (span.kind === SpanKind.SERVER) {
     assert.ok(span.spanContext);

diff --git a/packages/opentelemetry-plugin-http/test/functionals/http-enable.test.ts b/packages/opentelemetry-plugin-http/test/functionals/http-enable.test.ts
@@ -108,7 +108,7 @@ describe('HttpPlugin', () => {
       const result = await httpRequest.get(
         `http://${hostname}:${serverPort}${pathname}`
       );
-      const spans = audit.processSpans();
+      const spans = memoryExporter.getFinishedSpans();
       const [incomingSpan, outgoingSpan] = spans;
       const validations = {
         hostname,

diff --git a/packages/opentelemetry-types/src/common/Time.ts b/packages/opentelemetry-types/src/common/Time.ts
@@ -1,4 +1,4 @@
-/**
+/*!
  * Copyright 2019, OpenTelemetry Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,3 +15,4 @@
		*/

		export * from './id';
		export * from './performance';