dd-trace 6.11.0 → 6.12.0

package/packages/datadog-instrumentations/src/vitest-main-no-worker-init.js

@@ -1058,7 +1058,7 @@ function getRepeatedTestReport (task, testName, testSuiteAbsolutePath, testPrope
   const errors = browserEnvironment
     ? normalizeVitestBrowserErrors(result?.errors)
     : result?.errors || []
-  const finalAttemptStatus = finalStatus(statuses)
+  const finalAttemptStatus = finalStatus(statuses, testProperties)
   const hasFailure = finalAttemptStatus === 'fail'
   const attempts = []
   const attemptCount = getRepeatedAttemptCount(task, statuses)
@@ -1095,8 +1095,7 @@ function getRepeatedTestReport (task, testName, testSuiteAbsolutePath, testPrope
         testProperties,
         type,
         statuses,
-        isFinalAttempt,
-        hasFailure
+        isFinalAttempt
       ),
       isRetry: index > 0,
       status: attemptStatus,
@@ -1136,11 +1135,10 @@ function getRepeatedTestReport (task, testName, testSuiteAbsolutePath, testPrope
  * @param {'attempt_to_fix'|'early_flake_detection'|'external'} type
  * @param {string[]} statuses
  * @param {boolean} isFinalAttempt
- * @param {boolean} hasFailure
  * @returns {boolean}
  */
-function hasFailedAllManagedRetries (task, testProperties, type, statuses, isFinalAttempt, hasFailure) {
-  if (!isFinalAttempt || !hasFailure || statuses.length === 0 || !statuses.every(status => status === 'fail')) {
+function hasFailedAllManagedRetries (task, testProperties, type, statuses, isFinalAttempt) {
+  if (!isFinalAttempt || statuses.length === 0 || !statuses.every(status => status === 'fail')) {
     return false
   }
 
@@ -1165,7 +1163,8 @@ function getAttemptToFixFinalStatus (statuses) {
   return statuses.includes('fail') ? 'fail' : 'pass'
 }
 
-function getEarlyFlakeDetectionFinalStatus (statuses) {
+function getEarlyFlakeDetectionFinalStatus (statuses, testProperties) {
+  if (testProperties.isDisabled || testProperties.isQuarantined) return 'skip'
   return statuses.includes('pass') ? 'pass' : 'fail'
 }
 
@@ -1274,7 +1273,6 @@ function reportFinalTestAttempt (testReport) {
         testProperties,
         'external',
         ['fail'],
-        true,
         true
       ),
       isRetry: (result?.retryCount || 0) > 0 || (result?.repeatCount || 0) > 0,

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

@@ -534,6 +534,7 @@ class PlaywrightPlugin extends CiPlugin {
       testSourceLine,
       browserName,
       isNew,
+      isAttemptToFix,
       isDisabled,
       isModified,
       isQuarantined,
@@ -559,6 +560,9 @@ class PlaywrightPlugin extends CiPlugin {
       if (isNew) {
         span.setTag(TEST_IS_NEW, 'true')
       }
+      if (isAttemptToFix) {
+        span.setTag(TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX, 'true')
+      }
       if (isDisabled) {
         span.setTag(TEST_MANAGEMENT_IS_DISABLED, 'true')
       }

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

@@ -15,6 +15,7 @@ const {
   incrementWafUpdatesMetric,
   incrementWafConfigErrorsMetric,
   incrementWafRequestsMetric,
+  incrementRequestDurationMetrics,
   updateWafRequestsMetricTags,
   updateRaspRequestsMetricTags,
   updateRaspRuleSkippedMetricTags,
@@ -608,6 +609,7 @@ function finishRequest (req, res, storedResponseHeaders, requestBody, rootSpan)
 
   if (!req) return
 
+  incrementRequestDurationMetrics(req)
   incrementWafRequestsMetric(req)
 
   const tags = rootSpan.context().getTags()

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

@@ -12,6 +12,7 @@ const {
   trackRaspMetrics,
   trackRaspRuleMatch,
   trackRaspRuleSkipped,
+  incrementRaspDurationMetrics,
 } = require('./rasp')
 const {
   addWafRequestMetrics,
@@ -20,6 +21,7 @@ const {
   incrementWafUpdates,
   incrementWafConfigErrors,
   incrementWafRequests,
+  incrementWafDurationMetrics,
 } = require('./waf')
 
 const metricsStoreMap = new WeakMap()
@@ -142,6 +144,16 @@ function incrementWafRequestsMetric (req) {
   metricsStoreMap.delete(req)
 }
 
+function incrementRequestDurationMetrics (req) {
+  if (!req || !enabled) return
+
+  const store = getStore(req)
+  const requestMetrics = store[DD_TELEMETRY_REQUEST_METRICS]
+
+  incrementWafDurationMetrics(requestMetrics)
+  incrementRaspDurationMetrics(requestMetrics)
+}
+
 function incrementMissingUserLoginMetric (framework, eventType) {
   if (!enabled) return
 
@@ -199,6 +211,7 @@ module.exports = {
   incrementWafUpdatesMetric,
   incrementWafConfigErrorsMetric,
   incrementWafRequestsMetric,
+  incrementRequestDurationMetrics,
   incrementMissingUserLoginMetric,
   incrementMissingUserIdMetric,
   incrementSdkEventMetric,

package/packages/dd-trace/src/appsec/telemetry/rasp.js

@@ -77,6 +77,21 @@ function trackRaspRuleMatch (store, raspRule, blockTriggered, blocked) {
   appsecMetrics.count('rasp.rule.match', tags).inc(1)
 }
 
+function incrementRaspDurationMetrics (requestMetrics) {
+  const { raspDuration, raspDurationExt, wafVersion, rulesVersion } = requestMetrics
+  if (!raspDuration && !raspDurationExt) return
+
+  const versionsTags = getVersionsTags(wafVersion, rulesVersion)
+
+  if (raspDuration) {
+    appsecMetrics.distribution('rasp.duration', versionsTags).track(raspDuration)
+  }
+
+  if (raspDurationExt) {
+    appsecMetrics.distribution('rasp.duration_ext', versionsTags).track(raspDurationExt)
+  }
+}
+
 function trackRaspRuleSkipped (raspRule, reason) {
   const tags = { reason, rule_type: raspRule.type }
 
@@ -100,4 +115,5 @@ module.exports = {
   trackRaspMetrics,
   trackRaspRuleMatch,
   trackRaspRuleSkipped,
+  incrementRaspDurationMetrics,
 }

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

@@ -34,6 +34,14 @@ function addWafRequestMetrics (store, { duration, durationExt, wafTimeout, error
 function trackWafMetrics (store, metrics) {
   const versionsTags = getVersionsTags(metrics.wafVersion, metrics.rulesVersion)
 
+  const requestMetrics = store[DD_TELEMETRY_REQUEST_METRICS]
+  if (metrics.wafVersion) {
+    requestMetrics.wafVersion = metrics.wafVersion
+  }
+  if (metrics.rulesVersion) {
+    requestMetrics.rulesVersion = metrics.rulesVersion
+  }
+
   const metricTags = getOrCreateMetricTags(store, versionsTags)
 
   if (metrics.blockFailed) {
@@ -118,6 +126,21 @@ function incrementWafRequests (store) {
   }
 }
 
+function incrementWafDurationMetrics (requestMetrics) {
+  const { duration, durationExt, wafVersion, rulesVersion } = requestMetrics
+  if (!duration && !durationExt) return
+
+  const versionsTags = getVersionsTags(wafVersion, rulesVersion)
+
+  if (duration) {
+    appsecMetrics.distribution('waf.duration', versionsTags).track(duration)
+  }
+
+  if (durationExt) {
+    appsecMetrics.distribution('waf.duration_ext', versionsTags).track(durationExt)
+  }
+}
+
 function incrementTruncatedMetrics (metrics, truncationReason) {
   const truncationTags = { truncation_reason: truncationReason }
   appsecMetrics.count('waf.input_truncated', truncationTags).inc(1)
@@ -140,4 +163,5 @@ module.exports = {
   incrementWafUpdates,
   incrementWafConfigErrors,
   incrementWafRequests,
+  incrementWafDurationMetrics,
 }

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

@@ -9,6 +9,23 @@ 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 = {}
 
@@ -24,7 +41,7 @@ const carrierOperations = {}
 /**
  * @template Value
  * @typedef {object} CarrierField
- * @property {(carrier: Carrier) => Value | undefined} read
+ * @property {((carrier: Carrier) => Value | undefined) | undefined} read
  * @property {(carrier: Carrier, value: Value) => void} write
  * @property {(carrier: Carrier) => boolean} has
  * @property {(carrier: Carrier) => void} delete
@@ -53,19 +70,13 @@ function defineCapability (name, operations, capability) {
  * @template Value
  * @param {string} fieldName
  * @param {string} headerName
- * @param {(value: unknown) => Value | undefined} resolve
+ * @param {((carrier: Carrier) => Value | undefined) | undefined} read
  * @param {number} operations
  * @returns {CarrierField<Value>}
  */
-function defineField (fieldName, headerName, resolve, operations) {
+function defineField (fieldName, headerName, read, operations) {
   return defineCapability(fieldName, operations, {
-    /**
-     * @param {Carrier} carrier
-     * @returns {Value | undefined}
-     */
-    read (carrier) {
-      return resolve(carrier[headerName])
-    },
+    read,
 
     /**
      * @param {Carrier} carrier
@@ -183,48 +194,96 @@ 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',
-  'x-datadog-trace-id',
-  readLastText,
+  datadogTraceIdHeader,
+  readDatadogTraceId,
   FIELD_READ | FIELD_WRITE
 )
 const datadogParentId = defineField(
   'datadogParentId',
-  'x-datadog-parent-id',
-  readLastText,
+  datadogParentIdHeader,
+  readDatadogParentId,
   FIELD_READ | FIELD_WRITE | FIELD_DELETE
 )
 const datadogOrigin = defineField(
   'datadogOrigin',
-  'x-datadog-origin',
-  readLastText,
+  datadogOriginHeader,
+  readDatadogOrigin,
   FIELD_READ | FIELD_WRITE
 )
 const datadogSamplingPriority = defineField(
   'datadogSamplingPriority',
-  'x-datadog-sampling-priority',
-  readLastText,
+  datadogSamplingPriorityHeader,
+  readDatadogSamplingPriority,
   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)
+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)
 const dsmBase64 = defineField(
   'dsmBase64',
-  'dd-pathway-ctx-base64',
-  readLastPathway,
+  dsmBase64Header,
+  readDsmBase64,
   FIELD_READ | FIELD_WRITE | FIELD_HAS | FIELD_NAME_LENGTH
 )
-const dsmBinary = defineField('dsmBinary', 'dd-pathway-ctx', readLastPathway, FIELD_READ | FIELD_HAS)
+const dsmBinary = defineField('dsmBinary', dsmBinaryHeader, readDsmBinary, FIELD_READ | FIELD_HAS)
 
 const legacyBaggagePrefix = 'ot-baggage-'
 // RFC 7230 `token`, compatible with Node.js header-name validation.
@@ -314,23 +373,23 @@ function pickDsm (carrier) {
  * @property {typeof dsmBinary.has} hasDsmBinary
  * @property {typeof pickDsm} pickDsm
  * @property {typeof pickTextMap} pickTextMap
- * @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 {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, target: Record<string, string>) => void} readLegacyBaggage
- * @property {(carrier: Carrier) => string | undefined} readSqsd
- * @property {typeof traceparent.read} readTraceparent
- * @property {typeof tracestate.read} readTracestate
+ * @property {typeof readSqsd} readSqsd
+ * @property {typeof readTraceparent} readTraceparent
+ * @property {typeof readTracestate} 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 request = require('../requests/request')
+const { EVP_SUBDOMAIN_HEADER_NAME } = require('../../evp_proxy/constants')
+const { joinEVPProxyPath } = require('../../evp_proxy/path')
 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 = `${evpProxyPrefix}/api/v2/ci/libraries/tests`
-    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
+    options.path = joinEVPProxyPath(evpProxyPrefix, '/api/v2/ci/libraries/tests')
+    options.headers[EVP_SUBDOMAIN_HEADER_NAME] = 'api'
   } else {
     const { DD_API_KEY } = getConfig()
     if (!DD_API_KEY) {

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

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

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

@@ -1,5 +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')
 
@@ -54,9 +56,9 @@ class Writer extends BaseWriter {
     }
 
     if (this._evpProxyPrefix) {
-      options.path = `${this._evpProxyPrefix}/api/v2/citestcycle`
+      options.path = joinEVPProxyPath(this._evpProxyPrefix, '/api/v2/citestcycle')
       delete options.headers['dd-api-key']
-      options.headers['X-Datadog-EVP-Subdomain'] = 'citestcycle-intake'
+      options.headers[EVP_SUBDOMAIN_HEADER_NAME] = '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,6 +4,8 @@ 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')
 
@@ -83,8 +85,8 @@ function getCommitsToUpload ({ url, repositoryUrl, latestCommits, isEvpProxy, ev
   }
 
   if (isEvpProxy) {
-    options.path = `${evpProxyPrefix}/api/v2/git/repository/search_commits`
-    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
+    options.path = joinEVPProxyPath(evpProxyPrefix, '/api/v2/git/repository/search_commits')
+    options.headers[EVP_SUBDOMAIN_HEADER_NAME] = 'api'
     delete options.headers['dd-api-key']
   }
 
@@ -179,8 +181,8 @@ function uploadPackFile ({ url, isEvpProxy, evpProxyPrefix, packFileToUpload, re
   }
 
   if (isEvpProxy) {
-    options.path = `${evpProxyPrefix}/api/v2/git/repository/packfile`
-    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
+    options.path = joinEVPProxyPath(evpProxyPrefix, '/api/v2/git/repository/packfile')
+    options.headers[EVP_SUBDOMAIN_HEADER_NAME] = 'api'
     delete options.headers['dd-api-key']
   }
 

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

@@ -1,7 +1,8 @@
 'use strict'
 
 const getConfig = require('../../config')
-const request = require('../requests/request')
+const { EVP_SUBDOMAIN_HEADER_NAME } = require('../../evp_proxy/constants')
+const { joinEVPProxyPath } = require('../../evp_proxy/path')
 const log = require('../../log')
 const {
   incrementCountMetric,
@@ -13,6 +14,7 @@ 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')
 
@@ -227,8 +229,8 @@ function fetchFromApi ({
   }
 
   if (isEvpProxy) {
-    options.path = `${evpProxyPrefix}/api/v2/ci/tests/skippable`
-    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
+    options.path = joinEVPProxyPath(evpProxyPrefix, '/api/v2/ci/tests/skippable')
+    options.headers[EVP_SUBDOMAIN_HEADER_NAME] = 'api'
   } else {
     const { DD_API_KEY } = getConfig()
     if (!DD_API_KEY) {

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

@@ -1,6 +1,8 @@
 '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')
@@ -238,8 +240,8 @@ function getLibraryConfiguration ({
   }
 
   if (isEvpProxy) {
-    options.path = `${evpProxyPrefix}/api/v2/libraries/tests/services/setting`
-    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
+    options.path = joinEVPProxyPath(evpProxyPrefix, '/api/v2/libraries/tests/services/setting')
+    options.headers[EVP_SUBDOMAIN_HEADER_NAME] = '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,6 +4,8 @@ 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')
@@ -98,8 +100,8 @@ function uploadCoverageReport (
   }
 
   if (isEvpProxy) {
-    options.path = `${evpProxyPrefix}/api/v2/cicovreprt`
-    options.headers['X-Datadog-EVP-Subdomain'] = 'ci-intake'
+    options.path = joinEVPProxyPath(evpProxyPrefix, '/api/v2/cicovreprt')
+    options.headers[EVP_SUBDOMAIN_HEADER_NAME] = '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,6 +4,8 @@ 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')
 
@@ -134,8 +136,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 = `${evpProxyPrefix}${basePath}?${query}`
-    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
+    options.path = `${joinEVPProxyPath(evpProxyPrefix, basePath)}?${query}`
+    options.headers[EVP_SUBDOMAIN_HEADER_NAME] = '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 request = require('../requests/request')
+const { EVP_SUBDOMAIN_HEADER_NAME } = require('../../evp_proxy/constants')
+const { joinEVPProxyPath } = require('../../evp_proxy/path')
 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 = `${evpProxyPrefix}/api/v2/test/libraries/test-management/tests`
-    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
+    options.path = joinEVPProxyPath(evpProxyPrefix, '/api/v2/test/libraries/test-management/tests')
+    options.headers[EVP_SUBDOMAIN_HEADER_NAME] = 'api'
   } else {
     const { DD_API_KEY } = getConfig()
     if (!DD_API_KEY) {