Merge branch 'main' into issue-3826-sdk-node

open-telemetry · Jul 10, 2023 · 65bb85b · 65bb85b
2 parents fe62008 + 6d13eb4
commit 65bb85b
Show file tree

Hide file tree

Showing 84 changed files with 205 additions and 154 deletions.
diff --git a/.nycrc b/.nycrc
@@ -8,7 +8,6 @@
     "build/**/*.*",
     "src/index.ts",
     "src/platform/**/index.ts",
-    "src/platform/browser/*.ts",
     "src/version.ts",
     "test/**/*.*",
     ".eslintrc.js",

diff --git a/api/.eslintrc.js b/api/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "shared-node-browser": true
     },
-    ...require('../eslint.config.js')
+    ...require('../eslint.base.js')
 }
diff --git a/api/package.json b/api/package.json
@@ -23,9 +23,9 @@
     "docs:test": "linkinator docs/out --silent && linkinator docs/*.md *.md --markdown --silent",
     "lint:fix": "eslint . --ext .ts --fix",
     "lint": "eslint . --ext .ts",
-    "test:browser": "nyc karma start --single-run",
+    "test:browser": "karma start --single-run",
     "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
-    "test:webworker": "nyc karma start karma.worker.js --single-run",
+    "test:webworker": "karma start karma.worker.js --single-run",
     "cycle-check": "dpdm --exit-code circular:1 src/index.ts",
     "version": "node ../scripts/version-update.js",
     "prewatch": "npm run precompile",
@@ -68,10 +68,10 @@
     "codecov": "3.8.3",
     "cross-var": "1.1.0",
     "dpdm": "3.13.1",
-    "istanbul-instrumenter-loader": "3.0.1",
+    "babel-plugin-istanbul": "6.1.1",
     "karma": "6.4.2",
     "karma-chrome-launcher": "3.1.0",
-    "karma-coverage-istanbul-reporter": "3.0.3",
+    "karma-coverage": "2.2.1",
     "karma-mocha": "2.0.1",
     "karma-mocha-webworker": "1.3.0",
     "karma-spec-reporter": "0.0.36",

diff --git a/eslint.config.js → eslint.base.js b/eslint.config.js → eslint.base.js
diff --git a/experimental/examples/.eslintrc.js b/experimental/examples/.eslintrc.js
@@ -3,5 +3,5 @@ module.exports = {
       "mocha": true,
       "node": true
   },
-  ...require('../../eslint.config.js')
+  ...require('../../eslint.base.js')
 }
diff --git a/experimental/packages/api-events/.eslintrc.js b/experimental/packages/api-events/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
       "commonjs": true,
       "shared-node-browser": true
   },
-  ...require('../../../eslint.config.js')
+  ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json
@@ -18,7 +18,7 @@
     "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
     "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
     "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts",
-    "test:browser": "nyc karma start --single-run",
+    "test:browser": "karma start --single-run",
     "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
     "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
     "build": "npm run compile",
@@ -70,10 +70,10 @@
     "@types/webpack-env": "1.16.3",
     "codecov": "3.8.3",
     "cross-var": "1.1.0",
-    "istanbul-instrumenter-loader": "3.0.1",
+    "babel-plugin-istanbul": "6.1.1",
     "karma": "6.4.2",
     "karma-chrome-launcher": "3.1.0",
-    "karma-coverage-istanbul-reporter": "3.0.3",
+    "karma-coverage": "2.2.1",
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.36",
     "karma-webpack": "4.0.2",

diff --git a/experimental/packages/api-logs/.eslintrc.js b/experimental/packages/api-logs/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
       "commonjs": true,
       "shared-node-browser": true
   },
-  ...require('../../../eslint.config.js')
+  ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json
@@ -18,7 +18,7 @@
     "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
     "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
     "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts",
-    "test:browser": "nyc karma start --single-run",
+    "test:browser": "karma start --single-run",
     "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
     "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
     "build": "npm run compile",
@@ -70,10 +70,10 @@
     "@types/webpack-env": "1.16.3",
     "codecov": "3.8.3",
     "cross-var": "1.1.0",
-    "istanbul-instrumenter-loader": "3.0.1",
+    "babel-plugin-istanbul": "6.1.1",
     "karma": "6.4.2",
     "karma-chrome-launcher": "3.1.0",
-    "karma-coverage-istanbul-reporter": "3.0.3",
+    "karma-coverage": "2.2.1",
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.36",
     "karma-webpack": "4.0.2",

diff --git a/experimental/packages/exporter-logs-otlp-grpc/.eslintrc.js b/experimental/packages/exporter-logs-otlp-grpc/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json
@@ -48,7 +48,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.22.6",
+    "@babel/core": "7.22.8",
     "@grpc/proto-loader": "^0.7.3",
     "@opentelemetry/api": "1.4.1",
     "@opentelemetry/api-logs": "0.41.0",

diff --git a/experimental/packages/exporter-logs-otlp-http/.eslintrc.js b/experimental/packages/exporter-logs-otlp-http/.eslintrc.js
@@ -5,5 +5,5 @@ module.exports = {
     node: true,
     browser: true,
   },
-  ...require('../../../eslint.config.js'),
+  ...require('../../../eslint.base.js'),
 };
diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json
@@ -38,7 +38,7 @@
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "tdd:browser": "karma start",
     "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'",
-    "test:browser": "nyc karma start --single-run",
+    "test:browser": "karma start --single-run",
     "version": "node ../../../scripts/version-update.js",
     "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
     "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
@@ -71,7 +71,7 @@
   ],
   "sideEffects": false,
   "devDependencies": {
-    "@babel/core": "7.22.6",
+    "@babel/core": "7.22.8",
     "@opentelemetry/api-logs": "0.41.0",
     "@opentelemetry/resources": "1.15.0",
     "@types/mocha": "10.0.1",
@@ -82,10 +82,10 @@
     "codecov": "3.8.3",
     "cpx": "1.5.0",
     "cross-var": "1.1.0",
-    "istanbul-instrumenter-loader": "3.0.1",
+    "babel-plugin-istanbul": "6.1.1",
     "karma": "6.4.2",
     "karma-chrome-launcher": "3.1.0",
-    "karma-coverage-istanbul-reporter": "3.0.3",
+    "karma-coverage": "2.2.1",
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.36",
     "karma-webpack": "4.0.2",

diff --git a/experimental/packages/exporter-logs-otlp-proto/.eslintrc.js b/experimental/packages/exporter-logs-otlp-proto/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json
@@ -21,7 +21,7 @@
     "lint:fix": "eslint . --ext .ts --fix",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'",
-    "test:browser": "nyc karma start --single-run",
+    "test:browser": "karma start --single-run",
     "version": "node ../../../scripts/version-update.js",
     "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
     "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
@@ -63,21 +63,31 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.22.6",
+    "@babel/core": "7.22.8",
     "@opentelemetry/api": "1.4.1",
     "@types/mocha": "10.0.1",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.15",
     "codecov": "3.8.3",
     "cpx": "1.5.0",
     "cross-var": "1.1.0",
+    "babel-plugin-istanbul": "6.1.1",
+    "karma": "6.4.2",
+    "karma-chrome-launcher": "3.1.0",
+    "karma-coverage": "2.2.1",
+    "karma-mocha": "2.0.1",
+    "karma-spec-reporter": "0.0.36",
+    "karma-webpack": "4.0.2",
     "lerna": "7.1.1",
     "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.1.2",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
-    "typescript": "4.4.4"
+    "typescript": "4.4.4",
+    "webpack": "4.46.0",
+    "webpack-cli": "4.10.0",
+    "webpack-merge": "5.9.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0"

diff --git a/experimental/packages/exporter-trace-otlp-grpc/.eslintrc.js b/experimental/packages/exporter-trace-otlp-grpc/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json
@@ -47,7 +47,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.22.6",
+    "@babel/core": "7.22.8",
     "@grpc/proto-loader": "^0.7.3",
     "@opentelemetry/api": "1.4.1",
     "@opentelemetry/otlp-exporter-base": "0.41.0",

diff --git a/experimental/packages/exporter-trace-otlp-http/.eslintrc.js b/experimental/packages/exporter-trace-otlp-http/.eslintrc.js
@@ -5,5 +5,5 @@ module.exports = {
         "node": true,
         "browser": true
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json
@@ -23,7 +23,7 @@
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "tdd:browser": "karma start",
     "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'",
-    "test:browser": "nyc karma start --single-run",
+    "test:browser": "karma start --single-run",
     "version": "node ../../../scripts/version-update.js",
     "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
     "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
@@ -63,7 +63,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.22.6",
+    "@babel/core": "7.22.8",
     "@opentelemetry/api": "1.4.1",
     "@types/mocha": "10.0.1",
     "@types/node": "18.6.5",
@@ -73,10 +73,10 @@
     "codecov": "3.8.3",
     "cpx": "1.5.0",
     "cross-var": "1.1.0",
-    "istanbul-instrumenter-loader": "3.0.1",
+    "babel-plugin-istanbul": "6.1.1",
     "karma": "6.4.2",
     "karma-chrome-launcher": "3.1.0",
-    "karma-coverage-istanbul-reporter": "3.0.3",
+    "karma-coverage": "2.2.1",
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.36",
     "karma-webpack": "4.0.2",

diff --git a/experimental/packages/exporter-trace-otlp-proto/.eslintrc.js b/experimental/packages/exporter-trace-otlp-proto/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json
@@ -21,7 +21,7 @@
     "lint:fix": "eslint . --ext .ts --fix",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'",
-    "test:browser": "nyc karma start --single-run",
+    "test:browser": "karma start --single-run",
     "version": "node ../../../scripts/version-update.js",
     "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
     "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
@@ -62,21 +62,31 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.22.6",
+    "@babel/core": "7.22.8",
     "@opentelemetry/api": "1.4.1",
     "@types/mocha": "10.0.1",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.15",
     "codecov": "3.8.3",
     "cpx": "1.5.0",
     "cross-var": "1.1.0",
+    "babel-plugin-istanbul": "6.1.1",
+    "karma": "6.4.2",
+    "karma-chrome-launcher": "3.1.0",
+    "karma-coverage": "2.2.1",
+    "karma-mocha": "2.0.1",
+    "karma-spec-reporter": "0.0.36",
+    "karma-webpack": "4.0.2",
     "lerna": "7.1.1",
     "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.1.2",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
-    "typescript": "4.4.4"
+    "typescript": "4.4.4",
+    "webpack": "4.46.0",
+    "webpack-cli": "4.10.0",
+    "webpack-merge": "5.9.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0"

diff --git a/experimental/packages/opentelemetry-browser-detector/.eslintrc.js b/experimental/packages/opentelemetry-browser-detector/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json
@@ -14,7 +14,7 @@
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
     "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
-    "test:browser": "nyc karma start --single-run",
+    "test:browser": "karma start --single-run",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "tdd:browser": "karma start",
     "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
@@ -53,20 +53,30 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.22.6",
+    "@babel/core": "7.22.8",
     "@opentelemetry/api": "1.4.1",
     "@types/mocha": "10.0.1",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.15",
     "codecov": "3.8.3",
     "cross-var": "1.1.0",
+    "babel-plugin-istanbul": "6.1.1",
+    "karma": "6.4.2",
+    "karma-chrome-launcher": "3.1.0",
+    "karma-coverage": "2.2.1",
+    "karma-mocha": "2.0.1",
+    "karma-spec-reporter": "0.0.36",
+    "karma-webpack": "4.0.2",
     "lerna": "7.1.1",
     "mocha": "10.2.0",
     "nyc": "15.1.0",
     "sinon": "15.1.2",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
-    "typescript": "4.4.4"
+    "typescript": "4.4.4",
+    "webpack": "4.46.0",
+    "webpack-cli": "4.10.0",
+    "webpack-merge": "5.9.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0"

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/.eslintrc.js b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json
@@ -47,7 +47,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.22.6",
+    "@babel/core": "7.22.8",
     "@grpc/proto-loader": "^0.7.3",
     "@opentelemetry/api": "1.4.1",
     "@types/mocha": "10.0.1",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/.eslintrc.js b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/.eslintrc.js
@@ -5,5 +5,5 @@ module.exports = {
         "node": true,
         "browser": true
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }