Skip to content

Commit 8c2c582

Browse files
authored
Merge branch 'main' into sqs-batch-receive
2 parents 05104ff + 8b09de9 commit 8c2c582

File tree

29 files changed

+884
-182
lines changed

29 files changed

+884
-182
lines changed

.github/workflows/unit-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656
services:
5757
memcached:
58-
image: memcached:1.6.38-alpine
58+
image: memcached:1.6.39-alpine
5959
ports:
6060
- 11211:11211
6161
mongo:

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"eslint-plugin-header": "3.1.1",
5454
"eslint-plugin-import": "2.27.5",
5555
"eslint-plugin-node": "11.1.0",
56-
"eslint-plugin-prettier": "4.2.1",
56+
"eslint-plugin-prettier": "4.2.5",
5757
"glob": "^10.4.5",
5858
"lerna": "8.2.3",
5959
"lerna-changelog": "2.2.0",

packages/auto-instrumentations-web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"nyc": "17.1.0",
5858
"rimraf": "5.0.10",
5959
"sinon": "15.1.2",
60-
"ts-loader": "9.5.2",
60+
"ts-loader": "9.5.4",
6161
"typescript": "5.0.4",
6262
"webpack": "5.94.0",
6363
"webpack-cli": "5.1.4",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"nyc": "17.1.0",
7474
"rimraf": "5.0.10",
7575
"sinon": "15.1.2",
76-
"ts-loader": "9.5.2",
76+
"ts-loader": "9.5.4",
7777
"typescript": "5.0.4",
7878
"webpack": "5.94.0",
7979
"webpack-cli": "5.1.4",

packages/instrumentation-aws-lambda/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"dependencies": {
6363
"@opentelemetry/instrumentation": "^0.203.0",
6464
"@opentelemetry/semantic-conventions": "^1.27.0",
65-
"@types/aws-lambda": "8.10.150"
65+
"@types/aws-lambda": "8.10.152"
6666
},
6767
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-aws-lambda#readme"
6868
}

packages/instrumentation-aws-sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"@opentelemetry/api": "^1.3.0",
6666
"@opentelemetry/contrib-test-utils": "^0.49.0",
6767
"@opentelemetry/sdk-trace-base": "^2.0.0",
68-
"@smithy/node-http-handler": "4.1.0",
68+
"@smithy/node-http-handler": "4.1.1",
6969
"@types/mocha": "10.0.10",
7070
"@types/node": "18.18.14",
7171
"@types/sinon": "17.0.4",

packages/instrumentation-long-task/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"nyc": "17.1.0",
7474
"rimraf": "5.0.10",
7575
"sinon": "15.1.2",
76-
"ts-loader": "9.5.2",
76+
"ts-loader": "9.5.4",
7777
"typescript": "5.0.4",
7878
"webpack": "5.94.0",
7979
"webpack-cli": "5.1.4",

packages/instrumentation-pg/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"@opentelemetry/instrumentation": "^0.203.0",
8080
"@opentelemetry/semantic-conventions": "^1.34.0",
8181
"@opentelemetry/sql-common": "^0.41.0",
82-
"@types/pg": "8.15.4",
82+
"@types/pg": "8.15.5",
8383
"@types/pg-pool": "2.0.6"
8484
},
8585
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-pg#readme"

packages/instrumentation-redis/.tav.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ redis:
44
mode: latest-minors
55
commands: npm run test-v2-v3
66
- versions:
7-
include: '>=4 <5'
7+
include: '>=4 <6'
88
# "4.6.9" was a bad release that accidentally broke node v14 support.
99
exclude: "4.6.9"
1010
mode: latest-minors
11-
commands: npm test
11+
commands: npm run test

0 commit comments

Comments
 (0)