@devopsplaybook.io/otel-utils-fastify 0.0.1-beta4 → 0.0.1-beta5

package/dist/src/StandardTracerFastify.d.ts

@@ -1,8 +1,3 @@
-import { ConfigInterfaceOTel } from "@devopsplaybook.io/otel-utils";
-import { Span } from "@opentelemetry/sdk-trace-base";
+import { StandardLogger, StandardTracer } from "@devopsplaybook.io/otel-utils";
 import { FastifyInstance } from "fastify";
-export declare function StandardTracerFastifyRegisterHooks(fastify: FastifyInstance, config: ConfigInterfaceOTel): Promise<void>;
-export declare function StandardTracerFastifyInit(fastify: FastifyInstance): void;
-export interface FastifyRequestOTel {
-    span?: Span;
-}
+export declare function StandardTracerFastifyRegisterHooks(fastify: FastifyInstance, standardTracer: StandardTracer, standardLogger: StandardLogger): Promise<void>;

package/dist/src/StandardTracerFastify.js

@@ -1,61 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StandardTracerFastifyRegisterHooks = StandardTracerFastifyRegisterHooks;
-exports.StandardTracerFastifyInit = StandardTracerFastifyInit;
-const otel_utils_1 = require("@devopsplaybook.io/otel-utils");
 const api_1 = require("@opentelemetry/api");
 const core_1 = require("@opentelemetry/core");
 const sdk_node_1 = require("@opentelemetry/sdk-node");
 const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
 const propagator = new core_1.W3CTraceContextPropagator();
-const logger = new otel_utils_1.Logger("StandardTracerFastify");
-async function StandardTracerFastifyRegisterHooks(fastify, config) {
+async function StandardTracerFastifyRegisterHooks(fastify, standardTracer, standardLogger) {
+    const logger = standardLogger.createModuleLogger("Fastify");
     fastify.addHook("onRequest", async (req) => {
         if (req.url.indexOf("/api") !== 0) {
             return;
         }
-        let spanName = `${req.method}-${req.url}`;
-        let urlName = req.url;
-        if (config.OPENTELEMETRY_COLLECTOR_AWS) {
-            spanName = `${config.SERVICE_ID}-${config.VERSION}`;
-            urlName = `${config.SERVICE_ID}-${config.VERSION}-${req.method}-${req.url}`;
-        }
-        const callerContext = propagator.extract(api_1.ROOT_CONTEXT, req.headers, api_1.defaultTextMapGetter);
-        sdk_node_1.api.context.with(callerContext, () => {
-            const span = (0, otel_utils_1.StandardTracerStartSpan)(spanName);
-            span.setAttribute(semantic_conventions_1.ATTR_HTTP_REQUEST_METHOD, req.method);
-            span.setAttribute(semantic_conventions_1.ATTR_URL_PATH, urlName);
-            /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-            req.tracerSpanApi = span;
-        });
-    });
-    fastify.addHook("onResponse", async (req, reply) => {
-        /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-        const span = req.tracerSpanApi;
-        if (reply.statusCode > 299) {
-            span.status.code = api_1.SpanStatusCode.ERROR;
-        }
-        else {
-            span.status.code = api_1.SpanStatusCode.OK;
-        }
-        span.setAttribute(semantic_conventions_1.ATTR_HTTP_RESPONSE_STATUS_CODE, reply.statusCode);
-        span.end();
-    });
-    fastify.addHook("onError", async (req, reply, error) => {
-        /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-        const span = req.tracerSpanApi;
-        span.status.code = api_1.SpanStatusCode.ERROR;
-        span.recordException(error);
-        logger.error(error);
-    });
-}
-function StandardTracerFastifyInit(fastify) {
-    fastify.addHook("onRequest", async (req) => {
         const spanName = `${req.method}-${req.url}`;
         const urlName = req.url;
         const callerContext = propagator.extract(api_1.ROOT_CONTEXT, req.headers, api_1.defaultTextMapGetter);
         sdk_node_1.api.context.with(callerContext, () => {
-            const span = (0, otel_utils_1.StandardTracerStartSpan)(spanName);
+            const span = standardTracer.startSpan(spanName);
             span.setAttribute(semantic_conventions_1.ATTR_HTTP_REQUEST_METHOD, req.method);
             span.setAttribute(semantic_conventions_1.ATTR_URL_PATH, urlName);
             /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
@@ -79,5 +40,6 @@ function StandardTracerFastifyInit(fastify) {
         const span = req.tracerSpanApi;
         span.status.code = api_1.SpanStatusCode.ERROR;
         span.recordException(error);
+        logger.error(error);
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devopsplaybook.io/otel-utils-fastify",
-  "version": "0.0.1-beta4",
+  "version": "0.0.1-beta5",
   "description": "Utility to simplify integration with Open Telemetry for Fastify API Server",
   "keywords": [
     "Open",
@@ -20,14 +20,14 @@
   },
   "dependencies": {
     "fastify": "^5.5.0",
-    "@devopsplaybook.io/otel-utils": "1.0.1-beta4"
+    "@devopsplaybook.io/otel-utils": "1.0.1-beta6"
   },
   "devDependencies": {
     "@eslint/js": "^9.34.0",
     "@types/node": "^24.3.0",
     "@types/sqlite3": "^5.1.0",
     "ts-node": "^10.9.2",
-    "typescript-eslint": "^8.40.0",
+    "typescript-eslint": "^8.41.0",
     "typescript": "^5.9.2"
   },
   "publishConfig": {

package/src/StandardTracerFastify.ts

@@ -1,7 +1,8 @@
 import {
-  ConfigInterfaceOTel,
-  Logger,
-  StandardTracerStartSpan,
+  ConfigOTelInterface,
+  ModuleLogger,
+  StandardLogger,
+  StandardTracer,
 } from "@devopsplaybook.io/otel-utils";
 import {
   defaultTextMapGetter,
@@ -16,33 +17,31 @@ import {
   ATTR_HTTP_RESPONSE_STATUS_CODE,
   ATTR_URL_PATH,
 } from "@opentelemetry/semantic-conventions";
-import { FastifyInstance } from "fastify";
+import { FastifyInstance, FastifyRequest, FastifyReply } from "fastify";
 
 const propagator = new W3CTraceContextPropagator();
-const logger = new Logger("StandardTracerFastify");
 
 export async function StandardTracerFastifyRegisterHooks(
   fastify: FastifyInstance,
-  config: ConfigInterfaceOTel
+  standardTracer: StandardTracer,
+  standardLogger: StandardLogger
 ): Promise<void> {
-  fastify.addHook("onRequest", async (req) => {
+  const logger = standardLogger.createModuleLogger("Fastify");
+
+  fastify.addHook("onRequest", async (req: FastifyRequest) => {
     if (req.url.indexOf("/api") !== 0) {
       return;
     }
 
-    let spanName = `${req.method}-${req.url}`;
-    let urlName = req.url;
-    if (config.OPENTELEMETRY_COLLECTOR_AWS) {
-      spanName = `${config.SERVICE_ID}-${config.VERSION}`;
-      urlName = `${config.SERVICE_ID}-${config.VERSION}-${req.method}-${req.url}`;
-    }
+    const spanName = `${req.method}-${req.url}`;
+    const urlName = req.url;
     const callerContext = propagator.extract(
       ROOT_CONTEXT,
       req.headers,
       defaultTextMapGetter
     );
     api.context.with(callerContext, () => {
-      const span = StandardTracerStartSpan(spanName);
+      const span = standardTracer.startSpan(spanName);
       span.setAttribute(ATTR_HTTP_REQUEST_METHOD, req.method);
       span.setAttribute(ATTR_URL_PATH, urlName);
       /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
@@ -50,65 +49,29 @@ export async function StandardTracerFastifyRegisterHooks(
     });
   });
 
-  fastify.addHook("onResponse", async (req, reply) => {
-    /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-    const span = (req as any).tracerSpanApi as Span;
-    if (reply.statusCode > 299) {
-      span.status.code = SpanStatusCode.ERROR;
-    } else {
-      span.status.code = SpanStatusCode.OK;
+  fastify.addHook(
+    "onResponse",
+    async (req: FastifyRequest, reply: FastifyReply) => {
+      /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+      const span = (req as any).tracerSpanApi as Span;
+      if (reply.statusCode > 299) {
+        span.status.code = SpanStatusCode.ERROR;
+      } else {
+        span.status.code = SpanStatusCode.OK;
+      }
+      span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, reply.statusCode);
+      span.end();
     }
-    span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, reply.statusCode);
-    span.end();
-  });
+  );
 
-  fastify.addHook("onError", async (req, reply, error) => {
-    /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-    const span = (req as any).tracerSpanApi as Span;
-    span.status.code = SpanStatusCode.ERROR;
-    span.recordException(error);
-    logger.error(error);
-  });
-}
-
-export function StandardTracerFastifyInit(fastify: FastifyInstance) {
-  fastify.addHook("onRequest", async (req) => {
-    const spanName = `${req.method}-${req.url}`;
-    const urlName = req.url;
-    const callerContext = propagator.extract(
-      ROOT_CONTEXT,
-      req.headers,
-      defaultTextMapGetter
-    );
-    api.context.with(callerContext, () => {
-      const span = StandardTracerStartSpan(spanName);
-      span.setAttribute(ATTR_HTTP_REQUEST_METHOD, req.method);
-      span.setAttribute(ATTR_URL_PATH, urlName);
+  fastify.addHook(
+    "onError",
+    async (req: FastifyRequest, reply: FastifyReply, error) => {
       /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-      (req as any).tracerSpanApi = span;
-    });
-  });
-
-  fastify.addHook("onResponse", async (req, reply) => {
-    /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-    const span = (req as any).tracerSpanApi as Span;
-    if (reply.statusCode > 299) {
+      const span = (req as any).tracerSpanApi as Span;
       span.status.code = SpanStatusCode.ERROR;
-    } else {
-      span.status.code = SpanStatusCode.OK;
+      span.recordException(error);
+      logger.error(error);
     }
-    span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, reply.statusCode);
-    span.end();
-  });
-
-  fastify.addHook("onError", async (req, reply, error) => {
-    /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-    const span = (req as any).tracerSpanApi as Span;
-    span.status.code = SpanStatusCode.ERROR;
-    span.recordException(error);
-  });
-}
-
-export interface FastifyRequestOTel {
-  span?: Span;
+  );
 }