o11y 244.7.2 → 244.9.0

package/dist/modules/o11y/client/client.js

@@ -397,37 +397,50 @@ class Tracing {
         }
         return traceHeaders || {};
     }
-    _overrideFetch(instr, logErrors, activityName, useTracing, options, tasker) {
+    _overrideFetch(instr, logErrors, activityName, useTracing, tracingHeadersOptions, tasker) {
         Tracing._originalFetch = Tracing._global.fetch;
-        const o11yFetch = async (url, reqOptions, ...restArgs) => {
+        const o11yFetch = async (resource, options, ...restArgs) => {
             let activity;
             try {
                 tasker === null || tasker === void 0 ? void 0 : tasker.add();
-                const ofo = reqOptions === null || reqOptions === void 0 ? void 0 : reqOptions.o11y;
+                const ofo = options === null || options === void 0 ? void 0 : options.o11y;
                 if (!(ofo === null || ofo === void 0 ? void 0 : ofo.skipInstr)) {
                     activity = instr.startActivity(activityName || defaultActivityNameForFetch);
                 }
                 else {
                     Tracing._reqIndex += 1;
                     try {
-                        if (typeof url === 'string') {
-                            const urlObj = new URL(url);
+                        if (resource instanceof URL) {
+                            resource.searchParams.append('o11y', Tracing._reqIndex.toString());
+                        }
+                        else if (typeof resource === 'string') {
+                            const urlObj = new URL(resource);
                             const kv = `o11y=${Tracing._reqIndex}`;
                             urlObj.search += urlObj.search.startsWith('?') ? `&${kv}` : kv;
-                            url = urlObj.toString();
+                            resource = urlObj.toString();
                         }
                     }
                     catch (_a) { }
                 }
-                if (reqOptions) {
-                    delete reqOptions.o11y;
-                }
+                options === null || options === void 0 ? true : delete options.o11y;
                 if (useTracing) {
-                    reqOptions = reqOptions || {};
-                    const traceHeaders = Tracing._getTraceHeaders(activity, options, reqOptions.method, url === null || url === void 0 ? void 0 : url.toString());
-                    reqOptions.headers = Object.assign(reqOptions.headers || {}, traceHeaders);
+                    let method = options === null || options === void 0 ? void 0 : options.method;
+                    let url = resource === null || resource === void 0 ? void 0 : resource.toString();
+                    if (resource instanceof Request) {
+                        if (!method) {
+                            method = resource.method;
+                        }
+                        url = resource.url;
+                    }
+                    const traceHeaders = Tracing._getTraceHeaders(activity, tracingHeadersOptions, method, url);
+                    if (!this._applyTraceHeaders(resource, options, traceHeaders) &&
+                        options === undefined) {
+                        options = {
+                            headers: traceHeaders
+                        };
+                    }
                 }
-                return await Tracing._originalFetch.call(Tracing._global, url, reqOptions, ...restArgs);
+                return await Tracing._originalFetch.call(Tracing._global, resource, options, ...restArgs);
             }
             catch (ex) {
                 if (logErrors) {
@@ -536,6 +549,37 @@ class Tracing {
     resetRequestCounter() {
         Tracing._reqIndex = 0;
     }
+    _applyTraceHeaders(resource, options, traceHeaders) {
+        if ((options === null || options === void 0 ? void 0 : options.headers) !== undefined) {
+            if (options.headers instanceof Headers && typeof options.headers.set === 'function') {
+                Object.entries(traceHeaders).forEach(([key, value]) => {
+                    options.headers.set(key, value);
+                });
+                return true;
+            }
+            if (Array.isArray(options.headers)) {
+                Object.entries(traceHeaders).forEach((entry) => {
+                    options.headers.push(entry);
+                });
+                return true;
+            }
+            if (typeof options.headers === 'object') {
+                options.headers = Object.assign(options.headers, traceHeaders);
+                return true;
+            }
+        }
+        else if (resource instanceof Request && resource.headers instanceof Headers) {
+            Object.entries(traceHeaders).forEach(([key, value]) => {
+                resource.headers.set(key, value);
+            });
+            return true;
+        }
+        else if (options) {
+            options.headers = Object.assign({}, traceHeaders);
+            return true;
+        }
+        return false;
+    }
 }
 Tracing._global = utility.getGlobal();
 Tracing._isNetworkInstrumentationEnabled = false;
@@ -2098,7 +2142,7 @@ class ConsoleCollector {
     }
 }
 
-const version = '244.7.2';
+const version = '244.9.0';
 
 const idleDetector = new IdleDetectorImpl({
     logThreshold: 300,