Merge branch 'main' into nikita-tkachenko/rum-ci-visibility-integration

Author: amortemousque

.eslintrc.js

@@ -186,9 +186,16 @@ module.exports = {
   },
   overrides: [
     {
-      files: ['**/*.types.ts', '**/types.ts'],
+      files: ['**/*Event.types.ts'],
       rules: {
-        camelcase: 'off',
+        '@typescript-eslint/naming-convention': [
+          'error',
+          {
+            leadingUnderscore: 'allow',
+            selector: 'property',
+            format: ['snake_case'],
+          },
+        ],
       },
     },
     {

.gitlab-ci.yml

@@ -1,12 +1,12 @@
 variables:
-  CURRENT_STAGING: staging-11
+  CURRENT_STAGING: staging-13
   APP: 'browser-sdk'
-  CURRENT_CI_IMAGE: 60
+  CURRENT_CI_IMAGE: 61
   BUILD_STABLE_REGISTRY: '486234852809.dkr.ecr.us-east-1.amazonaws.com'
   CI_IMAGE: '$BUILD_STABLE_REGISTRY/ci/$APP:$CURRENT_CI_IMAGE'
   GIT_REPOSITORY: '[email protected]:DataDog/browser-sdk.git'
   MAIN_BRANCH: 'main'
-  CHROME_PACKAGE_VERSION: 122.0.6261.57-1
+  CHROME_PACKAGE_VERSION: 123.0.6312.58-1
 
 cache:
   key:
@@ -299,6 +299,7 @@ deploy-prod-canary:
     - VERSION=$(node -p -e "require('./lerna.json').version")
     - yarn
     - yarn build:bundle
+    - node ./scripts/deploy/check-monitors.js $UPLOAD_PATH
     - node ./scripts/deploy/deploy.js prod v${VERSION%%.*} $UPLOAD_PATH
     - node ./scripts/deploy/upload-source-maps.js v${VERSION%%.*} $UPLOAD_PATH
 

CHANGELOG.md

@@ -16,6 +16,24 @@
 
 ---
 
+## v5.13.0
+
+- ✨ [RUM-3542] Add trace context injection control in rum configuration ([#2656](https://github.com/DataDog/browser-sdk/pull/2656))
+- 🐛 [RUM-3599] do not define undefined instrumented method ([#2662](https://github.com/DataDog/browser-sdk/pull/2662))
+- 🐛 [RUM-3598] Ignore collecting requests to logs PCI intake as RUM resources ([#2655](https://github.com/DataDog/browser-sdk/pull/2655))
+- ⚡ [RUM-2633] Optimize DOM iteration in the recorder ([#2657](https://github.com/DataDog/browser-sdk/pull/2657))
+
+## v5.12.0
+
+- ✨ [RUM-3546] Add support of PCI compliant intake for browser logs ([#2648](https://github.com/DataDog/browser-sdk/pull/2648))
+- ✨ [RUM 3352] Extra resource event attributes to enable performance CWV troubleshooting ([#2646](https://github.com/DataDog/browser-sdk/pull/2646))
+- ✨ [RUM-2885] Collect CSP disposition ([#2635](https://github.com/DataDog/browser-sdk/pull/2635))
+- 🐛 [RUM-3440] Fix INP CSS selector computation
+- 🐛 [RUM-3502] fix fetch(url) tracing ([#2642](https://github.com/DataDog/browser-sdk/pull/2642))
+- 🔧 Enforce snake case for event type properties ([#2649](https://github.com/DataDog/browser-sdk/pull/2649))
+- 🔊 [RUM-3501] add `tracking_consent` to configuration telemetry ([#2640](https://github.com/DataDog/browser-sdk/pull/2640))
+- 🔧 configure renovate to deduplicate subdependencies ([#2643](https://github.com/DataDog/browser-sdk/pull/2643))
+
 ## v5.11.0
 
 - ✨ [RUM-3349] enable the consent management API ([#2634](https://github.com/DataDog/browser-sdk/pull/2634))

LICENSE-3rdparty.csv

@@ -63,7 +63,6 @@ dev,karma-spec-reporter,MIT,Copyright 2015 Michael Lex
 dev,karma-webpack,MIT,Copyright JS Foundation and other contributors
 dev,lerna,MIT,Copyright 2015-present Lerna Contributors
 dev,minimatch,ISC,Copyright (c) Isaac Z. Schlueter and Contributors
-dev,node-fetch,MIT,Copyright 2016-2020 Node Fetch Team
 dev,node-forge,BSD,Copyright (c) 2010, Digital Bazaar, Inc.
 dev,npm-run-all,MIT,Copyright 2015 Toru Nagashima
 dev,pako,MIT,(C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin

README.md

@@ -41,28 +41,29 @@ Datadog provides one CDN bundle per [site][70]:
 [2]: https://imgix.datadoghq.com/img/favicons/favicon-32x32.png
 [01]: https://badge.fury.io/js/%40datadog%2Fbrowser-logs.svg
 [02]: https://badge.fury.io/js/%40datadog%2Fbrowser-logs
-[03]: https://badgen.net/bundlephobia/minzip/@datadog/browser-logs
-[04]: https://bundlephobia.com/result?p=@datadog/browser-logs
+
+[03]: https://deno.bundlejs.com/badge?q=@datadog/browser-logs&treeshake=[*]
+[04]: https://bundlejs.com/?q=@datadog/browser-logs&treeshake=[*]
 [08]: https://docs.datadoghq.com/logs/log_collection/javascript
 [11]: https://badge.fury.io/js/%40datadog%2Fbrowser-rum.svg
 [12]: https://badge.fury.io/js/%40datadog%2Fbrowser-rum
-[13]: https://badgen.net/bundlephobia/minzip/@datadog/browser-rum
-[14]: https://bundlephobia.com/result?p=@datadog/browser-rum
+[13]: https://deno.bundlejs.com/badge?q=@datadog/browser-rum&treeshake=[*]
+[14]: https://bundlejs.com/?q=@datadog/browser-rum&treeshake=[*]
 [18]: https://docs.datadoghq.com/real_user_monitoring/browser/
 [21]: https://badge.fury.io/js/%40datadog%2Fbrowser-rum-slim.svg
 [22]: https://badge.fury.io/js/%40datadog%2Fbrowser-rum-slim
-[23]: https://badgen.net/bundlephobia/minzip/@datadog/browser-rum-slim
-[24]: https://bundlephobia.com/result?p=@datadog/browser-rum-slim
+[23]: https://deno.bundlejs.com/badge?q=@datadog/browser-rum-slim&treeshake=[*]
+[24]: https://bundlejs.com/?q=@datadog/browser-rum-slim&treeshake=[*]
 [41]: https://badge.fury.io/js/%40datadog%2Fbrowser-core.svg
 [42]: https://badge.fury.io/js/%40datadog%2Fbrowser-core
-[43]: https://badgen.net/bundlephobia/minzip/@datadog/browser-core
-[44]: https://bundlephobia.com/result?p=@datadog/browser-core
+[43]: https://deno.bundlejs.com/badge?q=@datadog/browser-core&treeshake=[*]
+[44]: https://bundlejs.com/?q=@datadog/browser-core&treeshake=[*]
 [51]: https://badge.fury.io/js/%40datadog%2Fbrowser-rum-core.svg
 [52]: https://badge.fury.io/js/%40datadog%2Fbrowser-rum-core
-[53]: https://badgen.net/bundlephobia/minzip/@datadog/browser-rum-core
-[54]: https://bundlephobia.com/result?p=@datadog/browser-rum-core
+[53]: https://deno.bundlejs.com/badge?q=@datadog/browser-rum-core&treeshake=[*]
+[54]: https://bundlejs.com/?q=@datadog/browser-rum-core&treeshake=[*]
 [61]: https://badge.fury.io/js/%40datadog%2Fbrowser-worker.svg
 [62]: https://badge.fury.io/js/%40datadog%2Fbrowser-worker
-[63]: https://badgen.net/bundlephobia/minzip/@datadog/browser-worker
-[64]: https://bundlephobia.com/result?p=@datadog/browser-worker
+[63]: https://deno.bundlejs.com/badge?q=@datadog/browser-worker&treeshake=[*]
+[64]: https://bundlejs.com/?q=@datadog/browser-worker&treeshake=[*]
 [70]: https://docs.datadoghq.com/getting_started/site/

developer-extension/package.json

@@ -1,29 +1,29 @@
 {
   "name": "@datadog/browser-sdk-developer-extension",
-  "version": "5.11.0",
+  "version": "5.13.0",
   "private": true,
   "scripts": {
     "build": "rm -rf dist && webpack --mode production",
     "dev": "webpack --mode development --watch"
   },
   "devDependencies": {
-    "@tabler/icons-react": "2.47.0",
-    "@types/chrome": "0.0.262",
-    "@types/react": "18.2.63",
-    "@types/react-dom": "18.2.19",
+    "@tabler/icons-react": "3.1.0",
+    "@types/chrome": "0.0.263",
+    "@types/react": "18.2.69",
+    "@types/react-dom": "18.2.22",
     "@webextension-toolbox/webpack-webextension-plugin": "3.3.1",
     "copy-webpack-plugin": "12.0.2",
     "css-loader": "6.10.0",
     "html-webpack-plugin": "5.6.0",
     "style-loader": "3.3.4",
-    "webpack": "5.90.3"
+    "webpack": "5.91.0"
   },
   "dependencies": {
     "@datadog/browser-core": "workspace:*",
     "@datadog/browser-logs": "workspace:*",
     "@datadog/browser-rum": "workspace:*",
-    "@mantine/core": "7.6.1",
-    "@mantine/hooks": "7.6.1",
+    "@mantine/core": "7.6.2",
+    "@mantine/hooks": "7.6.2",
     "clsx": "2.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0"

lerna.json

@@ -1,4 +1,4 @@
 {
   "npmClient": "yarn",
-  "version": "5.11.0"
+  "version": "5.13.0"
 }

package.json

@@ -30,18 +30,18 @@
   },
   "devDependencies": {
     "@jsdevtools/coverage-istanbul-loader": "3.0.5",
-    "@types/chrome": "0.0.262",
+    "@types/chrome": "0.0.263",
     "@types/connect-busboy": "1.0.3",
     "@types/cors": "2.8.17",
     "@types/express": "4.17.21",
     "@types/jasmine": "3.10.18",
-    "@typescript-eslint/eslint-plugin": "7.1.1",
-    "@typescript-eslint/parser": "7.1.1",
-    "@wdio/browserstack-service": "8.32.4",
-    "@wdio/cli": "8.32.4",
-    "@wdio/jasmine-framework": "8.32.4",
+    "@typescript-eslint/eslint-plugin": "7.3.1",
+    "@typescript-eslint/parser": "7.3.1",
+    "@wdio/browserstack-service": "8.35.1",
+    "@wdio/cli": "8.35.1",
+    "@wdio/jasmine-framework": "8.35.1",
     "@wdio/junit-reporter": "8.32.4",
-    "@wdio/local-runner": "8.32.4",
+    "@wdio/local-runner": "8.35.1",
     "@wdio/spec-reporter": "8.32.4",
     "ajv": "6.12.6",
     "browserstack-local": "1.5.5",
@@ -54,11 +54,11 @@
     "eslint-module-utils": "2.8.1",
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-jasmine": "4.1.3",
-    "eslint-plugin-jsdoc": "48.2.0",
+    "eslint-plugin-jsdoc": "48.2.1",
     "eslint-plugin-local-rules": "2.0.1",
     "eslint-plugin-prefer-arrow": "1.2.3",
     "eslint-plugin-unicorn": "51.0.1",
-    "express": "4.18.3",
+    "express": "4.19.2",
     "glob": "10.3.10",
     "jasmine-core": "3.99.1",
     "json-schema-to-typescript": "bcaudan/json-schema-to-typescript#bcaudan/add-readonly-support",
@@ -73,25 +73,25 @@
     "karma-webpack": "5.0.0",
     "lerna": "8.1.2",
     "minimatch": "9.0.3",
-    "node-fetch": "3.3.2",
     "npm-run-all": "4.1.5",
     "prettier": "3.2.5",
     "terser-webpack-plugin": "5.3.10",
     "ts-loader": "9.5.1",
     "ts-node": "10.9.2",
     "tsconfig-paths-webpack-plugin": "4.1.0",
     "typescript": "5.3.3",
-    "webdriverio": "8.32.4",
-    "webpack": "5.90.3",
+    "webdriverio": "8.35.1",
+    "webpack": "5.91.0",
     "webpack-cli": "5.1.4",
-    "webpack-dev-middleware": "7.0.0"
+    "webpack-dev-middleware": "7.1.0"
   },
   "resolutions": {
-    "ansi-regex": "5.0.1"
+    "ansi-regex": "5.0.1",
+    "@mantine/core/type-fest": "4.14.0"
   },
   "volta": {
     "node": "18.19.1",
-    "yarn": "1.22.21"
+    "yarn": "1.22.22"
   },
   "packageManager": "[email protected]"
 }

packages/core/package.json

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

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

@@ -1,4 +1,6 @@
 import type { RumEvent } from '../../../../rum-core/src'
+import { EXHAUSTIVE_INIT_CONFIGURATION, SERIALIZED_EXHAUSTIVE_INIT_CONFIGURATION } from '../../../test'
+import type { ExtractTelemetryConfiguration, MapInitConfigurationKey } from '../../../test'
 import { display } from '../../tools/display'
 import {
   ExperimentalFeature,
@@ -7,7 +9,7 @@ import {
 } from '../../tools/experimentalFeatures'
 import { TrackingConsent } from '../trackingConsent'
 import type { InitConfiguration } from './configuration'
-import { validateAndBuildConfiguration } from './configuration'
+import { serializeConfiguration, validateAndBuildConfiguration } from './configuration'
 
 describe('validateAndBuildConfiguration', () => {
   const clientToken = 'some_client_token'
@@ -207,4 +209,15 @@ describe('validateAndBuildConfiguration', () => {
       expect(displaySpy).toHaveBeenCalledOnceWith('Tracking Consent should be either "granted" or "not-granted"')
     })
   })
+
+  describe('serializeConfiguration', () => {
+    it('should serialize the configuration', () => {
+      // By specifying the type here, we can ensure that serializeConfiguration is returning an
+      // object containing all expected properties.
+      const serializedConfiguration: ExtractTelemetryConfiguration<MapInitConfigurationKey<keyof InitConfiguration>> =
+        serializeConfiguration(EXHAUSTIVE_INIT_CONFIGURATION)
+
+      expect(serializedConfiguration).toEqual(SERIALIZED_EXHAUSTIVE_INIT_CONFIGURATION)
+    })
+  })
 })

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

@@ -21,6 +21,13 @@ export const DefaultPrivacyLevel = {
 } as const
 export type DefaultPrivacyLevel = (typeof DefaultPrivacyLevel)[keyof typeof DefaultPrivacyLevel]
 
+export const TraceContextInjection = {
+  ALL: 'all',
+  SAMPLED: 'sampled',
+} as const
+
+export type TraceContextInjection = (typeof TraceContextInjection)[keyof typeof TraceContextInjection]
+
 export interface InitConfiguration {
   // global options
   clientToken: string
@@ -178,7 +185,7 @@ export function validateAndBuildConfiguration(initConfiguration: InitConfigurati
   )
 }
 
-export function serializeConfiguration(initConfiguration: InitConfiguration): Partial<RawTelemetryConfiguration> {
+export function serializeConfiguration(initConfiguration: InitConfiguration) {
   return {
     session_sample_rate: initConfiguration.sessionSampleRate,
     telemetry_sample_rate: initConfiguration.telemetrySampleRate,
@@ -193,5 +200,6 @@ export function serializeConfiguration(initConfiguration: InitConfiguration): Pa
     allow_fallback_to_local_storage: !!initConfiguration.allowFallbackToLocalStorage,
     store_contexts_across_pages: !!initConfiguration.storeContextsAcrossPages,
     allow_untrusted_events: !!initConfiguration.allowUntrustedEvents,
-  }
+    tracking_consent: initConfiguration.trackingConsent,
+  } satisfies RawTelemetryConfiguration
 }

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

@@ -145,4 +145,42 @@ describe('endpointBuilder', () => {
       ).not.toContain('flush_reason')
     })
   })
+
+  describe('PCI compliance intake with option', () => {
+    beforeEach(() => {
+      ;(window as unknown as BuildEnvWindow).__BUILD_ENV__SDK_VERSION__ = 'some_version'
+      resetExperimentalFeatures()
+    })
+
+    it('should return PCI compliance intake endpoint if site is us1', () => {
+      const config: InitConfiguration & { usePciIntake?: boolean } = {
+        clientToken,
+        usePciIntake: true,
+        site: 'datadoghq.com',
+      }
+      expect(createEndpointBuilder(config, 'logs', []).build('xhr', DEFAULT_PAYLOAD)).toContain(
+        'https://pci.browser-intake-datadoghq.com'
+      )
+    })
+    it('should not return PCI compliance intake endpoint if site is not us1', () => {
+      const config: InitConfiguration & { usePciIntake?: boolean } = {
+        clientToken,
+        usePciIntake: true,
+        site: 'ap1.datadoghq.com',
+      }
+      expect(createEndpointBuilder(config, 'logs', []).build('xhr', DEFAULT_PAYLOAD)).not.toContain(
+        'https://pci.browser-intake-datadoghq.com'
+      )
+    })
+    it('should not return PCI compliance intake endpoint if and site is us1 and track is not logs', () => {
+      const config: InitConfiguration & { usePciIntake?: boolean } = {
+        clientToken,
+        usePciIntake: true,
+        site: 'datadoghq.com',
+      }
+      expect(createEndpointBuilder(config, 'rum', []).build('xhr', DEFAULT_PAYLOAD)).not.toContain(
+        'https://pci.browser-intake-datadoghq.com'
+      )
+    })
+  })
 })

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

@@ -4,7 +4,7 @@ import { normalizeUrl } from '../../tools/utils/urlPolyfill'
 import { ExperimentalFeature, isExperimentalFeatureEnabled } from '../../tools/experimentalFeatures'
 import { generateUUID } from '../../tools/utils/stringUtils'
 import type { InitConfiguration } from './configuration'
-import { INTAKE_SITE_US1, INTAKE_SITE_FED_STAGING } from './intakeSites'
+import { INTAKE_SITE_US1, INTAKE_SITE_FED_STAGING, PCI_INTAKE_HOST_US1 } from './intakeSites'
 
 // replaced at build time
 declare const __BUILD_ENV__SDK_VERSION__: string
@@ -55,13 +55,17 @@ function createEndpointUrlWithParametersBuilder(
   if (typeof proxy === 'function') {
     return (parameters) => proxy({ path, parameters })
   }
-  const host = buildEndpointHost(initConfiguration)
+  const host = buildEndpointHost(trackType, initConfiguration)
   return (parameters) => `https://${host}${path}?${parameters}`
 }
 
-function buildEndpointHost(initConfiguration: InitConfiguration) {
+function buildEndpointHost(trackType: TrackType, initConfiguration: InitConfiguration & { usePciIntake?: boolean }) {
   const { site = INTAKE_SITE_US1, internalAnalyticsSubdomain } = initConfiguration
 
+  if (trackType === 'logs' && initConfiguration.usePciIntake && site === INTAKE_SITE_US1) {
+    return PCI_INTAKE_HOST_US1
+  }
+
   if (internalAnalyticsSubdomain && site === INTAKE_SITE_US1) {
     return `${internalAnalyticsSubdomain}.${INTAKE_SITE_US1}`
   }

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

@@ -2,6 +2,7 @@ export {
   Configuration,
   InitConfiguration,
   DefaultPrivacyLevel,
+  TraceContextInjection,
   validateAndBuildConfiguration,
   serializeConfiguration,
 } from './configuration'

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

@@ -3,3 +3,5 @@ export const INTAKE_SITE_FED_STAGING = 'dd0g-gov.com'
 export const INTAKE_SITE_US1 = 'datadoghq.com'
 export const INTAKE_SITE_EU1 = 'datadoghq.eu'
 export const INTAKE_SITE_US1_FED = 'ddog-gov.com'
+
+export const PCI_INTAKE_HOST_US1 = 'pci.browser-intake-datadoghq.com'