Merge branch 'main' into prerelease-v5

DataDog · Jul 20, 2023 · 5bc9940 · 5bc9940
2 parents 206edb6 + e344f34
commit 5bc9940
Show file tree

Hide file tree

Showing 53 changed files with 1,397 additions and 1,339 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  CURRENT_STAGING: staging-28
+  CURRENT_STAGING: staging-29
   APP: 'browser-sdk'
   CURRENT_CI_IMAGE: 49
   BUILD_STABLE_REGISTRY: '486234852809.dkr.ecr.us-east-1.amazonaws.com'
@@ -126,7 +126,10 @@ typecheck:
   interruptible: true
   script:
     - yarn
+    - yarn build
     - yarn typecheck
+    - scripts/cli typecheck test/app
+    - scripts/cli typecheck test/e2e
 
 build-and-lint:
   extends:
@@ -137,8 +140,6 @@ build-and-lint:
     - yarn
     - yarn build
     - yarn lint
-    - scripts/cli typecheck test/app
-    - scripts/cli typecheck test/e2e
 
 build-bundle:
   extends:

diff --git a/.prettierignore b/.prettierignore
@@ -3,3 +3,6 @@ cjs
 esm
 coverage
 rum-events-format
+.yarn
+developer-extension/dist
+test/app/dist
diff --git a/.yarn/releases/yarn-3.6.0.cjs → .yarn/releases/yarn-3.6.1.cjs b/.yarn/releases/yarn-3.6.0.cjs → .yarn/releases/yarn-3.6.1.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,3 +1,3 @@
-yarnPath: .yarn/releases/yarn-3.6.0.cjs
+yarnPath: .yarn/releases/yarn-3.6.1.cjs
 defaultSemverRangePrefix: ''
 nodeLinker: node-modules
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,25 @@
 - 🔥 [RUMF-1555] Remove `startTime` in xhr start context ([#2287](https://github.com/DataDog/browser-sdk/pull/2287))
 - ♻️ [RUMF-1555] Remove deprecated context manager APIs ([#2284](https://github.com/DataDog/browser-sdk/pull/2284))
 
+## v4.45.0
+
+- ✨ [RUM-235] add sample rates fields ([#2323](https://github.com/DataDog/browser-sdk/pull/2323))
+- 🐛 [RUM-238] Handle tracekit multilines message parsing ([#2332](https://github.com/DataDog/browser-sdk/pull/2332))
+- 🐛👷 Fix scope packages npm publication ([#2334](https://github.com/DataDog/browser-sdk/pull/2334))
+- 🔉 monitor reported errors ([#2335](https://github.com/DataDog/browser-sdk/pull/2335))
+
+## v4.44.2
+
+- 🐛👷 [RUM-232] fix worker/string package ([#2331](https://github.com/DataDog/browser-sdk/pull/2331))
+
+## v4.44.1
+
+- 🐛 Fix RUM slim npm package publication ([#2325](https://github.com/DataDog/browser-sdk/pull/2325))
+- 🐛 [RUM-231] Fix location.origin is "null" for file: URIs ([#2306](https://github.com/DataDog/browser-sdk/pull/2306))
+- ♻️ [RUM-232] create a `@datadog/browser-worker` package ([#2319](https://github.com/DataDog/browser-sdk/pull/2319))
+- 🔊 Add tracekit try parse message failing telemetry ([#2322](https://github.com/DataDog/browser-sdk/pull/2322))
+- 💬 Update heavy customer data warning ([#2316](https://github.com/DataDog/browser-sdk/pull/2316))
+
 ## v4.44.0
 
 - ✨ Collect replay privacy level in views ([#2299](https://github.com/DataDog/browser-sdk/pull/2299))

diff --git a/developer-extension/README.md b/developer-extension/README.md
@@ -11,7 +11,6 @@ build the extension manually.
 $ git clone https://github.com/DataDog/browser-sdk
 $ cd browser-sdk
 $ yarn
-$ cd developer-extension
 $ yarn build
 ```
 

diff --git a/developer-extension/package.json b/developer-extension/package.json
@@ -7,18 +7,20 @@
     "dev": "webpack --mode development --watch"
   },
   "devDependencies": {
-    "@types/chrome": "0.0.238",
-    "@types/react": "18.2.14",
-    "@types/react-dom": "18.2.6",
+    "@types/chrome": "0.0.241",
+    "@types/react": "18.2.15",
+    "@types/react-dom": "18.2.7",
     "@webextension-toolbox/webpack-webextension-plugin": "3.1.0",
     "copy-webpack-plugin": "11.0.0",
     "html-webpack-plugin": "5.5.3",
-    "webpack": "5.88.0"
+    "webpack": "5.88.1"
   },
   "dependencies": {
+    "@datadog/browser-logs": "workspace:*",
+    "@datadog/browser-rum": "workspace:*",
     "@emotion/react": "11.11.1",
-    "@mantine/core": "6.0.14",
-    "@mantine/hooks": "6.0.14",
+    "@mantine/core": "6.0.16",
+    "@mantine/hooks": "6.0.16",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-json-view": "1.21.3"

diff --git a/developer-extension/src/panel/components/alert.tsx b/developer-extension/src/panel/components/alert.tsx
@@ -15,7 +15,7 @@ export function Alert({
 }) {
   const color = level === 'warning' ? ('orange' as const) : ('red' as const)
   return (
-    <Center mt="xl">
+    <Center mt="xl" className="dd-privacy-allow">
       <MantineAlert color={color} title={title}>
         {message}
         {button && (

diff --git a/developer-extension/src/panel/components/panel.tsx b/developer-extension/src/panel/components/panel.tsx
@@ -32,7 +32,7 @@ export function Panel() {
       defaultValue={PanelTabs.Events}
       sx={{ height: '100vh', display: 'flex', flexDirection: 'column' }}
     >
-      <Tabs.List>
+      <Tabs.List className="dd-privacy-allow">
         <Tabs.Tab value={PanelTabs.Events}>Events</Tabs.Tab>
         <Tabs.Tab value={PanelTabs.Infos}>
           <Text>Infos</Text>

diff --git a/developer-extension/src/panel/components/tabs/eventsTab.tsx b/developer-extension/src/panel/components/tabs/eventsTab.tsx
@@ -35,7 +35,7 @@ export function EventTab({ events, filters, onFiltered, clear }: EventTabProps)
   return (
     <TabBase
       top={
-        <Group>
+        <Group className="dd-privacy-allow">
           <Chip.Group
             multiple
             value={filters.sdk}
@@ -49,6 +49,7 @@ export function EventTab({ events, filters, onFiltered, clear }: EventTabProps)
             value={filters.query}
             style={{ flexGrow: 1 }}
             onChange={(event) => onFiltered({ ...filters, query: event.currentTarget.value })}
+            className="dd-privacy-mask"
           />
 
           <Button color="violet" variant="light" onClick={flushEvents}>

diff --git a/developer-extension/src/panel/components/tabs/infosTab.tsx b/developer-extension/src/panel/components/tabs/infosTab.tsx
@@ -37,7 +37,7 @@ export function InfosTab() {
               <Entry name="Created" value={formatDate(Number(infos.cookie.created))} />
               <Entry name="Expire" value={formatDate(Number(infos.cookie.expire))} />
               <Space h="sm" />
-              <Button color="violet" variant="light" onClick={endSession}>
+              <Button color="violet" variant="light" onClick={endSession} className="dd-privacy-allow">
                 End current session
               </Button>
             </>
@@ -47,7 +47,7 @@ export function InfosTab() {
           {infos.rum && (
             <>
               {sessionId && (
-                <Group>
+                <Group className="dd-privacy-allow">
                   <AppLink
                     config={infos.rum.config}
                     path="rum/explorer"
@@ -76,15 +76,17 @@ export function InfosTab() {
           {infos.logs && (
             <>
               {sessionId && (
-                <AppLink
-                  config={infos.logs.config}
-                  path="logs"
-                  params={{
-                    query: `source:browser @session_id:${sessionId}`,
-                  }}
-                >
-                  Explorer
-                </AppLink>
+                <div className="dd-privacy-allow">
+                  <AppLink
+                    config={infos.logs.config}
+                    path="logs"
+                    params={{
+                      query: `source:browser @session_id:${sessionId}`,
+                    }}
+                  >
+                    Explorer
+                  </AppLink>
+                </div>
               )}
               <Entry name="Version" value={infos.logs.version} />
               <Entry name="Configuration" value={infos.logs.config} />