Skip to content

Commit 0f3c2ba

Browse files
authored
Merge branch 'main' into knex-sqlite3-v2
2 parents 28f9831 + cb0515a commit 0f3c2ba

File tree

18 files changed

+2223
-1843
lines changed

18 files changed

+2223
-1843
lines changed

.github/workflows/unit-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
runs-on: ubuntu-latest
4545
services:
4646
memcached:
47-
image: memcached:1.6.29-alpine
47+
image: memcached:1.6.34-alpine
4848
ports:
4949
- 11211:11211
5050
mongo:

metapackages/auto-instrumentations-web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"nyc": "15.1.0",
5454
"rimraf": "5.0.10",
5555
"sinon": "15.1.2",
56-
"ts-loader": "9.5.1",
56+
"ts-loader": "9.5.2",
5757
"typescript": "4.4.4",
5858
"webpack": "5.94.0",
5959
"webpack-cli": "5.1.4",

package-lock.json

Lines changed: 2204 additions & 1824 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/opentelemetry-id-generator-aws-xray/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"nyc": "15.1.0",
7070
"rimraf": "5.0.10",
7171
"sinon": "15.1.2",
72-
"ts-loader": "9.5.1",
72+
"ts-loader": "9.5.2",
7373
"typescript": "4.4.4",
7474
"webpack": "5.94.0",
7575
"webpack-cli": "5.1.4",

packages/winston-transport/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"@types/mocha": "7.0.2",
4141
"@types/node": "18.18.14",
4242
"@types/sinon": "10.0.20",
43-
"@types/triple-beam": "1.3.2",
43+
"@types/triple-beam": "1.3.5",
4444
"nyc": "15.1.0",
4545
"rimraf": "5.0.10",
4646
"sinon": "15.2.0",

plugins/node/instrumentation-dataloader/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"@opentelemetry/sdk-trace-node": "^1.8.0",
4949
"@types/mocha": "7.0.2",
5050
"@types/node": "18.18.14",
51-
"dataloader": "2.2.2",
51+
"dataloader": "2.2.3",
5252
"nyc": "15.1.0",
5353
"rimraf": "5.0.10",
5454
"test-all-versions": "6.1.0",

plugins/node/instrumentation-mongoose/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"@types/mocha": "8.2.3",
5454
"@types/node": "18.18.14",
5555
"expect": "29.2.0",
56-
"mongoose": "6.13.5",
56+
"mongoose": "6.13.8",
5757
"nyc": "15.1.0",
5858
"rimraf": "5.0.10",
5959
"test-all-versions": "6.1.0",

plugins/node/opentelemetry-instrumentation-aws-lambda/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"dependencies": {
5959
"@opentelemetry/instrumentation": "^0.57.0",
6060
"@opentelemetry/semantic-conventions": "^1.27.0",
61-
"@types/aws-lambda": "8.10.143"
61+
"@types/aws-lambda": "8.10.147"
6262
},
6363
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-aws-lambda#readme"
6464
}

plugins/node/opentelemetry-instrumentation-bunyan/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"dependencies": {
6363
"@opentelemetry/api-logs": "^0.57.0",
6464
"@opentelemetry/instrumentation": "^0.57.0",
65-
"@types/bunyan": "1.8.9"
65+
"@types/bunyan": "1.8.11"
6666
},
6767
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-bunyan#readme"
6868
}

plugins/node/opentelemetry-instrumentation-connect/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"@opentelemetry/core": "^1.8.0",
5858
"@opentelemetry/instrumentation": "^0.57.0",
5959
"@opentelemetry/semantic-conventions": "^1.27.0",
60-
"@types/connect": "3.4.36"
60+
"@types/connect": "3.4.38"
6161
},
6262
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-connect#readme"
6363
}

plugins/node/opentelemetry-instrumentation-hapi/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"@opentelemetry/api": "^1.3.0"
4444
},
4545
"devDependencies": {
46-
"@hapi/hapi": "21.3.10",
46+
"@hapi/hapi": "21.3.12",
4747
"@opentelemetry/api": "^1.3.0",
4848
"@opentelemetry/context-async-hooks": "^1.8.0",
4949
"@opentelemetry/contrib-test-utils": "^0.45.0",

plugins/web/opentelemetry-instrumentation-long-task/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"nyc": "15.1.0",
7070
"rimraf": "5.0.10",
7171
"sinon": "15.1.2",
72-
"ts-loader": "9.5.1",
72+
"ts-loader": "9.5.2",
7373
"typescript": "4.4.4",
7474
"webpack": "5.94.0",
7575
"webpack-cli": "5.1.4",

plugins/web/opentelemetry-instrumentation-user-interaction/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"@opentelemetry/context-zone-peer-dep": "^1.8.0",
5555
"@opentelemetry/instrumentation-xml-http-request": "^0.57.0",
5656
"@opentelemetry/sdk-trace-base": "^1.8.0",
57-
"@types/jquery": "3.5.30",
57+
"@types/jquery": "3.5.32",
5858
"@types/mocha": "10.0.6",
5959
"@types/node": "18.18.14",
6060
"@types/sinon": "10.0.20",
@@ -71,7 +71,7 @@
7171
"karma-webpack": "5.0.1",
7272
"nyc": "15.1.0",
7373
"sinon": "15.1.2",
74-
"ts-loader": "9.5.1",
74+
"ts-loader": "9.5.2",
7575
"typescript": "4.4.4",
7676
"webpack": "5.94.0",
7777
"webpack-cli": "5.1.4",

plugins/web/opentelemetry-plugin-react-load/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"@opentelemetry/sdk-trace-web": "^1.0.0",
5757
"@types/mocha": "10.0.6",
5858
"@types/node": "18.18.14",
59-
"@types/react": "17.0.80",
59+
"@types/react": "17.0.83",
6060
"@types/react-addons-test-utils": "0.14.26",
6161
"@types/react-dom": "18.0.2",
6262
"@types/shimmer": "1.0.3",
@@ -76,7 +76,7 @@
7676
"react-dom": "17.0.2",
7777
"rimraf": "5.0.10",
7878
"sinon": "15.1.2",
79-
"ts-loader": "9.5.1",
79+
"ts-loader": "9.5.2",
8080
"typescript": "4.4.4",
8181
"webpack": "5.94.0",
8282
"webpack-cli": "5.1.4",

propagators/opentelemetry-propagator-instana/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"karma-webpack": "5.0.1",
6565
"nyc": "15.1.0",
6666
"process": "0.11.10",
67-
"ts-loader": "9.5.1",
67+
"ts-loader": "9.5.2",
6868
"typescript": "4.4.4",
6969
"webpack": "5.94.0",
7070
"webpack-cli": "5.1.4",

propagators/opentelemetry-propagator-ot-trace/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"karma-webpack": "5.0.1",
6565
"nyc": "15.1.0",
6666
"sinon": "15.1.2",
67-
"ts-loader": "9.5.1",
67+
"ts-loader": "9.5.2",
6868
"typescript": "4.4.4",
6969
"webpack": "5.94.0",
7070
"webpack-cli": "5.1.4",

propagators/propagator-aws-xray-lambda/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"lerna": "6.6.2",
5555
"nyc": "15.1.0",
5656
"sinon": "15.1.2",
57-
"ts-loader": "9.5.1",
57+
"ts-loader": "9.5.2",
5858
"typescript": "4.4.4"
5959
},
6060
"dependencies": {

propagators/propagator-aws-xray/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"karma-webpack": "5.0.1",
7171
"lerna": "6.6.2",
7272
"nyc": "15.1.0",
73-
"ts-loader": "9.5.1",
73+
"ts-loader": "9.5.2",
7474
"typescript": "4.4.4",
7575
"webpack": "5.95.0",
7676
"webpack-cli": "5.1.4",

0 commit comments

Comments
 (0)