@lark-apaas/client-toolkit 1.2.1-alpha.11 → 1.2.1-alpha.13

package/lib/utils/axiosConfig.js

@@ -131,30 +131,74 @@ async function logResponse(ok, responseOrError) {
 const requestStacktraceMap = new Map();
 function initAxiosConfig(axiosInstance) {
     if (!axiosInstance) axiosInstance = axios;
-    if (axiosInstance && !axiosInstance._isTraced) {
-        axiosInstance._isTraced = true;
-        const originalRequest = axiosInstance.request;
-        axiosInstance.request = function(urlOrConfig, config) {
-            try {
-                const finalConfig = 'string' == typeof urlOrConfig ? config = config || {} : urlOrConfig = urlOrConfig || {};
-                const method = (finalConfig.method || 'GET').toUpperCase();
-                const url = finalConfig.url || ('string' == typeof urlOrConfig ? urlOrConfig : '');
-                const cleanedPath = url.split('?')[0].replace(/^\/spark\/p\/app_\w+/, '') || '/';
-                const span = observable.startSpan(`${method} ${cleanedPath}`);
-                if (span) {
-                    const spanContext = span.spanContext();
-                    if (spanContext && spanContext.traceId) {
-                        const traceInfo = `${spanContext.traceId}-${spanContext.spanId}`;
-                        if (!finalConfig.headers) finalConfig.headers = {};
-                        finalConfig.headers['X-Tt-TraceInfo'] = traceInfo;
-                        finalConfig.__span = span;
+    try {
+        if (axiosInstance && !axiosInstance._isTraced) {
+            axiosInstance._isTraced = true;
+            const methodsWithNoData = [
+                'get',
+                'delete',
+                'head',
+                'options'
+            ];
+            const methodsWithData = [
+                'post',
+                'put',
+                'patch',
+                "postForm",
+                "putForm",
+                "patchForm"
+            ];
+            const allMethods = [
+                'request',
+                ...methodsWithNoData,
+                ...methodsWithData
+            ];
+            allMethods.forEach((methodName)=>{
+                const originalMethod = axiosInstance[methodName];
+                if ('function' != typeof originalMethod) return;
+                axiosInstance[methodName] = function() {
+                    const args = Array.prototype.slice.call(arguments);
+                    try {
+                        let config;
+                        let url = '';
+                        let actualMethod = methodName.toUpperCase();
+                        if ('request' === methodName) if ('string' == typeof args[0]) {
+                            url = args[0];
+                            config = args[1] = args[1] || {};
+                        } else {
+                            config = args[0] = args[0] || {};
+                            url = config.url || '';
+                            actualMethod = (config.method || 'GET').toUpperCase();
+                        }
+                        else if (methodsWithNoData.includes(methodName)) {
+                            url = args[0];
+                            config = args[1] = args[1] || {};
+                        } else if (methodsWithData.includes(methodName)) {
+                            url = args[0];
+                            config = args[2] = args[2] || {};
+                        }
+                        if (config && !config.__span) {
+                            const cleanedPath = (url || '').split('?')[0].replace(/^\/spark\/p\/app_\w+/, '') || '/';
+                            const span = observable.startSpan(`${actualMethod} ${cleanedPath}`);
+                            if (span) {
+                                const spanContext = span.spanContext();
+                                if (spanContext && spanContext.traceId) {
+                                    const traceInfo = `${spanContext.traceId}-${spanContext.spanId}`;
+                                    if (!config.headers) config.headers = {};
+                                    config.headers['X-Tt-TraceInfo'] = traceInfo;
+                                    config.__span = span;
+                                }
+                            }
+                        }
+                    } catch (innerError) {
+                        console.error(`Trace wrapper inner error [${methodName}]:`, innerError);
                     }
-                }
-            } catch (error) {
-                console.error('Trace start failed:', error);
-            }
-            return originalRequest.apply(this, arguments);
-        };
+                    return originalMethod.apply(this, args);
+                };
+            });
+        }
+    } catch (e) {
+        console.error('Failed to init axios trace config wrapper:', e);
     }
     axiosInstance.interceptors.response.use((response)=>{
         const { __span: span, _startTime: startTime, url = "" } = response.config || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.1-alpha.11",
+  "version": "1.2.1-alpha.13",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [