v6-beta

.eslintrc.js

@@ -68,6 +68,7 @@ module.exports = {
     'one-var': ['error', 'never'],
     'prefer-rest-params': 'off',
     'prefer-template': 'error',
+    'prefer-object-spread': 'error',
     quotes: ['error', 'single', { avoidEscape: true }],
     radix: 'error',
     'require-await': 'error',
@@ -234,10 +235,6 @@ module.exports = {
             selector: 'ClassDeclaration',
             message: 'Classes are not allowed. Use functions instead.',
           },
-          {
-            selector: 'ObjectExpression > SpreadElement',
-            message: 'Object spread is not authorized. Please use "assign" from the core package utils instead.',
-          },
           {
             selector: 'ArrayExpression > SpreadElement',
             message: 'Array spread is not authorized. Please use .concat instead.',

.gitlab-ci.yml

@@ -447,17 +447,17 @@ merge-into-next-major:
     - yarn
     - node scripts/update-branch.js $NEXT_MAJOR_BRANCH
 
-check-staging-merge:
-  stage: test
-  extends:
-    - .base-configuration
-    - .feature-branches
-  interruptible: true
-  before_script:
-    - eval $(ssh-agent -s)
-  script:
-    - yarn
-    - node scripts/staging-ci/check-staging-merge.js
+# check-staging-merge:
+#   stage: test
+#   extends:
+#     - .base-configuration
+#     - .feature-branches
+#   interruptible: true
+#   before_script:
+#     - eval $(ssh-agent -s)
+#   script:
+#     - yarn
+#     - node scripts/staging-ci/check-staging-merge.js
 
 # A noop job that's used to signal to `to-staging` that it can merge to the
 # staging branch, even though the pipeline is still running

developer-extension/src/panel/components/tabs/eventsTab/copyEvent.spec.ts

@@ -1,4 +1,3 @@
-import { isIE } from '../../../../../../packages/core/src/tools/utils/browserDetection'
 import type { TelemetryEvent } from '../../../../../../packages/core/src/domain/telemetry'
 import type { LogsEvent } from '../../../../../../packages/logs/src/logsEvent.types'
 import type { RumEvent } from '../../../../../../packages/rum-core/src/rumEvent.types'
@@ -14,11 +13,6 @@ const LOG_EVENT = {
 } as LogsEvent
 
 describe('getIntakeUrlForEvent', () => {
-  beforeEach(() => {
-    if (isIE()) {
-      pending('IE not supported')
-    }
-  })
   it('should return undefined when RUM is not present', () => {
     expect(getIntakeUrlForEvent({} as any, RUM_ERROR_EVENT)).toBeUndefined()
   })

developer-extension/src/panel/hooks/useEvents/eventFilters.spec.ts

@@ -1,7 +1,7 @@
-import { isIE, isSafari } from '../../../../../packages/core/src/tools/utils/browserDetection'
+import { isSafari } from '../../../../../packages/core/src/tools/utils/browserDetection'
 import { parseQuery, matchWithWildcard } from './eventFilters'
 
-if (!isIE() && !isSafari()) {
+if (!isSafari()) {
   describe('parseQuery', () => {
     it('return a simple field', () => {
       expect(parseQuery('foo:bar')).toEqual([['foo', 'bar']])

packages/core/src/boot/init.ts

@@ -1,6 +1,5 @@
 import { catchUserErrors } from '../tools/catchUserErrors'
 import { setDebugMode } from '../tools/monitor'
-import { assign } from '../tools/utils/polyfills'
 import { display } from '../tools/display'
 
 // replaced at build time
@@ -21,19 +20,16 @@ export interface PublicApi {
 }
 
 export function makePublicApi<T extends PublicApi>(stub: Omit<T, keyof PublicApi>): T {
-  const publicApi = assign(
-    {
-      version: __BUILD_ENV__SDK_VERSION__,
-
-      // This API method is intentionally not monitored, since the only thing executed is the
-      // user-provided 'callback'.  All SDK usages executed in the callback should be monitored, and
-      // we don't want to interfere with the user uncaught exceptions.
-      onReady(callback: () => void) {
-        callback()
-      },
+  const publicApi = {
+    version: __BUILD_ENV__SDK_VERSION__,
+    // This API method is intentionally not monitored, since the only thing executed is the
+    // user-provided 'callback'.  All SDK usages executed in the callback should be monitored, and
+    // we don't want to interfere with the user uncaught exceptions.
+    onReady(callback: () => void) {
+      callback()
     },
-    stub
-  )
+    ...stub,
+  }
 
   // Add a "hidden" property to set debug mode. We define it that way to hide it
   // as much as possible but of course it's not a real protection.

packages/core/src/browser/fetchObservable.spec.ts

@@ -1,6 +1,5 @@
 import type { MockFetch, MockFetchManager } from '../../test'
 import { registerCleanupTask, mockFetch } from '../../test'
-import { isIE } from '../tools/utils/browserDetection'
 import type { Subscription } from '../tools/observable'
 import type { FetchResolveContext, FetchContext } from './fetchObservable'
 import { initFetchObservable } from './fetchObservable'
@@ -17,9 +16,6 @@ describe('fetch proxy', () => {
   let fetch: MockFetch
 
   beforeEach(() => {
-    if (isIE()) {
-      pending('no fetch support')
-    }
     mockFetchManager = mockFetch()
     originalMockFetch = window.fetch
 

packages/core/src/browser/fetchObservable.ts

@@ -2,7 +2,6 @@ import type { InstrumentedMethodCall } from '../tools/instrumentMethod'
 import { instrumentMethod } from '../tools/instrumentMethod'
 import { monitor } from '../tools/monitor'
 import { Observable } from '../tools/observable'
-import { assign } from '../tools/utils/polyfills'
 import type { ClocksState } from '../tools/utils/timeUtils'
 import { clocksNow } from '../tools/utils/timeUtils'
 import { normalizeUrl } from '../tools/utils/urlPolyfill'
@@ -101,7 +100,7 @@ function afterSend(
 
   function reportFetch(partialContext: Partial<FetchResolveContext>) {
     context.state = 'resolve'
-    assign(context, partialContext)
+    Object.assign(context, partialContext)
     observable.notify(context)
   }
 

packages/core/src/browser/pageExitObservable.ts

@@ -1,5 +1,5 @@
 import { Observable } from '../tools/observable'
-import { objectValues, includes } from '../tools/utils/polyfills'
+import { objectValues } from '../tools/utils/polyfills'
 import type { Configuration } from '../domain/configuration'
 import { addEventListeners, addEventListener, DOM_EVENT } from './addEventListener'
 
@@ -51,6 +51,6 @@ export function createPageExitObservable(configuration: Configuration): Observab
   })
 }
 
-export function isPageExitReason(reason: string | undefined): reason is PageExitReason {
-  return includes(objectValues(PageExitReason), reason)
+export function isPageExitReason(reason: string): reason is PageExitReason {
+  return objectValues(PageExitReason).includes(reason as PageExitReason)
 }

packages/core/src/browser/xhrObservable.spec.ts

@@ -1,6 +1,5 @@
 import type { Configuration } from '../domain/configuration'
 import { withXhr, mockXhr } from '../../test'
-import { isIE } from '../tools/utils/browserDetection'
 import type { Subscription } from '../tools/observable'
 import type { XhrCompleteContext, XhrContext } from './xhrObservable'
 import { initXhrObservable } from './xhrObservable'
@@ -346,9 +345,6 @@ describe('xhr observable', () => {
   })
 
   it('should track request to URL object', (done) => {
-    if (isIE()) {
-      pending('IE not supported')
-    }
     withXhr({
       setup(xhr) {
         xhr.open('GET', new URL('http://example.com/path'))

packages/core/src/domain/configuration/configuration.ts

@@ -6,7 +6,6 @@ import { ONE_SECOND } from '../../tools/utils/timeUtils'
 import { isPercentage } from '../../tools/utils/numberUtils'
 import { ONE_KIBI_BYTE } from '../../tools/utils/byteUtils'
 import { objectHasValue } from '../../tools/utils/objectUtils'
-import { assign } from '../../tools/utils/polyfills'
 import { selectSessionStoreStrategyType } from '../session/sessionStore'
 import type { SessionStoreStrategyType } from '../session/storeStrategies/sessionStoreStrategy'
 import { TrackingConsent } from '../trackingConsent'
@@ -161,7 +160,7 @@ type GenericBeforeSendCallback = (event: any, context?: any) => unknown
  */
 type ProxyFn = (options: { path: string; parameters: string }) => string
 
-interface ReplicaUserConfiguration {
+export interface ReplicaUserConfiguration {
   applicationId?: string
   clientToken: string
 }
@@ -242,43 +241,41 @@ export function validateAndBuildConfiguration(initConfiguration: InitConfigurati
     return
   }
 
-  return assign(
-    {
-      beforeSend:
-        initConfiguration.beforeSend && catchUserErrors(initConfiguration.beforeSend, 'beforeSend threw an error:'),
-      sessionStoreStrategyType: selectSessionStoreStrategyType(initConfiguration),
-      sessionSampleRate: initConfiguration.sessionSampleRate ?? 100,
-      telemetrySampleRate: initConfiguration.telemetrySampleRate ?? 20,
-      telemetryConfigurationSampleRate: initConfiguration.telemetryConfigurationSampleRate ?? 5,
-      telemetryUsageSampleRate: initConfiguration.telemetryUsageSampleRate ?? 5,
-      service: initConfiguration.service || undefined,
-      silentMultipleInit: !!initConfiguration.silentMultipleInit,
-      allowUntrustedEvents: !!initConfiguration.allowUntrustedEvents,
-      trackingConsent: initConfiguration.trackingConsent ?? TrackingConsent.GRANTED,
-      storeContextsAcrossPages: !!initConfiguration.storeContextsAcrossPages,
-      /**
-       * beacon payload max queue size implementation is 64kb
-       * ensure that we leave room for logs, rum and potential other users
-       */
-      batchBytesLimit: 16 * ONE_KIBI_BYTE,
+  return {
+    beforeSend:
+      initConfiguration.beforeSend && catchUserErrors(initConfiguration.beforeSend, 'beforeSend threw an error:'),
+    sessionStoreStrategyType: selectSessionStoreStrategyType(initConfiguration),
+    sessionSampleRate: initConfiguration.sessionSampleRate ?? 100,
+    telemetrySampleRate: initConfiguration.telemetrySampleRate ?? 20,
+    telemetryConfigurationSampleRate: initConfiguration.telemetryConfigurationSampleRate ?? 5,
+    telemetryUsageSampleRate: initConfiguration.telemetryUsageSampleRate ?? 5,
+    service: initConfiguration.service || undefined,
+    silentMultipleInit: !!initConfiguration.silentMultipleInit,
+    allowUntrustedEvents: !!initConfiguration.allowUntrustedEvents,
+    trackingConsent: initConfiguration.trackingConsent ?? TrackingConsent.GRANTED,
+    storeContextsAcrossPages: !!initConfiguration.storeContextsAcrossPages,
+    /**
+     * beacon payload max queue size implementation is 64kb
+     * ensure that we leave room for logs, rum and potential other users
+     */
+    batchBytesLimit: 16 * ONE_KIBI_BYTE,
 
-      eventRateLimiterThreshold: 3000,
-      maxTelemetryEventsPerPage: 15,
+    eventRateLimiterThreshold: 3000,
+    maxTelemetryEventsPerPage: 15,
 
-      /**
-       * flush automatically, aim to be lower than ALB connection timeout
-       * to maximize connection reuse.
-       */
-      flushTimeout: (30 * ONE_SECOND) as Duration,
+    /**
+     * flush automatically, aim to be lower than ALB connection timeout
+     * to maximize connection reuse.
+     */
+    flushTimeout: (30 * ONE_SECOND) as Duration,
 
-      /**
-       * Logs intake limit
-       */
-      batchMessagesLimit: 50,
-      messageBytesLimit: 256 * ONE_KIBI_BYTE,
-    },
-    computeTransportConfiguration(initConfiguration)
-  )
+    /**
+     * Logs intake limit
+     */
+    batchMessagesLimit: 50,
+    messageBytesLimit: 256 * ONE_KIBI_BYTE,
+    ...computeTransportConfiguration(initConfiguration),
+  }
 }
 
 export function serializeConfiguration(initConfiguration: InitConfiguration) {

packages/core/src/domain/configuration/endpointBuilder.spec.ts

@@ -1,5 +1,4 @@
 import type { BuildEnvWindow } from '../../../test'
-import { startsWith } from '../../tools/utils/polyfills'
 import type { Payload } from '../../transport'
 import type { InitConfiguration } from './configuration'
 import { createEndpointBuilder } from './endpointBuilder'
@@ -69,12 +68,11 @@ describe('endpointBuilder', () => {
     })
 
     it('normalizes the proxy url', () => {
-      expect(
-        startsWith(
-          createEndpointBuilder({ ...initConfiguration, proxy: '/path' }, 'rum', []).build('xhr', DEFAULT_PAYLOAD),
-          `${location.origin}/path?ddforward`
-        )
-      ).toBeTrue()
+      const endpoint = createEndpointBuilder({ ...initConfiguration, proxy: '/path' }, 'rum', []).build(
+        'xhr',
+        DEFAULT_PAYLOAD
+      )
+      expect(endpoint.startsWith(`${location.origin}/path?ddforward`)).toBeTrue()
     })
 
     it('should allow to fully control the proxy url', () => {

packages/core/src/domain/configuration/transportConfiguration.ts

@@ -1,4 +1,4 @@
-import { objectValues, assign } from '../../tools/utils/polyfills'
+import { objectValues } from '../../tools/utils/polyfills'
 import type { InitConfiguration } from './configuration'
 import type { EndpointBuilder } from './endpointBuilder'
 import { createEndpointBuilder } from './endpointBuilder'
@@ -30,14 +30,12 @@ export function computeTransportConfiguration(initConfiguration: InitConfigurati
 
   const replicaConfiguration = computeReplicaConfiguration(initConfiguration, intakeUrlPrefixes, tags)
 
-  return assign(
-    {
-      isIntakeUrl: (url: string) => intakeUrlPrefixes.some((intakeEndpoint) => url.indexOf(intakeEndpoint) === 0),
-      replica: replicaConfiguration,
-      site,
-    },
-    endpointBuilders
-  )
+  return {
+    isIntakeUrl: (url: string) => intakeUrlPrefixes.some((intakeEndpoint) => url.indexOf(intakeEndpoint) === 0),
+    replica: replicaConfiguration,
+    site,
+    ...endpointBuilders,
+  }
 }
 
 function computeEndpointBuilders(initConfiguration: InitConfiguration, tags: string[]) {
@@ -57,10 +55,11 @@ function computeReplicaConfiguration(
     return
   }
 
-  const replicaConfiguration: InitConfiguration = assign({}, initConfiguration, {
+  const replicaConfiguration: InitConfiguration = {
+    ...initConfiguration,
     site: INTAKE_SITE_US1,
     clientToken: initConfiguration.replica.clientToken,
-  })
+  }
 
   const replicaEndpointBuilders = {
     logsEndpointBuilder: createEndpointBuilder(replicaConfiguration, 'logs', tags),
@@ -69,7 +68,10 @@ function computeReplicaConfiguration(
 
   intakeUrlPrefixes.push(...objectValues(replicaEndpointBuilders).map((builder) => builder.urlPrefix))
 
-  return assign({ applicationId: initConfiguration.replica.applicationId }, replicaEndpointBuilders)
+  return {
+    applicationId: initConfiguration.replica.applicationId,
+    ...replicaEndpointBuilders,
+  }
 }
 
 function computeIntakeUrlPrefixes(

packages/core/src/domain/console/consoleObservable.spec.ts

@@ -1,5 +1,4 @@
 /* eslint-disable no-console */
-import { isIE } from '../../tools/utils/browserDetection'
 import { ConsoleApiName } from '../../tools/display'
 import type { Subscription } from '../../tools/observable'
 import type { ErrorConsoleLog } from './consoleObservable'
@@ -104,11 +103,7 @@ describe('console error observable', () => {
   it('should extract stack from first error', () => {
     console.error(new TypeError('foo'), new TypeError('bar'))
     const stack = notifyLog.calls.mostRecent().args[0].error.stack
-    if (!isIE()) {
-      expect(stack).toMatch(/^TypeError: foo\s+at/)
-    } else {
-      expect(stack).toContain('TypeError: foo')
-    }
+    expect(stack).toContain('TypeError: foo')
   })
 
   it('should retrieve fingerprint from error', () => {

packages/core/src/domain/console/consoleObservable.ts

@@ -3,7 +3,6 @@ import { mergeObservables, Observable } from '../../tools/observable'
 import { ConsoleApiName, globalConsole } from '../../tools/display'
 import { callMonitored } from '../../tools/monitor'
 import { sanitize } from '../../tools/serialisation/sanitize'
-import { find } from '../../tools/utils/polyfills'
 import { jsonStringify } from '../../tools/serialisation/jsonStringify'
 import type { RawError } from '../error/error.types'
 import { ErrorHandling, ErrorSource } from '../error/error.types'
@@ -74,7 +73,7 @@ function buildConsoleLog(params: unknown[], api: ConsoleApiName, handlingStack:
   let error: RawError | undefined
 
   if (api === ConsoleApiName.error) {
-    const firstErrorParam = find(params, (param: unknown): param is Error => param instanceof Error)
+    const firstErrorParam = params.find((param: unknown): param is Error => param instanceof Error)
 
     error = {
       stack: firstErrorParam ? toStackTraceString(computeStackTrace(firstErrorParam)) : undefined,