unnbound-logger-sdk 3.2.1 → 3.2.2

package/dist/axios.d.ts

@@ -21,13 +21,17 @@ interface HttpClientOptions extends HttpOptions<GetPayload> {
     silent?: boolean;
     startSpan?: typeof startSpan;
 }
+type TracedMethod = 'request' | 'get' | 'delete' | 'head' | 'options' | 'post' | 'put' | 'patch';
+type TraceableAxios = Pick<AxiosInstance, 'defaults'> & Record<TracedMethod, (...args: never[]) => object>;
 /**
  * Wraps an axios instance to add tracing and span tracking.
  *
  * Repeated calls for the same instance are no-ops; the first call's options remain active.
+ * Axios 1.20+ types an ESM import and a CommonJS require with separate, mutually unassignable
+ * declarations, so the signature accepts an instance from either and returns the caller's type.
  * @param client - The axios instance to wrap
  * @param options - Configuration options for HTTP tracing
  * @returns The wrapped axios instance with span tracking
  */
-export declare const traceAxios: (client: AxiosInstance, { ignoreTraceRoutes, traceHeaderKey, getPayload, onRequest, redact: redactOptions, silent, startSpan: startSpanImpl, }?: HttpClientOptions) => AxiosInstance;
+export declare function traceAxios<Client extends TraceableAxios>(client: Client, options?: HttpClientOptions): Client;
 export {};

package/dist/axios.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.traceAxios = void 0;
+exports.traceAxios = traceAxios;
 const axios_1 = require("axios");
 const span_1 = require("./span");
 const storage_1 = require("./storage");
@@ -42,45 +42,33 @@ const buildOutgoingHttpPayload = (config, res, redact) => {
 const getNoopPayload = () => ({});
 const onNoopRequest = (config, callback) => callback(config);
 const tracedMarker = Symbol.for('unnbound-logger-sdk.traceAxios.traced');
-/**
- * Wraps an axios instance to add tracing and span tracking.
- *
- * Repeated calls for the same instance are no-ops; the first call's options remain active.
- * @param client - The axios instance to wrap
- * @param options - Configuration options for HTTP tracing
- * @returns The wrapped axios instance with span tracking
- */
-const traceAxios = (client, { ignoreTraceRoutes = types_1.defaultIgnoreTraceRoutes, traceHeaderKey = types_1.defaultTraceHeaderKey, getPayload = getNoopPayload, onRequest = onNoopRequest, redact: redactOptions, silent = false, startSpan: startSpanImpl = span_1.startSpan, } = {
+function traceAxios(client, { ignoreTraceRoutes = types_1.defaultIgnoreTraceRoutes, traceHeaderKey = types_1.defaultTraceHeaderKey, getPayload = getNoopPayload, onRequest = onNoopRequest, redact: redactOptions, silent = false, startSpan: startSpanImpl = span_1.startSpan, } = {
     ignoreTraceRoutes: types_1.defaultIgnoreTraceRoutes,
     traceHeaderKey: types_1.defaultTraceHeaderKey,
     getPayload: getNoopPayload,
     onRequest: onNoopRequest,
-}) => {
+}) {
     if (tracedMarker in client)
         return client;
     const redact = redactOptions === true || redactOptions === false
         ? { request: redactOptions, response: redactOptions }
         : redactOptions;
+    // Axios keeps its response defaults private; proxies preserve the original method signatures.
     const createSpanWrappedRequest = (originalMethod, method) => {
         const { headers: defaultHeaders, ...partialDefaultConfig } = client.defaults;
         const headers = { ...defaultHeaders.common, ...(method && defaultHeaders[method]) };
         const defaultConfig = { ...partialDefaultConfig, headers };
-        return async (config) => {
-            config = (0, axios_1.mergeConfig)(defaultConfig, config);
-            const url = buildUrl(config.baseURL, config.url);
-            // Check if this request should be ignored
-            if ((0, utils_1.shouldIgnorePath)(url, ignoreTraceRoutes))
-                return originalMethod(config);
-            const traceId = storage_1.storage.getStore()?.traceId;
-            config = { ...config, headers: { ...config.headers, [traceHeaderKey]: traceId } };
-            if (silent) {
-                // SAFETY: onRequest returns the originalMethod promise, typed as Axios R
-                return onRequest(config, (config) => originalMethod(config));
-            }
-            // SAFETY: startSpan resolves to the originalMethod promise, typed as Axios R
-            return onRequest(config, (config) => {
-                // Execute the request within a span
-                return startSpanImpl('Outgoing HTTP request', () => originalMethod(config), (options) => {
+        return new Proxy(originalMethod, {
+            async apply(request, _thisArg, [config]) {
+                config = (0, axios_1.mergeConfig)(defaultConfig, config);
+                const url = buildUrl(config.baseURL, config.url);
+                if ((0, utils_1.shouldIgnorePath)(url, ignoreTraceRoutes))
+                    return request(config);
+                const traceId = storage_1.storage.getStore()?.traceId;
+                config = { ...config, headers: { ...config.headers, [traceHeaderKey]: traceId } };
+                if (silent)
+                    return onRequest(config, (config) => request(config));
+                return onRequest(config, (config) => startSpanImpl('Outgoing HTTP request', () => request(config), (options) => {
                     const response = options
                         ? options.error
                             ? (0, axios_1.isAxiosError)(options.error)
@@ -92,22 +80,29 @@ const traceAxios = (client, { ignoreTraceRoutes = types_1.defaultIgnoreTraceRout
                         ...buildOutgoingHttpPayload(config, response, redact),
                         ...getPayload(config, response),
                     };
-                });
-            });
-        };
+                }));
+            },
+        });
     };
     const request = client.request.bind(client);
     const tracedRequest = createSpanWrappedRequest(request);
     client.request = tracedRequest;
     ['post', 'put', 'patch'].forEach((method) => {
         const func = createSpanWrappedRequest(request, method);
-        client[method] = (url, data, config) => func({ ...config, method, url, data });
+        client[method] = new Proxy(client[method], {
+            apply(_target, _thisArg, [url, data, config]) {
+                return func({ ...config, method, url, data });
+            },
+        });
     });
     ['delete', 'get', 'head', 'options'].forEach((method) => {
         const func = createSpanWrappedRequest(request, method);
-        client[method] = (url, config) => func({ ...config, method, url });
+        client[method] = new Proxy(client[method], {
+            apply(_target, _thisArg, [url, config]) {
+                return func({ ...config, method, url });
+            },
+        });
     });
     Object.defineProperty(client, tracedMarker, { value: true });
     return client;
-};
-exports.traceAxios = traceAxios;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unnbound-logger-sdk",
   "description": "A structured logging library with TypeScript support using Pino. Provides consistent, well-typed logging with automatic logId, workflowId, traceId, and deploymentId tracking across operational contexts.",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "keywords": [
@@ -25,7 +25,7 @@
     "url": "https://github.com/unnbounddev/unnbound-sdks/issues"
   },
   "dependencies": {
-    "axios": "1.18.0",
+    "axios": "1.20.0",
     "express": "^4.0.0 || ^5.0.0",
     "pino": "^10.3.1",
     "uuid": "^11.1.1"
@@ -37,7 +37,7 @@
     "vitest": "^4.0.15"
   },
   "peerDependencies": {
-    "axios": "^1.18.0",
+    "axios": "^1.20.0",
     "express": "^4.0.0 || ^5.0.0"
   },
   "peerDependenciesMeta": {
@@ -60,7 +60,7 @@
   "scripts": {
     "build": "tsc",
     "test": "vitest run src",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "tsc --noEmit && tsc -p tsconfig.test.json",
     "format": "oxfmt --write .",
     "format:check": "oxfmt --check .",
     "start:example": "tsx watch examples/node-express.ts",