Bump @fastify/otel to 0.6.0

Author: onurtemizkan

packages/node/package.json

@@ -65,7 +65,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@fastify/otel": "onurtemizkan/otel#fastify-types",
+    "@fastify/otel": "0.6.0",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/context-async-hooks": "^1.30.1",
     "@opentelemetry/core": "^1.30.1",
@@ -101,8 +101,7 @@
     "import-in-the-middle": "^1.13.0"
   },
   "devDependencies": {
-    "@types/node": "^18.19.1",
-    "fastify": "^5.3.1"
+    "@types/node": "^18.19.1"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",

packages/node/rollup.npm.config.mjs

@@ -37,7 +37,6 @@ export default [
             },
           }),
         ],
-        external: ['fastify'],
       },
     }),
   ),

packages/node/src/integrations/tracing/fastify/index.ts

@@ -1,5 +1,5 @@
-import FastifyOtelInstrumentation from '@fastify/otel';
-import type { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
+import { FastifyOtelInstrumentation } from '@fastify/otel';
+import type { FastifyInstance, FastifyReply, FastifyRequest } from './types';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
@@ -77,7 +77,8 @@ export const instrumentFastify = generateInstrumentOnce(INTEGRATION_NAME, () =>
     });
   });
 
-  return fastifyOtelInstrumentationInstance;
+  // Returning this as any not to deal with the internal types of the FastifyOtelInstrumentation
+  return fastifyOtelInstrumentationInstance as any;
 });
 
 const _fastifyIntegration = (() => {
@@ -207,7 +208,7 @@ function instrumentClient(): void {
 }
 
 function instrumentOnRequest(fastify: FastifyInstance): void {
-  fastify.addHook('onRequest', async (request: FastifyRequest, _reply) => {
+  fastify.addHook('onRequest', async (request: FastifyRequest & { opentelemetry?: () => { span?: Span } }, _reply) => {
     if (request.opentelemetry) {
       const { span } = request.opentelemetry();