dd-trace 5.123.0 → 6.11.0

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

@@ -9,23 +9,6 @@ const FIELD_HAS = 4
 const FIELD_DELETE = 8
 const FIELD_NAME_LENGTH = 16
 
-const b3FlagsHeader = 'x-b3-flags'
-const b3Header = 'b3'
-const b3SampledHeader = 'x-b3-sampled'
-const b3SpanIdHeader = 'x-b3-spanid'
-const b3TraceIdHeader = 'x-b3-traceid'
-const baggageHeader = 'baggage'
-const datadogOriginHeader = 'x-datadog-origin'
-const datadogParentIdHeader = 'x-datadog-parent-id'
-const datadogSamplingPriorityHeader = 'x-datadog-sampling-priority'
-const datadogTagsHeader = 'x-datadog-tags'
-const datadogTraceIdHeader = 'x-datadog-trace-id'
-const dsmBase64Header = 'dd-pathway-ctx-base64'
-const dsmBinaryHeader = 'dd-pathway-ctx'
-const sqsdHeader = 'x-aws-sqsd-attr-_datadog'
-const traceparentHeader = 'traceparent'
-const tracestateHeader = 'tracestate'
-
 /** @type {Record<string, unknown>} */
 const carrierOperations = {}
 
@@ -41,7 +24,7 @@ const carrierOperations = {}
 /**
  * @template Value
  * @typedef {object} CarrierField
- * @property {((carrier: Carrier) => Value | undefined) | undefined} read
+ * @property {(carrier: Carrier) => Value | undefined} read
  * @property {(carrier: Carrier, value: Value) => void} write
  * @property {(carrier: Carrier) => boolean} has
  * @property {(carrier: Carrier) => void} delete
@@ -70,13 +53,19 @@ function defineCapability (name, operations, capability) {
  * @template Value
  * @param {string} fieldName
  * @param {string} headerName
- * @param {((carrier: Carrier) => Value | undefined) | undefined} read
+ * @param {(value: unknown) => Value | undefined} resolve
  * @param {number} operations
  * @returns {CarrierField<Value>}
  */
-function defineField (fieldName, headerName, read, operations) {
+function defineField (fieldName, headerName, resolve, operations) {
   return defineCapability(fieldName, operations, {
-    read,
+    /**
+     * @param {Carrier} carrier
+     * @returns {Value | undefined}
+     */
+    read (carrier) {
+      return resolve(carrier[headerName])
+    },
 
     /**
      * @param {Carrier} carrier
@@ -194,96 +183,48 @@ function readLastPathway (value) {
   return result
 }
 
-/** @param {Carrier} carrier */
-function readB3Flags (carrier) { return readLastText(carrier[b3FlagsHeader]) }
-
-/** @param {Carrier} carrier */
-function readB3 (carrier) { return readLastText(carrier[b3Header]) }
-
-/** @param {Carrier} carrier */
-function readB3Sampled (carrier) { return readLastText(carrier[b3SampledHeader]) }
-
-/** @param {Carrier} carrier */
-function readB3SpanId (carrier) { return readLastText(carrier[b3SpanIdHeader]) }
-
-/** @param {Carrier} carrier */
-function readB3TraceId (carrier) { return readLastText(carrier[b3TraceIdHeader]) }
-
-/** @param {Carrier} carrier */
-function readBaggage (carrier) { return readListText(carrier[baggageHeader]) }
-
-/** @param {Carrier} carrier */
-function readDatadogOrigin (carrier) { return readLastText(carrier[datadogOriginHeader]) }
-
-/** @param {Carrier} carrier */
-function readDatadogParentId (carrier) { return readLastText(carrier[datadogParentIdHeader]) }
-
-/** @param {Carrier} carrier */
-function readDatadogSamplingPriority (carrier) { return readLastText(carrier[datadogSamplingPriorityHeader]) }
-
-/** @param {Carrier} carrier */
-function readDatadogTags (carrier) { return readListText(carrier[datadogTagsHeader]) }
-
-/** @param {Carrier} carrier */
-function readDatadogTraceId (carrier) { return readLastText(carrier[datadogTraceIdHeader]) }
-
-/** @param {Carrier} carrier */
-function readDsmBase64 (carrier) { return readLastPathway(carrier[dsmBase64Header]) }
-
-/** @param {Carrier} carrier */
-function readDsmBinary (carrier) { return readLastPathway(carrier[dsmBinaryHeader]) }
-
-/** @param {Carrier} carrier */
-function readSqsd (carrier) { return readLastText(carrier[sqsdHeader]) }
-
-/** @param {Carrier} carrier */
-function readTraceparent (carrier) { return readUniqueText(carrier[traceparentHeader]) }
-
-/** @param {Carrier} carrier */
-function readTracestate (carrier) { return readListText(carrier[tracestateHeader]) }
-
 const datadogTraceId = defineField(
   'datadogTraceId',
-  datadogTraceIdHeader,
-  readDatadogTraceId,
+  'x-datadog-trace-id',
+  readLastText,
   FIELD_READ | FIELD_WRITE
 )
 const datadogParentId = defineField(
   'datadogParentId',
-  datadogParentIdHeader,
-  readDatadogParentId,
+  'x-datadog-parent-id',
+  readLastText,
   FIELD_READ | FIELD_WRITE | FIELD_DELETE
 )
 const datadogOrigin = defineField(
   'datadogOrigin',
-  datadogOriginHeader,
-  readDatadogOrigin,
+  'x-datadog-origin',
+  readLastText,
   FIELD_READ | FIELD_WRITE
 )
 const datadogSamplingPriority = defineField(
   'datadogSamplingPriority',
-  datadogSamplingPriorityHeader,
-  readDatadogSamplingPriority,
+  'x-datadog-sampling-priority',
+  readLastText,
   FIELD_READ | FIELD_WRITE
 )
-defineField('datadogTags', datadogTagsHeader, readDatadogTags, FIELD_READ | FIELD_WRITE)
-defineField('baggage', baggageHeader, readBaggage, FIELD_READ | FIELD_WRITE)
-const b3TraceId = defineField('b3TraceId', b3TraceIdHeader, readB3TraceId, FIELD_READ | FIELD_WRITE)
-const b3SpanId = defineField('b3SpanId', b3SpanIdHeader, readB3SpanId, FIELD_READ | FIELD_WRITE)
-const b3ParentId = defineField('b3ParentId', 'x-b3-parentspanid', undefined, FIELD_WRITE)
-const b3Sampled = defineField('b3Sampled', b3SampledHeader, readB3Sampled, FIELD_READ | FIELD_WRITE)
-const b3Flags = defineField('b3Flags', b3FlagsHeader, readB3Flags, FIELD_READ | FIELD_WRITE)
-const b3 = defineField('b3', b3Header, readB3, FIELD_READ | FIELD_WRITE)
-defineField('sqsd', sqsdHeader, readSqsd, FIELD_READ)
-const traceparent = defineField('traceparent', traceparentHeader, readTraceparent, FIELD_READ | FIELD_WRITE)
-const tracestate = defineField('tracestate', tracestateHeader, readTracestate, FIELD_READ | FIELD_WRITE)
+defineField('datadogTags', 'x-datadog-tags', readListText, FIELD_READ | FIELD_WRITE)
+defineField('baggage', 'baggage', readListText, FIELD_READ | FIELD_WRITE)
+const b3TraceId = defineField('b3TraceId', 'x-b3-traceid', readLastText, FIELD_READ | FIELD_WRITE)
+const b3SpanId = defineField('b3SpanId', 'x-b3-spanid', readLastText, FIELD_READ | FIELD_WRITE)
+const b3ParentId = defineField('b3ParentId', 'x-b3-parentspanid', readLastText, FIELD_WRITE)
+const b3Sampled = defineField('b3Sampled', 'x-b3-sampled', readLastText, FIELD_READ | FIELD_WRITE)
+const b3Flags = defineField('b3Flags', 'x-b3-flags', readLastText, FIELD_READ | FIELD_WRITE)
+const b3 = defineField('b3', 'b3', readLastText, FIELD_READ | FIELD_WRITE)
+defineField('sqsd', 'x-aws-sqsd-attr-_datadog', readLastText, FIELD_READ)
+const traceparent = defineField('traceparent', 'traceparent', readUniqueText, FIELD_READ | FIELD_WRITE)
+const tracestate = defineField('tracestate', 'tracestate', readListText, FIELD_READ | FIELD_WRITE)
 const dsmBase64 = defineField(
   'dsmBase64',
-  dsmBase64Header,
-  readDsmBase64,
+  'dd-pathway-ctx-base64',
+  readLastPathway,
   FIELD_READ | FIELD_WRITE | FIELD_HAS | FIELD_NAME_LENGTH
 )
-const dsmBinary = defineField('dsmBinary', dsmBinaryHeader, readDsmBinary, FIELD_READ | FIELD_HAS)
+const dsmBinary = defineField('dsmBinary', 'dd-pathway-ctx', readLastPathway, FIELD_READ | FIELD_HAS)
 
 const legacyBaggagePrefix = 'ot-baggage-'
 // RFC 7230 `token`, compatible with Node.js header-name validation.
@@ -373,23 +314,23 @@ function pickDsm (carrier) {
  * @property {typeof dsmBinary.has} hasDsmBinary
  * @property {typeof pickDsm} pickDsm
  * @property {typeof pickTextMap} pickTextMap
- * @property {typeof readBaggage} readBaggage
- * @property {typeof readB3} readB3
- * @property {typeof readB3Flags} readB3Flags
- * @property {typeof readB3Sampled} readB3Sampled
- * @property {typeof readB3SpanId} readB3SpanId
- * @property {typeof readB3TraceId} readB3TraceId
- * @property {typeof readDatadogOrigin} readDatadogOrigin
- * @property {typeof readDatadogParentId} readDatadogParentId
- * @property {typeof readDatadogSamplingPriority} readDatadogSamplingPriority
- * @property {typeof readDatadogTags} readDatadogTags
- * @property {typeof readDatadogTraceId} readDatadogTraceId
- * @property {typeof readDsmBase64} readDsmBase64
- * @property {typeof readDsmBinary} readDsmBinary
+ * @property {(carrier: Carrier) => string | undefined} readBaggage
+ * @property {typeof b3.read} readB3
+ * @property {typeof b3Flags.read} readB3Flags
+ * @property {typeof b3Sampled.read} readB3Sampled
+ * @property {typeof b3SpanId.read} readB3SpanId
+ * @property {typeof b3TraceId.read} readB3TraceId
+ * @property {typeof datadogOrigin.read} readDatadogOrigin
+ * @property {typeof datadogParentId.read} readDatadogParentId
+ * @property {typeof datadogSamplingPriority.read} readDatadogSamplingPriority
+ * @property {(carrier: Carrier) => string | undefined} readDatadogTags
+ * @property {typeof datadogTraceId.read} readDatadogTraceId
+ * @property {typeof dsmBase64.read} readDsmBase64
+ * @property {typeof dsmBinary.read} readDsmBinary
  * @property {(carrier: Carrier, target: Record<string, string>) => void} readLegacyBaggage
- * @property {typeof readSqsd} readSqsd
- * @property {typeof readTraceparent} readTraceparent
- * @property {typeof readTracestate} readTracestate
+ * @property {(carrier: Carrier) => string | undefined} readSqsd
+ * @property {typeof traceparent.read} readTraceparent
+ * @property {typeof tracestate.read} readTracestate
  * @property {(carrier: Carrier, value: string) => void} writeBaggage
  * @property {typeof b3.write} writeB3
  * @property {typeof b3Flags.write} writeB3Flags

package/packages/dd-trace/src/ci-visibility/early-flake-detection/get-known-tests.js

@@ -1,10 +1,10 @@
 'use strict'
 
 const getConfig = require('../../config')
-const { EVP_SUBDOMAIN_HEADER_NAME } = require('../../evp_proxy/constants')
-const { joinEVPProxyPath } = require('../../evp_proxy/path')
+const request = require('../requests/request')
 const id = require('../../id')
 const log = require('../../log')
+
 const {
   incrementCountMetric,
   distributionMetric,
@@ -14,8 +14,8 @@ const {
   TELEMETRY_KNOWN_TESTS_RESPONSE_TESTS,
   TELEMETRY_KNOWN_TESTS_RESPONSE_BYTES,
 } = require('../../ci-visibility/telemetry')
+
 const { getNumFromKnownTests } = require('../../plugins/util/test')
-const request = require('../requests/request')
 const { buildCacheKey, writeToCache, withCache } = require('../requests/fs-cache')
 const { validateKnownTestsResponse } = require('../test-optimization-http-cache-schema')
 
@@ -162,8 +162,8 @@ function fetchFromApi ({
   }
 
   if (isEvpProxy) {
-    options.path = joinEVPProxyPath(evpProxyPrefix, '/api/v2/ci/libraries/tests')
-    options.headers[EVP_SUBDOMAIN_HEADER_NAME] = 'api'
+    options.path = `${evpProxyPrefix}/api/v2/ci/libraries/tests`
+    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
   } else {
     const { DD_API_KEY } = getConfig()
     if (!DD_API_KEY) {

package/packages/dd-trace/src/ci-visibility/exporters/agent-proxy/index.js

@@ -8,8 +8,6 @@ const request = require('../request')
 const { fetchAgentInfo } = require('../../../agent/info')
 const { DEBUGGER_INPUT_V1 } = require('../../../debugger/constants')
 
-// Product-specific discovery: newest advertised version, skip v3 (citestcycle), gzip if >= v4.
-// Shared `evp_proxy` discovery is an explicit path allowlist and does not cover this contract.
 const AGENT_EVP_PROXY_PATH_PREFIX = '/evp_proxy/v'
 const AGENT_EVP_PROXY_PATH_REGEX = /\/evp_proxy\/v(\d+)\/?/
 

package/packages/dd-trace/src/ci-visibility/exporters/agentless/coverage-writer.js

@@ -1,9 +1,7 @@
 'use strict'
 const getConfig = require('../../../config')
-const { EVP_SUBDOMAIN_HEADER_NAME } = require('../../../evp_proxy/constants')
-const { joinEVPProxyPath } = require('../../../evp_proxy/path')
-const { safeJSONStringify } = require('../../../exporters/common/util')
 const log = require('../../../log')
+const { safeJSONStringify } = require('../../../exporters/common/util')
 
 const {
   incrementCountMetric,
@@ -55,9 +53,9 @@ class Writer extends BaseWriter {
     }
 
     if (this._evpProxyPrefix) {
-      options.path = joinEVPProxyPath(this._evpProxyPrefix, '/api/v2/citestcov')
+      options.path = `${this._evpProxyPrefix}/api/v2/citestcov`
       delete options.headers['dd-api-key']
-      options.headers[EVP_SUBDOMAIN_HEADER_NAME] = 'citestcov-intake'
+      options.headers['X-Datadog-EVP-Subdomain'] = 'citestcov-intake'
     }
 
     // eslint-disable-next-line eslint-rules/eslint-log-printf-style

package/packages/dd-trace/src/ci-visibility/exporters/agentless/writer.js

@@ -1,7 +1,5 @@
 'use strict'
 const getConfig = require('../../../config')
-const { EVP_SUBDOMAIN_HEADER_NAME } = require('../../../evp_proxy/constants')
-const { joinEVPProxyPath } = require('../../../evp_proxy/path')
 const { safeJSONStringify } = require('../../../exporters/common/util')
 const log = require('../../../log')
 
@@ -56,9 +54,9 @@ class Writer extends BaseWriter {
     }
 
     if (this._evpProxyPrefix) {
-      options.path = joinEVPProxyPath(this._evpProxyPrefix, '/api/v2/citestcycle')
+      options.path = `${this._evpProxyPrefix}/api/v2/citestcycle`
       delete options.headers['dd-api-key']
-      options.headers[EVP_SUBDOMAIN_HEADER_NAME] = 'citestcycle-intake'
+      options.headers['X-Datadog-EVP-Subdomain'] = 'citestcycle-intake'
     }
 
     // eslint-disable-next-line eslint-rules/eslint-log-printf-style

package/packages/dd-trace/src/ci-visibility/exporters/git/git_metadata.js

@@ -4,8 +4,6 @@ const fs = require('fs')
 const path = require('path')
 
 const getConfig = require('../../../config')
-const { EVP_SUBDOMAIN_HEADER_NAME } = require('../../../evp_proxy/constants')
-const { joinEVPProxyPath } = require('../../../evp_proxy/path')
 const FormData = require('../../../exporters/common/form-data')
 const request = require('../../../exporters/common/request')
 
@@ -85,8 +83,8 @@ function getCommitsToUpload ({ url, repositoryUrl, latestCommits, isEvpProxy, ev
   }
 
   if (isEvpProxy) {
-    options.path = joinEVPProxyPath(evpProxyPrefix, '/api/v2/git/repository/search_commits')
-    options.headers[EVP_SUBDOMAIN_HEADER_NAME] = 'api'
+    options.path = `${evpProxyPrefix}/api/v2/git/repository/search_commits`
+    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
     delete options.headers['dd-api-key']
   }
 
@@ -181,8 +179,8 @@ function uploadPackFile ({ url, isEvpProxy, evpProxyPrefix, packFileToUpload, re
   }
 
   if (isEvpProxy) {
-    options.path = joinEVPProxyPath(evpProxyPrefix, '/api/v2/git/repository/packfile')
-    options.headers[EVP_SUBDOMAIN_HEADER_NAME] = 'api'
+    options.path = `${evpProxyPrefix}/api/v2/git/repository/packfile`
+    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
     delete options.headers['dd-api-key']
   }
 

package/packages/dd-trace/src/ci-visibility/intelligent-test-runner/get-skippable-suites.js

@@ -1,8 +1,7 @@
 'use strict'
 
 const getConfig = require('../../config')
-const { EVP_SUBDOMAIN_HEADER_NAME } = require('../../evp_proxy/constants')
-const { joinEVPProxyPath } = require('../../evp_proxy/path')
+const request = require('../requests/request')
 const log = require('../../log')
 const {
   incrementCountMetric,
@@ -14,7 +13,6 @@ const {
   TELEMETRY_ITR_SKIPPABLE_TESTS_RESPONSE_TESTS,
   TELEMETRY_ITR_SKIPPABLE_TESTS_RESPONSE_BYTES,
 } = require('../../ci-visibility/telemetry')
-const request = require('../requests/request')
 const { buildCacheKey, writeToCache, withCache } = require('../requests/fs-cache')
 const { validateSkippableTestsResponse } = require('../test-optimization-http-cache-schema')
 
@@ -229,8 +227,8 @@ function fetchFromApi ({
   }
 
   if (isEvpProxy) {
-    options.path = joinEVPProxyPath(evpProxyPrefix, '/api/v2/ci/tests/skippable')
-    options.headers[EVP_SUBDOMAIN_HEADER_NAME] = 'api'
+    options.path = `${evpProxyPrefix}/api/v2/ci/tests/skippable`
+    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
   } else {
     const { DD_API_KEY } = getConfig()
     if (!DD_API_KEY) {

package/packages/dd-trace/src/ci-visibility/requests/get-library-configuration.js

@@ -1,8 +1,6 @@
 'use strict'
 
 const getConfig = require('../../config')
-const { EVP_SUBDOMAIN_HEADER_NAME } = require('../../evp_proxy/constants')
-const { joinEVPProxyPath } = require('../../evp_proxy/path')
 const id = require('../../id')
 const log = require('../../log')
 const { EARLY_FLAKE_DETECTION_RETRY_BUCKETS, createEfdRetryPolicy } = require('../efd-retry-policy')
@@ -240,8 +238,8 @@ function getLibraryConfiguration ({
   }
 
   if (isEvpProxy) {
-    options.path = joinEVPProxyPath(evpProxyPrefix, '/api/v2/libraries/tests/services/setting')
-    options.headers[EVP_SUBDOMAIN_HEADER_NAME] = 'api'
+    options.path = `${evpProxyPrefix}/api/v2/libraries/tests/services/setting`
+    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
   } else {
     if (!config.DD_API_KEY) {
       return done(new Error('Request to settings endpoint was not done because Datadog API key is not defined.'))

package/packages/dd-trace/src/ci-visibility/requests/upload-coverage-report.js

@@ -4,8 +4,6 @@ const { closeSync, constants, fstatSync, openSync, readFileSync } = require('nod
 const { gzipSync } = require('node:zlib')
 
 const getConfig = require('../../config')
-const { EVP_SUBDOMAIN_HEADER_NAME } = require('../../evp_proxy/constants')
-const { joinEVPProxyPath } = require('../../evp_proxy/path')
 const FormData = require('../../exporters/common/form-data')
 const request = require('../../exporters/common/request')
 const log = require('../../log')
@@ -100,8 +98,8 @@ function uploadCoverageReport (
   }
 
   if (isEvpProxy) {
-    options.path = joinEVPProxyPath(evpProxyPrefix, '/api/v2/cicovreprt')
-    options.headers[EVP_SUBDOMAIN_HEADER_NAME] = 'ci-intake'
+    options.path = `${evpProxyPrefix}/api/v2/cicovreprt`
+    options.headers['X-Datadog-EVP-Subdomain'] = 'ci-intake'
   } else {
     options.path = '/api/v2/cicovreprt'
     options.headers['dd-api-key'] = DD_API_KEY

package/packages/dd-trace/src/ci-visibility/requests/upload-test-screenshot.js

@@ -4,8 +4,6 @@ const { readFileSync } = require('node:fs')
 const { extname } = require('node:path')
 
 const getConfig = require('../../config')
-const { EVP_SUBDOMAIN_HEADER_NAME } = require('../../evp_proxy/constants')
-const { joinEVPProxyPath } = require('../../evp_proxy/path')
 const log = require('../../log')
 const request = require('../exporters/request')
 
@@ -136,8 +134,8 @@ function uploadTestScreenshot (
   if (isEvpProxy) {
     // Agent mode: prefix the evp_proxy path, tell the proxy which subdomain to forward to, and
     // drop the API key — the Agent injects it. The query params survive the proxy.
-    options.path = `${joinEVPProxyPath(evpProxyPrefix, basePath)}?${query}`
-    options.headers[EVP_SUBDOMAIN_HEADER_NAME] = 'api'
+    options.path = `${evpProxyPrefix}${basePath}?${query}`
+    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
   } else {
     options.headers['DD-API-KEY'] = DD_API_KEY
   }

package/packages/dd-trace/src/ci-visibility/test-management/get-test-management-tests.js

@@ -1,10 +1,10 @@
 'use strict'
 
 const getConfig = require('../../config')
-const { EVP_SUBDOMAIN_HEADER_NAME } = require('../../evp_proxy/constants')
-const { joinEVPProxyPath } = require('../../evp_proxy/path')
+const request = require('../requests/request')
 const id = require('../../id')
 const log = require('../../log')
+
 const {
   incrementCountMetric,
   distributionMetric,
@@ -14,7 +14,7 @@ const {
   TELEMETRY_TEST_MANAGEMENT_TESTS_RESPONSE_TESTS,
   TELEMETRY_TEST_MANAGEMENT_TESTS_RESPONSE_BYTES,
 } = require('../telemetry')
-const request = require('../requests/request')
+
 const { buildCacheKey, writeToCache, withCache } = require('../requests/fs-cache')
 const { validateTestManagementTestsResponse } = require('../test-optimization-http-cache-schema')
 
@@ -132,8 +132,8 @@ function fetchFromApi ({
   }
 
   if (isEvpProxy) {
-    options.path = joinEVPProxyPath(evpProxyPrefix, '/api/v2/test/libraries/test-management/tests')
-    options.headers[EVP_SUBDOMAIN_HEADER_NAME] = 'api'
+    options.path = `${evpProxyPrefix}/api/v2/test/libraries/test-management/tests`
+    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
   } else {
     const { DD_API_KEY } = getConfig()
     if (!DD_API_KEY) {

package/packages/dd-trace/src/debugger/constants.js

@@ -4,5 +4,4 @@ module.exports = {
   DEBUGGER_DIAGNOSTICS_V1: '/debugger/v1/diagnostics',
   DEBUGGER_INPUT_V1: '/debugger/v1/input',
   DEBUGGER_INPUT_V2: '/debugger/v2/input',
-  INSPECT_SEGMENT_GLOBAL_PROPERTY: 'debuggerInspectSegment',
 }

package/packages/dd-trace/src/debugger/devtools_client/condition.js

@@ -55,7 +55,7 @@ function compileSegments (segments) {
       ? `(() => {
           try {
             const result = ${compile(json)}
-            return typeof result === 'string' ? result : $dd_inspectSegment(result)
+            return typeof result === 'string' ? result : $dd_inspect(result, $dd_segmentInspectOptions)
           } catch (e) {
             return { expr: ${JSON.stringify(dsl)}, message: \`\${e.name}: \${e.message}\` }
           }

package/packages/dd-trace/src/debugger/devtools_client/index.js

@@ -4,7 +4,6 @@ const { randomUUID } = require('crypto')
 const { workerData: { probeSamplerBuffer } } = require('worker_threads')
 const { version } = require('../../../../../package.json')
 const processTags = require('../../process-tags')
-const { INSPECT_SEGMENT_GLOBAL_PROPERTY } = require('../constants')
 const {
   MAX_SAMPLED_PROBES_PER_PAUSE,
   SAMPLED_PROBE_COUNT_INDEX,
@@ -24,8 +23,16 @@ require('./remote_config')
 
 /** @typedef {import('node:inspector').Debugger.EvaluateOnCallFrameReturnType} EvaluateOnCallFrameResult */
 
-const templateExpressionSetupCode = 'const $dd_inspectSegment = ' +
-  `globalThis[Symbol.for('dd-trace')][${JSON.stringify(INSPECT_SEGMENT_GLOBAL_PROPERTY)}];`
+const templateExpressionSetupCode = `
+  const $dd_inspect = global.require('node:util').inspect;
+  const $dd_segmentInspectOptions = {
+    depth: 0,
+    customInspect: false,
+    maxArrayLength: 3,
+    maxStringLength: 8 * 1024,
+    breakLength: Infinity
+  };
+`
 
 // Expression to run on a call frame of the paused thread to get its active trace and span id.
 const getDDTagsExpression = `(() => {

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

@@ -7,7 +7,7 @@ const { Worker, MessageChannel, threadId: parentThreadId } = require('worker_thr
 const log = require('../log')
 const { fetchAgentInfo } = require('../agent/info')
 const getDebuggerConfig = require('./config')
-const { DEBUGGER_DIAGNOSTICS_V1, DEBUGGER_INPUT_V2, INSPECT_SEGMENT_GLOBAL_PROPERTY } = require('./constants')
+const { DEBUGGER_DIAGNOSTICS_V1, DEBUGGER_INPUT_V2 } = require('./constants')
 const { installProbeSampler, uninstallProbeSampler } = require('./probe_sampler')
 
 /**
@@ -64,9 +64,7 @@ function start (config, rcInstance) {
   const logChannel = new MessageChannel()
   configChannel = new MessageChannel()
 
-  const debuggerGlobals = globalThis[Symbol.for('dd-trace')]
-  debuggerGlobals.utilTypes = types
-  debuggerGlobals[INSPECT_SEGMENT_GLOBAL_PROPERTY] = require('./inspect-segment')
+  globalThis[Symbol.for('dd-trace')].utilTypes = types
 
   const probeSamplerBuffer = installProbeSampler()
 

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

@@ -93,10 +93,7 @@ function request (data, options, callback) {
 
   docker.inject(options.headers)
 
-  const connectionOptions = {
-    ...options,
-    agent: options.agent ?? (isSecure ? httpsAgent : httpAgent),
-  }
+  options.agent = isSecure ? httpsAgent : httpAgent
 
   /**
    * @param {import('node:http').IncomingMessage} res
@@ -221,7 +218,7 @@ function request (data, options, callback) {
         }
       }
 
-      const req = client.request(connectionOptions, (res) => onResponse(res, complete, handleError))
+      const req = client.request(options, (res) => onResponse(res, complete, handleError))
 
       req.once('close', finalize)
       req.once('timeout', finalize)

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

@@ -33,8 +33,7 @@ function datasetRecordFromResource (resource) {
     attrs.input ?? null,
     attrs.expected_output ?? null,
     attrs.metadata ?? {},
-    id,
-    attrs.tags ?? []
+    id
   )
 }
 
@@ -196,7 +195,7 @@ class ExperimentsClient {
     const resources = Array.isArray(response?.records)
       ? response.records
       : (Array.isArray(response?.data) ? response.data : [])
-    return datasetMutationResultFromResources(resources)
+    return resources.map(datasetRecordFromResource)
   }
 
   async batchUpdateDatasetRecords (projectId, datasetId, attributes) {
@@ -227,9 +226,6 @@ class ExperimentsClient {
     const query = new URLSearchParams()
     if (options.cursor) query.set('page[cursor]', options.cursor)
     if (options.version !== undefined && options.version !== null) query.set('filter[version]', String(options.version))
-    if (Array.isArray(options.tags)) {
-      for (const tag of options.tags) query.append('filter[tags]', tag)
-    }
     const response = await this.request(
       'GET',
       `${API_BASE_PATH}/${projectId}/datasets/${datasetId}/records?${query.toString()}`