Merge branch main of github.com:flashcatcloud/browser-sdk

Author: niuweili

.github/PULL_REQUEST_TEMPLATE.md

@@ -14,9 +14,13 @@
 
 <!-- By submitting this test, you confirm the following: -->
 
+<<<<<<< HEAD
 - [ ] Tested locally
 - [ ] Tested on staging
 - [ ] Added unit tests for this change.
 - [ ] Added e2e/integration tests for this change.
 
 <!-- Also, please read the contribution guidelines: https://github.com/DataDog/browser-sdk/blob/main/CONTRIBUTING.md -->
+=======
+I have gone over the [contributing](https://github.com/flashcatcloud/browser-sdk/blob/main/CONTRIBUTING.md) documentation.
+>>>>>>> b8d6611df7aa9a0b069bd04ee12b3cc1cc8a9935

.gitignore

@@ -23,5 +23,9 @@ package.tgz
 /blob-report/
 /playwright/.cache/
 .VSCodeCounter
+<<<<<<< HEAD
 .env
 .vscode
+=======
+.env
+>>>>>>> b8d6611df7aa9a0b069bd04ee12b3cc1cc8a9935

developer-extension/package.json

@@ -21,9 +21,14 @@
     "@flashcatcloud/browser-core": "workspace:*",
     "@flashcatcloud/browser-logs": "workspace:*",
     "@flashcatcloud/browser-rum": "workspace:*",
+<<<<<<< HEAD
     "@mantine/core": "8.0.1",
     "@mantine/hooks": "8.0.1",
     "@tabler/icons-react": "3.33.0",
+=======
+    "@mantine/core": "7.17.1",
+    "@mantine/hooks": "7.17.1",
+>>>>>>> b8d6611df7aa9a0b069bd04ee12b3cc1cc8a9935
     "clsx": "2.1.1",
     "react": "19.1.0",
     "react-dom": "19.1.0"

package.json

@@ -39,7 +39,11 @@
   "devDependencies": {
     "@alicloud/cdn20180510": "5.0.0",
     "@alicloud/openapi-client": "0.4.13",
+<<<<<<< HEAD
     "@eslint/js": "9.27.0",
+=======
+    "@eslint/js": "9.21.0",
+>>>>>>> b8d6611df7aa9a0b069bd04ee12b3cc1cc8a9935
     "@jsdevtools/coverage-istanbul-loader": "3.0.5",
     "@playwright/test": "1.52.0",
     "@swc/core": "1.11.24",

packages/logs/package.json

@@ -14,7 +14,11 @@
     "replace-build-env": "node ../../scripts/build/replace-build-env.js"
   },
   "dependencies": {
+<<<<<<< HEAD
     "@flashcatcloud/browser-core": "0.0.2"
+=======
+    "@flashcatcloud/browser-core": "workspace:*"
+>>>>>>> b8d6611df7aa9a0b069bd04ee12b3cc1cc8a9935
   },
   "peerDependencies": {
     "@flashcatcloud/browser-rum": "0.0.2"

packages/logs/src/boot/startLogs.spec.ts

@@ -20,7 +20,10 @@ import {
   registerCleanupTask,
   mockClock,
   expireCookie,
+<<<<<<< HEAD
   DEFAULT_FETCH_MOCK,
+=======
+>>>>>>> b8d6611df7aa9a0b069bd04ee12b3cc1cc8a9935
 } from '@flashcatcloud/browser-core/test'
 
 import type { LogsConfiguration } from '../domain/configuration'

packages/logs/src/domain/assembly.spec.ts

@@ -1,5 +1,16 @@
 import type { Context, RelativeTime, TimeStamp } from '@flashcatcloud/browser-core'
+<<<<<<< HEAD
 import { Observable, ErrorSource, ONE_MINUTE, getTimeStamp, noop } from '@flashcatcloud/browser-core'
+=======
+import {
+  Observable,
+  ErrorSource,
+  ONE_MINUTE,
+  getTimeStamp,
+  noop,
+  createCustomerDataTracker,
+} from '@flashcatcloud/browser-core'
+>>>>>>> b8d6611df7aa9a0b069bd04ee12b3cc1cc8a9935
 import type { Clock } from '@flashcatcloud/browser-core/test'
 import { mockClock } from '@flashcatcloud/browser-core/test'
 import type { LogsEvent } from '../logsEvent.types'
@@ -72,10 +83,15 @@ describe('startLogsAssembly', () => {
       beforeSend: (x: LogsEvent) => beforeSend(x),
     }
     beforeSend = noop
+<<<<<<< HEAD
     mainLogger = new Logger(() => noop)
     const hooks = createHooks()
     startRUMInternalContext(hooks)
     startLogsAssembly(sessionManager, configuration, lifeCycle, hooks, () => COMMON_CONTEXT, noop)
+=======
+    mainLogger = new Logger(() => noop, createCustomerDataTracker(noop))
+    startLogsAssembly(sessionManager, configuration, lifeCycle, () => COMMON_CONTEXT, noop)
+>>>>>>> b8d6611df7aa9a0b069bd04ee12b3cc1cc8a9935
     window.FC_RUM = {
       getInternalContext: noop,
     }

packages/logs/src/domain/assembly.ts

@@ -1,4 +1,5 @@
 import type { EventRateLimiter, RawError } from '@flashcatcloud/browser-core'
+<<<<<<< HEAD
 import {
   ErrorSource,
   HookNames,
@@ -7,6 +8,9 @@ import {
   getRelativeTime,
   isEmptyObject,
 } from '@flashcatcloud/browser-core'
+=======
+import { ErrorSource, combine, createEventRateLimiter, getRelativeTime, isEmptyObject } from '@flashcatcloud/browser-core'
+>>>>>>> b8d6611df7aa9a0b069bd04ee12b3cc1cc8a9935
 import type { CommonContext } from '../rawLogsEvent.types'
 import type { LogsConfiguration } from './configuration'
 import type { LifeCycle } from './lifeCycle'

packages/logs/src/domain/contexts/rumInternalContext.spec.ts

@@ -1,5 +1,10 @@
+<<<<<<< HEAD
 import type { Context, RelativeTime, TelemetryEvent } from '@flashcatcloud/browser-core'
 import { HookNames, startTelemetry, TelemetryService } from '@flashcatcloud/browser-core'
+=======
+import type { TelemetryEvent } from '@flashcatcloud/browser-core'
+import { startTelemetry, TelemetryService } from '@flashcatcloud/browser-core'
+>>>>>>> b8d6611df7aa9a0b069bd04ee12b3cc1cc8a9935
 import { mockSyntheticsWorkerValues } from '@flashcatcloud/browser-core/test'
 import { validateAndBuildLogsConfiguration } from '../configuration'
 import type { Hooks } from '../hooks'
@@ -34,10 +39,14 @@ describe('startRUMInternalContext', () => {
 
   it('returns undefined if the global variable does not have a `getInternalContext` method', () => {
     window.FC_RUM = {} as any
+<<<<<<< HEAD
     const defaultLogsEventAttributes = hooks.triggerHook(HookNames.Assemble, {
       startTime: 0 as RelativeTime,
     })
     expect(defaultLogsEventAttributes).toBeUndefined()
+=======
+    expect(getRUMInternalContext()).toBeUndefined()
+>>>>>>> b8d6611df7aa9a0b069bd04ee12b3cc1cc8a9935
   })
 
   it('returns the internal context from the `getInternalContext` method', () => {

packages/logs/src/domain/contexts/rumInternalContext.ts

@@ -1,13 +1,21 @@
+<<<<<<< HEAD
 import type { Context, RelativeTime } from '@flashcatcloud/browser-core'
+=======
+import type { RelativeTime, Context } from '@flashcatcloud/browser-core'
+>>>>>>> b8d6611df7aa9a0b069bd04ee12b3cc1cc8a9935
 import {
   willSyntheticsInjectRum,
   addTelemetryDebug,
   getSyntheticsTestId,
   getSyntheticsResultId,
+<<<<<<< HEAD
   HookNames,
   SKIPPED,
 } from '@flashcatcloud/browser-core'
 import type { Hooks } from '../hooks'
+=======
+} from '@flashcatcloud/browser-core'
+>>>>>>> b8d6611df7aa9a0b069bd04ee12b3cc1cc8a9935
 
 interface Rum {
   getInternalContext?: (startTime?: RelativeTime) => Context | undefined
@@ -49,7 +57,13 @@ export function startRUMInternalContext(hooks: Hooks) {
     }
   }
 
+<<<<<<< HEAD
   function getInternalContextFromRumGlobal(startTime?: RelativeTime, rumGlobal?: Rum): Context | undefined {
+=======
+  return getInternalContextFromRumGlobal(browserWindow.FC_RUM)
+
+  function getInternalContextFromRumGlobal(rumGlobal?: Rum): Context | undefined {
+>>>>>>> b8d6611df7aa9a0b069bd04ee12b3cc1cc8a9935
     if (rumGlobal && rumGlobal.getInternalContext) {
       return rumGlobal.getInternalContext(startTime)
     }