Skip to content

Commit 0904ae9

Browse files
authored
build: Bump @opentelemetry/instrumentation and relax to ^ (#11905)
As some instrumentation may need higher versions, which we don't want to block there. This shuld be treated more like core etc. Note that deduping this does not really work nicely, sadly, because this is still experimental (`0.x`) so `^0.50.0` will not match `0.51.0` 😞
1 parent 5114e44 commit 0904ae9

File tree

3 files changed

+23
-69
lines changed

3 files changed

+23
-69
lines changed

packages/node/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"@opentelemetry/api": "^1.8.0",
5757
"@opentelemetry/context-async-hooks": "^1.23.0",
5858
"@opentelemetry/core": "^1.23.0",
59-
"@opentelemetry/instrumentation": "0.48.0",
59+
"@opentelemetry/instrumentation": "^0.51.0",
6060
"@opentelemetry/instrumentation-connect": "0.35.0",
6161
"@opentelemetry/instrumentation-express": "0.35.0",
6262
"@opentelemetry/instrumentation-fastify": "0.35.0",

packages/opentelemetry/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"peerDependencies": {
5050
"@opentelemetry/api": "^1.8.0",
5151
"@opentelemetry/core": "^1.23.0",
52-
"@opentelemetry/instrumentation": "0.48.0",
52+
"@opentelemetry/instrumentation": "^0.51.0",
5353
"@opentelemetry/sdk-trace-base": "^1.23.0",
5454
"@opentelemetry/semantic-conventions": "^1.23.0"
5555
},

yarn.lock

Lines changed: 21 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -6322,17 +6322,6 @@
63226322
"@types/pg" "8.6.1"
63236323
"@types/pg-pool" "2.0.4"
63246324

6325-
"@opentelemetry/[email protected]", "@opentelemetry/instrumentation@^0.48.0":
6326-
version "0.48.0"
6327-
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.48.0.tgz#a6dee936e973f1270c464657a55bb570807194aa"
6328-
integrity sha512-sjtZQB5PStIdCw5ovVTDGwnmQC+GGYArJNgIcydrDSqUTdYBnMrN9P4pwQZgS3vTGIp+TU1L8vMXGe51NVmIKQ==
6329-
dependencies:
6330-
"@types/shimmer" "^1.0.2"
6331-
import-in-the-middle "1.7.1"
6332-
require-in-the-middle "^7.1.1"
6333-
semver "^7.5.2"
6334-
shimmer "^1.2.1"
6335-
63366325
"@opentelemetry/[email protected]", "@opentelemetry/instrumentation@^0.50.0":
63376326
version "0.50.0"
63386327
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.50.0.tgz#c558cfc64b84c11d304f31ccdf0de312ec60a2c9"
@@ -6368,6 +6357,17 @@
63686357
semver "^7.5.2"
63696358
shimmer "^1.2.1"
63706359

6360+
"@opentelemetry/instrumentation@^0.48.0":
6361+
version "0.48.0"
6362+
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.48.0.tgz#a6dee936e973f1270c464657a55bb570807194aa"
6363+
integrity sha512-sjtZQB5PStIdCw5ovVTDGwnmQC+GGYArJNgIcydrDSqUTdYBnMrN9P4pwQZgS3vTGIp+TU1L8vMXGe51NVmIKQ==
6364+
dependencies:
6365+
"@types/shimmer" "^1.0.2"
6366+
import-in-the-middle "1.7.1"
6367+
require-in-the-middle "^7.1.1"
6368+
semver "^7.5.2"
6369+
shimmer "^1.2.1"
6370+
63716371
"@opentelemetry/propagation-utils@^0.30.8":
63726372
version "0.30.8"
63736373
resolved "https://registry.yarnpkg.com/@opentelemetry/propagation-utils/-/propagation-utils-0.30.8.tgz#5ae1468250e4f225be98b70aed994586248e2de3"
@@ -8382,17 +8382,8 @@
83828382
dependencies:
83838383
"@types/unist" "*"
83848384

8385-
"@types/history-4@npm:@types/[email protected]":
8386-
version "4.7.8"
8387-
resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
8388-
integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
8389-
8390-
"@types/history-5@npm:@types/[email protected]":
8391-
version "4.7.8"
8392-
resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
8393-
integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
8394-
8395-
"@types/history@*":
8385+
"@types/history-4@npm:@types/[email protected]", "@types/history-5@npm:@types/[email protected]", "@types/history@*":
8386+
name "@types/history-4"
83968387
version "4.7.8"
83978388
resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
83988389
integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
@@ -8756,15 +8747,7 @@
87568747
"@types/history" "^3"
87578748
"@types/react" "*"
87588749

8759-
"@types/react-router-4@npm:@types/[email protected]":
8760-
version "5.1.14"
8761-
resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.14.tgz#e0442f4eb4c446541ad7435d44a97f8fe6df40da"
8762-
integrity sha512-LAJpqYUaCTMT2anZheoidiIymt8MuX286zoVFPM3DVb23aQBH0mAkFvzpd4LKqiolV8bBtZWT5Qp7hClCNDENw==
8763-
dependencies:
8764-
"@types/history" "*"
8765-
"@types/react" "*"
8766-
8767-
"@types/react-router-5@npm:@types/[email protected]":
8750+
"@types/react-router-4@npm:@types/[email protected]", "@types/react-router-5@npm:@types/[email protected]":
87688751
version "5.1.14"
87698752
resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.14.tgz#e0442f4eb4c446541ad7435d44a97f8fe6df40da"
87708753
integrity sha512-LAJpqYUaCTMT2anZheoidiIymt8MuX286zoVFPM3DVb23aQBH0mAkFvzpd4LKqiolV8bBtZWT5Qp7hClCNDENw==
@@ -25793,7 +25776,8 @@ react-is@^18.0.0:
2579325776
dependencies:
2579425777
"@remix-run/router" "1.0.2"
2579525778

25796-
"react-router-6@npm:[email protected]":
25779+
"react-router-6@npm:[email protected]", [email protected]:
25780+
name react-router-6
2579725781
version "6.3.0"
2579825782
resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557"
2579925783
integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==
@@ -25808,13 +25792,6 @@ react-router-dom@^6.2.2:
2580825792
history "^5.2.0"
2580925793
react-router "6.3.0"
2581025794

25811-
25812-
version "6.3.0"
25813-
resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557"
25814-
integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==
25815-
dependencies:
25816-
history "^5.2.0"
25817-
2581825795
react@^18.0.0:
2581925796
version "18.0.0"
2582025797
resolved "https://registry.yarnpkg.com/react/-/react-18.0.0.tgz#b468736d1f4a5891f38585ba8e8fb29f91c3cb96"
@@ -28050,7 +28027,8 @@ string-template@~0.2.1:
2805028027
resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
2805128028
integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
2805228029

28053-
"string-width-cjs@npm:string-width@^4.2.0":
28030+
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
28031+
name string-width-cjs
2805428032
version "4.2.3"
2805528033
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
2805628034
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -28076,15 +28054,6 @@ string-width@^2.1.0:
2807628054
is-fullwidth-code-point "^2.0.0"
2807728055
strip-ansi "^4.0.0"
2807828056

28079-
string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
28080-
version "4.2.3"
28081-
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
28082-
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
28083-
dependencies:
28084-
emoji-regex "^8.0.0"
28085-
is-fullwidth-code-point "^3.0.0"
28086-
strip-ansi "^6.0.1"
28087-
2808828057
string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2:
2808928058
version "5.1.2"
2809028059
resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -28180,14 +28149,7 @@ stringify-object@^3.2.1:
2818028149
is-obj "^1.0.1"
2818128150
is-regexp "^1.0.0"
2818228151

28183-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
28184-
version "6.0.1"
28185-
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
28186-
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
28187-
dependencies:
28188-
ansi-regex "^5.0.1"
28189-
28190-
[email protected], strip-ansi@^6.0.0, strip-ansi@^6.0.1:
28152+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", [email protected], strip-ansi@^6.0.0, strip-ansi@^6.0.1:
2819128153
version "6.0.1"
2819228154
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
2819328155
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -30818,7 +30780,8 @@ workerpool@^6.4.0:
3081830780
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.4.0.tgz#f8d5cfb45fde32fa3b7af72ad617c3369567a462"
3081930781
integrity sha512-i3KR1mQMNwY2wx20ozq2EjISGtQWDIfV56We+yGJ5yDs8jTwQiLLaqHlkBHITlCuJnYlVRmXegxFxZg7gqI++A==
3082030782

30821-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
30783+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
30784+
name wrap-ansi-cjs
3082230785
version "7.0.0"
3082330786
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
3082430787
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -30836,15 +30799,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
3083630799
string-width "^4.1.0"
3083730800
strip-ansi "^6.0.0"
3083830801

30839-
wrap-ansi@^7.0.0:
30840-
version "7.0.0"
30841-
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
30842-
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
30843-
dependencies:
30844-
ansi-styles "^4.0.0"
30845-
string-width "^4.1.0"
30846-
strip-ansi "^6.0.0"
30847-
3084830802
wrap-ansi@^8.1.0:
3084930803
version "8.1.0"
3085030804
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

0 commit comments

Comments
 (0)