Merge branch 'master' into metrics-updates

open-telemetry · Dec 2, 2020 · 1e6ab7c · 1e6ab7c
2 parents c7826f1 + b22ca63
commit 1e6ab7c
Show file tree

Hide file tree

Showing 34 changed files with 51 additions and 43 deletions.
diff --git a/packages/opentelemetry-api/package.json b/packages/opentelemetry-api/package.json
@@ -73,7 +73,7 @@
     "nyc": "15.1.0",
     "sinon": "9.2.1",
     "ts-loader": "8.0.11",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "typedoc": "0.19.2",
     "typescript": "3.9.7",
     "webpack": "4.44.2"

diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json
@@ -50,7 +50,7 @@
     "mocha": "7.2.0",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7"
   },

diff --git a/packages/opentelemetry-context-base/package.json b/packages/opentelemetry-context-base/package.json
@@ -51,7 +51,7 @@
     "mocha": "7.2.0",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7"
   }

diff --git a/packages/opentelemetry-context-zone-peer-dep/README.md b/packages/opentelemetry-context-zone-peer-dep/README.md
@@ -23,15 +23,17 @@ npm install --save @opentelemetry/context-zone-peer-dep
 
 ```js
 import { ConsoleSpanExporter, SimpleSpanProcessor } from '@opentelemetry/tracing';
-import { WebTracer } from '@opentelemetry/web';
+import { WebTracerProvider } from '@opentelemetry/web';
 import { ZoneContextManager } from '@opentelemetry/context-zone-peer-dep';
 
-const webTracerWithZone = new WebTracer({
+const providerWithZone = new WebTracerProvider();
+providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
+providerWithZone.register({
   contextManager: new ZoneContextManager()
 });
-webTracerWithZone.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
 
 // Example how the ZoneContextManager keeps the reference to the correct context during async operations
+const webTracerWithZone = providerWithZone.getTracer('default');
 const span1 = webTracerWithZone.startSpan('foo1');
 webTracerWithZone.withSpan(span1, () => {
   console.log('Current span is span1', webTracerWithZone.getCurrentSpan() === span1);

diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json
@@ -63,7 +63,7 @@
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
     "ts-loader": "8.0.11",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7",
     "webpack": "4.44.2",

diff --git a/packages/opentelemetry-context-zone/README.md b/packages/opentelemetry-context-zone/README.md
@@ -20,15 +20,17 @@ npm install --save @opentelemetry/context-zone
 
 ```js
 import { ConsoleSpanExporter, SimpleSpanProcessor } from '@opentelemetry/tracing';
-import { WebTracer } from '@opentelemetry/web';
+import { WebTracerProvider } from '@opentelemetry/web';
 import { ZoneContextManager } from '@opentelemetry/context-zone';
 
-const webTracerWithZone = new WebTracer({
+const providerWithZone = new WebTracerProvider();
+providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
+provider.register({
   contextManager: new ZoneContextManager()
 });
-webTracerWithZone.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
 
 // Example how the ZoneContextManager keeps the reference to the correct context during async operations
+const webTracerWithZone = providerWithZone.getTracer('default');
 const span1 = webTracerWithZone.startSpan('foo1');
 webTracerWithZone.withSpan(span1, () => {
   console.log('Current span is span1', webTracerWithZone.getCurrentSpan() === span1);

diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json
@@ -57,7 +57,7 @@
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
     "ts-loader": "8.0.11",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7",
     "webpack": "4.44.2",

diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json
@@ -72,7 +72,7 @@
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
     "ts-loader": "8.0.11",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7",
     "webpack": "4.44.2"

diff --git a/packages/opentelemetry-exporter-collector-grpc/package.json b/packages/opentelemetry-exporter-collector-grpc/package.json
@@ -59,7 +59,7 @@
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
     "ts-loader": "8.0.11",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7"
   },

diff --git a/packages/opentelemetry-exporter-collector-proto/package.json b/packages/opentelemetry-exporter-collector-proto/package.json
@@ -59,7 +59,7 @@
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
     "ts-loader": "8.0.11",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7"
   },

diff --git a/packages/opentelemetry-exporter-collector/package.json b/packages/opentelemetry-exporter-collector/package.json
@@ -71,7 +71,7 @@
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
     "ts-loader": "8.0.11",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7",
     "webpack": "4.44.2",

diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json
@@ -53,7 +53,7 @@
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7"
   },

diff --git a/packages/opentelemetry-exporter-prometheus/package.json b/packages/opentelemetry-exporter-prometheus/package.json
@@ -48,7 +48,7 @@
     "mocha": "7.2.0",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7"
   },

diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json
@@ -69,7 +69,7 @@
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
     "ts-loader": "8.0.11",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7",
     "webpack": "4.44.2",

diff --git a/packages/opentelemetry-grpc-utils/package.json b/packages/opentelemetry-grpc-utils/package.json
@@ -62,7 +62,7 @@
     "rimraf": "3.0.2",
     "semver": "7.3.2",
     "sinon": "9.2.1",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7"
   },

diff --git a/packages/opentelemetry-instrumentation-xml-http-request/README.md b/packages/opentelemetry-instrumentation-xml-http-request/README.md
@@ -18,32 +18,36 @@ npm install --save @opentelemetry/instrumentation-xml-http-request
 
 ```js
 import { ConsoleSpanExporter, SimpleSpanProcessor } from '@opentelemetry/tracing';
-import { WebTracer } from '@opentelemetry/web';
+import { WebTracerProvider } from '@opentelemetry/web';
 import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request';
 import { ZoneContextManager } from '@opentelemetry/context-zone';
 
 // this is still possible
-const webTracerWithZone = new WebTracer({
-  contextManager: new ZoneContextManager(),
+const providerWithZone = new WebTracerProvider({
   plugins: [
     new XMLHttpRequestInstrumentation({
       propagateTraceHeaderCorsUrls: ['http://localhost:8090']
     })
   ]
 });
+providerWithZone.register({
+  contextManager: new ZoneContextManager(),
+});
+const webTracerWithZone = providerWithZone.getTracer('default');
 /////////////////////////////////////////
 
 // or plugin can be also initialised separately and then set the tracer provider or meter provider
 const xmlHttpRequestInstrumentation = new XMLHttpRequestInstrumentation({
   propagateTraceHeaderCorsUrls: ['http://localhost:8090']
 });
-const webTracerWithZone = new WebTracer({
+const providerWithZone = new WebTracerProvider();
+providerWithZone.register({
   contextManager: new ZoneContextManager(),
 });
-xmlHttpRequestInstrumentation.setTracerProvider(webTracerWithZone);
+xmlHttpRequestInstrumentation.setTracerProvider(providerWithZone);
 /////////////////////////////////////////
 
-webTracerWithZone.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
+providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
 
 // and some test
 const req = new XMLHttpRequest();

diff --git a/packages/opentelemetry-instrumentation-xml-http-request/package.json b/packages/opentelemetry-instrumentation-xml-http-request/package.json
@@ -67,7 +67,7 @@
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
     "ts-loader": "8.0.11",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7",
     "webpack": "4.44.2",

diff --git a/packages/opentelemetry-instrumentation/package.json b/packages/opentelemetry-instrumentation/package.json
@@ -85,7 +85,7 @@
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
     "ts-loader": "8.0.11",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7",
     "webpack": "4.44.2",

diff --git a/packages/opentelemetry-metrics/package.json b/packages/opentelemetry-metrics/package.json
@@ -51,7 +51,7 @@
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7"
   },

diff --git a/packages/opentelemetry-node/package.json b/packages/opentelemetry-node/package.json
@@ -55,7 +55,7 @@
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "shimmer": "1.2.1",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7"
   },

diff --git a/packages/opentelemetry-plugin-fetch/package.json b/packages/opentelemetry-plugin-fetch/package.json
@@ -68,7 +68,7 @@
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
     "ts-loader": "8.0.11",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7",
     "webpack": "4.44.2",

diff --git a/packages/opentelemetry-plugin-grpc-js/package.json b/packages/opentelemetry-plugin-grpc-js/package.json
@@ -62,7 +62,7 @@
     "rimraf": "3.0.2",
     "semver": "7.3.2",
     "sinon": "9.2.1",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7"
   },

diff --git a/packages/opentelemetry-plugin-grpc/package.json b/packages/opentelemetry-plugin-grpc/package.json
@@ -61,7 +61,7 @@
     "rimraf": "3.0.2",
     "semver": "7.3.2",
     "sinon": "9.2.1",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7"
   },

diff --git a/packages/opentelemetry-plugin-http/package.json b/packages/opentelemetry-plugin-http/package.json
@@ -67,7 +67,7 @@
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
     "superagent": "6.1.0",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7"
   },

diff --git a/packages/opentelemetry-plugin-https/package.json b/packages/opentelemetry-plugin-https/package.json
@@ -66,7 +66,7 @@
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
     "superagent": "6.1.0",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7"
   },

diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json
@@ -55,7 +55,7 @@
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "ts-loader": "8.0.11",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "typescript": "3.9.7"
   }
 }
diff --git a/packages/opentelemetry-resource-detector-aws/package.json b/packages/opentelemetry-resource-detector-aws/package.json
@@ -51,7 +51,7 @@
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7"
   },

diff --git a/packages/opentelemetry-resource-detector-gcp/package.json b/packages/opentelemetry-resource-detector-gcp/package.json
@@ -51,7 +51,7 @@
     "nock": "12.0.3",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7"
   },

diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json
@@ -55,7 +55,7 @@
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7"
   },

diff --git a/packages/opentelemetry-sdk-node/package.json b/packages/opentelemetry-sdk-node/package.json
@@ -68,7 +68,7 @@
     "semver": "7.3.2",
     "sinon": "9.2.1",
     "ts-loader": "8.0.11",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "typescript": "3.9.7"
   }
 }
diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json
@@ -51,7 +51,7 @@
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7"
   }

diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json
@@ -48,7 +48,7 @@
     "mocha": "7.2.0",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "tslint-consistent-codestyle": "1.16.0",
     "tslint-microsoft-contrib": "6.2.0",

diff --git a/packages/opentelemetry-tracing/package.json b/packages/opentelemetry-tracing/package.json
@@ -68,7 +68,7 @@
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
     "ts-loader": "8.0.11",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7",
     "webpack": "4.44.2"

diff --git a/packages/opentelemetry-web/package.json b/packages/opentelemetry-web/package.json
@@ -68,7 +68,7 @@
     "rimraf": "3.0.2",
     "sinon": "9.2.1",
     "ts-loader": "8.0.11",
-    "ts-mocha": "7.0.0",
+    "ts-mocha": "8.0.0",
     "ts-node": "9.0.0",
     "typescript": "3.9.7",
     "webpack": "4.44.2",