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

package/lib/utils/axiosConfig.js

@@ -131,22 +131,31 @@ async function logResponse(ok, responseOrError) {
 const requestStacktraceMap = new Map();
 function initAxiosConfig(axiosInstance) {
     if (!axiosInstance) axiosInstance = axios;
-    axiosInstance.interceptors.request.use((config)=>{
-        const method = (config.method || 'GET').toUpperCase();
-        const url = config.url || '';
-        const cleanedPath = url.split('?')[0].replace(/^\/spark\/p\/app_\w+/, '') || '/';
-        try {
-            const span = observable.startSpan(`${method} ${cleanedPath}`);
-            if (span) {
-                const traceInfo = `${span.spanContext().traceId}-${span.spanContext().spanId}`;
-                config.headers["X-Tt-TraceInfo"] = traceInfo;
-                config.__span = span;
+    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;
+                    }
+                }
+            } catch (error) {
+                console.error('Trace start failed:', error);
             }
-        } catch (error) {
-            console.error('Trace 配置失败:', error);
-        }
-        return config;
-    });
+            return originalRequest.apply(this, arguments);
+        };
+    }
     axiosInstance.interceptors.response.use((response)=>{
         const { __span: span, _startTime: startTime, url = "" } = response.config || {};
         const method = (response.config.method || 'GET').toUpperCase();

package/package.json

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