@pratham.raval/browser-core 6.22.3 → 6.22.5

package/src/domain/synthetics/syntheticsWorkerValues.ts

@@ -1,14 +1,14 @@
 import { getInitCookie } from '../../browser/cookie'
 import { globalObject, isWorkerEnvironment } from '../../tools/globalObject'
 
-export const SYNTHETICS_TEST_ID_COOKIE_NAME = 'datadog-synthetics-public-id'
-export const SYNTHETICS_RESULT_ID_COOKIE_NAME = 'datadog-synthetics-result-id'
-export const SYNTHETICS_INJECTS_RUM_COOKIE_NAME = 'datadog-synthetics-injects-rum'
+export const SYNTHETICS_TEST_ID_COOKIE_NAME = 'motadata-synthetics-public-id'
+export const SYNTHETICS_RESULT_ID_COOKIE_NAME = 'motadata-synthetics-result-id'
+export const SYNTHETICS_INJECTS_RUM_COOKIE_NAME = 'motadata-synthetics-injects-rum'
 
 export interface BrowserWindow extends Window {
-  _DATADOG_SYNTHETICS_PUBLIC_ID?: unknown
-  _DATADOG_SYNTHETICS_RESULT_ID?: unknown
-  _DATADOG_SYNTHETICS_INJECTS_RUM?: unknown
+  _MOTADATA_SYNTHETICS_PUBLIC_ID?: unknown
+  _MOTADATA_SYNTHETICS_RESULT_ID?: unknown
+  _MOTADATA_SYNTHETICS_INJECTS_RUM?: unknown
 }
 
 export function willSyntheticsInjectRum(): boolean {
@@ -18,18 +18,18 @@ export function willSyntheticsInjectRum(): boolean {
   }
 
   return Boolean(
-    (globalObject as BrowserWindow)._DATADOG_SYNTHETICS_INJECTS_RUM || getInitCookie(SYNTHETICS_INJECTS_RUM_COOKIE_NAME)
+    (globalObject as BrowserWindow)._MOTADATA_SYNTHETICS_INJECTS_RUM || getInitCookie(SYNTHETICS_INJECTS_RUM_COOKIE_NAME)
   )
 }
 
 export function getSyntheticsTestId(): string | undefined {
-  const value = (window as BrowserWindow)._DATADOG_SYNTHETICS_PUBLIC_ID || getInitCookie(SYNTHETICS_TEST_ID_COOKIE_NAME)
+  const value = (window as BrowserWindow)._MOTADATA_SYNTHETICS_PUBLIC_ID || getInitCookie(SYNTHETICS_TEST_ID_COOKIE_NAME)
   return typeof value === 'string' ? value : undefined
 }
 
 export function getSyntheticsResultId(): string | undefined {
   const value =
-    (window as BrowserWindow)._DATADOG_SYNTHETICS_RESULT_ID || getInitCookie(SYNTHETICS_RESULT_ID_COOKIE_NAME)
+    (window as BrowserWindow)._MOTADATA_SYNTHETICS_RESULT_ID || getInitCookie(SYNTHETICS_RESULT_ID_COOKIE_NAME)
   return typeof value === 'string' ? value : undefined
 }
 

package/src/domain/tags.ts

@@ -36,15 +36,15 @@ export function buildTag(key: string, rawValue?: string) {
   // warning.
   const tag = rawValue ? `${key}:${rawValue}` : key
 
-  if (tag.length > TAG_SIZE_LIMIT || hasForbiddenCharacters(tag)) {
-    display.warn(
-      `Tag ${tag} doesn't meet tag requirements and will be sanitized. ${MORE_DETAILS} ${DOCS_ORIGIN}/getting_started/tagging/#defining-tags`
-    )
-  }
+  // if (tag.length > TAG_SIZE_LIMIT || hasForbiddenCharacters(tag)) {
+  //   display.warn(
+  //     `Tag ${tag} doesn't meet tag requirements and will be sanitized. ${MORE_DETAILS} ${DOCS_ORIGIN}/getting_started/tagging/#defining-tags`
+  //   )
+  // }
 
   // Let the backend do most of the sanitization, but still make sure multiple tags can't be crafted
   // by forging a value containing commas.
-  return sanitizeTag(tag)
+  return tag
 }
 
 export function sanitizeTag(tag: string) {

package/src/domain/telemetry/telemetry.ts

@@ -5,7 +5,7 @@ import { toStackTraceString } from '../../tools/stackTrace/handlingStack'
 import { getExperimentalFeatures } from '../../tools/experimentalFeatures'
 import type { Configuration } from '../configuration'
 import { buildTags } from '../tags'
-import { INTAKE_SITE_STAGING, INTAKE_SITE_US1_FED } from '../intakeSites'
+
 import { BufferedObservable, Observable } from '../../tools/observable'
 import { clocksNow } from '../../tools/utils/timeUtils'
 import { displayIfDebugEnabled, startMonitorErrorCollection } from '../../tools/monitor'
@@ -74,7 +74,7 @@ export const enum TelemetryMetrics {
 
 const METRIC_SAMPLE_RATE = 1
 
-const TELEMETRY_EXCLUDED_SITES: string[] = [INTAKE_SITE_US1_FED]
+const TELEMETRY_EXCLUDED_SITES: string[] = []
 
 let telemetryObservable: BufferedObservable<{ rawEvent: RawTelemetryEvent; metricName?: string }> | undefined
 
@@ -188,7 +188,7 @@ export function startTelemetryCollection(
       service: telemetryService,
       version: __BUILD_ENV__SDK_VERSION__,
       source: 'browser' as const,
-      _dd: {
+      _md: {
         format_version: 2 as const,
       },
       telemetry: combine(rawEvent, {
@@ -196,7 +196,7 @@ export function startTelemetryCollection(
         connectivity: getConnectivity(),
         sdk_setup: __BUILD_ENV__SDK_SETUP__,
       }) as TelemetryEvent['telemetry'],
-      ddtags: buildTags(configuration).join(','),
+      mdtags: buildTags(configuration).join(','),
       experimental_features: Array.from(getExperimentalFeatures()),
     }
 
@@ -262,7 +262,7 @@ export function resetTelemetry() {
  * but keep replicating staging events for reliability
  */
 function isTelemetryReplicationAllowed(configuration: Configuration) {
-  return configuration.site === INTAKE_SITE_STAGING
+  return false // No telemetry replication for custom sites
 }
 
 export function addTelemetryDebug(message: string, context?: Context) {

package/src/domain/telemetry/telemetryEvent.types.ts

@@ -540,7 +540,7 @@ export interface CommonTelemetryProperties {
   /**
    * Internal properties
    */
-  _dd: {
+  _md: {
     /**
      * Version of the RUM event format
      */

package/src/index.ts

@@ -68,6 +68,7 @@ export {
   BridgeCapability,
   createBatch,
   createFlushController,
+  setCurrentSite
 } from './transport'
 export * from './tools/display'
 export type { Encoder, EncoderResult } from './tools/encoder'

package/src/tools/display.ts

@@ -41,7 +41,7 @@ Object.keys(ConsoleApiName).forEach((name) => {
   originalConsoleMethods[name as ConsoleApiName] = globalConsole[name as ConsoleApiName]
 })
 
-const PREFIX = 'Datadog Browser SDK:'
+const PREFIX = 'Motadata Browser SDK:'
 
 export const display: Display = {
   debug: originalConsoleMethods.debug.bind(globalConsole, PREFIX),

package/src/tools/experimentalFeatures.ts

@@ -18,6 +18,7 @@ export enum ExperimentalFeature {
   USE_TREE_WALKER_FOR_ACTION_NAME = 'use_tree_walker_for_action_name',
   FEATURE_OPERATION_VITAL = 'feature_operation_vital',
   SHORT_SESSION_INVESTIGATION = 'short_session_investigation',
+  ENCODE_COOKIE_OPTIONS = 'encode_cookie_options',
 }
 
 const enabledExperimentalFeatures: Set<ExperimentalFeature> = new Set()

package/src/tools/utils/browserDetection.ts

@@ -1,3 +1,6 @@
+// eslint-disable-next-line import/no-extraneous-dependencies, local-rules/disallow-side-effects, local-rules/enforce-prod-deps-imports
+import { UAParser } from 'ua-parser-js';
+
 // Exported only for tests
 export const enum Browser {
   CHROMIUM,
@@ -37,3 +40,26 @@ export function detectBrowser(browserWindow: Window = window) {
 
   return Browser.OTHER
 }
+
+/**
+ * Get detailed browser name for X-Browser-Name header
+ * Uses ua-parser-js for accurate browser detection
+ */
+let detailedBrowserNameCache: string | undefined
+
+export function getDetailedBrowserName(browserWindow: Window = window): string {
+  return (
+    detailedBrowserNameCache ??
+    (detailedBrowserNameCache = detectDetailedBrowserName(browserWindow))
+  )
+}
+
+export function detectDetailedBrowserName(browserWindow: Window = window): string {
+  const ua = browserWindow.navigator.userAgent
+  const parser = new UAParser(ua)
+  const result = parser.getResult()
+
+  // Return the browser name from ua-parser-js
+  // If browser name is undefined or empty, return 'Unknown Browser'
+  return result.browser.name || 'Unknown Browser'
+}

package/src/tools/utils/stringUtils.ts

@@ -11,6 +11,10 @@ export function generateUUID(placeholder?: string): string {
 
 const COMMA_SEPARATED_KEY_VALUE = /([\w-]+)\s*=\s*([^;]+)/g
 
+/**
+ * Returns the value of the key with the given name
+ * If there are multiple values with the same key, returns the first one
+ */
 export function findCommaSeparatedValue(rawString: string, name: string): string | undefined {
   COMMA_SEPARATED_KEY_VALUE.lastIndex = 0
   while (true) {
@@ -25,6 +29,36 @@ export function findCommaSeparatedValue(rawString: string, name: string): string
   }
 }
 
+/**
+ * Returns a map of all the values with the given key
+ * If there are multiple values with the same key, returns all the values
+ */
+export function findAllCommaSeparatedValues(rawString: string): Map<string, string[]> {
+  const result = new Map<string, string[]>()
+  COMMA_SEPARATED_KEY_VALUE.lastIndex = 0
+  while (true) {
+    const match = COMMA_SEPARATED_KEY_VALUE.exec(rawString)
+    if (match) {
+      const key = match[1]
+      const value = match[2]
+      if (result.has(key)) {
+        result.get(key)!.push(value)
+      } else {
+        result.set(key, [value])
+      }
+    } else {
+      break
+    }
+  }
+  return result
+}
+
+/**
+ * Returns a map of the values with the given key
+ * ⚠️ If there are multiple values with the same key, returns the LAST one
+ *
+ * @deprecated use `findAllCommaSeparatedValues()` instead
+ */
 export function findCommaSeparatedValues(rawString: string): Map<string, string> {
   const result = new Map<string, string>()
   COMMA_SEPARATED_KEY_VALUE.lastIndex = 0

package/src/transport/httpRequest.ts

@@ -3,6 +3,7 @@ import type { Context } from '../tools/serialisation/context'
 import { monitor, monitorError } from '../tools/monitor'
 import type { RawError } from '../domain/error/error.types'
 import { Observable } from '../tools/observable'
+import { getDetailedBrowserName } from '../tools/utils/browserDetection'
 import { newRetryState, sendWithRetryStrategy } from './sendWithRetryStrategy'
 
 /**
@@ -62,6 +63,12 @@ export interface RetryInfo {
   lastFailureStatus: number
 }
 
+let currentSite: string | undefined
+
+export function setCurrentSite(site: string | undefined) {
+  currentSite = site
+}
+
 export function createHttpRequest<Body extends Payload = Payload>(
   endpointBuilders: EndpointBuilder[],
   bytesLimit: number,
@@ -133,10 +140,16 @@ export function fetchKeepAliveStrategy(
 
   if (canUseKeepAlive) {
     const fetchUrl = endpointBuilder.build('fetch-keepalive', payload)
-
-    fetch(fetchUrl, { method: 'POST', body: payload.data, keepalive: true, mode: 'cors' })
-      .then(monitor((response: Response) => onResponse?.({ status: response.status, type: response.type })))
-      .catch(monitor(() => fetchStrategy(endpointBuilder, payload, onResponse)))
+    const headers = buildRequestHeaders(fetchUrl)
+
+    fetch(fetchUrl, { method: 'POST', body: payload.data, keepalive: true, mode: 'cors', headers })
+      .then(monitor((response: Response) => {
+        onResponse?.({ status: response.status, type: response.type })
+      }))
+      .catch(monitor((error) => {
+        fetchStrategy(endpointBuilder, payload, onResponse)
+        onResponse?.({ status: 0 })
+      }))
   } else {
     fetchStrategy(endpointBuilder, payload, onResponse)
   }
@@ -148,8 +161,9 @@ export function fetchStrategy(
   onResponse?: (r: HttpResponse) => void
 ) {
   const fetchUrl = endpointBuilder.build('fetch', payload)
+  const headers = buildRequestHeaders(fetchUrl)
 
-  fetch(fetchUrl, { method: 'POST', body: payload.data, mode: 'cors' })
+  fetch(fetchUrl, { method: 'POST', body: payload.data, mode: 'cors', headers })
     .then(monitor((response: Response) => onResponse?.({ status: response.status, type: response.type })))
     .catch(monitor(() => onResponse?.({ status: 0 })))
 }
@@ -162,3 +176,15 @@ function isKeepAliveSupported() {
     return false
   }
 }
+
+function buildRequestHeaders(url?: string): HeadersInit {
+  const headers: HeadersInit = {}
+
+  // dynamically match your RUM SDK endpoint host
+  // "site" comes from init() call, so this automatically adjusts
+  if (currentSite && url ) {
+    headers['X-Browser-Name'] = getDetailedBrowserName()
+  }
+
+  return headers
+}

package/src/transport/index.ts

@@ -1,5 +1,5 @@
 export type { BandwidthStats, HttpRequest, HttpRequestEvent, Payload, RetryInfo } from './httpRequest'
-export { createHttpRequest } from './httpRequest'
+export { createHttpRequest, setCurrentSite } from './httpRequest'
 export type { BrowserWindowWithEventBridge, DatadogEventBridge } from './eventBridge'
 export { canUseEventBridge, bridgeSupports, getEventBridge, BridgeCapability } from './eventBridge'
 export { createBatch } from './batch'