Merge branch 'main' of github.com:open-telemetry/opentelemetry-js into config-yml

Author: maryliag

CHANGELOG.md

@@ -36,6 +36,7 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2
 * fix(resource): do not trigger `Accessing resource attributes before async attributes settled` warning when detecting resources [#5546](https://github.com/open-telemetry/opentelemetry-js/pull/5546) @dyladan
   * verbose logging of detected resource removed
 * fix(resource): use dynamic import over require to improve ESM compliance [#5298](https://github.com/open-telemetry/opentelemetry-js/pull/5298) @xiaoxiangmoe
+* fix(core): `getNumberFromEnv` should return number | undefined [#5874](https://github.com/open-telemetry/opentelemetry-js/pull/5874) @shubham-vunet
 
 ### :books: Documentation
 

api/package.json

@@ -29,7 +29,7 @@
   "repository": "open-telemetry/opentelemetry-js",
   "scripts": {
     "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
-    "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
+    "precompile": "lerna run version --scope @opentelemetry/api --include-dependencies",
     "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
     "lint:fix": "eslint . --ext .ts --fix",
     "lint": "eslint . --ext .ts",
@@ -79,7 +79,6 @@
     "@types/webpack": "5.28.5",
     "@types/webpack-env": "1.16.3",
     "babel-plugin-istanbul": "7.0.0",
-    "cross-var": "1.1.0",
     "dpdm": "3.13.1",
     "karma": "6.4.4",
     "karma-chrome-launcher": "3.1.0",

api/src/platform/browser/globalThis.ts

@@ -25,7 +25,7 @@
  */
 
 /** only globals that common to node and browsers are allowed */
-// eslint-disable-next-line node/no-unsupported-features/es-builtins, no-undef
+// eslint-disable-next-line n/no-unsupported-features/es-builtins, no-undef
 export const _globalThis: typeof globalThis =
   typeof globalThis === 'object'
     ? globalThis

api/src/platform/node/globalThis.ts

@@ -15,5 +15,5 @@
  */
 
 /** only globals that common to node and browsers are allowed */
-// eslint-disable-next-line node/no-unsupported-features/es-builtins
+// eslint-disable-next-line n/no-unsupported-features/es-builtins
 export const _globalThis = typeof globalThis === 'object' ? globalThis : global;

eslint.base.js

@@ -2,7 +2,7 @@ module.exports = {
   plugins: [
     "@typescript-eslint",
     "header",
-    "node",
+    "n",
     "prettier"
   ],
   extends: ["eslint:recommended", "plugin:prettier/recommended"],
@@ -19,7 +19,7 @@ module.exports = {
     "prefer-rest-params": "off",
     "no-console": "error",
     "no-shadow": "off",
-    "node/no-deprecated-api": ["warn"],
+    "n/no-deprecated-api": ["warn"],
     "header/header": ["error", "block", [{
       pattern: / \* Copyright The OpenTelemetry Authors[\r\n]+ \*[\r\n]+ \* Licensed under the Apache License, Version 2\.0 \(the \"License\"\);[\r\n]+ \* you may not use this file except in compliance with the License\.[\r\n]+ \* You may obtain a copy of the License at[\r\n]+ \*[\r\n]+ \*      https:\/\/www\.apache\.org\/licenses\/LICENSE-2\.0[\r\n]+ \*[\r\n]+ \* Unless required by applicable law or agreed to in writing, software[\r\n]+ \* distributed under the License is distributed on an \"AS IS\" BASIS,[\r\n]+ \* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.[\r\n]+ \* See the License for the specific language governing permissions and[\r\n]+ \* limitations under the License\./gm,
       template:

experimental/CHANGELOG.md

@@ -9,6 +9,10 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2
 ### :boom: Breaking Changes
 
 * feat(api-logs)!: Marked private methods as "conventionally private". [#5789](https://github.com/open-telemetry/opentelemetry-js/pull/5789)
+* feat(exporter-otlp-\*): support custom HTTP agents [#5719](https://github.com/open-telemetry/opentelemetry-js/pull/5719) @raphael-theriault-swi
+  * `OtlpHttpConfiguration.agentOptions` has been removed and functionality has been rolled into `OtlpHttpConfiguration.agentFactory`
+    * (old) `{ agentOptions: myOptions }`
+    * (new) `{ agentFactory: httpAgentFactoryFromOptions(myOptions) }`
 
 ### :rocket: Features
 

experimental/packages/api-logs/package.json

@@ -24,7 +24,7 @@
     "lint:fix": "eslint . --ext .ts --fix",
     "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",
+    "precompile": "lerna run version --scope @opentelemetry/api-logs --include-dependencies",
     "prewatch": "node ../../../scripts/version-update.js",
     "align-api-deps": "node ../../../scripts/align-api-deps.js"
   },
@@ -67,7 +67,6 @@
     "@types/node": "^8.10.66",
     "@types/webpack-env": "1.16.3",
     "babel-plugin-istanbul": "7.0.0",
-    "cross-var": "1.1.0",
     "karma": "6.4.4",
     "karma-chrome-launcher": "3.1.0",
     "karma-coverage": "2.2.1",

experimental/packages/api-logs/src/platform/browser/globalThis.ts

@@ -26,7 +26,7 @@
  */
 
 /** only globals that common to node and browsers are allowed */
-// eslint-disable-next-line node/no-unsupported-features/es-builtins, no-undef
+// eslint-disable-next-line n/no-unsupported-features/es-builtins, no-undef
 export const _globalThis: typeof globalThis =
   typeof globalThis === 'object'
     ? globalThis

experimental/packages/api-logs/src/platform/node/globalThis.ts

@@ -15,5 +15,5 @@
  */
 
 /** only globals that common to node and browsers are allowed */
-// eslint-disable-next-line node/no-unsupported-features/es-builtins
+// eslint-disable-next-line n/no-unsupported-features/es-builtins
 export const _globalThis = typeof globalThis === 'object' ? globalThis : global;

experimental/packages/exporter-logs-otlp-grpc/package.json

@@ -15,7 +15,7 @@
     "test": "nyc mocha 'test/**/*.test.ts'",
     "version": "node ../../../scripts/version-update.js",
     "watch": "tsc --watch --build",
-    "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
+    "precompile": "lerna run version --scope @opentelemetry/exporter-logs-otlp-grpc --include-dependencies",
     "prewatch": "npm run precompile",
     "peer-api-check": "node ../../../scripts/peer-api-check.js",
     "align-api-deps": "node ../../../scripts/align-api-deps.js"
@@ -55,7 +55,6 @@
     "@types/mocha": "10.0.10",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.4",
-    "cross-var": "1.1.0",
     "lerna": "6.6.2",
     "mocha": "11.1.0",
     "nyc": "17.1.0",