Skip to content

Commit

Permalink
Merge branch 'main' into feature/fix-2268
Browse files Browse the repository at this point in the history
  • Loading branch information
johnli-developer committed Aug 16, 2024
2 parents 1289068 + b169191 commit 434e9bd
Show file tree
Hide file tree
Showing 64 changed files with 1,224 additions and 1,756 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: |
npm ci
- uses: googleapis/release-please-action@f3969c04a4ec81d7a9aa4010d84ae6a7602f86a7 # v4.1.1
- uses: googleapis/release-please-action@7987652d64b4581673a76e33ad5e98e3dd56832f # v4.1.3
id: release
with:
token: ${{secrets.RELEASE_PR_TOKEN}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
services:
memcached:
image: memcached:1.6.21-alpine
image: memcached:1.6.29-alpine
ports:
- 11211:11211
mongo:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
"@opentelemetry/contrib-test-utils": "^0.40.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.20",
"mocha": "7.2.0",
"nock": "13.3.3",
"nyc": "15.1.0",
"rimraf": "5.0.5",
"rimraf": "5.0.10",
"sinon": "15.2.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
"@opentelemetry/contrib-test-utils": "^0.40.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.20",
"mocha": "7.2.0",
"nock": "13.3.3",
"nyc": "15.1.0",
"rimraf": "5.0.5",
"rimraf": "5.0.10",
"sinon": "15.2.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
"@opentelemetry/contrib-test-utils": "^0.40.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.20",
"mocha": "7.2.0",
"nock": "13.3.3",
"nyc": "15.1.0",
"rimraf": "5.0.5",
"rimraf": "5.0.10",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
"@opentelemetry/contrib-test-utils": "^0.40.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.20",
"eslint-plugin-header": "^3.1.1",
"mocha": "7.2.0",
"nock": "13.3.3",
"nyc": "15.1.0",
"rimraf": "5.0.5",
"rimraf": "5.0.10",
"sinon": "15.2.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
"@opentelemetry/contrib-test-utils": "^0.40.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/semver": "7.5.3",
"@types/semver": "7.5.8",
"mocha": "7.2.0",
"nock": "13.3.3",
"nyc": "15.1.0",
"rimraf": "5.0.5",
"rimraf": "5.0.10",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
"@opentelemetry/api": "^1.0.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.20",
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "5.0.5",
"rimraf": "5.0.10",
"sinon": "15.2.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
"@opentelemetry/sdk-node": "^0.52.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/semver": "7.5.3",
"@types/semver": "7.5.8",
"mocha": "7.2.0",
"nock": "13.3.3",
"nyc": "15.1.0",
"rimraf": "5.0.5",
"rimraf": "5.0.10",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
},
Expand Down
2 changes: 1 addition & 1 deletion incubator/opentelemetry-sampler-aws-xray/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@opentelemetry/contrib-test-utils": "^0.35.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.20",
"@typescript-eslint/eslint-plugin": "5.8.1",
"@typescript-eslint/parser": "5.8.1",
"eslint": "8.7.0",
Expand Down
4 changes: 2 additions & 2 deletions metapackages/auto-configuration-propagators/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
"@opentelemetry/api": "^1.4.1",
"@types/mocha": "7.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.20",
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "5.0.5",
"rimraf": "5.0.10",
"sinon": "15.2.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
Expand Down
4 changes: 2 additions & 2 deletions metapackages/auto-instrumentations-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
"@opentelemetry/api": "^1.4.1",
"@types/mocha": "7.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.20",
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "5.0.5",
"rimraf": "5.0.10",
"sinon": "15.2.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
Expand Down
6 changes: 3 additions & 3 deletions metapackages/auto-instrumentations-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,21 @@
"@opentelemetry/api": "^1.3.0",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
"@types/sinon": "17.0.3",
"@types/sinon": "10.0.20",
"@types/webpack-env": "1.16.3",
"assert": "2.0.0",
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "6.1.1",
"cross-var": "1.1.0",
"karma": "6.4.3",
"karma": "6.4.4",
"karma-chrome-launcher": "3.1.0",
"karma-coverage": "2.2.1",
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "5.0.1",
"mocha": "10.2.0",
"nyc": "15.1.0",
"rimraf": "5.0.5",
"rimraf": "5.0.10",
"sinon": "15.1.2",
"ts-loader": "9.5.1",
"ts-mocha": "10.0.0",
Expand Down
Loading

0 comments on commit 434e9bd

Please sign in to comment.