@devopsplaybook.io/otel-utils-fastify 1.0.0-beta1 → 1.0.1-beta1

package/dist/src/StandardTracerFastify.d.ts

@@ -1,3 +1,8 @@
 import { StandardLogger, StandardTracer } from "@devopsplaybook.io/otel-utils";
+import { Span } from "@opentelemetry/sdk-trace-base";
 import { FastifyInstance } from "fastify";
-export declare function StandardTracerFastifyRegisterHooks(fastify: FastifyInstance, standardTracer: StandardTracer, standardLogger: StandardLogger): void;
+export declare function StandardTracerFastifyRegisterHooks(fastify: FastifyInstance, standardTracer: StandardTracer, standardLogger: StandardLogger, options?: StandardTracerFastifyRegisterHooksOptions): void;
+export interface StandardTracerFastifyRegisterHooksOptions {
+    rootApiPath?: string;
+}
+export declare function OTelRequestSpan(req: any): Span;

package/dist/src/StandardTracerFastify.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StandardTracerFastifyRegisterHooks = StandardTracerFastifyRegisterHooks;
+exports.OTelRequestSpan = OTelRequestSpan;
 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();
-function StandardTracerFastifyRegisterHooks(fastify, standardTracer, standardLogger) {
+function StandardTracerFastifyRegisterHooks(fastify, standardTracer, standardLogger, options) {
     const logger = standardLogger.createModuleLogger("Fastify");
     fastify.addHook("onRequest", async (req) => {
-        if (req.url.indexOf("/api") !== 0) {
+        if (!req.url.startsWith((options === null || options === void 0 ? void 0 : options.rootApiPath) || "/api")) {
             return;
         }
         const spanName = `${req.method}-${req.url}`;
@@ -43,3 +44,7 @@ function StandardTracerFastifyRegisterHooks(fastify, standardTracer, standardLog
         logger.error(error);
     });
 }
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function OTelRequestSpan(req) {
+    return req.tracerSpanApi;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devopsplaybook.io/otel-utils-fastify",
-  "version": "1.0.0-beta1",
+  "version": "1.0.1-beta1",
   "description": "Utility to simplify integration with Open Telemetry for Fastify API Server",
   "keywords": [
     "Open",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "fastify": "^5.5.0",
-    "@devopsplaybook.io/otel-utils": "1.0.1-beta8"
+    "@devopsplaybook.io/otel-utils": "^1.0.1"
   },
   "devDependencies": {
     "@eslint/js": "^9.34.0",

package/src/StandardTracerFastify.ts

@@ -12,19 +12,20 @@ import {
   ATTR_HTTP_RESPONSE_STATUS_CODE,
   ATTR_URL_PATH,
 } from "@opentelemetry/semantic-conventions";
-import { FastifyInstance, FastifyRequest, FastifyReply } from "fastify";
+import { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
 
 const propagator = new W3CTraceContextPropagator();
 
 export function StandardTracerFastifyRegisterHooks(
   fastify: FastifyInstance,
   standardTracer: StandardTracer,
-  standardLogger: StandardLogger
+  standardLogger: StandardLogger,
+  options?: StandardTracerFastifyRegisterHooksOptions
 ): void {
   const logger = standardLogger.createModuleLogger("Fastify");
 
   fastify.addHook("onRequest", async (req: FastifyRequest) => {
-    if (req.url.indexOf("/api") !== 0) {
+    if (!req.url.startsWith(options?.rootApiPath || "/api")) {
       return;
     }
 
@@ -70,3 +71,12 @@ export function StandardTracerFastifyRegisterHooks(
     }
   );
 }
+
+export interface StandardTracerFastifyRegisterHooksOptions {
+  rootApiPath?: string;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function OTelRequestSpan(req: any): Span {
+  return req.tracerSpanApi;
+}