Inline fastify types

Author: onurtemizkan

packages/node/package.json

@@ -101,8 +101,7 @@
     "import-in-the-middle": "^1.13.0"
   },
   "devDependencies": {
-    "@types/node": "^18.19.1",
-    "fastify": "4.18.0"
+    "@types/node": "^18.19.1"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",

packages/node/src/integrations/tracing/fastify-v3/instrumentation.ts

@@ -30,9 +30,16 @@ import { SEMATTRS_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
 
 import { AttributeNames, FastifyNames, FastifyTypes } from './enums/AttributeNames';
 
-import type { FastifyErrorCodes, FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
+import type {
+  FastifyErrorCodes,
+  FastifyInstance,
+  FastifyReply,
+  FastifyRequest,
+  HandlerOriginal,
+  HookHandlerDoneFunction,
+  PluginFastifyReply,
+} from './internal-types';
 
-import type { HandlerOriginal, HookHandlerDoneFunction, PluginFastifyReply } from './internal-types';
 import type { FastifyInstrumentationConfig } from './types';
 import { endSpan, safeExecuteInTheMiddleMaybePromise, startSpan } from './utils';
 /** @knipignore */
@@ -99,7 +106,7 @@ export class FastifyInstrumentationV3 extends InstrumentationBase<FastifyInstrum
   private _wrapHandler(
     pluginName: string,
     hookName: string,
-    original: (...args: unknown[]) => Promise<unknown>,
+    original: HandlerOriginal,
     syncFunctionWithDone: boolean,
   ): () => Promise<unknown> {
     const instrumentation = this;
@@ -156,6 +163,7 @@ export class FastifyInstrumentationV3 extends InstrumentationBase<FastifyInstrum
     const instrumentation = this;
     this._diag.debug('Patching fastify server.addHook function');
 
+    // biome-ignore lint/complexity/useArrowFunction: <explanation>
     return function (original: FastifyInstance['addHook']): () => FastifyInstance {
       return function wrappedAddHook(this: any, ...args: any) {
         const name = args[0] as string;

packages/node/src/integrations/tracing/fastify-v3/internal-types.ts

@@ -14,15 +14,49 @@
  * limitations under the License.
  */
 import type { Span } from '@opentelemetry/api';
-import type { FastifyReply } from 'fastify';
 
-export interface HookHandlerDoneFunction {
-  (): void;
+export type FastifyError = any;
+
+export type HookHandlerDoneFunction = <TError extends Error = FastifyError>(err?: TError) => void;
+
+export type FastifyErrorCodes = any;
+
+export type FastifyPlugin = any;
+
+export interface FastifyInstance {
+  pluginName: string;
+  register: (plugin: FastifyPlugin) => void;
+  addHook(
+    name:
+      | 'onRequest'
+      | 'preHandler'
+      | 'preParsing'
+      | 'preValidation'
+      | 'preSerialization'
+      | 'preHandler'
+      | 'onSend'
+      | 'onResponse'
+      | 'onError'
+      | 'onTimeout',
+    handler: HandlerOriginal,
+  ): FastifyInstance;
 }
-// biome-ignore lint/nursery/noUnusedImports:
+
+export interface FastifyReply {
+  send: () => FastifyReply;
+}
+export interface FastifyRequest {
+  routeOptions?: {
+    url?: string;
+  };
+  routerPath?: string;
+}
+
 import type { spanRequestSymbol } from './constants';
 
-export type HandlerOriginal = (() => Promise<unknown>) & (() => void);
+export type HandlerOriginal =
+  | ((request: FastifyRequest, reply: FastifyReply, done: HookHandlerDoneFunction) => Promise<void>)
+  | ((request: FastifyRequest, reply: FastifyReply, done: HookHandlerDoneFunction) => void);
 
 export type PluginFastifyReply = FastifyReply & {
   [spanRequestSymbol]?: Span[];

packages/node/src/integrations/tracing/fastify-v3/utils.ts

@@ -62,6 +62,7 @@ export function endSpan(reply: PluginFastifyReply, err?: any) {
   if (!spans.length) {
     return;
   }
+  // biome-ignore lint/complexity/noForEach: <explanation>
   spans.forEach((span: Span) => {
     if (err) {
       span.setStatus({

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

@@ -13,8 +13,7 @@ import type { IntegrationFn, Span } from '@sentry/core';
 import { generateInstrumentOnce } from '../../otel/instrument';
 import { FastifyInstrumentationV3 } from './fastify-v3/instrumentation';
 
-import type { FastifyInstance } from 'fastify';
-
+import type { FastifyInstance } from './fastify-v3/internal-types';
 /**
  * Minimal request type containing properties around route information.
  * Works for Fastify 3, 4 and 5.