Merge branch 'main' into knex-sqlite3-v2

deejay1 · web-flow · commit 0f3c2ba0f73c · 2025-02-01T17:47:23.000+01:00
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -44,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       memcached:
-        image: memcached:1.6.29-alpine
+        image: memcached:1.6.34-alpine
         ports:
         - 11211:11211
       mongo:
diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json
@@ -53,7 +53,7 @@
     "nyc": "15.1.0",
     "rimraf": "5.0.10",
     "sinon": "15.1.2",
-    "ts-loader": "9.5.1",
+    "ts-loader": "9.5.2",
     "typescript": "4.4.4",
     "webpack": "5.94.0",
     "webpack-cli": "5.1.4",
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json
@@ -69,7 +69,7 @@
     "nyc": "15.1.0",
     "rimraf": "5.0.10",
     "sinon": "15.1.2",
-    "ts-loader": "9.5.1",
+    "ts-loader": "9.5.2",
     "typescript": "4.4.4",
     "webpack": "5.94.0",
     "webpack-cli": "5.1.4",
diff --git a/packages/winston-transport/package.json b/packages/winston-transport/package.json
@@ -40,7 +40,7 @@
     "@types/mocha": "7.0.2",
     "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",
-    "@types/triple-beam": "1.3.2",
+    "@types/triple-beam": "1.3.5",
     "nyc": "15.1.0",
     "rimraf": "5.0.10",
     "sinon": "15.2.0",
diff --git a/plugins/node/instrumentation-dataloader/package.json b/plugins/node/instrumentation-dataloader/package.json
@@ -48,7 +48,7 @@
     "@opentelemetry/sdk-trace-node": "^1.8.0",
     "@types/mocha": "7.0.2",
     "@types/node": "18.18.14",
-    "dataloader": "2.2.2",
+    "dataloader": "2.2.3",
     "nyc": "15.1.0",
     "rimraf": "5.0.10",
     "test-all-versions": "6.1.0",
diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json
@@ -53,7 +53,7 @@
     "@types/mocha": "8.2.3",
     "@types/node": "18.18.14",
     "expect": "29.2.0",
-    "mongoose": "6.13.5",
+    "mongoose": "6.13.8",
     "nyc": "15.1.0",
     "rimraf": "5.0.10",
     "test-all-versions": "6.1.0",
diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json
@@ -58,7 +58,7 @@
   "dependencies": {
     "@opentelemetry/instrumentation": "^0.57.0",
     "@opentelemetry/semantic-conventions": "^1.27.0",
-    "@types/aws-lambda": "8.10.143"
+    "@types/aws-lambda": "8.10.147"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-aws-lambda#readme"
 }
diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json
@@ -62,7 +62,7 @@
   "dependencies": {
     "@opentelemetry/api-logs": "^0.57.0",
     "@opentelemetry/instrumentation": "^0.57.0",
-    "@types/bunyan": "1.8.9"
+    "@types/bunyan": "1.8.11"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-bunyan#readme"
 }
diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json
@@ -57,7 +57,7 @@
     "@opentelemetry/core": "^1.8.0",
     "@opentelemetry/instrumentation": "^0.57.0",
     "@opentelemetry/semantic-conventions": "^1.27.0",
-    "@types/connect": "3.4.36"
+    "@types/connect": "3.4.38"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-connect#readme"
 }
diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json
@@ -43,7 +43,7 @@
     "@opentelemetry/api": "^1.3.0"
   },
   "devDependencies": {
-    "@hapi/hapi": "21.3.10",
+    "@hapi/hapi": "21.3.12",
     "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/context-async-hooks": "^1.8.0",
     "@opentelemetry/contrib-test-utils": "^0.45.0",
diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json
@@ -69,7 +69,7 @@
     "nyc": "15.1.0",
     "rimraf": "5.0.10",
     "sinon": "15.1.2",
-    "ts-loader": "9.5.1",
+    "ts-loader": "9.5.2",
     "typescript": "4.4.4",
     "webpack": "5.94.0",
     "webpack-cli": "5.1.4",
diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json
@@ -54,7 +54,7 @@
     "@opentelemetry/context-zone-peer-dep": "^1.8.0",
     "@opentelemetry/instrumentation-xml-http-request": "^0.57.0",
     "@opentelemetry/sdk-trace-base": "^1.8.0",
-    "@types/jquery": "3.5.30",
+    "@types/jquery": "3.5.32",
     "@types/mocha": "10.0.6",
     "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",
@@ -71,7 +71,7 @@
     "karma-webpack": "5.0.1",
     "nyc": "15.1.0",
     "sinon": "15.1.2",
-    "ts-loader": "9.5.1",
+    "ts-loader": "9.5.2",
     "typescript": "4.4.4",
     "webpack": "5.94.0",
     "webpack-cli": "5.1.4",
diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json
@@ -56,7 +56,7 @@
     "@opentelemetry/sdk-trace-web": "^1.0.0",
     "@types/mocha": "10.0.6",
     "@types/node": "18.18.14",
-    "@types/react": "17.0.80",
+    "@types/react": "17.0.83",
     "@types/react-addons-test-utils": "0.14.26",
     "@types/react-dom": "18.0.2",
     "@types/shimmer": "1.0.3",
@@ -76,7 +76,7 @@
     "react-dom": "17.0.2",
     "rimraf": "5.0.10",
     "sinon": "15.1.2",
-    "ts-loader": "9.5.1",
+    "ts-loader": "9.5.2",
     "typescript": "4.4.4",
     "webpack": "5.94.0",
     "webpack-cli": "5.1.4",
diff --git a/propagators/opentelemetry-propagator-instana/package.json b/propagators/opentelemetry-propagator-instana/package.json
@@ -64,7 +64,7 @@
     "karma-webpack": "5.0.1",
     "nyc": "15.1.0",
     "process": "0.11.10",
-    "ts-loader": "9.5.1",
+    "ts-loader": "9.5.2",
     "typescript": "4.4.4",
     "webpack": "5.94.0",
     "webpack-cli": "5.1.4",
diff --git a/propagators/opentelemetry-propagator-ot-trace/package.json b/propagators/opentelemetry-propagator-ot-trace/package.json
@@ -64,7 +64,7 @@
     "karma-webpack": "5.0.1",
     "nyc": "15.1.0",
     "sinon": "15.1.2",
-    "ts-loader": "9.5.1",
+    "ts-loader": "9.5.2",
     "typescript": "4.4.4",
     "webpack": "5.94.0",
     "webpack-cli": "5.1.4",
diff --git a/propagators/propagator-aws-xray-lambda/package.json b/propagators/propagator-aws-xray-lambda/package.json
@@ -54,7 +54,7 @@
     "lerna": "6.6.2",
     "nyc": "15.1.0",
     "sinon": "15.1.2",
-    "ts-loader": "9.5.1",
+    "ts-loader": "9.5.2",
     "typescript": "4.4.4"
   },
   "dependencies": {
diff --git a/propagators/propagator-aws-xray/package.json b/propagators/propagator-aws-xray/package.json
@@ -70,7 +70,7 @@
     "karma-webpack": "5.0.1",
     "lerna": "6.6.2",
     "nyc": "15.1.0",
-    "ts-loader": "9.5.1",
+    "ts-loader": "9.5.2",
     "typescript": "4.4.4",
     "webpack": "5.95.0",
     "webpack-cli": "5.1.4",

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@`
`58`	`58`	`"dependencies": {`
`59`	`59`	`"@opentelemetry/instrumentation": "^0.57.0",`
`60`	`60`	`"@opentelemetry/semantic-conventions": "^1.27.0",`
`61`		`- "@types/aws-lambda": "8.10.143"`
	`61`	`+ "@types/aws-lambda": "8.10.147"`
`62`	`62`	`},`
`63`	`63`	`"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-aws-lambda#readme"`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@`
`62`	`62`	`"dependencies": {`
`63`	`63`	`"@opentelemetry/api-logs": "^0.57.0",`
`64`	`64`	`"@opentelemetry/instrumentation": "^0.57.0",`
`65`		`- "@types/bunyan": "1.8.9"`
	`65`	`+ "@types/bunyan": "1.8.11"`
`66`	`66`	`},`
`67`	`67`	`"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-bunyan#readme"`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@`
`57`	`57`	`"@opentelemetry/core": "^1.8.0",`
`58`	`58`	`"@opentelemetry/instrumentation": "^0.57.0",`
`59`	`59`	`"@opentelemetry/semantic-conventions": "^1.27.0",`
`60`		`- "@types/connect": "3.4.36"`
	`60`	`+ "@types/connect": "3.4.38"`
`61`	`61`	`},`
`62`	`62`	`"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-connect#readme"`
`63`	`63`	`}`