dd-trace 6.6.0 → 6.8.0

package/packages/dd-trace/src/exporters/common/url.js

@@ -32,11 +32,9 @@ function parseUrl (urlObjOrString) {
   // `urlToHttpOptions` returns `pathname` at runtime, but @types/node narrows it
   // to `ClientRequestArgs`, which omits it; cast so the named-pipe fold below can
   // read and rewrite it.
-  const url = /** @type {import('node:http').ClientRequestArgs & { pathname: string }} */ (
-    urlObjOrString !== null && typeof urlObjOrString === 'object'
-      ? urlToHttpOptions(urlObjOrString)
-      : urlToHttpOptions(new URL(urlObjOrString))
-  )
+  const url = /** @type {import('node:http').ClientRequestArgs & { pathname: string }} */ (urlToHttpOptions(
+    urlObjOrString !== null && typeof urlObjOrString === 'object' ? urlObjOrString : new URL(urlObjOrString)
+  ))
 
   if (url.protocol === 'unix:' && url.hostname === '.') {
     url.path = url.pathname = `//.${url.pathname}`

package/packages/dd-trace/src/exporters/electron/index.js

@@ -16,6 +16,8 @@ class ElectronExporter {
   }
 
   export (spans) {
+    if (!traceChannel.hasSubscribers) return
+
     this.#traces.push(spans)
 
     const { flushInterval } = this._config
@@ -35,7 +37,8 @@ class ElectronExporter {
     clearTimeout(this.#timer)
     this.#timer = undefined
 
-    const traces = this.#traces.splice(0)
+    const traces = this.#traces
+    this.#traces = []
 
     if (traces.length > 0 && traceChannel.hasSubscribers) {
       const formattedTraces = traces.map(spans => spans.map(span => normalizeSpan(truncateSpan(span))))

package/packages/dd-trace/src/external-logger/src/index.js

@@ -78,7 +78,6 @@ class ExternalLogger {
 
   // Flushes logs with optional callback for when the call is complete
   flush (cb = () => {}) {
-    let logs
     let numLogs
     let encodedLogs
 
@@ -88,7 +87,7 @@ class ExternalLogger {
     }
 
     try {
-      logs = this.queue
+      const logs = this.queue
       this.queue = []
 
       numLogs = logs.length

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

@@ -39,8 +39,8 @@ const flare = {
     logChannel?.unsubscribe(logger)
     logChannel = new LogChannel(logLevel)
     logChannel.subscribe(logger)
-    tracerLogs = tracerLogs || new FlareFile()
-    timer = timer || setTimeout(flare.cleanup, TIMEOUT)
+    tracerLogs ||= new FlareFile()
+    timer ||= setTimeout(flare.cleanup, TIMEOUT)
   },
 
   send (task) {

package/packages/dd-trace/src/id.js

@@ -185,7 +185,7 @@ function toNumberString (buffer, radix) {
   let low = readInt32(buffer, buffer.length - 4)
   let str = ''
 
-  radix = radix || 10
+  radix ||= 10
 
   while (1) {
     const mod = (high % radix) * UINT_MAX + low

package/packages/dd-trace/src/llmobs/constants/tags.js

@@ -1,7 +1,7 @@
 'use strict'
 
 module.exports = {
-  SPAN_KINDS: ['llm', 'agent', 'workflow', 'task', 'tool', 'embedding', 'retrieval'],
+  SPAN_KINDS: ['llm', 'agent', 'workflow', 'task', 'tool', 'embedding', 'retrieval', 'experiment'],
   SPAN_KIND: '_ml_obs.meta.span.kind',
   SESSION_ID: '_ml_obs.session_id',
   SESSION_ID_TRACE_DEFAULT_KEY: '_ml_obs.trace_session_id',

package/packages/dd-trace/src/llmobs/experiments/client.js

@@ -14,9 +14,11 @@ function apiHost (site) {
 }
 
 // Web-app host for dashboard URLs. Single-level sites (datadoghq.com,
-// ddog-gov.com) are served from the `app.` subdomain; regional sites
-// (us3.datadoghq.com, ap1.datadoghq.com) are used as-is.
+// ddog-gov.com) are served from the `app.` subdomain; staging uses
+// dd.datad0g.com; regional sites (us3.datadoghq.com, ap1.datadoghq.com)
+// are used as-is.
 function appHost (site) {
+  if (site === 'datad0g.com') return 'dd.datad0g.com'
   return site.split('.').length === 2 ? `app.${site}` : site
 }
 

package/packages/dd-trace/src/llmobs/experiments/dataset.js

@@ -2,15 +2,35 @@
 
 const { API_BASE_PATH } = require('./client')
 
-// Immutable dataset record: { input, expectedOutput?, metadata? }.
+// Dataset record: { input, expectedOutput?, metadata?, id? }.
+// `id` may be user-provided before push or filled from the backend-created record.
 class DatasetRecord {
-  constructor (input, expectedOutput = null, metadata = {}) {
+  constructor (input, expectedOutput = null, metadata = {}, id = null) {
     this.input = input
     this.expectedOutput = expectedOutput ?? null
     this.metadata = metadata ?? {}
+    this.id = id ?? null
   }
 }
 
+function createdRecordsFromResponse (response) {
+  if (Array.isArray(response?.records)) return response.records
+  if (Array.isArray(response?.data)) return response.data
+  return []
+}
+
+function recordIdFromCreatedRecord (record) {
+  return String(record?.id ?? record?.attributes?.id ?? '')
+}
+
+function versionFromCreatedRecords (records) {
+  const versions = records
+    .map(record => Number(record?.attributes?.valid_from_version ?? record?.attributes?.version))
+    .filter(Number.isFinite)
+  if (versions.length === 0) return null
+  return Math.max(...versions)
+}
+
 // A local buffer of dataset records, created remotely and pushed on first run
 // (or eagerly via push()). Pushes are incremental.
 class Dataset {
@@ -22,6 +42,8 @@ class Dataset {
   #id
   #projectId
   #pushedCount
+  #version
+  #latestVersion
 
   constructor (client, name, description = '') {
     this.#client = client
@@ -32,16 +54,20 @@ class Dataset {
     this.#id = null
     this.#projectId = null
     this.#pushedCount = 0
+    this.#version = null
+    this.#latestVersion = null
   }
 
   // Build a Dataset that already exists remotely (used by pullDataset).
-  static fromExisting (client, name, description, id, projectId, records, recordIds) {
+  static fromExisting (client, name, description, id, projectId, records, recordIds, version, latestVersion) {
     const dataset = new Dataset(client, name, description)
     dataset.#id = id
     dataset.#projectId = projectId
     dataset.#records.push(...records)
     dataset.#recordIds.push(...recordIds)
     dataset.#pushedCount = records.length
+    dataset.#version = version ?? null
+    dataset.#latestVersion = latestVersion ?? version ?? null
     return dataset
   }
 
@@ -74,6 +100,14 @@ class Dataset {
     return this.#projectId
   }
 
+  version () {
+    return this.#version
+  }
+
+  latestVersion () {
+    return this.#latestVersion
+  }
+
   // Dashboard URL for this dataset, or null until pushed/pulled.
   url () {
     if (this.#id === null) return null
@@ -100,7 +134,12 @@ class Dataset {
         throw new Error(`Failed to create dataset '${this.#name}': ${err.message}`)
       }
       this.#id = response?.data?.id ?? null
+      if (this.#id === null) {
+        throw new Error(`Failed to create dataset '${this.#name}': backend response is missing dataset id`)
+      }
       this.#projectId = projectId
+      this.#version = response?.data?.attributes?.current_version ?? this.#version
+      this.#latestVersion = response?.data?.attributes?.current_version ?? this.#latestVersion
     }
 
     if (this.#pushedCount >= this.#records.length) return { pushedCount: 0, totalCount: 0 }
@@ -108,6 +147,9 @@ class Dataset {
     const pending = this.#records.slice(this.#pushedCount)
     const records = pending.map((rec) => {
       const out = { input: rec.input }
+      if (rec.id != null) {
+        out.id = rec.id
+      }
       if (rec.expectedOutput !== null && rec.expectedOutput !== undefined) {
         out.expected_output = rec.expectedOutput
       }
@@ -128,20 +170,30 @@ class Dataset {
       throw new Error(`Failed to push records to dataset '${this.#name}': ${err.message}`)
     }
 
-    // The append-records response returns created records under a top-level
-    // `records` field, not the usual `data` envelope.
-    const created = response?.records
+    // The append-records response has used both a top-level `records` array
+    // and JSON:API `data` resources. Accept either so generated/custom record
+    // ids are preserved for experiment row tagging.
+    const created = createdRecordsFromResponse(response)
+    const pushedVersion = versionFromCreatedRecords(created)
+    if (pushedVersion === null) {
+      // The dataset contents changed, but the backend did not report the new
+      // version. Avoid pinning later experiments to the pre-append create version.
+      this.#version = null
+    } else {
+      this.#version = pushedVersion
+      this.#latestVersion = Math.max(Number(this.#latestVersion ?? pushedVersion), pushedVersion)
+    }
+
     let pushedCount = 0
-    if (Array.isArray(created)) {
-      for (const node of created) {
-        const recordId = String(node?.id ?? '')
-        if (recordId !== '') pushedCount++
-        this.#recordIds.push(recordId)
+    for (const [index, node] of created.entries()) {
+      const recordId = recordIdFromCreatedRecord(node)
+      if (recordId !== '') {
+        pushedCount++
+        pending[index].id = recordId
       }
-      for (let i = created.length; i < pending.length; i++) this.#recordIds.push('')
-    } else {
-      for (let i = 0; i < pending.length; i++) this.#recordIds.push('')
+      this.#recordIds.push(recordId)
     }
+    for (let i = created.length; i < pending.length; i++) this.#recordIds.push('')
 
     // Advance by the snapshotted pending count, not the live records length,
     // so records added while this push was in flight aren't skipped by the next push.