Merge 531f52f into def9ba3

open-telemetry · Mar 1, 2022 · 29f5812 · 29f5812
2 parents def9ba3 + 531f52f
commit 29f5812
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/karma.webpack.js b/karma.webpack.js
@@ -22,7 +22,7 @@ module.exports = {
   target: 'web',
   output: { filename: 'bundle.js' },
   resolve: { extensions: ['.ts', '.js'] },
-  devtool: 'inline-source-map',
+  devtool: 'eval-source-map',
   module: {
     rules: [
       { test: /\.ts$/, use: 'ts-loader' },

diff --git a/packages/opentelemetry-sdk-trace-base/test/common/Span.test.ts b/packages/opentelemetry-sdk-trace-base/test/common/Span.test.ts
@@ -21,22 +21,32 @@ import {
   SpanContext,
   SpanKind,
   TraceFlags,
+  HrTime,
 } from '@opentelemetry/api';
 import {
   DEFAULT_ATTRIBUTE_COUNT_LIMIT,
   DEFAULT_ATTRIBUTE_VALUE_LENGTH_LIMIT,
-  hrTime,
   hrTimeDuration,
   hrTimeToMilliseconds,
   hrTimeToNanoseconds,
+  otperformance as performance,
 } from '@opentelemetry/core';
 import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
 import * as assert from 'assert';
+import * as sinon from 'sinon';
 import { BasicTracerProvider, Span, SpanProcessor } from '../../src';
 
-const performanceTimeOrigin = hrTime();
+const performanceTimeOrigin: HrTime = [1, 1];
 
 describe('Span', () => {
+  beforeEach(() => {
+    sinon.stub(performance, 'timeOrigin')
+      .value(hrTimeToMilliseconds(performanceTimeOrigin));
+  });
+  afterEach(() => {
+    sinon.restore();
+  });
+
   const tracer = new BasicTracerProvider({
     spanLimits: {
       attributeValueLengthLimit: 100,