Skip to content

Commit f1121ce

Browse files
andreiborzamydea
andauthored
fix(node): Use sentry forked @fastify/otel dependency with pinned Otel v1 deps (#16256)
The `@fastify/otel` instrumentation uses OpenTelemetry v2, but for the time being Sentry only supports OpenTelemetry v1. We forked the library at https://github.com/getsentry/fastify-otel/tree/otel-v1 and downgraded its dependencies to OpenTelemetry v1. For the downgrade work in the fork see: getsentry/fastify-otel@7893f70 **Note**: This also bumps the instrumentation from `0.6.0` to `0.8.0`. Resolves: #16245 --------- Co-authored-by: Francesco Gringl-Novy <[email protected]>
1 parent 5ed5627 commit f1121ce

File tree

2 files changed

+9
-34
lines changed

2 files changed

+9
-34
lines changed

packages/node/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"access": "public"
6666
},
6767
"dependencies": {
68-
"@fastify/otel": "0.6.0",
68+
"@fastify/otel": "getsentry/fastify-otel#otel-v1",
6969
"@opentelemetry/api": "^1.9.0",
7070
"@opentelemetry/context-async-hooks": "^1.30.1",
7171
"@opentelemetry/core": "^1.30.1",

yarn.lock

+8-33
Original file line numberDiff line numberDiff line change
@@ -3912,14 +3912,14 @@
39123912
resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.0.0.tgz#f22824caff3ae506b18207bad4126dbc6ccdb6b8"
39133913
integrity sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==
39143914

3915-
"@fastify/[email protected]":
3916-
version "0.6.0"
3917-
resolved "https://registry.yarnpkg.com/@fastify/otel/-/otel-0.6.0.tgz#f86dfa6711804d0087288d7fadc097b41feea5b1"
3918-
integrity sha512-lL+36KwGcFiAMcsPOLLsR+GV8ZpQuz5RLVstlgqmecTdQLTXVOe9Z8uwpMg9ktPcV++Ugp3dzzpBKNFWWWelYg==
3915+
"@fastify/otel@git+https://github.com/getsentry/fastify-otel.git#otel-v1":
3916+
version "0.8.0"
3917+
resolved "git+https://github.com/getsentry/fastify-otel.git#39826f0b6bb23e82fc83819d96c5440a504ab5bc"
39193918
dependencies:
3920-
"@opentelemetry/core" "^2.0.0"
3921-
"@opentelemetry/instrumentation" "^0.200.0"
3919+
"@opentelemetry/core" "^1.30.1"
3920+
"@opentelemetry/instrumentation" "^0.57.2"
39223921
"@opentelemetry/semantic-conventions" "^1.28.0"
3922+
minimatch "^10.0.1"
39233923

39243924
"@gar/promisify@^1.1.3":
39253925
version "1.1.3"
@@ -5420,13 +5420,6 @@
54205420
dependencies:
54215421
"@octokit/openapi-types" "^18.0.0"
54225422

5423-
"@opentelemetry/[email protected]":
5424-
version "0.200.0"
5425-
resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.200.0.tgz#f9015fd844920c13968715b3cdccf5a4d4ff907e"
5426-
integrity sha512-IKJBQxh91qJ+3ssRly5hYEJ8NDHu9oY/B1PXVSCWf7zytmYO9RNLB0Ox9XQ/fJ8m6gY6Q6NtBWlmXfaXt5Uc4Q==
5427-
dependencies:
5428-
"@opentelemetry/api" "^1.3.0"
5429-
54305423
"@opentelemetry/[email protected]":
54315424
version "0.52.1"
54325425
resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.52.1.tgz#52906375da4d64c206b0c4cb8ffa209214654ecc"
@@ -5458,13 +5451,6 @@
54585451
dependencies:
54595452
"@opentelemetry/semantic-conventions" "1.28.0"
54605453

5461-
"@opentelemetry/core@^2.0.0":
5462-
version "2.0.0"
5463-
resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-2.0.0.tgz#37e9f0e9ddec4479b267aca6f32d88757c941b3a"
5464-
integrity sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ==
5465-
dependencies:
5466-
"@opentelemetry/semantic-conventions" "^1.29.0"
5467-
54685454
"@opentelemetry/instrumentation-amqplib@^0.46.1":
54695455
version "0.46.1"
54705456
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-amqplib/-/instrumentation-amqplib-0.46.1.tgz#7101678488d0e942162ca85c9ac6e93e1f3e0008"
@@ -5695,17 +5681,6 @@
56955681
semver "^7.5.2"
56965682
shimmer "^1.2.1"
56975683

5698-
"@opentelemetry/instrumentation@^0.200.0":
5699-
version "0.200.0"
5700-
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.200.0.tgz#29d1d4f70cbf0cb1ca9f2f78966379b0be96bddc"
5701-
integrity sha512-pmPlzfJd+vvgaZd/reMsC8RWgTXn2WY1OWT5RT42m3aOn5532TozwXNDhg1vzqJ+jnvmkREcdLr27ebJEQt0Jg==
5702-
dependencies:
5703-
"@opentelemetry/api-logs" "0.200.0"
5704-
"@types/shimmer" "^1.2.0"
5705-
import-in-the-middle "^1.8.1"
5706-
require-in-the-middle "^7.1.1"
5707-
shimmer "^1.2.1"
5708-
57095684
"@opentelemetry/instrumentation@^0.52.1":
57105685
version "0.52.1"
57115686
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.52.1.tgz#2e7e46a38bd7afbf03cf688c862b0b43418b7f48"
@@ -5750,7 +5725,7 @@
57505725
resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.28.0.tgz#337fb2bca0453d0726696e745f50064411f646d6"
57515726
integrity sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==
57525727

5753-
"@opentelemetry/semantic-conventions@^1.25.1", "@opentelemetry/semantic-conventions@^1.27.0", "@opentelemetry/semantic-conventions@^1.28.0", "@opentelemetry/semantic-conventions@^1.29.0", "@opentelemetry/semantic-conventions@^1.30.0":
5728+
"@opentelemetry/semantic-conventions@^1.25.1", "@opentelemetry/semantic-conventions@^1.27.0", "@opentelemetry/semantic-conventions@^1.28.0", "@opentelemetry/semantic-conventions@^1.30.0":
57545729
version "1.32.0"
57555730
resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.32.0.tgz#a15e8f78f32388a7e4655e7f539570e40958ca3f"
57565731
integrity sha512-s0OpmpQFSfMrmedAn9Lhg4KWJELHCU6uU9dtIJ28N8UGhf9Y55im5X8fEzwhwDwiSqN+ZPSNrDJF7ivf/AuRPQ==
@@ -20832,7 +20807,7 @@ [email protected], minimatch@^5.0.1, minimatch@^5.1.0:
2083220807
dependencies:
2083320808
brace-expansion "^2.0.1"
2083420809

20835-
minimatch@^10.0.0:
20810+
minimatch@^10.0.0, minimatch@^10.0.1:
2083620811
version "10.0.1"
2083720812
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.1.tgz#ce0521856b453c86e25f2c4c0d03e6ff7ddc440b"
2083820813
integrity sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==

0 commit comments

Comments
 (0)