Merge branch 'main' into feat/unify-with-bind

open-telemetry · Jun 30, 2021 · 4616497 · 4616497
2 parents 07c0b4c + 0141897
commit 4616497
Show file tree

Hide file tree

Showing 55 changed files with 620 additions and 462 deletions.
diff --git a/backwards-compatability/node10/package.json b/backwards-compatability/node10/package.json
@@ -12,8 +12,8 @@
     "@opentelemetry/tracing": "0.22.0"
   },
   "devDependencies": {
-    "@types/node": "10.17.59",
-    "typescript": "4.3.2"
+    "@types/node": "10.17.60",
+    "typescript": "4.3.4"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0"

diff --git a/backwards-compatability/node12/package.json b/backwards-compatability/node12/package.json
@@ -12,8 +12,8 @@
     "@opentelemetry/tracing": "0.22.0"
   },
   "devDependencies": {
-    "@types/node": "12.20.11",
-    "typescript": "4.3.2"
+    "@types/node": "12.20.15",
+    "typescript": "4.3.4"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0"

diff --git a/backwards-compatability/node8/package.json b/backwards-compatability/node8/package.json
@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "@types/node": "8.10.66",
-    "typescript": "4.3.2"
+    "typescript": "4.3.4"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0"

diff --git a/examples/opentracing-shim/package.json b/examples/opentracing-shim/package.json
@@ -33,6 +33,8 @@
     "@opentelemetry/exporter-zipkin": "0.22.0",
     "@opentelemetry/instrumentation": "0.22.0",
     "@opentelemetry/node": "0.22.0",
+    "@opentelemetry/resources": "0.22.0",
+    "@opentelemetry/semantic-conventions": "0.22.0",
     "@opentelemetry/shim-opentracing": "0.22.0",
     "@opentelemetry/tracing": "0.22.0",
     "opentracing": "^0.14.4"

diff --git a/examples/opentracing-shim/server.js b/examples/opentracing-shim/server.js
@@ -37,7 +37,7 @@ async function handleRequest(req, res) {
 
   res.writeHead(200, { 'Content-Type': 'application/json' });
   res.write(
-    JSON.stringify({ status: 'OK', traceId: span.spanContext().toTraceId() }),
+    JSON.stringify({ status: 'OK', traceId: span.context().toTraceId() }),
   );
 
   res.end();

diff --git a/examples/opentracing-shim/shim.js b/examples/opentracing-shim/shim.js
@@ -1,33 +1,33 @@
 'use strict';
 
-const { registerInstrumentations } = require('@opentelemetry/instrumentation');
+const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
+const { Resource } = require('@opentelemetry/resources');
 const { NodeTracerProvider } = require('@opentelemetry/node');
 const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
 const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
 const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
 const { TracerShim } = require('@opentelemetry/shim-opentracing');
 
 function shim(serviceName) {
-  const provider = new NodeTracerProvider();
+  const provider = new NodeTracerProvider({
+    resource: new Resource({ [ResourceAttributes.SERVICE_NAME]: serviceName }),
+  });
 
   provider.addSpanProcessor(new SimpleSpanProcessor(getExporter(serviceName)));
   // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings
   provider.register();
 
-  registerInstrumentations({
-  });
-
   return new TracerShim(provider.getTracer('opentracing-shim'));
 }
 
-function getExporter(serviceName) {
+function getExporter() {
   const type = process.env.EXPORTER.toLowerCase() || 'jaeger';
 
   if (type.startsWith('z')) {
-    return new ZipkinExporter({ serviceName });
+    return new ZipkinExporter();
   }
 
-  return new JaegerExporter({ serviceName, flushInterval: 100 });
+  return new JaegerExporter();
 }
 
 exports.shim = shim;
diff --git a/getting-started/README.md b/getting-started/README.md
@@ -58,7 +58,7 @@ To create traces on NodeJS, you need `@opentelemetry/node`, `@opentelemetry/core
 
 ```sh
 $ npm install \
-  @opentelemetry/core \
+  @opentelemetry/api \
   @opentelemetry/node \
   @opentelemetry/instrumentation-http \
   @opentelemetry/instrumentation-express \

diff --git a/getting-started/traced-example/package.json b/getting-started/traced-example/package.json
@@ -13,7 +13,7 @@
     "@opentelemetry/exporter-zipkin": "0.22.0",
     "@opentelemetry/node": "0.22.0",
     "@opentelemetry/instrumentation": "0.22.0",
-    "@opentelemetry/instrumentation-express": "^0.16.0",
+    "@opentelemetry/instrumentation-express": "^0.22.0",
     "@opentelemetry/instrumentation-http": "0.22.0",
     "@opentelemetry/tracing": "0.22.0",
     "axios": "^0.21.0",

diff --git a/getting-started/ts-example/example/package.json b/getting-started/ts-example/example/package.json
@@ -9,8 +9,8 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@types/express": "4.17.11",
-    "@types/node": "14.14.43",
+    "@types/express": "4.17.12",
+    "@types/node": "14.17.4",
     "ts-node": "8.10.2"
   },
   "dependencies": {

diff --git a/getting-started/ts-example/monitored-example/package.json b/getting-started/ts-example/monitored-example/package.json
@@ -9,8 +9,8 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@types/express": "4.17.11",
-    "@types/node": "14.14.43",
+    "@types/express": "4.17.12",
+    "@types/node": "14.17.4",
     "ts-node": "8.10.2"
   },
   "dependencies": {

diff --git a/getting-started/ts-example/traced-example/package.json b/getting-started/ts-example/traced-example/package.json
@@ -9,16 +9,16 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@types/express": "4.17.11",
-    "@types/node": "14.14.43",
+    "@types/express": "4.17.12",
+    "@types/node": "14.17.4",
     "ts-node": "9.1.1"
   },
   "dependencies": {
     "@opentelemetry/core": "0.22.0",
     "@opentelemetry/exporter-zipkin": "0.22.0",
     "@opentelemetry/instrumentation": "0.22.0",
     "@opentelemetry/node": "0.22.0",
-    "@opentelemetry/instrumentation-express": "^0.16.0",
+    "@opentelemetry/instrumentation-express": "^0.22.0",
     "@opentelemetry/instrumentation-http": "0.22.0",
     "@opentelemetry/tracing": "0.22.0",
     "axios": "^0.21.0",

diff --git a/integration-tests/propagation-validation-server/package.json b/integration-tests/propagation-validation-server/package.json
@@ -19,10 +19,10 @@
     "express": "4.17.1"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.0.0",
-    "typescript": "4.3.2"
+    "@opentelemetry/api": "^1.0.1",
+    "typescript": "4.3.4"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.0.1"
   }
 }
diff --git a/package.json b/package.json
@@ -46,24 +46,24 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@commitlint/cli": "12.1.1",
-    "@commitlint/config-conventional": "12.1.1",
-    "@typescript-eslint/eslint-plugin": "4.25.0",
-    "@typescript-eslint/parser": "4.25.0",
+    "@commitlint/cli": "12.1.4",
+    "@commitlint/config-conventional": "12.1.4",
+    "@typescript-eslint/eslint-plugin": "4.28.1",
+    "@typescript-eslint/parser": "4.28.1",
     "beautify-benchmark": "0.2.4",
     "benchmark": "2.1.4",
-    "eslint": "7.27.0",
+    "eslint": "7.29.0",
     "eslint-config-airbnb-base": "14.2.1",
     "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-import": "2.23.3",
+    "eslint-plugin-import": "2.23.4",
     "eslint-plugin-node": "11.1.0",
-    "gh-pages": "3.1.0",
+    "gh-pages": "3.2.3",
     "husky": "4.3.8",
     "lerna": "3.22.1",
     "lerna-changelog": "1.0.1",
     "markdownlint-cli": "0.27.1",
-    "typescript": "4.3.2",
-    "update-ts-references": "2.3.0"
+    "typescript": "4.3.4",
+    "update-ts-references": "2.4.0"
   },
   "husky": {
     "hooks": {

diff --git a/packages/opentelemetry-api-metrics/package.json b/packages/opentelemetry-api-metrics/package.json
@@ -53,12 +53,12 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.0.1"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.0.1",
     "@types/mocha": "8.2.2",
-    "@types/node": "14.14.43",
+    "@types/node": "14.17.4",
     "@types/webpack-env": "1.16.0",
     "codecov": "3.8.2",
     "istanbul-instrumenter-loader": "3.0.1",
@@ -70,9 +70,9 @@
     "karma-webpack": "4.0.2",
     "mocha": "7.2.0",
     "nyc": "15.1.0",
-    "ts-loader": "8.2.0",
+    "ts-loader": "8.3.0",
     "ts-mocha": "8.0.0",
-    "typescript": "4.3.2",
+    "typescript": "4.3.4",
     "webpack": "4.46.0"
   }
 }
diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json
@@ -40,19 +40,19 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.0.1",
     "@types/mocha": "8.2.2",
-    "@types/node": "14.14.43",
+    "@types/node": "14.17.4",
     "@types/shimmer": "1.0.1",
-    "codecov": "^3.8.2",
+    "codecov": "3.8.2",
     "mocha": "7.2.0",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
-    "typescript": "4.3.2"
+    "typescript": "4.3.4"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.0.1"
   }
 }
diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json
@@ -45,10 +45,10 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.14.0",
-    "@opentelemetry/api": "^1.0.0",
+    "@babel/core": "7.14.6",
+    "@opentelemetry/api": "^1.0.1",
     "@types/mocha": "8.2.2",
-    "@types/node": "14.14.43",
+    "@types/node": "14.17.4",
     "@types/sinon": "9.0.11",
     "@types/webpack-env": "1.16.0",
     "@types/zone.js": "0.5.12",
@@ -65,16 +65,16 @@
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "sinon": "10.0.0",
-    "ts-loader": "8.2.0",
+    "ts-loader": "8.3.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
-    "typescript": "4.3.2",
+    "typescript": "4.3.4",
     "webpack": "4.46.0",
-    "webpack-cli": "4.6.0",
+    "webpack-cli": "4.7.2",
     "zone.js": "0.11.4"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.0.1",
     "zone.js": "^0.10.2 || ^0.11.0"
   },
   "sideEffects": false

diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json
@@ -42,9 +42,9 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.14.0",
+    "@babel/core": "7.14.6",
     "@types/mocha": "8.2.2",
-    "@types/node": "14.14.43",
+    "@types/node": "14.17.4",
     "@types/sinon": "9.0.11",
     "@types/webpack-env": "1.16.0",
     "babel-loader": "8.2.2",
@@ -58,13 +58,13 @@
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "sinon": "10.0.0",
-    "ts-loader": "8.2.0",
+    "ts-loader": "8.3.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
-    "typescript": "4.3.2",
+    "typescript": "4.3.4",
     "webpack": "4.46.0",
-    "webpack-cli": "4.6.0",
-    "webpack-merge": "5.7.3"
+    "webpack-cli": "4.7.2",
+    "webpack-merge": "5.8.0"
   },
   "dependencies": {
     "@opentelemetry/context-zone-peer-dep": "0.22.0",

diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json
@@ -55,10 +55,10 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.0.1",
     "@types/mocha": "8.2.2",
-    "@types/node": "14.14.43",
-    "@types/semver": "7.3.5",
+    "@types/node": "14.17.4",
+    "@types/semver": "7.3.6",
     "@types/sinon": "9.0.11",
     "@types/webpack-env": "1.16.0",
     "codecov": "3.8.2",
@@ -73,14 +73,14 @@
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "sinon": "10.0.0",
-    "ts-loader": "8.2.0",
+    "ts-loader": "8.3.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
-    "typescript": "4.3.2",
+    "typescript": "4.3.4",
     "webpack": "4.46.0"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.0.1"
   },
   "dependencies": {
     "@opentelemetry/semantic-conventions": "0.22.0",

diff --git a/packages/opentelemetry-exporter-collector-grpc/package.json b/packages/opentelemetry-exporter-collector-grpc/package.json
@@ -45,25 +45,25 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.14.0",
-    "@opentelemetry/api": "^1.0.0",
+    "@babel/core": "7.14.6",
+    "@opentelemetry/api": "^1.0.1",
     "@opentelemetry/api-metrics": "0.22.0",
     "@types/mocha": "8.2.2",
-    "@types/node": "14.14.43",
+    "@types/node": "14.17.4",
     "@types/sinon": "9.0.11",
     "codecov": "3.8.2",
     "cpx": "1.5.0",
     "mocha": "7.2.0",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "sinon": "10.0.0",
-    "ts-loader": "8.2.0",
+    "ts-loader": "8.3.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
-    "typescript": "4.3.2"
+    "typescript": "4.3.4"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.0.1"
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.2.12",