Merge branch 'main' into fix/version-mismatch

open-telemetry · Jun 8, 2023 · 5c6747f · 5c6747f
2 parents 8824f19 + a2ff4b6
commit 5c6747f
Show file tree

Hide file tree

Showing 51 changed files with 67 additions and 54 deletions.
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -23,7 +23,7 @@ jobs:
           path: |
             package-lock.json
             packages/*/package-lock.json
-            backwards-compatability/*/package-lock.json
+            backwards-compatibility/*/package-lock.json
             metapackages/*/package-lock.json
             packages/*/package-lock.json
             integration-tests/*/package-lock.json

diff --git a/api/package.json b/api/package.json
@@ -76,7 +76,7 @@
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
     "memfs": "3.4.9",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/...l/backwards-compatability/node14/index.ts → ...l/backwards-compatibility/node14/index.ts b/...l/backwards-compatability/node14/index.ts → ...l/backwards-compatibility/node14/index.ts
diff --git a/...ckwards-compatability/node14/package.json → ...ckwards-compatibility/node14/package.json b/...ckwards-compatability/node14/package.json → ...ckwards-compatibility/node14/package.json
@@ -2,7 +2,7 @@
   "name": "backcompat-node14",
   "version": "0.40.0",
   "private": true,
-  "description": "Backwards compatability app for node 14 types and the OpenTelemetry Node.js SDK",
+  "description": "Backwards compatibility app for node 14 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
   "scripts": {
     "test:backcompat": "tsc --noEmit index.ts && tsc --noEmit --esModuleInterop index.ts",

diff --git a/...kwards-compatability/node14/tsconfig.json → ...kwards-compatibility/node14/tsconfig.json b/...kwards-compatability/node14/tsconfig.json → ...kwards-compatibility/node14/tsconfig.json
diff --git a/...l/backwards-compatability/node16/index.ts → ...l/backwards-compatibility/node16/index.ts b/...l/backwards-compatability/node16/index.ts → ...l/backwards-compatibility/node16/index.ts
diff --git a/...ckwards-compatability/node16/package.json → ...ckwards-compatibility/node16/package.json b/...ckwards-compatability/node16/package.json → ...ckwards-compatibility/node16/package.json
@@ -2,7 +2,7 @@
   "name": "backcompat-node16",
   "version": "0.40.0",
   "private": true,
-  "description": "Backwards compatability app for node 16 types and the OpenTelemetry Node.js SDK",
+  "description": "Backwards compatibility app for node 16 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
   "scripts": {
     "test:backcompat": "tsc --noEmit index.ts && tsc --noEmit --esModuleInterop index.ts",

diff --git a/...kwards-compatability/node16/tsconfig.json → ...kwards-compatibility/node16/tsconfig.json b/...kwards-compatability/node16/tsconfig.json → ...kwards-compatibility/node16/tsconfig.json
diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json
@@ -75,7 +75,7 @@
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json
@@ -75,7 +75,7 @@
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json
@@ -59,7 +59,7 @@
     "@types/sinon": "10.0.13",
     "codecov": "3.8.3",
     "cpx": "1.5.0",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json
@@ -87,7 +87,7 @@
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json
@@ -70,7 +70,7 @@
     "@types/sinon": "10.0.13",
     "codecov": "3.8.3",
     "cpx": "1.5.0",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json
@@ -56,7 +56,7 @@
     "@types/sinon": "10.0.13",
     "codecov": "3.8.3",
     "cpx": "1.5.0",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json
@@ -79,7 +79,7 @@
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json
@@ -69,7 +69,7 @@
     "@types/sinon": "10.0.13",
     "codecov": "3.8.3",
     "cpx": "1.5.0",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json
@@ -55,11 +55,11 @@
   "devDependencies": {
     "@babel/core": "7.16.0",
     "@opentelemetry/api": "1.4.1",
-    "@types/mocha": "10.0.0",
+    "@types/mocha": "10.0.1",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.13",
     "codecov": "3.8.3",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json
@@ -55,7 +55,7 @@
     "@types/sinon": "10.0.13",
     "codecov": "3.8.3",
     "cpx": "1.5.0",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json
@@ -79,7 +79,7 @@
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json
@@ -54,7 +54,7 @@
     "@types/sinon": "10.0.13",
     "codecov": "3.8.3",
     "cpx": "1.5.0",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/experimental/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json
@@ -49,7 +49,7 @@
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.13",
     "codecov": "3.8.3",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-mocha": "10.0.0",

diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json
@@ -72,7 +72,7 @@
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json
@@ -59,7 +59,7 @@
     "@types/sinon": "10.0.13",
     "codecov": "3.8.3",
     "grpc": "1.24.11",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "node-pre-gyp": "0.17.0",
     "nyc": "15.1.0",
     "semver": "7.5.1",

diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json
@@ -58,7 +58,7 @@
     "@types/superagent": "4.1.13",
     "axios": "1.4.0",
     "codecov": "3.8.3",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nock": "13.0.11",
     "nyc": "15.1.0",
     "request": "2.88.2",

diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json
@@ -72,7 +72,7 @@
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json
@@ -99,7 +99,7 @@
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json
@@ -69,7 +69,7 @@
     "@types/sinon": "10.0.13",
     "codecov": "3.8.3",
     "istanbul-instrumenter-loader": "3.0.1",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "semver": "7.5.1",
     "sinon": "15.0.0",

diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json
@@ -70,7 +70,7 @@
     "@types/sinon": "10.0.13",
     "codecov": "3.8.3",
     "istanbul-instrumenter-loader": "3.0.1",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nock": "13.0.11",
     "nyc": "15.1.0",
     "sinon": "15.0.0",

diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json
@@ -58,7 +58,7 @@
     "@types/sinon": "10.0.13",
     "codecov": "3.8.3",
     "cpx": "1.5.0",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "protobufjs-cli": "1.0.2",
     "sinon": "15.0.0",

diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json
@@ -65,7 +65,7 @@
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.13",
     "codecov": "3.8.3",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "protobufjs-cli": "1.0.2",
     "sinon": "15.0.0",

diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json
@@ -68,7 +68,7 @@
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json
@@ -84,7 +84,7 @@
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-mocha": "10.0.0",

diff --git a/experimental/packages/shim-opencensus/package.json b/experimental/packages/shim-opencensus/package.json
@@ -52,7 +52,7 @@
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.13",
     "codecov": "3.8.3",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-mocha": "10.0.0",

diff --git a/lerna.json b/lerna.json
@@ -6,7 +6,7 @@
     "packages/*",
     "experimental/packages/*",
     "experimental/examples/*",
-    "experimental/backwards-compatability/*",
+    "experimental/backwards-compatibility/*",
     "integration-tests/*",
     "selenium-tests",
     "examples/otlp-exporter-node",

diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json
@@ -48,7 +48,7 @@
     "@types/mocha": "10.0.0",
     "@types/node": "18.6.5",
     "codecov": "3.8.3",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"

diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json
@@ -69,7 +69,7 @@
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json
@@ -62,7 +62,7 @@
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json
@@ -78,7 +78,7 @@
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
     "lerna": "6.0.3",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json
@@ -50,7 +50,7 @@
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.13",
     "codecov": "3.8.3",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nock": "13.0.11",
     "nyc": "15.1.0",
     "sinon": "15.0.0",

diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json
@@ -75,7 +75,7 @@
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nock": "13.0.11",
     "nyc": "15.1.0",
     "sinon": "15.0.0",

diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json
@@ -62,7 +62,7 @@
     "@types/node": "18.6.5",
     "codecov": "3.8.3",
     "istanbul-instrumenter-loader": "3.0.1",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json
@@ -67,7 +67,7 @@
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json
@@ -75,7 +75,7 @@
     "karma-mocha-webworker": "1.3.0",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nock": "13.0.11",
     "nyc": "15.1.0",
     "sinon": "15.0.0",

diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json
@@ -79,7 +79,7 @@
     "karma-mocha-webworker": "1.3.0",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json
@@ -53,7 +53,7 @@
     "@types/semver": "7.3.9",
     "@types/sinon": "10.0.13",
     "codecov": "3.8.3",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-mocha": "10.0.0",

diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json
@@ -76,7 +76,7 @@
     "karma-mocha-webworker": "1.3.0",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "4.0.2",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",

diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json
@@ -53,7 +53,7 @@
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.13",
     "codecov": "3.8.3",
-    "mocha": "10.0.0",
+    "mocha": "10.2.0",
     "nock": "13.0.11",
     "nyc": "15.1.0",
     "sinon": "15.0.0",