@jennifersoft/jennifer5-instrumentation 5.6.5-1 → 5.6.5

package/dist/index.d.mts

@@ -52,37 +52,4 @@ type GcMetricsCallback = (gcCount: number, gcTime: number, gcCountDelta: number)
  */
 declare function startGcMetricsCollection(intervalMs?: number, callback?: GcMetricsCallback): (() => void) | null;
 
-/**
- * Transaction context that is maintained across async operations
- */
-interface TransactionContext {
-    id: number;
-    enable: boolean;
-}
-/**
- * Manages transaction contexts using AsyncLocalStorage
- */
-declare class TransactionContextManager {
-    private _asyncLocalStorage;
-    constructor();
-    /**
-     * Create a new transaction context
-     */
-    start(): TransactionContext;
-    /**
-     * Run a callback within a transaction context scope
-     * All async operations within this scope will automatically have access to the context
-     */
-    run<T>(ctx: TransactionContext, callback: () => T): T;
-    /**
-     * Get the current transaction context (if any)
-     * This works automatically across async boundaries thanks to AsyncLocalStorage
-     */
-    getCurrentContext(): TransactionContext | undefined;
-}
-declare const contextManager: TransactionContextManager;
-
-type RouteHandler<TRequest extends Request = Request> = (request: TRequest) => Promise<Response> | Response;
-declare function withJenniferNextRouteTx<TRequest extends Request>(handler: RouteHandler<TRequest>): RouteHandler<TRequest>;
-
-export { type GcMetricsCallback, type HeapMetricsCallback, type TransactionContext, TransactionContextManager, contextManager, registerIitmHooks, registerRitmHooks, startGcMetricsCollection, startHeapMetricsCollection, withJenniferNextRouteTx };
+export { type GcMetricsCallback, type HeapMetricsCallback, registerIitmHooks, registerRitmHooks, startGcMetricsCollection, startHeapMetricsCollection };

package/dist/index.d.ts

@@ -52,37 +52,4 @@ type GcMetricsCallback = (gcCount: number, gcTime: number, gcCountDelta: number)
  */
 declare function startGcMetricsCollection(intervalMs?: number, callback?: GcMetricsCallback): (() => void) | null;
 
-/**
- * Transaction context that is maintained across async operations
- */
-interface TransactionContext {
-    id: number;
-    enable: boolean;
-}
-/**
- * Manages transaction contexts using AsyncLocalStorage
- */
-declare class TransactionContextManager {
-    private _asyncLocalStorage;
-    constructor();
-    /**
-     * Create a new transaction context
-     */
-    start(): TransactionContext;
-    /**
-     * Run a callback within a transaction context scope
-     * All async operations within this scope will automatically have access to the context
-     */
-    run<T>(ctx: TransactionContext, callback: () => T): T;
-    /**
-     * Get the current transaction context (if any)
-     * This works automatically across async boundaries thanks to AsyncLocalStorage
-     */
-    getCurrentContext(): TransactionContext | undefined;
-}
-declare const contextManager: TransactionContextManager;
-
-type RouteHandler<TRequest extends Request = Request> = (request: TRequest) => Promise<Response> | Response;
-declare function withJenniferNextRouteTx<TRequest extends Request>(handler: RouteHandler<TRequest>): RouteHandler<TRequest>;
-
-export { type GcMetricsCallback, type HeapMetricsCallback, type TransactionContext, TransactionContextManager, contextManager, registerIitmHooks, registerRitmHooks, startGcMetricsCollection, startHeapMetricsCollection, withJenniferNextRouteTx };
+export { type GcMetricsCallback, type HeapMetricsCallback, registerIitmHooks, registerRitmHooks, startGcMetricsCollection, startHeapMetricsCollection };

package/dist/index.js

@@ -20,13 +20,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  TransactionContextManager: () => TransactionContextManager,
-  contextManager: () => contextManager,
   registerIitmHooks: () => registerIitmHooks,
   registerRitmHooks: () => registerRitmHooks,
   startGcMetricsCollection: () => startGcMetricsCollection,
-  startHeapMetricsCollection: () => startHeapMetricsCollection,
-  withJenniferNextRouteTx: () => withJenniferNextRouteTx
+  startHeapMetricsCollection: () => startHeapMetricsCollection
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -369,8 +366,12 @@ function setNewWmonidCookie(res, txid) {
     httpOnly: (0, import_jennifer5_agent2.configEnableHttpOnlyForWmonidCookie)()
   });
 }
-function getWmonidInCookie(req, res, txid) {
+function getWmonid(req, res, txid) {
   try {
+    if ((0, import_jennifer5_agent2.configUsingRemoteAddressForWmonid)()) {
+      const clientIp = req.socket?.remoteAddress || "";
+      return (0, import_jennifer5_agent2.hashString)(clientIp);
+    }
     const wmonidCookie = getCookie(req, WMONID_COOKIE_NAME);
     if (wmonidCookie) {
       return (0, import_jennifer5_agent2.base64ToI64)(wmonidCookie);
@@ -570,7 +571,7 @@ function handleRequestEvent(server, originalEmit, eventName, args) {
   const [req, res] = args;
   const ctx = contextManager.start();
   if (ctx.enable) {
-    const wmonidInCookie = !(0, import_jennifer5_agent4.configUsingRemoteAddressForWmonid)() ? getWmonidInCookie(req, res, ctx.id) : void 0;
+    const wmonid = getWmonid(req, res, ctx.id);
     const incomingRemotecallInfo = getTopologyInfo(req);
     setTopologyResponseHeaders(incomingRemotecallInfo, res);
     (0, import_jennifer5_agent4.createTransactionCtx)({
@@ -579,7 +580,7 @@ function handleRequestEvent(server, originalEmit, eventName, args) {
       httpHeaders: createHttpHeaders(req),
       httpUrl: req?.url,
       clientIp: req?.socket?.remoteAddress,
-      wmonidInCookie,
+      wmonid,
       incomingRemotecallInfo
     });
     return contextManager.run(ctx, () => {
@@ -3487,61 +3488,10 @@ function startGcMetricsCollection(intervalMs = 1e3, callback) {
   };
   return cleanup;
 }
-
-// src/helpers/nextjs/with-jennifer-route-tx.ts
-var import_jennifer5_agent26 = require("@jennifersoft/jennifer5-agent");
-function toHeaderLines(headers) {
-  const entries = [];
-  headers.forEach((value, key) => {
-    entries.push(`${key}:${value}`);
-  });
-  return entries;
-}
-function resolveHttpUrl(request) {
-  if (request.nextUrl) {
-    return `${request.nextUrl.pathname}${request.nextUrl.search}`;
-  }
-  const parsed = new URL(request.url);
-  return `${parsed.pathname}${parsed.search}`;
-}
-function withJenniferNextRouteTx(handler) {
-  return async function wrappedHandler(request) {
-    const ctx = contextManager.start();
-    const txId = ctx.id;
-    const httpUrl = resolveHttpUrl(request);
-    if (!ctx.enable) {
-      return handler(request);
-    }
-    (0, import_jennifer5_agent26.createTransactionCtx)({
-      txId,
-      method: "next.route",
-      httpMethod: request.method,
-      httpUrl,
-      httpHeaders: toHeaderLines(request.headers)
-    });
-    return contextManager.run(ctx, async () => {
-      try {
-        const response = await handler(request);
-        (0, import_jennifer5_agent26.releaseTransactionCtx)(txId, {
-          httpStatusCode: response.status
-        });
-        return response;
-      } catch (error) {
-        (0, import_jennifer5_agent26.releaseTransactionCtx)(txId, {
-          httpStatusCode: 500
-        });
-        throw error;
-      }
-    });
-  };
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  TransactionContextManager,
-  contextManager,
   registerIitmHooks,
   registerRitmHooks,
   startGcMetricsCollection,
-  startHeapMetricsCollection,
-  withJenniferNextRouteTx
+  startHeapMetricsCollection
 });

package/dist/index.mjs

@@ -5,7 +5,6 @@ import { Hook } from "require-in-the-middle";
 import {
   info,
   warn as warn3,
-  configUsingRemoteAddressForWmonid as configUsingRemoteAddressForWmonid2,
   createTransactionCtx,
   releaseTransactionCtx
 } from "@jennifersoft/jennifer5-agent";
@@ -162,8 +161,10 @@ var contextManager = new TransactionContextManager();
 import {
   i64ToBase64,
   base64ToI64,
+  hashString,
   configEnableHttpOnlyForWmonidCookie,
   configEnableSecureForWmonidCookie,
+  configUsingRemoteAddressForWmonid,
   warn
 } from "@jennifersoft/jennifer5-agent";
 
@@ -349,8 +350,12 @@ function setNewWmonidCookie(res, txid) {
     httpOnly: configEnableHttpOnlyForWmonidCookie()
   });
 }
-function getWmonidInCookie(req, res, txid) {
+function getWmonid(req, res, txid) {
   try {
+    if (configUsingRemoteAddressForWmonid()) {
+      const clientIp = req.socket?.remoteAddress || "";
+      return hashString(clientIp);
+    }
     const wmonidCookie = getCookie(req, WMONID_COOKIE_NAME);
     if (wmonidCookie) {
       return base64ToI64(wmonidCookie);
@@ -558,7 +563,7 @@ function handleRequestEvent(server, originalEmit, eventName, args) {
   const [req, res] = args;
   const ctx = contextManager.start();
   if (ctx.enable) {
-    const wmonidInCookie = !configUsingRemoteAddressForWmonid2() ? getWmonidInCookie(req, res, ctx.id) : void 0;
+    const wmonid = getWmonid(req, res, ctx.id);
     const incomingRemotecallInfo = getTopologyInfo(req);
     setTopologyResponseHeaders(incomingRemotecallInfo, res);
     createTransactionCtx({
@@ -567,7 +572,7 @@ function handleRequestEvent(server, originalEmit, eventName, args) {
       httpHeaders: createHttpHeaders(req),
       httpUrl: req?.url,
       clientIp: req?.socket?.remoteAddress,
-      wmonidInCookie,
+      wmonid,
       incomingRemotecallInfo
     });
     return contextManager.run(ctx, () => {
@@ -3577,60 +3582,9 @@ function startGcMetricsCollection(intervalMs = 1e3, callback) {
   };
   return cleanup;
 }
-
-// src/helpers/nextjs/with-jennifer-route-tx.ts
-import { createTransactionCtx as createTransactionCtx3, releaseTransactionCtx as releaseTransactionCtx4 } from "@jennifersoft/jennifer5-agent";
-function toHeaderLines(headers) {
-  const entries = [];
-  headers.forEach((value, key) => {
-    entries.push(`${key}:${value}`);
-  });
-  return entries;
-}
-function resolveHttpUrl(request) {
-  if (request.nextUrl) {
-    return `${request.nextUrl.pathname}${request.nextUrl.search}`;
-  }
-  const parsed = new URL(request.url);
-  return `${parsed.pathname}${parsed.search}`;
-}
-function withJenniferNextRouteTx(handler) {
-  return async function wrappedHandler(request) {
-    const ctx = contextManager.start();
-    const txId = ctx.id;
-    const httpUrl = resolveHttpUrl(request);
-    if (!ctx.enable) {
-      return handler(request);
-    }
-    createTransactionCtx3({
-      txId,
-      method: "next.route",
-      httpMethod: request.method,
-      httpUrl,
-      httpHeaders: toHeaderLines(request.headers)
-    });
-    return contextManager.run(ctx, async () => {
-      try {
-        const response = await handler(request);
-        releaseTransactionCtx4(txId, {
-          httpStatusCode: response.status
-        });
-        return response;
-      } catch (error) {
-        releaseTransactionCtx4(txId, {
-          httpStatusCode: 500
-        });
-        throw error;
-      }
-    });
-  };
-}
 export {
-  TransactionContextManager,
-  contextManager,
   registerIitmHooks,
   registerRitmHooks,
   startGcMetricsCollection,
-  startHeapMetricsCollection,
-  withJenniferNextRouteTx
+  startHeapMetricsCollection
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jennifersoft/jennifer5-instrumentation",
-  "version": "5.6.5-1",
+  "version": "5.6.5",
   "description": "Instrumentation hooks for Jennifer APM",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -26,8 +26,8 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@jennifersoft/jennifer5-agent": "5.6.5-1",
-    "import-in-the-middle": "3.0.1",
+    "@jennifersoft/jennifer5-agent": "5.6.5",
+    "import-in-the-middle": "3.0.0",
     "require-in-the-middle": "^8.0.1"
   },
   "engines": {