From e20653bcd6343bd55ac9fccdfe383cb94af019db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luismi=20Rami=CC=81rez?= Date: Mon, 4 Nov 2024 14:46:08 +0100 Subject: [PATCH] Add compatibilify for Fastify v5 Update OpenTelemetry dependencies related to Fastify so apps using Fastify v5 are automatically instrumented. --- .changesets/add-fastify-v5-compatibility.md | 6 ++ package-lock.json | 84 ++++++++++++++------- package.json | 8 +- 3 files changed, 65 insertions(+), 33 deletions(-) create mode 100644 .changesets/add-fastify-v5-compatibility.md diff --git a/.changesets/add-fastify-v5-compatibility.md b/.changesets/add-fastify-v5-compatibility.md new file mode 100644 index 00000000..29d419f6 --- /dev/null +++ b/.changesets/add-fastify-v5-compatibility.md @@ -0,0 +1,6 @@ +--- +bump: patch +type: add +--- + +Add Fastify v5 compatibility diff --git a/package-lock.json b/package-lock.json index ba2d14e0..8cdd5606 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@appsignal/nodejs", - "version": "3.5.0", + "version": "3.5.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@appsignal/nodejs", - "version": "3.5.0", + "version": "3.5.1", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -16,7 +16,7 @@ "@opentelemetry/exporter-metrics-otlp-proto": ">= 0.49.0 < 0.52", "@opentelemetry/instrumentation-amqplib": ">= 0.38.0 < 0.39", "@opentelemetry/instrumentation-express": ">= 0.40.1 < 0.41", - "@opentelemetry/instrumentation-fastify": ">= 0.37.0 < 0.38", + "@opentelemetry/instrumentation-fastify": ">= 0.41.0 < 0.42", "@opentelemetry/instrumentation-graphql": ">= 0.41.0 < 0.42", "@opentelemetry/instrumentation-http": ">= 0.52.0 < 0.53", "@opentelemetry/instrumentation-ioredis": ">= 0.41.0 < 0.42", @@ -32,9 +32,9 @@ "@opentelemetry/instrumentation-redis-4": ">= 0.40.0 < 0.41", "@opentelemetry/instrumentation-restify": ">= 0.39.0 < 0.40", "@opentelemetry/instrumentation-undici": ">= 0.3.0 < 0.5", - "@opentelemetry/sdk-metrics": ">= 1.21.0 <= 1.25.0", - "@opentelemetry/sdk-node": ">= 0.48.0 <= 0.52", - "@opentelemetry/sdk-trace-base": ">= 1.21.0 <= 1.25.0", + "@opentelemetry/sdk-metrics": ">= 1.21.0 <= 1.27.0", + "@opentelemetry/sdk-node": ">= 0.48.0 <= 0.54", + "@opentelemetry/sdk-trace-base": ">= 1.21.0 <= 1.27.0", "@prisma/instrumentation": ">= 5.11.0 < 5.14.0", "node-addon-api": "^3.1.0", "node-gyp": "^10.0.0", @@ -2817,14 +2817,13 @@ } }, "node_modules/@opentelemetry/instrumentation-fastify": { - "version": "0.37.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.37.0.tgz", - "integrity": "sha512-WRjwzNZgupSzbEYvo9s+QuHJRqZJjVdNxSEpGBwWK8RKLlHGwGVAu0gcc2gPamJWUJsGqPGvahAPWM18ZkWj6A==", - "license": "Apache-2.0", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.41.0.tgz", + "integrity": "sha512-pNRjFvf0mvqfJueaeL/qEkuGJwgtE5pgjIHGYwjc2rMViNCrtY9/Sf+Nu8ww6dDd/Oyk2fwZZP7i0XZfCnETrA==", "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.52.0", - "@opentelemetry/semantic-conventions": "^1.22.0" + "@opentelemetry/instrumentation": "^0.54.0", + "@opentelemetry/semantic-conventions": "^1.27.0" }, "engines": { "node": ">=14" @@ -2833,15 +2832,25 @@ "@opentelemetry/api": "^1.3.0" } }, + "node_modules/@opentelemetry/instrumentation-fastify/node_modules/@opentelemetry/api-logs": { + "version": "0.54.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.54.0.tgz", + "integrity": "sha512-9HhEh5GqFrassUndqJsyW7a0PzfyWr2eV2xwzHLIS+wX3125+9HE9FMRAKmJRwxZhgZGwH3HNQQjoMGZqmOeVA==", + "dependencies": { + "@opentelemetry/api": "^1.3.0" + }, + "engines": { + "node": ">=14" + } + }, "node_modules/@opentelemetry/instrumentation-fastify/node_modules/@opentelemetry/instrumentation": { - "version": "0.52.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.52.0.tgz", - "integrity": "sha512-LPwSIrw+60cheWaXsfGL8stBap/AppKQJFE+qqRvzYrgttXFH2ofoIMxWadeqPTq4BYOXM/C7Bdh/T+B60xnlQ==", - "license": "Apache-2.0", + "version": "0.54.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.54.0.tgz", + "integrity": "sha512-B0Ydo9g9ehgNHwtpc97XivEzjz0XBKR6iQ83NTENIxEEf5NHE0otZQuZLgDdey1XNk+bP1cfRpIkSFWM5YlSyg==", "dependencies": { - "@opentelemetry/api-logs": "0.52.0", - "@types/shimmer": "^1.0.2", - "import-in-the-middle": "1.8.0", + "@opentelemetry/api-logs": "0.54.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" @@ -2853,15 +2862,33 @@ "@opentelemetry/api": "^1.3.0" } }, + "node_modules/@opentelemetry/instrumentation-fastify/node_modules/@opentelemetry/semantic-conventions": { + "version": "1.27.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.27.0.tgz", + "integrity": "sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg==", + "engines": { + "node": ">=14" + } + }, + "node_modules/@opentelemetry/instrumentation-fastify/node_modules/import-in-the-middle": { + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.11.2.tgz", + "integrity": "sha512-gK6Rr6EykBcc6cVWRSBR5TWf8nn6hZMYSRYqCcHa0l0d1fPK7JSYo6+Mlmck76jIX9aL/IZ71c06U2VpFwl1zA==", + "dependencies": { + "acorn": "^8.8.2", + "acorn-import-attributes": "^1.9.5", + "cjs-module-lexer": "^1.2.2", + "module-details-from-path": "^1.0.3" + } + }, "node_modules/@opentelemetry/instrumentation-fastify/node_modules/require-in-the-middle": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-7.3.0.tgz", - "integrity": "sha512-nQFEv9gRw6SJAwWD2LrL0NmQvAcO7FBwJbwmr2ttPAacfy0xuiOjE5zt+zM4xDyuyvUaxBi/9gb2SoCyNEVJcw==", - "license": "MIT", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-7.4.0.tgz", + "integrity": "sha512-X34iHADNbNDfr6OTStIAHWSAvvKQRYgLO6duASaVf7J2VA3lvmNYboAHOuLC2huav1IwgZJtyEcJCKVzFxOSMQ==", "dependencies": { - "debug": "^4.1.1", + "debug": "^4.3.5", "module-details-from-path": "^1.0.3", - "resolve": "^1.22.1" + "resolve": "^1.22.8" }, "engines": { "node": ">=8.6.0" @@ -5126,10 +5153,9 @@ } }, "node_modules/@types/shimmer": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.0.5.tgz", - "integrity": "sha512-9Hp0ObzwwO57DpLFF0InUjUm/II8GmKAvzbefxQTihCb7KI6yc9yzf0nLc4mVdby5N4DRCgQM2wCup9KTieeww==", - "license": "MIT" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.2.0.tgz", + "integrity": "sha512-UE7oxhQLLd9gub6JKIAhDq06T0F6FnztwMNRvYgjeQSBeMc1ZG/tA47EwfduvkuQS8apbkM/lpLpWsaCeYsXVg==" }, "node_modules/@types/stack-utils": { "version": "2.0.3", diff --git a/package.json b/package.json index 6b342871..f4ef6717 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@opentelemetry/exporter-metrics-otlp-proto": ">= 0.49.0 < 0.52", "@opentelemetry/instrumentation-amqplib": ">= 0.38.0 < 0.39", "@opentelemetry/instrumentation-express": ">= 0.40.1 < 0.41", - "@opentelemetry/instrumentation-fastify": ">= 0.37.0 < 0.38", + "@opentelemetry/instrumentation-fastify": ">= 0.41.0 < 0.42", "@opentelemetry/instrumentation-graphql": ">= 0.41.0 < 0.42", "@opentelemetry/instrumentation-http": ">= 0.52.0 < 0.53", "@opentelemetry/instrumentation-ioredis": ">= 0.41.0 < 0.42", @@ -34,9 +34,9 @@ "@opentelemetry/instrumentation-redis-4": ">= 0.40.0 < 0.41", "@opentelemetry/instrumentation-restify": ">= 0.39.0 < 0.40", "@opentelemetry/instrumentation-undici": ">= 0.3.0 < 0.5", - "@opentelemetry/sdk-metrics": ">= 1.21.0 <= 1.25.0", - "@opentelemetry/sdk-node": ">= 0.48.0 <= 0.52", - "@opentelemetry/sdk-trace-base": ">= 1.21.0 <= 1.25.0", + "@opentelemetry/sdk-metrics": ">= 1.21.0 <= 1.27.0", + "@opentelemetry/sdk-node": ">= 0.48.0 <= 0.54", + "@opentelemetry/sdk-trace-base": ">= 1.21.0 <= 1.27.0", "@prisma/instrumentation": ">= 5.11.0 < 5.14.0", "node-addon-api": "^3.1.0", "node-gyp": "^10.0.0",