✨ add logs and rum-and-logs variants, __DD_BASE_CONFIG__ merge, static imports

Author: mormubis

packages/endpoint/src/bundleGenerator.ts

@@ -1,6 +1,8 @@
 import type { SdkVariant } from './sdkDownloader.ts'
-import { getDefaultVersion } from './sdkDownloader.ts'
+import { getDefaultVersion, downloadSDK } from './sdkDownloader.ts'
 import { INLINE_HELPERS } from './helpers.ts'
+import { fetchRemoteConfiguration } from '@datadog/browser-remote-config'
+import { resolveDynamicValues, serializeConfigToJs } from '@datadog/browser-remote-config/node'
 
 export type { SdkVariant } from './sdkDownloader.ts'
 
@@ -26,10 +28,9 @@ export interface GenerateBundleOptions {
 }
 
 const CONFIG_FETCH_TIMEOUT_MS = 30_000
-const VALID_VARIANTS: SdkVariant[] = ['rum', 'rum-slim']
+const VALID_VARIANTS: SdkVariant[] = ['rum', 'rum-slim', 'logs', 'rum-and-logs']
 
 export async function fetchConfig(options: FetchConfigOptions) {
-  const { fetchRemoteConfiguration } = await import('@datadog/browser-remote-config')
   const result = await fetchRemoteConfiguration({
     applicationId: options.applicationId,
     remoteConfigurationId: options.remoteConfigurationId,
@@ -69,9 +70,11 @@ export function generateCombinedBundle(options: CombineBundleOptions): string {
   // SDK bundle (${variant}) from CDN
   ${sdkCode}
 
-  // Auto-initialize
-  if (typeof window !== 'undefined' && window.DD_RUM) {
-    window.DD_RUM.init(__DATADOG_REMOTE_CONFIG__);
+  // Auto-initialize — merge base config (clientToken, site, etc.) set by the page before this script
+  var __DD_CONFIG__ = Object.assign({}, window.__DD_BASE_CONFIG__ || {}, __DATADOG_REMOTE_CONFIG__);
+  if (typeof window !== 'undefined') {
+    if (window.DD_RUM) { window.DD_RUM.init(__DD_CONFIG__); }
+    if (window.DD_LOGS) { window.DD_LOGS.init(__DD_CONFIG__); }
   }
 })();`
 }
@@ -93,11 +96,9 @@ export async function generateBundle(options: GenerateBundleOptions): Promise<st
     site: options.site,
   })
 
-  const { resolveDynamicValues, serializeConfigToJs } = await import('@datadog/browser-remote-config/node')
   const resolved = resolveDynamicValues(configResult.value)
   const configJs = serializeConfigToJs(resolved)
 
-  const { downloadSDK } = await import('./sdkDownloader.ts')
   const sdkCode = await downloadSDK({ variant: options.variant, datacenter: options.datacenter })
   const sdkVersion = getDefaultVersion()
 

packages/endpoint/src/sdkDownloader.ts

@@ -3,7 +3,14 @@ import https from 'node:https'
 // eslint-disable-next-line local-rules/disallow-side-effects, local-rules/enforce-prod-deps-imports -- Node.js build tool
 import { createRequire } from 'node:module'
 
-export type SdkVariant = 'rum' | 'rum-slim'
+export type SdkVariant = 'rum' | 'rum-slim' | 'logs' | 'rum-and-logs'
+
+// Variants that map to a single CDN file
+const CDN_VARIANTS: Record<Exclude<SdkVariant, 'rum-and-logs'>, string> = {
+  rum: 'rum',
+  'rum-slim': 'rum-slim',
+  logs: 'logs',
+}
 
 export interface DownloadSDKOptions {
   variant: SdkVariant
@@ -34,15 +41,26 @@ export async function downloadSDK(options: SdkVariant | DownloadSDKOptions): Pro
   const variant = typeof options === 'string' ? options : options.variant
   const datacenter = typeof options === 'string' ? DEFAULT_DATACENTER : (options.datacenter ?? DEFAULT_DATACENTER)
   const version = typeof options === 'string' ? getDefaultVersion() : (options.version ?? getDefaultVersion())
+
+  // rum-and-logs: download both SDKs and concatenate
+  if (variant === 'rum-and-logs') {
+    const [rum, logs] = await Promise.all([
+      downloadSDK({ variant: 'rum', datacenter, version }),
+      downloadSDK({ variant: 'logs', datacenter, version }),
+    ])
+    return `${rum}\n${logs}`
+  }
+
   const majorVersion = getMajorVersion(version)
+  const cdnVariant = CDN_VARIANTS[variant]
 
   const cacheKey = `${variant}-${majorVersion}-${datacenter}`
   const cached = sdkCache.get(cacheKey)
   if (cached) {
     return cached
   }
 
-  const cdnUrl = `${CDN_HOST}/${datacenter}/v${majorVersion}/datadog-${variant}.js`
+  const cdnUrl = `${CDN_HOST}/${datacenter}/v${majorVersion}/datadog-${cdnVariant}.js`
 
   const sdkCode = await new Promise<string>((resolve, reject) => {
     const request = https.get(cdnUrl, { timeout: 30000 }, (res) => {

packages/remote-config/package.json

@@ -7,7 +7,8 @@
   "types": "cjs/index.d.ts",
   "exports": {
     ".": "./src/index.ts",
-    "./node": "./src/entries/node.ts"
+    "./node": "./src/entries/node.ts",
+    "./package.json": "./package.json"
   },
   "scripts": {
     "build": "node ../../scripts/build/build-package.ts --modules"