Merge branch 'main' into codeboten/rm-logging-references

open-telemetry · Oct 8, 2024 · 17b7da0 · 17b7da0
2 parents cc5d218 + fbeb305
commit 17b7da0
Show file tree

Hide file tree

Showing 66 changed files with 1,304 additions and 197 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -2,17 +2,9 @@ name: "CodeQL Analysis"
 
 on:
   workflow_dispatch:
-  schedule:
-    #        ┌───────────── minute (0 - 59)
-    #        │  ┌───────────── hour (0 - 23)
-    #        │  │ ┌───────────── day of the month (1 - 31)
-    #        │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
-    #        │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
-    #        │  │ │ │ │
-    #        │  │ │ │ │
-    #        │  │ │ │ │
-    #        *  * * * *
-    - cron: '30 1 * * *'
+  push:
+    branches: [ main ]
+  pull_request:
 
 jobs:
   CodeQL-Build:

diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
@@ -42,7 +42,7 @@
     "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/contrib-test-utils": "^0.41.0",
     "@types/mocha": "8.2.3",
-    "@types/node": "18.6.5",
+    "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",
     "mocha": "7.2.0",
     "nock": "13.3.3",

diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json
@@ -41,7 +41,7 @@
     "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/contrib-test-utils": "^0.41.0",
     "@types/mocha": "8.2.3",
-    "@types/node": "18.6.5",
+    "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",
     "mocha": "7.2.0",
     "nock": "13.3.3",

diff --git a/detectors/node/opentelemetry-resource-detector-azure/package.json b/detectors/node/opentelemetry-resource-detector-azure/package.json
@@ -34,7 +34,7 @@
     "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/contrib-test-utils": "^0.41.0",
     "@types/mocha": "8.2.3",
-    "@types/node": "18.6.5",
+    "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",
     "mocha": "7.2.0",
     "nock": "13.3.3",

diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/detectors/node/opentelemetry-resource-detector-container/package.json
@@ -7,7 +7,6 @@
   "repository": "open-telemetry/opentelemetry-js-contrib",
   "scripts": {
     "clean": "rimraf build/*",
-    "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
     "compile": "tsc -p .",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
@@ -36,7 +35,7 @@
     "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/contrib-test-utils": "^0.41.0",
     "@types/mocha": "8.2.3",
-    "@types/node": "18.6.5",
+    "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",
     "eslint-plugin-header": "^3.1.1",
     "mocha": "7.2.0",

diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json
@@ -41,7 +41,7 @@
     "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/contrib-test-utils": "^0.41.0",
     "@types/mocha": "8.2.3",
-    "@types/node": "18.6.5",
+    "@types/node": "18.18.14",
     "@types/semver": "7.5.8",
     "mocha": "7.2.0",
     "nock": "13.3.3",

diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json
@@ -44,7 +44,7 @@
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
     "@types/mocha": "8.2.3",
-    "@types/node": "18.6.5",
+    "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",
     "mocha": "7.2.0",
     "nyc": "15.1.0",

diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json
@@ -41,7 +41,7 @@
     "@opentelemetry/contrib-test-utils": "^0.41.0",
     "@opentelemetry/sdk-node": "^0.53.0",
     "@types/mocha": "8.2.3",
-    "@types/node": "18.6.5",
+    "@types/node": "18.18.14",
     "@types/semver": "7.5.8",
     "mocha": "7.2.0",
     "nock": "13.3.3",

diff --git a/incubator/opentelemetry-sampler-aws-xray/package.json b/incubator/opentelemetry-sampler-aws-xray/package.json
@@ -52,7 +52,7 @@
     "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/contrib-test-utils": "^0.35.0",
     "@types/mocha": "8.2.3",
-    "@types/node": "18.6.5",
+    "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",
     "@typescript-eslint/eslint-plugin": "5.8.1",
     "@typescript-eslint/parser": "5.8.1",

diff --git a/metapackages/auto-configuration-propagators/package.json b/metapackages/auto-configuration-propagators/package.json
@@ -35,7 +35,7 @@
   "devDependencies": {
     "@opentelemetry/api": "^1.4.1",
     "@types/mocha": "7.0.2",
-    "@types/node": "18.6.5",
+    "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",
     "mocha": "7.2.0",
     "nyc": "15.1.0",

diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json
@@ -39,7 +39,7 @@
   "devDependencies": {
     "@opentelemetry/api": "^1.4.1",
     "@types/mocha": "7.0.2",
-    "@types/node": "18.6.5",
+    "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",
     "mocha": "7.2.0",
     "nyc": "15.1.0",

diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json
@@ -39,7 +39,7 @@
     "@babel/preset-env": "7.24.6",
     "@opentelemetry/api": "^1.3.0",
     "@types/mocha": "10.0.6",
-    "@types/node": "18.6.5",
+    "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",
     "@types/webpack-env": "1.16.3",
     "assert": "2.0.0",