@coralogix/browser 2.8.6 → 2.8.7

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.8.7 (2025-06-30)
+
+### 🩹 Fixes
+
+- Add sessionId to span attr
+- Fix adding network span to global span even when the global span is ended.
+- Handle global span in idle mode.
+
 ## 2.8.6 (2025-06-26)
 
 ### 🧰 Improvements

package/index.esm2.js

@@ -699,9 +699,26 @@ function getUserAgentData() {
 }
 
 var GLOBAL_SPAN_KEY = '__globalSpan__';
+var GLOBAL_SPAN_MAP_KEY = '__globalSpanMap__';
 var CUSTOM_TRACER_KEY = '__customTracer__';
 var CUSTOM_TRACER_IGNORED_INSTRUMENTS = '__customTracerIgnoredInstruments__';
 
+function addGlobalSpanByTraceId(traceId, globalSpan) {
+    var _a;
+    CxGlobal[GLOBAL_SPAN_MAP_KEY] = __assign(__assign({}, (CxGlobal[GLOBAL_SPAN_MAP_KEY] || {})), (_a = {}, _a[traceId] = globalSpan, _a));
+}
+function getGlobalSpanByTraceId(traceId) {
+    var _a;
+    return (_a = CxGlobal[GLOBAL_SPAN_MAP_KEY]) === null || _a === void 0 ? void 0 : _a[traceId];
+}
+function clearGlobalSpanMap() {
+    var globalSpanMap = CxGlobal[GLOBAL_SPAN_MAP_KEY];
+    Object.keys(globalSpanMap || {}).forEach(function (traceId) {
+        var globalSpan = globalSpanMap[traceId];
+        globalSpan === null || globalSpan === void 0 ? void 0 : globalSpan.endSpan();
+    });
+    delete CxGlobal[GLOBAL_SPAN_MAP_KEY];
+}
 function setGlobalSpan(globalSpan) {
     CxGlobal[GLOBAL_SPAN_KEY] = globalSpan;
 }
@@ -724,9 +741,11 @@ function getCustomTracerIgnoredInstruments() {
     return CxGlobal[CUSTOM_TRACER_IGNORED_INSTRUMENTS];
 }
 function shouldAttachSpanToGlobalSpan(instrumentationType) {
+    return getGlobalSpan() && !isInstrumentationIgnored(instrumentationType);
+}
+function isInstrumentationIgnored(instrumentationType) {
     var _a;
-    return (getGlobalSpan() &&
-        !((_a = getCustomTracerIgnoredInstruments()) === null || _a === void 0 ? void 0 : _a.includes(instrumentationType)));
+    return !!((_a = getCustomTracerIgnoredInstruments()) === null || _a === void 0 ? void 0 : _a.includes(instrumentationType));
 }
 function attachChildSpanToGlobalSpan(name) {
     var globalSpan = getGlobalSpan();
@@ -1314,9 +1333,10 @@ var NetworkInstrumentationAttributes = {
 };
 
 function checkAttachingNetworkSpanToGlobalSpan(span) {
-    if (shouldAttachSpanToGlobalSpan(CoralogixEventType.NETWORK_REQUEST)) {
-        var globalSpan = getGlobalSpan();
-        var _a = globalSpan.span.spanContext(), traceId = _a.traceId, globalSpanId = _a.spanId;
+    var activeGlobalSpan = getGlobalSpanByTraceId(span.spanContext().traceId);
+    if (activeGlobalSpan &&
+        !isInstrumentationIgnored(CoralogixEventType.NETWORK_REQUEST)) {
+        var _a = activeGlobalSpan.span.spanContext(), traceId = _a.traceId, globalSpanId = _a.spanId;
         span['_spanContext'].traceId = traceId;
         span['parentSpanId'] = globalSpanId;
     }
@@ -3825,13 +3845,19 @@ var SessionManager = (function (_super) {
             console.debug('Coralogix Browser SDK - Session expired, clearing session');
         }
         (_a = CxGlobal.sessionStorage) === null || _a === void 0 ? void 0 : _a.setItem(PREV_SESSION_KEY, JSON.stringify(__assign(__assign({}, this.activeSession), { hasRecording: (_b = this.sessionRecorder) === null || _b === void 0 ? void 0 : _b.getSessionHasRecording(), hasScreenshot: (_c = this.sessionRecorder) === null || _c === void 0 ? void 0 : _c.getSessionHasScreenshot() })));
-        clearGlobalSpan();
+        this.clearGlobalSpans();
         this.clearSessionWithErrorMode();
         (_d = getSnapshotManager()) === null || _d === void 0 ? void 0 : _d.resetSnapshot();
         this._currentPageFragment = undefined;
         (_e = this.sessionRecorder) === null || _e === void 0 ? void 0 : _e.stopRecording();
         (_f = CxGlobal.sessionStorage) === null || _f === void 0 ? void 0 : _f.removeItem(SESSION_KEY);
     };
+    SessionManager.prototype.clearGlobalSpans = function () {
+        var _a;
+        (_a = getGlobalSpan()) === null || _a === void 0 ? void 0 : _a.endSpan();
+        clearGlobalSpan();
+        clearGlobalSpanMap();
+    };
     SessionManager.prototype.clearSessionWithErrorMode = function () {
         this.sessionHasError = false;
         this.cachedLogsSent = false;
@@ -4014,7 +4040,7 @@ function resolveUrlBlueprinters(urlBlueprinters) {
     return resolvedUrlBlueprinters;
 }
 
-var SDK_VERSION = '2.8.6';
+var SDK_VERSION = '2.8.7';
 
 function shouldDropEvent(cxRumEvent, options) {
     if (isDocumentErrorWithoutMessage(cxRumEvent)) {
@@ -4175,7 +4201,7 @@ var CoralogixSpanMapProcessor = (function () {
                     traceId: traceId,
                     parentSpanId: parentSpanId,
                     name: name,
-                    attributes: __assign(__assign({}, flattenAttributes(attributes)), this.resolveLabels(cxSpan.text.cx_rum)),
+                    attributes: __assign(__assign(__assign({}, flattenAttributes(attributes)), this.resolveLabels(cxSpan.text.cx_rum)), { sessionId: sessionId }),
                     startTime: startTime,
                     endTime: endTime,
                     status: severity === CoralogixLogSeverity.Error
@@ -4731,6 +4757,7 @@ var CoralogixRum = {
                     },
                 };
                 setGlobalSpan(globalSpanModel);
+                addGlobalSpanByTraceId(globalSpan.spanContext().traceId, globalSpanModel);
                 return globalSpanModel;
             },
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coralogix/browser",
-  "version": "2.8.6",
+  "version": "2.8.7",
   "description": "Official Coralogix SDK for browsers",
   "license": "Apache-2.0",
   "author": "Coralogix",

package/src/custom-spans/custom-spans.consts.d.ts

@@ -1,3 +1,4 @@
 export declare const GLOBAL_SPAN_KEY = "__globalSpan__";
+export declare const GLOBAL_SPAN_MAP_KEY = "__globalSpanMap__";
 export declare const CUSTOM_TRACER_KEY = "__customTracer__";
 export declare const CUSTOM_TRACER_IGNORED_INSTRUMENTS = "__customTracerIgnoredInstruments__";

package/src/custom-spans/custom-spans.utils.d.ts

@@ -1,6 +1,9 @@
 import { CustomTracerIgnoredInstruments, GlobalSpan } from './custom-spans.types';
 import { Tracer } from '@opentelemetry/sdk-trace-base';
 import { Span } from '@opentelemetry/api';
+export declare function addGlobalSpanByTraceId(traceId: string, globalSpan: GlobalSpan): void;
+export declare function getGlobalSpanByTraceId(traceId: string): GlobalSpan | undefined;
+export declare function clearGlobalSpanMap(): void;
 export declare function setGlobalSpan(globalSpan: GlobalSpan): void;
 export declare function getGlobalSpan(): GlobalSpan;
 export declare function clearGlobalSpan(): void;
@@ -10,4 +13,5 @@ export declare function clearCustomTracer(): void;
 export declare function setCustomTracerIgnoredInstruments(ignoredInstruments: CustomTracerIgnoredInstruments[]): void;
 export declare function getCustomTracerIgnoredInstruments(): CustomTracerIgnoredInstruments[];
 export declare function shouldAttachSpanToGlobalSpan(instrumentationType: CustomTracerIgnoredInstruments): boolean;
+export declare function isInstrumentationIgnored(instrumentationType: CustomTracerIgnoredInstruments): boolean;
 export declare function attachChildSpanToGlobalSpan(name: string): Span;

package/src/session/sessionManager.d.ts

@@ -34,6 +34,7 @@ export declare class SessionManager extends SessionIdle {
     private clearSessionWhenIdle;
     private clearPrevSession;
     private clearSession;
+    private clearGlobalSpans;
     private clearSessionWithErrorMode;
     private handleRefreshedSessions;
     private createNewSession;

package/src/version.d.ts

@@ -1 +1 @@
-export declare const SDK_VERSION = "2.8.6";
+export declare const SDK_VERSION = "2.8.7";