Skip to content

Commit

Permalink
Merge branch 'develop' into fix/fetch-not-release
Browse files Browse the repository at this point in the history
  • Loading branch information
Lei-k authored Dec 27, 2024
2 parents 617fcc3 + 4415881 commit 09a0fda
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 30 deletions.
2 changes: 1 addition & 1 deletion packages/aws-serverless/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"dependencies": {
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/instrumentation": "^0.56.0",
"@opentelemetry/instrumentation-aws-lambda": "0.49.0",
"@opentelemetry/instrumentation-aws-lambda": "0.50.0",
"@opentelemetry/instrumentation-aws-sdk": "0.48.0",
"@sentry/core": "8.45.0",
"@sentry/node": "8.45.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@
"@opentelemetry/context-async-hooks": "^1.29.0",
"@opentelemetry/core": "^1.29.0",
"@opentelemetry/instrumentation": "^0.56.0",
"@opentelemetry/instrumentation-amqplib": "^0.45.0",
"@opentelemetry/instrumentation-amqplib": "^0.46.0",
"@opentelemetry/instrumentation-connect": "0.42.0",
"@opentelemetry/instrumentation-dataloader": "0.15.0",
"@opentelemetry/instrumentation-express": "0.46.0",
"@opentelemetry/instrumentation-express": "0.47.0",
"@opentelemetry/instrumentation-fastify": "0.43.0",
"@opentelemetry/instrumentation-fs": "0.18.0",
"@opentelemetry/instrumentation-generic-pool": "0.42.0",
Expand All @@ -87,7 +87,7 @@
"@opentelemetry/instrumentation-mongodb": "0.50.0",
"@opentelemetry/instrumentation-mongoose": "0.45.0",
"@opentelemetry/instrumentation-mysql": "0.44.0",
"@opentelemetry/instrumentation-mysql2": "0.44.0",
"@opentelemetry/instrumentation-mysql2": "0.45.0",
"@opentelemetry/instrumentation-pg": "0.49.0",
"@opentelemetry/instrumentation-redis-4": "0.45.0",
"@opentelemetry/instrumentation-tedious": "0.17.0",
Expand Down
66 changes: 40 additions & 26 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7568,6 +7568,13 @@
dependencies:
"@opentelemetry/api" "^1.3.0"

"@opentelemetry/[email protected]":
version "0.57.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.57.0.tgz#794f9ff6343671f68e228eeb606d416c4ab29653"
integrity sha512-l1aJ30CXeauVYaI+btiynHpw341LthkMTv3omi1VJDX14werY2Wmv9n1yudMsq9HuY0m8PvXEVX4d8zxEb+WRg==
dependencies:
"@opentelemetry/api" "^1.3.0"

"@opentelemetry/[email protected]", "@opentelemetry/api@^1.0.0", "@opentelemetry/api@^1.3.0", "@opentelemetry/api@^1.8", "@opentelemetry/api@^1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.9.0.tgz#d03eba68273dc0f7509e2a3d5cba21eae10379fe"
Expand Down Expand Up @@ -7606,21 +7613,21 @@
"@opentelemetry/context-base" "^0.12.0"
semver "^7.1.3"

"@opentelemetry/instrumentation-amqplib@^0.45.0":
version "0.45.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-amqplib/-/instrumentation-amqplib-0.45.0.tgz#747d72e38ff89266670e730ead90b85b6edc62d3"
integrity sha512-SlKLsOS65NGMIBG1Lh/hLrMDU9WzTUF25apnV6ZmWZB1bBmUwan7qrwwrTu1cL5LzJWCXOdZPuTaxP7pC9qxnQ==
"@opentelemetry/instrumentation-amqplib@^0.46.0":
version "0.46.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-amqplib/-/instrumentation-amqplib-0.46.0.tgz#8b0c61213034780a79c16216c62eee0ce1457ddf"
integrity sha512-04VHHV1KIN/c1wLWwzmLI02d/welgscBJ4BuDqrHaxd+ZIdlVXK9UYQsYf3JwSeF52z/4YoSzr8bfdVBSWoMAg==
dependencies:
"@opentelemetry/core" "^1.8.0"
"@opentelemetry/instrumentation" "^0.56.0"
"@opentelemetry/instrumentation" "^0.57.0"
"@opentelemetry/semantic-conventions" "^1.27.0"

"@opentelemetry/instrumentation-aws-lambda@0.49.0":
version "0.49.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-aws-lambda/-/instrumentation-aws-lambda-0.49.0.tgz#dbc27f899b4c9148b6608f6584673c517bbf439c"
integrity sha512-FIKQSzX/MSzfARqgm7lX9p/QUj7USyicioBYI5BFGuOOoLefxBlJINAcRs3EvCh1taEnJ7/LpbrhlcF7r4Yqvg==
"@opentelemetry/instrumentation-aws-lambda@0.50.0":
version "0.50.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-aws-lambda/-/instrumentation-aws-lambda-0.50.0.tgz#83a196e743d12dc4cbf4a83e874533635bebccde"
integrity sha512-9yKygM6xqVANaV3urc5lW/lWms/AkzlS8TJXnFxNscmQuU4WjxkBX9/kEWJgE5jYvkWqmc0r1s/ZgwGZvyl/rQ==
dependencies:
"@opentelemetry/instrumentation" "^0.56.0"
"@opentelemetry/instrumentation" "^0.57.0"
"@opentelemetry/semantic-conventions" "^1.27.0"
"@types/aws-lambda" "8.10.143"

Expand Down Expand Up @@ -7651,13 +7658,13 @@
dependencies:
"@opentelemetry/instrumentation" "^0.56.0"

"@opentelemetry/instrumentation-express@0.46.0":
version "0.46.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-express/-/instrumentation-express-0.46.0.tgz#8dfbc9dc567e2e864a00a6a7edfbec2dd8482056"
integrity sha512-BCEClDj/HPq/1xYRAlOr6z+OUnbp2eFp18DSrgyQz4IT9pkdYk8eWHnMi9oZSqlC6J5mQzkFmaW5RrKb1GLQhg==
"@opentelemetry/instrumentation-express@0.47.0":
version "0.47.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-express/-/instrumentation-express-0.47.0.tgz#f0477db3b1f4b342beb9ecd08edc26c470566724"
integrity sha512-XFWVx6k0XlU8lu6cBlCa29ONtVt6ADEjmxtyAyeF2+rifk8uBJbk1La0yIVfI0DoKURGbaEDTNelaXG9l/lNNQ==
dependencies:
"@opentelemetry/core" "^1.8.0"
"@opentelemetry/instrumentation" "^0.56.0"
"@opentelemetry/instrumentation" "^0.57.0"
"@opentelemetry/semantic-conventions" "^1.27.0"

"@opentelemetry/[email protected]":
Expand Down Expand Up @@ -7769,12 +7776,12 @@
"@opentelemetry/instrumentation" "^0.56.0"
"@opentelemetry/semantic-conventions" "^1.27.0"

"@opentelemetry/instrumentation-mysql2@0.44.0":
version "0.44.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.44.0.tgz#309d3fa452d4fcb632c4facb68ed7ea74b6738f9"
integrity sha512-e9QY4AGsjGFwmfHd6kBa4yPaQZjAq2FuxMb0BbKlXCAjG+jwqw+sr9xWdJGR60jMsTq52hx3mAlE3dUJ9BipxQ==
"@opentelemetry/instrumentation-mysql2@0.45.0":
version "0.45.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.45.0.tgz#95501759d470dbc7038670e91205e8ed601ec402"
integrity sha512-qLslv/EPuLj0IXFvcE3b0EqhWI8LKmrgRPIa4gUd8DllbBpqJAvLNJSv3cC6vWwovpbSI3bagNO/3Q2SuXv2xA==
dependencies:
"@opentelemetry/instrumentation" "^0.56.0"
"@opentelemetry/instrumentation" "^0.57.0"
"@opentelemetry/semantic-conventions" "^1.27.0"
"@opentelemetry/sql-common" "^0.40.1"

Expand Down Expand Up @@ -7869,6 +7876,18 @@
semver "^7.5.2"
shimmer "^1.2.1"

"@opentelemetry/instrumentation@^0.57.0":
version "0.57.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.57.0.tgz#397d68587abd4d46d2d0ac6b4f2438af49706ff8"
integrity sha512-qIKp+tSCLqofneUWRc5XHtr9jHIq0N0BJfaJamM9gjEFO8sthV4SDXDGNOSAx16PxkbrQJ5/AxMPAGCXl8W/Hg==
dependencies:
"@opentelemetry/api-logs" "0.57.0"
"@types/shimmer" "^1.2.0"
import-in-the-middle "^1.8.1"
require-in-the-middle "^7.1.1"
semver "^7.5.2"
shimmer "^1.2.1"

"@opentelemetry/propagation-utils@^0.30.14":
version "0.30.15"
resolved "https://registry.yarnpkg.com/@opentelemetry/propagation-utils/-/propagation-utils-0.30.15.tgz#cf82691ec728afa6a117d0585da2b75ec7e0459a"
Expand Down Expand Up @@ -9605,16 +9624,11 @@
resolved "https://registry.yarnpkg.com/@types/array.prototype.flat/-/array.prototype.flat-1.2.1.tgz#5433a141730f8e1d7a8e7486458ceb8144ee5edc"
integrity sha512-JOvNJUU/zjfJWcA1aHDnCKHwQjZ7VQ3UNfbcMKXrkQKKyMkJHrQ9vpSVMhgsztrtsbIRJKazMDvg2QggFVwJqw==

"@types/[email protected]":
"@types/[email protected]", "@types/aws-lambda@^8.10.62":
version "8.10.143"
resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-8.10.143.tgz#383693fbaadc6994a71d64a7c09e8c244fad8dff"
integrity sha512-u5vzlcR14ge/4pMTTMDQr3MF0wEe38B2F9o84uC4F43vN5DGTy63npRrB6jQhyt+C0lGv4ZfiRcRkqJoZuPnmg==

"@types/aws-lambda@^8.10.62":
version "8.10.122"
resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-8.10.122.tgz#206c8d71b09325d26a458dba27db842afdc54df1"
integrity sha512-vBkIh9AY22kVOCEKo5CJlyCgmSWvasC+SWUxL/x/vOwRobMpI/HG1xp/Ae3AqmSiZeLUbOhW0FCD3ZjqqUxmXw==

"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14":
version "7.1.19"
resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
Expand Down

0 comments on commit 09a0fda

Please sign in to comment.