dd-trace 6.1.0 → 6.3.0

package/packages/datadog-plugin-modelcontextprotocol-sdk/src/tracing.js

@@ -1,55 +1,173 @@
 'use strict'
 
+const Plugin = require('../../dd-trace/src/plugins/plugin')
 const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
 
-class McpToolCallPlugin extends TracingPlugin {
-  static id = 'modelcontextprotocol_client'
-  static prefix = 'tracing:orchestrion:@modelcontextprotocol/sdk:Client_callTool'
+const {
+  DISTRIBUTED_TRACE_META_KEY,
+  tagErrorResult,
+} = require('./utils')
 
-  bindStart (ctx) {
-    const params = ctx.arguments?.[0]
-    const toolName = params?.name
+const MCP_REQUEST_SPAN_NAME = 'mcp.request'
+const CLIENT_TOOL_CALL_RESOURCE = 'client_tool_call'
+const CLIENT_LIST_TOOLS_RESOURCE = 'ClientSession.list_tools'
+const SERVER_TOOL_CALL_RESOURCE = 'server_tool_call'
 
-    this.startSpan('mcp.client.tool.call', {
-      resource: toolName,
+function getServerRequestResource (request) {
+  if (request?.method === 'tools/call') return SERVER_TOOL_CALL_RESOURCE
+  return request?.method
+}
+
+class McpPlugin extends TracingPlugin {
+  bindStart (ctx) {
+    const spanOptions = {
+      resource: this.getResource(ctx),
       type: 'mcp',
-      kind: 'client',
-    }, ctx)
+      kind: this.constructor.kind,
+    }
+    const childOf = this.getChildOf(ctx)
+    if (childOf) spanOptions.childOf = childOf
 
+    this.startSpan(this.constructor.spanName, spanOptions, ctx)
+    const span = ctx.currentStore?.span
+    if (span) this.onStart(span, ctx)
     return ctx.currentStore
   }
 
   asyncEnd (ctx) {
-    const result = ctx.result
-    if (result?.isError) {
-      const span = ctx.currentStore?.span
-      const errorText = result.content?.find?.(c => c.type === 'text')?.text || 'Tool call returned isError: true'
-      span?.setTag('error', new Error(errorText))
-    }
+    const span = ctx.currentStore?.span
+    if (span) this.onEnd(span, ctx)
     super.finish(ctx)
   }
+
+  getResource () {}
+  getChildOf () {}
+  onStart () {}
+  onEnd () {}
 }
 
-class McpListToolsPlugin extends TracingPlugin {
+class McpPropagationPlugin extends Plugin {
+  static id = 'modelcontextprotocol_propagation'
+
+  constructor (...args) {
+    super(...args)
+    this.addSub('apm:mcp:client:request:inject', this.injectTraceContext.bind(this))
+  }
+
+  injectTraceContext (ctx) {
+    const span = this.tracer.scope().active()
+    if (!span) return
+
+    const traceContext = {}
+    this.tracer.inject(span, 'text_map', traceContext)
+    ctx.traceContext = traceContext
+  }
+}
+
+class McpToolCallPlugin extends McpPlugin {
+  static id = 'modelcontextprotocol_client'
+  static prefix = 'tracing:orchestrion:@modelcontextprotocol/sdk:Client_callTool'
+  static spanName = MCP_REQUEST_SPAN_NAME
+  static kind = 'client'
+  getResource () { return CLIENT_TOOL_CALL_RESOURCE }
+  onEnd (span, ctx) { tagErrorResult(span, ctx.result) }
+}
+
+class McpListToolsPlugin extends McpPlugin {
   static id = 'modelcontextprotocol_list_tools'
   static prefix = 'tracing:orchestrion:@modelcontextprotocol/sdk:Client_listTools'
+  static spanName = MCP_REQUEST_SPAN_NAME
+  static kind = 'client'
+  getResource () { return CLIENT_LIST_TOOLS_RESOURCE }
+}
 
-  bindStart (ctx) {
-    this.startSpan('mcp.tools.list', {
-      resource: 'tools/list',
-      type: 'mcp',
-      kind: 'client',
-    }, ctx)
+class McpListResourcesPlugin extends McpPlugin {
+  static id = 'modelcontextprotocol_list_resources'
+  static prefix = 'tracing:orchestrion:@modelcontextprotocol/sdk:Client_listResources'
+  static spanName = 'mcp.resources.list'
+  static kind = 'client'
+  getResource () { return 'resources/list' }
+}
 
-    return ctx.currentStore
+class McpReadResourcePlugin extends McpPlugin {
+  static id = 'modelcontextprotocol_read_resource'
+  static prefix = 'tracing:orchestrion:@modelcontextprotocol/sdk:Client_readResource'
+  static spanName = 'mcp.resource.read'
+  static kind = 'client'
+  getResource () { return 'resources/read' }
+}
+
+class McpListPromptsPlugin extends McpPlugin {
+  static id = 'modelcontextprotocol_list_prompts'
+  static prefix = 'tracing:orchestrion:@modelcontextprotocol/sdk:Client_listPrompts'
+  static spanName = 'mcp.prompts.list'
+  static kind = 'client'
+  getResource () { return 'prompts/list' }
+}
+
+class McpGetPromptPlugin extends McpPlugin {
+  static id = 'modelcontextprotocol_get_prompt'
+  static prefix = 'tracing:orchestrion:@modelcontextprotocol/sdk:Client_getPrompt'
+  static spanName = 'mcp.prompt.get'
+  static kind = 'client'
+  getResource () { return 'prompts/get' }
+}
+
+class McpServerRequestPlugin extends McpPlugin {
+  static id = 'modelcontextprotocol_server'
+  static prefix = 'tracing:apm:mcp:server:request'
+  static spanName = MCP_REQUEST_SPAN_NAME
+  static kind = 'server'
+  getResource (ctx) { return getServerRequestResource(ctx.request) }
+  getChildOf (ctx) {
+    const traceContext = ctx.request?.params?._meta?.[DISTRIBUTED_TRACE_META_KEY]
+    if (!traceContext || typeof traceContext !== 'object') return
+
+    const childOf = this.tracer.extract('text_map', traceContext)
+    const activeSpan = this.activeSpan
+    if (!childOf || activeSpan?.context().toTraceId() === childOf.toTraceId()) return
+
+    return childOf
   }
 
-  asyncEnd (ctx) {
-    super.finish(ctx)
+  onEnd (span, ctx) {
+    if (ctx.error) {
+      span.setTag('error', ctx.error)
+    } else {
+      tagErrorResult(span, ctx.result)
+    }
   }
 }
 
+class McpServerToolCallPlugin extends McpPlugin {
+  static id = 'modelcontextprotocol_server_tool'
+  static prefix = 'tracing:orchestrion:@modelcontextprotocol/sdk:McpServer_executeToolHandler'
+  static spanName = 'mcp.server.tool.call'
+  static kind = 'internal'
+
+  /**
+   * @param {...unknown} args Plugin constructor arguments.
+   */
+  constructor (...args) {
+    super(...args)
+    this.toolNames = new WeakMap()
+    this.addSub('apm:mcp:server:tool:registered', ({ tool, name }) => {
+      this.toolNames.set(tool, name)
+    })
+  }
+
+  getResource (ctx) { return this.toolNames.get(ctx.arguments?.[0]) }
+  onEnd (span, ctx) { tagErrorResult(span, ctx.result) }
+}
+
 module.exports = [
+  McpPropagationPlugin,
   McpToolCallPlugin,
   McpListToolsPlugin,
+  McpListResourcesPlugin,
+  McpReadResourcePlugin,
+  McpListPromptsPlugin,
+  McpGetPromptPlugin,
+  McpServerRequestPlugin,
+  McpServerToolCallPlugin,
 ]

package/packages/datadog-plugin-modelcontextprotocol-sdk/src/utils.js

@@ -0,0 +1,30 @@
+'use strict'
+
+const { ERROR_MESSAGE, ERROR_TYPE } = require('../../dd-trace/src/constants')
+
+const DISTRIBUTED_TRACE_META_KEY = '_dd_trace_context'
+
+function getFirstTextContent (content) {
+  if (!Array.isArray(content)) return
+
+  for (const item of content) {
+    if (item.type === 'text' && item.text) return item.text
+  }
+}
+
+function setErrorTags (span, message) {
+  span.setTag('error', 1)
+  span.setTag(ERROR_TYPE, 'Error')
+  span.setTag(ERROR_MESSAGE, message)
+}
+
+function tagErrorResult (span, result) {
+  if (result?.isError) {
+    setErrorTags(span, getFirstTextContent(result.content) || 'Tool call returned isError: true')
+  }
+}
+
+module.exports = {
+  DISTRIBUTED_TRACE_META_KEY,
+  tagErrorResult,
+}

package/packages/datadog-plugin-playwright/src/index.js

@@ -68,7 +68,7 @@ class PlaywrightPlugin extends CiPlugin {
     }) => {
       const testSuite = getTestSuitePath(filePath, this.repositoryRoot)
       const isModified = isModifiedTest(testSuite, 0, 0, modifiedFiles, this.constructor.id)
-      onDone({ isModified })
+      onDone(isModified)
     })
 
     this.addSub('ci:playwright:session:finish', ({

package/packages/datadog-plugin-vitest/src/index.js

@@ -67,7 +67,6 @@ class VitestPlugin extends CiPlugin {
         testCommand: this.command,
         repositoryRoot: this.repositoryRoot,
         codeOwnersEntries: this.codeOwnersEntries,
-        testEnvironmentMetadata: this.testEnvironmentMetadata,
       })
     })
 
@@ -324,7 +323,6 @@ class VitestPlugin extends CiPlugin {
       const {
         codeOwnersEntries,
         repositoryRoot,
-        testEnvironmentMetadata,
         requestErrorTags,
         testSuiteAbsolutePath,
         frameworkVersion,
@@ -334,12 +332,6 @@ class VitestPlugin extends CiPlugin {
 
       const testCommand = ctx.testCommand || 'vitest run'
       const { testSessionId, testModuleId } = ctx
-      if (testEnvironmentMetadata) {
-        this.testEnvironmentMetadata = {
-          ...this.testEnvironmentMetadata,
-          ...testEnvironmentMetadata,
-        }
-      }
       this._setRepositoryRoot(repositoryRoot, codeOwnersEntries)
       this.command = testCommand
       this.frameworkVersion = frameworkVersion

package/packages/datadog-shimmer/src/shimmer.js

@@ -1,5 +1,7 @@
 'use strict'
 
+const { isModuleNamespaceObject } = require('node:util').types
+
 /**
  * @type {Set<string | symbol>}
  */
@@ -168,14 +170,19 @@ function wrap (target, name, wrapper, options) {
 
   copyProperties(original, wrapped)
 
-  if (descriptor.writable) {
+  const immutableModuleNamespace = descriptor.configurable === false &&
+    descriptor.writable && isModuleNamespaceObject(target)
+
+  if (descriptor.writable && !immutableModuleNamespace) {
     if (descriptor.configurable && descriptor.enumerable) {
       target[name] = wrapped
       return target
     }
     descriptor.value = wrapped
   } else {
-    if (descriptor.set && options?.replaceGetter) {
+    if (immutableModuleNamespace) {
+      descriptor.value = wrapped
+    } else if (descriptor.set && options?.replaceGetter) {
       // A lazy accessor pair (e.g. Node 20's `fs.opendir`). `original` already
       // resolved the value through the getter. Keep the property an accessor pair
       // so the shape stays observationally identical — a downstream consumer may

package/packages/dd-trace/src/appsec/channels.js

@@ -25,6 +25,7 @@ module.exports = {
   httpClientRequestStart: dc.channel('apm:http:client:request:start'),
   httpClientResponseStart: dc.channel('apm:http:client:response:start'),
   httpClientResponseFinish: dc.channel('apm:http:client:response:finish'),
+  informationalResponse: dc.channel('datadog:http:server:informational-response:start'),
   incomingHttpRequestEnd: dc.channel('dd-trace:incomingHttpRequestEnd'),
   incomingHttpRequestStart: dc.channel('dd-trace:incomingHttpRequestStart'),
   lambdaStartInvocation: dc.channel('datadog:lambda:start-invocation'),

package/packages/dd-trace/src/appsec/index.js

@@ -29,6 +29,7 @@ const {
   responseBody,
   responseWriteHead,
   responseSetHeader,
+  informationalResponse,
   routerParam,
   fastifyResponseChannel,
   fastifyPathParams,
@@ -98,7 +99,8 @@ function enable (_config) {
     responseBody.subscribe(onResponseBody)
     fastifyResponseChannel.subscribe(onResponseBody)
     responseWriteHead.subscribe(onResponseWriteHead)
-    responseSetHeader.subscribe(onResponseSetHeader)
+    responseSetHeader.subscribe(onResponseOperation)
+    informationalResponse.subscribe(onResponseOperation)
     stripeCheckoutSessionCreate.subscribe(onStripeCheckoutSessionCreate)
     stripePaymentIntentCreate.subscribe(onStripePaymentIntentCreate)
     stripeConstructEvent.subscribe(onStripeConstructEvent)
@@ -403,7 +405,7 @@ function onResponseWriteHead ({ req, res, abortController, statusCode, responseH
   handleResults(results?.actions, req, res, rootSpan, abortController)
 }
 
-function onResponseSetHeader ({ res, abortController }) {
+function onResponseOperation ({ res, abortController }) {
   if (isBlocked(res)) {
     abortController?.abort()
   }
@@ -547,7 +549,8 @@ function disable () {
   if (responseBody.hasSubscribers) responseBody.unsubscribe(onResponseBody)
   if (fastifyResponseChannel.hasSubscribers) fastifyResponseChannel.unsubscribe(onResponseBody)
   if (responseWriteHead.hasSubscribers) responseWriteHead.unsubscribe(onResponseWriteHead)
-  if (responseSetHeader.hasSubscribers) responseSetHeader.unsubscribe(onResponseSetHeader)
+  if (responseSetHeader.hasSubscribers) responseSetHeader.unsubscribe(onResponseOperation)
+  if (informationalResponse.hasSubscribers) informationalResponse.unsubscribe(onResponseOperation)
   if (stripeCheckoutSessionCreate.hasSubscribers) stripeCheckoutSessionCreate.unsubscribe(onStripeCheckoutSessionCreate)
   if (stripePaymentIntentCreate.hasSubscribers) stripePaymentIntentCreate.unsubscribe(onStripePaymentIntentCreate)
   if (stripeConstructEvent.hasSubscribers) stripeConstructEvent.unsubscribe(onStripeConstructEvent)

package/packages/dd-trace/src/appsec/lambda.js

@@ -7,9 +7,7 @@ const addresses = require('./addresses')
 const Reporter = require('./reporter')
 const waf = require('./waf')
 
-// Tracks spans for which start-invocation has been processed, so that
-// end-invocation can gate correctly
-const activeInvocations = new WeakSet()
+const activeInvocations = new WeakMap()
 
 /**
  * Maps pre-extracted HTTP data from the Lambda event to WAF addresses,
@@ -31,7 +29,8 @@ function onLambdaStartInvocation (data) {
       return
     }
 
-    activeInvocations.add(span)
+    const req = { headers: headers ?? {} }
+    activeInvocations.set(span, req)
 
     span.addTags({
       '_dd.appsec.enabled': 1,
@@ -74,7 +73,7 @@ function onLambdaStartInvocation (data) {
       persistent[addresses.HTTP_INCOMING_COOKIES] = cookies
     }
 
-    waf.run({ persistent }, span, undefined, span)
+    waf.run({ persistent }, req, undefined, span)
   } catch (err) {
     log.error('[ASM] Error in Lambda start-invocation handler', err)
   }
@@ -100,6 +99,7 @@ function onLambdaEndInvocation (data) {
       return
     }
 
+    const req = activeInvocations.get(span)
     activeInvocations.delete(span)
 
     let hasPersistentData = false
@@ -118,12 +118,12 @@ function onLambdaEndInvocation (data) {
     }
 
     if (hasPersistentData) {
-      waf.run({ persistent }, span, undefined, span)
+      waf.run({ persistent }, req, undefined, span)
     }
 
-    waf.disposeContext(span)
+    waf.disposeContext(req)
 
-    Reporter.finishRequest(span, null, {}, undefined, span)
+    Reporter.finishRequest(req, null, {}, undefined, span)
   } catch (err) {
     log.error('[ASM] Error in Lambda end-invocation handler', err)
   }

package/packages/dd-trace/src/appsec/waf/waf_manager.js

@@ -42,7 +42,7 @@ class WAFManager {
       this.ddwafVersion = this.ddwafVersion || 'unknown'
       Reporter.reportWafInit(this.ddwafVersion, 'unknown')
 
-      log.error('[ASM] AppSec could not load native package. In-app WAF features will not be available.')
+      log.error('[ASM] AppSec could not load native package. In-app WAF features will not be available.', err)
 
       throw err
     }

package/packages/dd-trace/src/ci-visibility/dynamic-instrumentation/worker/index.js

@@ -51,12 +51,20 @@ const limits = {
 }
 
 /**
- * Remove empty collection arrays before sending snapshots through the Test Optimization logs path.
+ * @param {object} value - Snapshot object or sub-object.
+ * @returns {boolean}
+ */
+function isCapturedValue (value) {
+  return typeof value.type === 'string'
+}
+
+/**
+ * Remove empty capture containers before sending snapshots through the Test Optimization logs path.
  *
  * @param {object} value - Snapshot object or sub-object.
  * @returns {void}
  */
-function removeEmptyCollectionProperties (value) {
+function removeEmptyCaptureProperties (value) {
   const stack = [value]
 
   while (stack.length > 0) {
@@ -72,26 +80,25 @@ function removeEmptyCollectionProperties (value) {
       continue
     }
 
-    if (Array.isArray(current.elements)) {
-      if (current.elements.length === 0) {
+    if (isCapturedValue(current)) {
+      if (current.elements === null || (Array.isArray(current.elements) && current.elements.length === 0)) {
         delete current.elements
-      } else {
-        stack.push(current.elements)
       }
-    }
 
-    if (Array.isArray(current.entries)) {
-      if (current.entries.length === 0) {
+      if (current.entries === null || (Array.isArray(current.entries) && current.entries.length === 0)) {
         delete current.entries
-      } else {
-        stack.push(current.entries)
       }
-    }
 
-    for (const key of Object.keys(current)) {
-      if (key === 'elements' || key === 'entries') continue
+      if (current.fields === null || (
+        current.fields &&
+        typeof current.fields === 'object' &&
+        Object.keys(current.fields).length === 0
+      )) {
+        delete current.fields
+      }
+    }
 
-      const child = current[key]
+    for (const child of Object.values(current)) {
       if (child && typeof child === 'object') {
         stack.push(child)
       }
@@ -129,7 +136,7 @@ session.on('Debugger.paused', async ({ params: { hitBreakpoints: [hitBreakpoint]
       language: 'javascript',
     }
 
-    removeEmptyCollectionProperties(snapshot.captures)
+    removeEmptyCaptureProperties(snapshot.captures)
 
     if (processTags) {
       snapshot[processTags.DYNAMIC_INSTRUMENTATION_FIELD_NAME] = processTags.tagsObject

package/packages/dd-trace/src/config/config-types.d.ts

@@ -70,3 +70,11 @@ export type ConfigKey = KnownStringKeys<ConfigProperties>
 export type ConfigPath = ConfigPathFor<ConfigProperties>
 export type ConfigPathValue<TPath extends ConfigPath> = ConfigPathValueFor<ConfigProperties, TPath>
 export type ConfigDefaults = Partial<{ [TPath in ConfigPath]: ConfigPathValue<TPath> }>
+export type ConfigurationOption = {
+  property?: string
+  parser?: (value: unknown, optionName: string, source: string) => unknown
+  type: string
+  canonicalName?: string
+  transformer?: (value: unknown, optionName: string, source: string) => unknown
+  telemetryTransformer?: (value: unknown) => unknown
+}

package/packages/dd-trace/src/config/defaults.js

@@ -1,9 +1,16 @@
 'use strict'
 
+const assert = require('node:assert')
 const util = require('util')
 
 const { DD_MAJOR } = require('../../../../version')
-const { parsers, transformers, telemetryTransformers, setWarnInvalidValue } = require('./parsers')
+const {
+  parsers,
+  programmaticTypeCoercions,
+  transformers,
+  telemetryTransformers,
+  setWarnInvalidValue,
+} = require('./parsers')
 const applyMajorOverrides = require('./major-overrides')
 const {
   supportedConfigurations,
@@ -70,6 +77,7 @@ for (const [name, value] of Object.entries(defaults)) {
 function generateTelemetry (value = null, origin, optionName) {
   const tableEntry = configurationsTable[optionName]
   const { type, canonicalName = optionName } = tableEntry ?? { type: typeof value }
+  const error = parseErrors.get(`${canonicalName}${origin}`)
   // Sensitive configurations are excluded from configuration telemetry: their
   // entry is never added to `configWithOrigin`, the single source for every
   // telemetry path (app-started and app-client-configuration-change).
@@ -81,7 +89,9 @@ function generateTelemetry (value = null, origin, optionName) {
   // TODO: Validate that space separated tags are parsed by the backend. Optimizations would be possible with that.
   // TODO: How to handle telemetry reporting for aliases?
   if (value !== null) {
-    if (telemetryTransformers[type]) {
+    if (error && typeof value === 'object') {
+      value = util.inspect(value, { customInspect: false, getters: false })
+    } else if (telemetryTransformers[type]) {
       value = telemetryTransformers[type](value)
     } else if (typeof value === 'object' && value !== null) {
       // Custom optionsTable entries (no `configurationsTable` row, e.g. `logger`)
@@ -100,7 +110,6 @@ function generateTelemetry (value = null, origin, optionName) {
     origin,
     seq_id: seqId++,
   }
-  const error = parseErrors.get(`${canonicalName}${origin}`)
   if (error) {
     parseErrors.delete(`${canonicalName}${origin}`)
     telemetryEntry.error = error
@@ -135,12 +144,8 @@ function generateTelemetry (value = null, origin, optionName) {
 const optionsTable = {
   // Additional properties that are not supported by the supported-configurations.json file.
   lookup: {
-    transformer (value) {
-      if (typeof value === 'function') {
-        return value
-      }
-    },
     property: 'lookup',
+    type: 'FUNCTION',
   },
   logger: {
     transformer (object) {
@@ -165,12 +170,15 @@ const optionsTable = {
       }
     },
     property: 'logger',
+    type: 'MAP',
   },
   isCiVisibility: {
     property: 'isCiVisibility',
+    type: 'BOOLEAN',
   },
   plugins: {
     property: 'plugins',
+    type: 'BOOLEAN',
   },
 }
 
@@ -185,13 +193,7 @@ const parser = (value, optionName, source) => {
 
 /**
  * @template {import('./config-types').ConfigPath} TPath
- * @type {Partial<Record<TPath, {
- *   property?: string,
- *   parser: (value: unknown, optionName: string, source: string) => unknown,
- *   canonicalName?: string,
- *   transformer?: (value: unknown, optionName: string, source: string) => unknown,
- *   telemetryTransformer?: (value: unknown) => unknown
- * }>>} ConfigurationsTable
+ * @type {Partial<Record<TPath, import('./config-types').ConfigurationOption>>} ConfigurationsTable
  */
 const configurationsTable = {}
 
@@ -231,6 +233,7 @@ for (const [canonicalName, entries] of Object.entries(supportedConfigurations))
       ? `${entry.namespace}.${canonicalName}`
       : (entry.internalPropertyName ?? entry.configurationNames?.[0] ?? canonicalName)
     const type = entry.type.toUpperCase()
+    assert.ok(programmaticTypeCoercions[type])
 
     let transformer = transformers[entry.transform]
     if (entry.allowed) {
@@ -353,6 +356,8 @@ module.exports = {
   parseErrors,
 
   generateTelemetry,
+
+  warnInvalidValue,
 }
 
 // `dns` is instrumented, so requiring it pulls in the dns plugin, which loads

package/packages/dd-trace/src/config/index.js

@@ -35,9 +35,10 @@ const {
   configWithOrigin,
   parseErrors,
   generateTelemetry,
+  warnInvalidValue,
 } = require('./defaults')
 const { normalizeService } = require('./normalize-service')
-const { transformers } = require('./parsers')
+const { programmaticTypeCoercions, transformers } = require('./parsers')
 
 const RUNTIME_ID = uuid()
 
@@ -55,6 +56,7 @@ const tracerMetrics = telemetryMetrics.manager.namespace('tracers')
  * @typedef {import('../../../../index').TracerOptions} TracerOptions
  * @typedef {import('./config-types').ConfigKey} ConfigKey
  * @typedef {import('./config-types').ConfigPath} ConfigPath
+ * @typedef {import('./config-types').ConfigurationOption} ConfigurationOption
  * @typedef {{
  *   value: import('./config-types').ConfigPathValue<ConfigPath>,
  *   source: TelemetrySource
@@ -121,6 +123,9 @@ function setAndTrack (config, name, value, rawValue = value, source = 'calculate
   if (value == null) {
     // TODO: This works as before while ignoring undefined programmatic options is not ideal.
     if (source !== 'default') {
+      if (rawValue !== value) {
+        generateTelemetry(rawValue, source, name)
+      }
       return
     }
   } else if (source === 'calculated' || source === 'remote_config') {
@@ -285,8 +290,13 @@ class Config extends ConfigBase {
           continue
         }
       }
-      // TODO: Coerce mismatched types to the expected type, if possible. E.g., strings <> numbers
-      const transformed = value !== undefined && entry.transformer ? entry.transformer(value, fullName, source) : value
+      const coerced = programmaticTypeCoercions[entry.type](value)
+      if (coerced === undefined && value !== undefined) {
+        warnInvalidValue(value, fullName, source, `Invalid ${entry.type} input`)
+      }
+      const transformed = coerced !== undefined && entry.transformer
+        ? entry.transformer(coerced, fullName, source)
+        : coerced
       setAndTrack(this, entry.property ?? name, transformed, value, source)
     }
   }