@openobserve/browser-core 0.2.11-rc1 → 0.2.11

package/esm/transport/sendWithRetryStrategy.d.ts

@@ -1,4 +1,4 @@
-import type { TrackType } from '../domain/configuration';
+import type { EndpointType } from '../domain/configuration';
 import type { RawError } from '../domain/error/error.types';
 import type { Payload, HttpResponse } from './httpRequest';
 export declare const MAX_ONGOING_BYTES_COUNT: number;
@@ -19,7 +19,7 @@ export interface RetryState {
     queueFullReported: boolean;
 }
 type SendStrategy = (payload: Payload, onResponse: (r: HttpResponse) => void) => void;
-export declare function sendWithRetryStrategy(payload: Payload, state: RetryState, sendStrategy: SendStrategy, trackType: TrackType, reportError: (error: RawError) => void): void;
+export declare function sendWithRetryStrategy(payload: Payload, state: RetryState, sendStrategy: SendStrategy, endpointType: EndpointType, reportError: (error: RawError) => void): void;
 export declare function newRetryState(): RetryState;
 declare function newPayloadQueue(): {
     bytesCount: number;

package/esm/transport/sendWithRetryStrategy.js

@@ -8,15 +8,15 @@ export var MAX_ONGOING_REQUESTS = 32;
 export var MAX_QUEUE_BYTES_COUNT = 3 * ONE_MEBI_BYTE;
 export var MAX_BACKOFF_TIME = ONE_MINUTE;
 export var INITIAL_BACKOFF_TIME = ONE_SECOND;
-export function sendWithRetryStrategy(payload, state, sendStrategy, trackType, reportError) {
+export function sendWithRetryStrategy(payload, state, sendStrategy, endpointType, reportError) {
     if (state.transportStatus === 0 /* TransportStatus.UP */ &&
         state.queuedPayloads.size() === 0 &&
         state.bandwidthMonitor.canHandle(payload)) {
         send(payload, state, sendStrategy, {
-            onSuccess: function () { return retryQueuedPayloads(0 /* RetryReason.AFTER_SUCCESS */, state, sendStrategy, trackType, reportError); },
+            onSuccess: function () { return retryQueuedPayloads(0 /* RetryReason.AFTER_SUCCESS */, state, sendStrategy, endpointType, reportError); },
             onFailure: function () {
                 state.queuedPayloads.enqueue(payload);
-                scheduleRetry(state, sendStrategy, trackType, reportError);
+                scheduleRetry(state, sendStrategy, endpointType, reportError);
             },
         });
     }
@@ -24,7 +24,7 @@ export function sendWithRetryStrategy(payload, state, sendStrategy, trackType, r
         state.queuedPayloads.enqueue(payload);
     }
 }
-function scheduleRetry(state, sendStrategy, trackType, reportError) {
+function scheduleRetry(state, sendStrategy, endpointType, reportError) {
     if (state.transportStatus !== 2 /* TransportStatus.DOWN */) {
         return;
     }
@@ -34,11 +34,11 @@ function scheduleRetry(state, sendStrategy, trackType, reportError) {
             onSuccess: function () {
                 state.queuedPayloads.dequeue();
                 state.currentBackoffTime = INITIAL_BACKOFF_TIME;
-                retryQueuedPayloads(1 /* RetryReason.AFTER_RESUME */, state, sendStrategy, trackType, reportError);
+                retryQueuedPayloads(1 /* RetryReason.AFTER_RESUME */, state, sendStrategy, endpointType, reportError);
             },
             onFailure: function () {
                 state.currentBackoffTime = Math.min(MAX_BACKOFF_TIME, state.currentBackoffTime * 2);
-                scheduleRetry(state, sendStrategy, trackType, reportError);
+                scheduleRetry(state, sendStrategy, endpointType, reportError);
             },
         });
     }, state.currentBackoffTime);
@@ -64,10 +64,10 @@ function send(payload, state, sendStrategy, _a) {
         }
     });
 }
-function retryQueuedPayloads(reason, state, sendStrategy, trackType, reportError) {
+function retryQueuedPayloads(reason, state, sendStrategy, endpointType, reportError) {
     if (reason === 0 /* RetryReason.AFTER_SUCCESS */ && state.queuedPayloads.isFull() && !state.queueFullReported) {
         reportError({
-            message: "Reached max ".concat(trackType, " events size queued for upload: ").concat(MAX_QUEUE_BYTES_COUNT / ONE_MEBI_BYTE, "MiB"),
+            message: "Reached max ".concat(endpointType, " events size queued for upload: ").concat(MAX_QUEUE_BYTES_COUNT / ONE_MEBI_BYTE, "MiB"),
             source: ErrorSource.AGENT,
             startClocks: clocksNow(),
         });
@@ -76,7 +76,7 @@ function retryQueuedPayloads(reason, state, sendStrategy, trackType, reportError
     var previousQueue = state.queuedPayloads;
     state.queuedPayloads = newPayloadQueue();
     while (previousQueue.size() > 0) {
-        sendWithRetryStrategy(previousQueue.dequeue(), state, sendStrategy, trackType, reportError);
+        sendWithRetryStrategy(previousQueue.dequeue(), state, sendStrategy, endpointType, reportError);
     }
 }
 function shouldRetryRequest(response) {

package/esm/transport/sendWithRetryStrategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"sendWithRetryStrategy.js","sourceRoot":"","sources":["../../src/transport/sendWithRetryStrategy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sendWithRetryStrategy.js","sourceRoot":"","sources":["../../src/transport/sendWithRetryStrategy.ts"],"names":[],"mappings":"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"}

package/esm/transport/startBatchWithReplica.d.ts

@@ -3,18 +3,13 @@ import type { Context } from '../tools/serialisation/context';
 import type { Observable } from '../tools/observable';
 import type { PageExitEvent } from '../browser/pageExitObservable';
 import type { RawError } from '../domain/error/error.types';
-import type { Encoder } from '../tools/encoder';
-export interface BatchConfiguration {
+export declare function startBatchWithReplica<T extends Context>(configuration: Configuration, primary: {
+    endpoint: EndpointBuilder;
+}, replica: {
     endpoint: EndpointBuilder;
-    encoder: Encoder;
-}
-interface ReplicaBatchConfiguration<T> extends BatchConfiguration {
     transformMessage?: (message: T) => T;
-}
-export declare function startBatchWithReplica<T extends Context>(configuration: Configuration, primary: BatchConfiguration, replica: ReplicaBatchConfiguration<T> | undefined, reportError: (error: RawError) => void, pageExitObservable: Observable<PageExitEvent>, sessionExpireObservable: Observable<void>): {
+} | undefined, reportError: (error: RawError) => void, pageExitObservable: Observable<PageExitEvent>, sessionExpireObservable: Observable<void>): {
     flushObservable: Observable<import("./flushController").FlushEvent>;
     add(message: T, replicated?: boolean): void;
     upsert: (message: T, key: string) => void;
-    stop: () => void;
 };
-export {};

package/esm/transport/startBatchWithReplica.js

@@ -2,11 +2,10 @@ import { Batch } from './batch';
 import { createHttpRequest } from './httpRequest';
 import { createFlushController } from './flushController';
 export function startBatchWithReplica(configuration, primary, replica, reportError, pageExitObservable, sessionExpireObservable) {
-    var primaryBatch = createBatch(configuration, primary);
-    var replicaBatch = replica && createBatch(configuration, replica);
-    function createBatch(configuration, _a) {
-        var endpoint = _a.endpoint, encoder = _a.encoder;
-        return new Batch(encoder, createHttpRequest(configuration, endpoint, configuration.batchBytesLimit, reportError), createFlushController({
+    var primaryBatch = createBatch(configuration, primary.endpoint);
+    var replicaBatch = replica && createBatch(configuration, replica.endpoint);
+    function createBatch(configuration, endpointBuilder) {
+        return new Batch(createHttpRequest(configuration, endpointBuilder, configuration.batchBytesLimit, reportError), createFlushController({
             messagesLimit: configuration.batchMessagesLimit,
             bytesLimit: configuration.batchBytesLimit,
             durationLimit: configuration.flushTimeout,
@@ -29,10 +28,6 @@ export function startBatchWithReplica(configuration, primary, replica, reportErr
                 replicaBatch.upsert(replica.transformMessage ? replica.transformMessage(message) : message, key);
             }
         },
-        stop: function () {
-            primaryBatch.stop();
-            replicaBatch === null || replicaBatch === void 0 ? void 0 : replicaBatch.stop();
-        },
     };
 }
 //# sourceMappingURL=startBatchWithReplica.js.map

package/esm/transport/startBatchWithReplica.js.map

@@ -1 +1 @@
-{"version":3,"file":"startBatchWithReplica.js","sourceRoot":"","sources":["../../src/transport/startBatchWithReplica.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAWzD,MAAM,UAAU,qBAAqB,CACnC,aAA4B,EAC5B,OAA2B,EAC3B,OAAiD,EACjD,WAAsC,EACtC,kBAA6C,EAC7C,uBAAyC;IAEzC,IAAM,YAAY,GAAG,WAAW,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;IACxD,IAAM,YAAY,GAAG,OAAO,IAAI,WAAW,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;IAEnE,SAAS,WAAW,CAAC,aAA4B,EAAE,EAAyC;YAAvC,QAAQ,cAAA,EAAE,OAAO,aAAA;QACpE,OAAO,IAAI,KAAK,CACd,OAAO,EACP,iBAAiB,CAAC,aAAa,EAAE,QAAQ,EAAE,aAAa,CAAC,eAAe,EAAE,WAAW,CAAC,EACtF,qBAAqB,CAAC;YACpB,aAAa,EAAE,aAAa,CAAC,kBAAkB;YAC/C,UAAU,EAAE,aAAa,CAAC,eAAe;YACzC,aAAa,EAAE,aAAa,CAAC,YAAY;YACzC,kBAAkB,oBAAA;YAClB,uBAAuB,yBAAA;SACxB,CAAC,EACF,aAAa,CAAC,iBAAiB,CAChC,CAAA;IACH,CAAC;IAED,OAAO;QACL,eAAe,EAAE,YAAY,CAAC,eAAe,CAAC,eAAe;QAE7D,GAAG,YAAC,OAAU,EAAE,UAAiB;YAAjB,2BAAA,EAAA,iBAAiB;YAC/B,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YACzB,IAAI,YAAY,IAAI,UAAU,EAAE,CAAC;gBAC/B,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;YAC1F,CAAC;QACH,CAAC;QAED,MAAM,EAAE,UAAC,OAAU,EAAE,GAAW;YAC9B,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;YACjC,IAAI,YAAY,EAAE,CAAC;gBACjB,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;YAClG,CAAC;QACH,CAAC;QAED,IAAI,EAAE;YACJ,YAAY,CAAC,IAAI,EAAE,CAAA;YACnB,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,IAAI,EAAE,CAAA;QACtB,CAAC;KACF,CAAA;AACH,CAAC"}
+{"version":3,"file":"startBatchWithReplica.js","sourceRoot":"","sources":["../../src/transport/startBatchWithReplica.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAEzD,MAAM,UAAU,qBAAqB,CACnC,aAA4B,EAC5B,OAAsC,EACtC,OAAwF,EACxF,WAAsC,EACtC,kBAA6C,EAC7C,uBAAyC;IAEzC,IAAM,YAAY,GAAG,WAAW,CAAC,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;IACjE,IAAM,YAAY,GAAG,OAAO,IAAI,WAAW,CAAC,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;IAE5E,SAAS,WAAW,CAAC,aAA4B,EAAE,eAAgC;QACjF,OAAO,IAAI,KAAK,CACd,iBAAiB,CAAC,aAAa,EAAE,eAAe,EAAE,aAAa,CAAC,eAAe,EAAE,WAAW,CAAC,EAC7F,qBAAqB,CAAC;YACpB,aAAa,EAAE,aAAa,CAAC,kBAAkB;YAC/C,UAAU,EAAE,aAAa,CAAC,eAAe;YACzC,aAAa,EAAE,aAAa,CAAC,YAAY;YACzC,kBAAkB,oBAAA;YAClB,uBAAuB,yBAAA;SACxB,CAAC,EACF,aAAa,CAAC,iBAAiB,CAChC,CAAA;IACH,CAAC;IAED,OAAO;QACL,eAAe,EAAE,YAAY,CAAC,eAAe,CAAC,eAAe;QAE7D,GAAG,YAAC,OAAU,EAAE,UAAiB;YAAjB,2BAAA,EAAA,iBAAiB;YAC/B,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YACzB,IAAI,YAAY,IAAI,UAAU,EAAE;gBAC9B,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;aACzF;QACH,CAAC;QAED,MAAM,EAAE,UAAC,OAAU,EAAE,GAAW;YAC9B,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;YACjC,IAAI,YAAY,EAAE;gBAChB,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;aACjG;QACH,CAAC;KACF,CAAA;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openobserve/browser-core",
-  "version": "0.2.11-rc1",
+  "version": "0.2.11",
   "license": "Apache-2.0",
   "main": "cjs/index.js",
   "module": "esm/index.js",

package/src/browser/addEventListener.ts

@@ -3,11 +3,7 @@ import { getZoneJsOriginalValue } from '../tools/getZoneJsOriginalValue'
 import type { Configuration } from '../domain/configuration'
 import type { VisualViewport, VisualViewportEventMap } from './types'
 
-export type TrustableEvent<E extends Event = Event> = E & { __ddIsTrusted?: boolean }
-
-// We want to use a real enum (i.e. not a const enum) here, to be able to iterate over it to automatically add _ddIsTrusted in e2e tests
-// eslint-disable-next-line no-restricted-syntax
-export enum DOM_EVENT {
+export const enum DOM_EVENT {
   BEFORE_UNLOAD = 'beforeunload',
   CLICK = 'click',
   DBL_CLICK = 'dblclick',
@@ -41,7 +37,6 @@ export enum DOM_EVENT {
   PAUSE = 'pause',
   SECURITY_POLICY_VIOLATION = 'securitypolicyviolation',
   SELECTION_CHANGE = 'selectionchange',
-  STORAGE = 'storage',
 }
 
 interface AddEventListenerOptions {
@@ -59,23 +54,23 @@ type EventMapFor<T> = T extends Window
       visibilitychange: Event
     }
   : T extends Document
-    ? DocumentEventMap
-    : T extends HTMLElement
-      ? HTMLElementEventMap
-      : T extends VisualViewport
-        ? VisualViewportEventMap
-        : T extends ShadowRoot
-          ? // ShadowRootEventMap is not yet defined in our supported TS version. Instead, use
-            // GlobalEventHandlersEventMap which is more than enough as we only need to listen for events bubbling
-            // through the ShadowRoot like "change" or "input"
-            GlobalEventHandlersEventMap
-          : T extends XMLHttpRequest
-            ? XMLHttpRequestEventMap
-            : T extends Performance
-              ? PerformanceEventMap
-              : T extends Worker
-                ? WorkerEventMap
-                : Record<never, never>
+  ? DocumentEventMap
+  : T extends HTMLElement
+  ? HTMLElementEventMap
+  : T extends VisualViewport
+  ? VisualViewportEventMap
+  : T extends ShadowRoot
+  ? // ShadowRootEventMap is not yet defined in our supported TS version. Instead, use
+    // GlobalEventHandlersEventMap which is more than enough as we only need to listen for events bubbling
+    // through the ShadowRoot like "change" or "input"
+    GlobalEventHandlersEventMap
+  : T extends XMLHttpRequest
+  ? XMLHttpRequestEventMap
+  : T extends Performance
+  ? PerformanceEventMap
+  : T extends Worker
+  ? WorkerEventMap
+  : Record<never, never>
 
 /**
  * Add an event listener to an event target object (Window, Element, mock object...).  This provides
@@ -91,7 +86,7 @@ export function addEventListener<Target extends EventTarget, EventName extends k
   configuration: Configuration,
   eventTarget: Target,
   eventName: EventName,
-  listener: (event: EventMapFor<Target>[EventName] & { type: EventName }) => void,
+  listener: (event: EventMapFor<Target>[EventName]) => void,
   options?: AddEventListenerOptions
 ) {
   return addEventListeners(configuration, eventTarget, [eventName], listener, options)
@@ -110,30 +105,29 @@ export function addEventListener<Target extends EventTarget, EventName extends k
  * * with `once: true`, the listener will be called at most once, even if different events are listened
  */
 export function addEventListeners<Target extends EventTarget, EventName extends keyof EventMapFor<Target> & string>(
-  configuration: Configuration,
+  _: Configuration,
   eventTarget: Target,
   eventNames: EventName[],
-  listener: (event: EventMapFor<Target>[EventName] & { type: EventName }) => void,
+  listener: (event: EventMapFor<Target>[EventName]) => void,
   { once, capture, passive }: AddEventListenerOptions = {}
 ) {
-  const listenerWithMonitor = monitor((event: TrustableEvent) => {
-    if (!event.isTrusted && !event.__ddIsTrusted && !configuration.allowUntrustedEvents) {
-      return
-    }
-    if (once) {
-      stop()
-    }
-    listener(event as unknown as EventMapFor<Target>[EventName] & { type: EventName })
-  })
+  const wrappedListener = monitor(
+    once
+      ? (event: Event) => {
+          stop()
+          listener(event as EventMapFor<Target>[EventName])
+        }
+      : (listener as (event: Event) => void)
+  )
 
   const options = passive ? { capture, passive } : capture
 
   const add = getZoneJsOriginalValue(eventTarget, 'addEventListener')
-  eventNames.forEach((eventName) => add.call(eventTarget, eventName, listenerWithMonitor, options))
+  eventNames.forEach((eventName) => add.call(eventTarget, eventName, wrappedListener, options))
 
   function stop() {
     const remove = getZoneJsOriginalValue(eventTarget, 'removeEventListener')
-    eventNames.forEach((eventName) => remove.call(eventTarget, eventName, listenerWithMonitor, options))
+    eventNames.forEach((eventName) => remove.call(eventTarget, eventName, wrappedListener, options))
   }
 
   return {

package/src/browser/cookie.ts

@@ -1,11 +1,10 @@
 import { display } from '../tools/display'
 import { ONE_MINUTE, ONE_SECOND } from '../tools/utils/timeUtils'
-import { findCommaSeparatedValue, findCommaSeparatedValues, generateUUID } from '../tools/utils/stringUtils'
+import { findCommaSeparatedValue, generateUUID } from '../tools/utils/stringUtils'
 
 export interface CookieOptions {
   secure?: boolean
   crossSite?: boolean
-  partitioned?: boolean
   domain?: string
 }
 
@@ -16,31 +15,13 @@ export function setCookie(name: string, value: string, expireDelay: number, opti
   const sameSite = options && options.crossSite ? 'none' : 'strict'
   const domain = options && options.domain ? `;domain=${options.domain}` : ''
   const secure = options && options.secure ? ';secure' : ''
-  const partitioned = options && options.partitioned ? ';partitioned' : ''
-  document.cookie = `${name}=${value};${expires};path=/;samesite=${sameSite}${domain}${secure}${partitioned}`
+  document.cookie = `${name}=${value};${expires};path=/;samesite=${sameSite}${domain}${secure}`
 }
 
 export function getCookie(name: string) {
   return findCommaSeparatedValue(document.cookie, name)
 }
 
-let initCookieParsed: Map<string, string> | undefined
-
-/**
- * Returns a cached value of the cookie. Use this during SDK initialization (and whenever possible)
- * to avoid accessing document.cookie multiple times.
- */
-export function getInitCookie(name: string) {
-  if (!initCookieParsed) {
-    initCookieParsed = findCommaSeparatedValues(document.cookie)
-  }
-  return initCookieParsed.get(name)
-}
-
-export function resetInitCookies() {
-  initCookieParsed = undefined
-}
-
 export function deleteCookie(name: string, options?: CookieOptions) {
   setCookie(name, '', 0, options)
 }

package/src/browser/fetchObservable.ts

@@ -1,6 +1,5 @@
-import type { InstrumentedMethodCall } from '../tools/instrumentMethod'
 import { instrumentMethod } from '../tools/instrumentMethod'
-import { monitor } from '../tools/monitor'
+import { callMonitored, monitor } from '../tools/monitor'
 import { Observable } from '../tools/observable'
 import type { ClocksState } from '../tools/utils/timeUtils'
 import { clocksNow } from '../tools/utils/timeUtils'
@@ -39,29 +38,38 @@ export function initFetchObservable() {
 }
 
 function createFetchObservable() {
-  return new Observable<FetchContext>((observable) => {
+  const observable = new Observable<FetchContext>(() => {
     if (!window.fetch) {
       return
     }
 
-    const { stop } = instrumentMethod(window, 'fetch', (call) => beforeSend(call, observable))
+    const { stop } = instrumentMethod(
+      window,
+      'fetch',
+      (originalFetch) =>
+        function (input, init) {
+          let responsePromise: Promise<Response>
+
+          const context = callMonitored(beforeSend, null, [observable, input, init])
+          if (context) {
+            responsePromise = originalFetch.call(this, context.input as RequestInfo, context.init)
+            callMonitored(afterSend, null, [observable, responsePromise, context])
+          } else {
+            responsePromise = originalFetch.call(this, input, init)
+          }
+
+          return responsePromise
+        }
+    )
 
     return stop
   })
-}
-
-function beforeSend(
-  { parameters, onPostCall }: InstrumentedMethodCall<Window, 'fetch'>,
-  observable: Observable<FetchContext>
-) {
-  const [input, init] = parameters
-  let methodFromParams = init && init.method
 
-  if (methodFromParams === undefined && input instanceof Request) {
-    methodFromParams = input.method
-  }
+  return observable
+}
 
-  const method = methodFromParams !== undefined ? String(methodFromParams).toUpperCase() : 'GET'
+function beforeSend(observable: Observable<FetchContext>, input: unknown, init?: RequestInit) {
+  const method = (init && init.method) || (input instanceof Request && input.method) || 'GET'
   const url = input instanceof Request ? input.url : normalizeUrl(String(input))
   const startClocks = clocksNow()
 
@@ -76,11 +84,7 @@ function beforeSend(
 
   observable.notify(context)
 
-  // Those properties can be changed by observable subscribers
-  parameters[0] = context.input as RequestInfo | URL
-  parameters[1] = context.init
-
-  onPostCall((responsePromise) => afterSend(observable, responsePromise, context))
+  return context
 }
 
 function afterSend(

package/src/browser/pageExitObservable.ts

@@ -19,7 +19,7 @@ export interface PageExitEvent {
 }
 
 export function createPageExitObservable(configuration: Configuration): Observable<PageExitEvent> {
-  return new Observable<PageExitEvent>((observable) => {
+  const observable = new Observable<PageExitEvent>(() => {
     const pagehideEnabled = isExperimentalFeatureEnabled(ExperimentalFeature.PAGEHIDE)
     const { stop: stopListeners } = addEventListeners(
       configuration,
@@ -60,6 +60,8 @@ export function createPageExitObservable(configuration: Configuration): Observab
       stopBeforeUnloadListener()
     }
   })
+
+  return observable
 }
 
 export function isPageExitReason(reason: string | undefined): reason is PageExitReason {

package/src/browser/xhrObservable.ts

@@ -1,8 +1,7 @@
-import type { InstrumentedMethodCall } from '../tools/instrumentMethod'
-import { instrumentMethod } from '../tools/instrumentMethod'
+import { instrumentMethodAndCallOriginal } from '../tools/instrumentMethod'
 import { Observable } from '../tools/observable'
-import type { Duration, ClocksState } from '../tools/utils/timeUtils'
-import { elapsed, clocksNow, timeStampNow } from '../tools/utils/timeUtils'
+import type { Duration, RelativeTime, ClocksState } from '../tools/utils/timeUtils'
+import { elapsed, relativeNow, clocksNow, timeStampNow } from '../tools/utils/timeUtils'
 import { normalizeUrl } from '../tools/utils/urlPolyfill'
 import { shallowClone } from '../tools/utils/objectUtils'
 import type { Configuration } from '../domain/configuration'
@@ -16,6 +15,7 @@ export interface XhrOpenContext {
 
 export interface XhrStartContext extends Omit<XhrOpenContext, 'state'> {
   state: 'start'
+  startTime: RelativeTime // deprecated
   startClocks: ClocksState
   isAborted: boolean
   xhr: XMLHttpRequest
@@ -40,14 +40,20 @@ export function initXhrObservable(configuration: Configuration) {
 }
 
 function createXhrObservable(configuration: Configuration) {
-  return new Observable<XhrContext>((observable) => {
-    const { stop: stopInstrumentingStart } = instrumentMethod(XMLHttpRequest.prototype, 'open', openXhr)
+  const observable = new Observable<XhrContext>(() => {
+    const { stop: stopInstrumentingStart } = instrumentMethodAndCallOriginal(XMLHttpRequest.prototype, 'open', {
+      before: openXhr,
+    })
 
-    const { stop: stopInstrumentingSend } = instrumentMethod(XMLHttpRequest.prototype, 'send', (call) => {
-      sendXhr(call, configuration, observable)
+    const { stop: stopInstrumentingSend } = instrumentMethodAndCallOriginal(XMLHttpRequest.prototype, 'send', {
+      before() {
+        sendXhr.call(this, configuration, observable)
+      },
     })
 
-    const { stop: stopInstrumentingAbort } = instrumentMethod(XMLHttpRequest.prototype, 'abort', abortXhr)
+    const { stop: stopInstrumentingAbort } = instrumentMethodAndCallOriginal(XMLHttpRequest.prototype, 'abort', {
+      before: abortXhr,
+    })
 
     return () => {
       stopInstrumentingStart()
@@ -55,42 +61,42 @@ function createXhrObservable(configuration: Configuration) {
       stopInstrumentingAbort()
     }
   })
+  return observable
 }
 
-function openXhr({ target: xhr, parameters: [method, url] }: InstrumentedMethodCall<XMLHttpRequest, 'open'>) {
-  xhrContexts.set(xhr, {
+function openXhr(this: XMLHttpRequest, method: string, url: string | URL | undefined | null) {
+  xhrContexts.set(this, {
     state: 'open',
-    method: String(method).toUpperCase(),
+    method,
     url: normalizeUrl(String(url)),
   })
 }
 
-function sendXhr(
-  { target: xhr }: InstrumentedMethodCall<XMLHttpRequest, 'send'>,
-  configuration: Configuration,
-  observable: Observable<XhrContext>
-) {
-  const context = xhrContexts.get(xhr)
+function sendXhr(this: XMLHttpRequest, configuration: Configuration, observable: Observable<XhrContext>) {
+  const context = xhrContexts.get(this)
   if (!context) {
     return
   }
 
   const startContext = context as XhrStartContext
   startContext.state = 'start'
+  startContext.startTime = relativeNow()
   startContext.startClocks = clocksNow()
   startContext.isAborted = false
-  startContext.xhr = xhr
+  startContext.xhr = this
 
   let hasBeenReported = false
 
-  const { stop: stopInstrumentingOnReadyStateChange } = instrumentMethod(xhr, 'onreadystatechange', () => {
-    if (xhr.readyState === XMLHttpRequest.DONE) {
-      // Try to report the XHR as soon as possible, because the XHR may be mutated by the
-      // application during a future event. For example, Angular is calling .abort() on
-      // completed requests during an onreadystatechange event, so the status becomes '0'
-      // before the request is collected.
-      onEnd()
-    }
+  const { stop: stopInstrumentingOnReadyStateChange } = instrumentMethodAndCallOriginal(this, 'onreadystatechange', {
+    before() {
+      if (this.readyState === XMLHttpRequest.DONE) {
+        // Try to report the XHR as soon as possible, because the XHR may be mutated by the
+        // application during a future event. For example, Angular is calling .abort() on
+        // completed requests during a onreadystatechange event, so the status becomes '0'
+        // before the request is collected.
+        onEnd()
+      }
+    },
   })
 
   const onEnd = () => {
@@ -104,17 +110,17 @@ function sendXhr(
     const completeContext = context as XhrCompleteContext
     completeContext.state = 'complete'
     completeContext.duration = elapsed(startContext.startClocks.timeStamp, timeStampNow())
-    completeContext.status = xhr.status
+    completeContext.status = this.status
     observable.notify(shallowClone(completeContext))
   }
 
-  const { stop: unsubscribeLoadEndListener } = addEventListener(configuration, xhr, 'loadend', onEnd)
+  const { stop: unsubscribeLoadEndListener } = addEventListener(configuration, this, 'loadend', onEnd)
 
   observable.notify(startContext)
 }
 
-function abortXhr({ target: xhr }: InstrumentedMethodCall<XMLHttpRequest, 'abort'>) {
-  const context = xhrContexts.get(xhr) as XhrStartContext | undefined
+function abortXhr(this: XMLHttpRequest) {
+  const context = xhrContexts.get(this) as XhrStartContext | undefined
   if (context) {
     context.isAborted = true
   }