dd-trace 5.108.0 → 5.110.0

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

@@ -0,0 +1,34 @@
+'use strict'
+
+const telemetryMetrics = require('../../telemetry/metrics')
+
+const appsecMetrics = telemetryMetrics.manager.namespace('appsec')
+
+const normalizedFrameworkCache = new Map()
+
+function normalizeFramework (framework) {
+  let normalized = normalizedFrameworkCache.get(framework)
+  if (normalized === undefined) {
+    normalized = framework ? framework.toLowerCase().replaceAll(' ', '_') : 'unknown'
+    normalizedFrameworkCache.set(framework, normalized)
+  }
+  return normalized
+}
+
+function incrementApiSecRequestSchema (framework) {
+  appsecMetrics.count('api_security.request.schema', { framework: normalizeFramework(framework) }).inc()
+}
+
+function incrementApiSecRequestNoSchema (framework) {
+  appsecMetrics.count('api_security.request.no_schema', { framework: normalizeFramework(framework) }).inc()
+}
+
+function incrementApiSecMissingRoute (framework) {
+  appsecMetrics.count('api_security.missing_route', { framework: normalizeFramework(framework) }).inc()
+}
+
+module.exports = {
+  incrementApiSecRequestSchema,
+  incrementApiSecRequestNoSchema,
+  incrementApiSecMissingRoute,
+}

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

@@ -1,5 +1,10 @@
 'use strict'
 
+const {
+  incrementApiSecMissingRoute,
+  incrementApiSecRequestNoSchema,
+  incrementApiSecRequestSchema,
+} = require('./api_security')
 const { DD_TELEMETRY_REQUEST_METRICS } = require('./common')
 const { incrementMissingUserId, incrementMissingUserLogin, incrementSdkEvent } = require('./user')
 const {
@@ -155,6 +160,24 @@ function incrementSdkEventMetric (eventType, sdkVersion) {
   incrementSdkEvent(eventType, sdkVersion)
 }
 
+function incrementApiSecRequestSchemaMetric (framework) {
+  if (!enabled) return
+
+  incrementApiSecRequestSchema(framework)
+}
+
+function incrementApiSecRequestNoSchemaMetric (framework) {
+  if (!enabled) return
+
+  incrementApiSecRequestNoSchema(framework)
+}
+
+function incrementApiSecMissingRouteMetric (framework) {
+  if (!enabled) return
+
+  incrementApiSecMissingRoute(framework)
+}
+
 function getRequestMetrics (req) {
   if (req) {
     const store = getStore(req)
@@ -179,6 +202,9 @@ module.exports = {
   incrementMissingUserLoginMetric,
   incrementMissingUserIdMetric,
   incrementSdkEventMetric,
+  incrementApiSecRequestSchemaMetric,
+  incrementApiSecRequestNoSchemaMetric,
+  incrementApiSecMissingRouteMetric,
 
   getRequestMetrics,
 }

package/packages/dd-trace/src/ci-visibility/requests/request.js

@@ -12,26 +12,10 @@ const {
   isRetriableNetworkError,
   singleJitteredDelay,
 } = require('../../exporters/common/retry')
-const { urlToHttpOptions } = require('../../exporters/common/url-to-http-options-polyfill')
+const { parseUrl } = require('../../exporters/common/url')
 
 const legacyStorage = storage('legacy')
 
-function parseUrl (urlObjOrString) {
-  if (urlObjOrString !== null && typeof urlObjOrString === 'object') {
-    return urlToHttpOptions(urlObjOrString)
-  }
-
-  const url = urlToHttpOptions(new URL(urlObjOrString))
-
-  if (url.protocol === 'unix:' && url.hostname === '.') {
-    const udsPath = urlObjOrString.slice(5)
-    url.path = udsPath
-    url.pathname = udsPath
-  }
-
-  return url
-}
-
 /**
  * Simplified HTTP request for test optimization (library config). Uses common HTTP agents.
  * Retries: 429 (with X-ratelimit-reset, max 30s wait),

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

@@ -1,6 +1,5 @@
 'use strict'
 
-const dns = require('dns')
 const util = require('util')
 
 const { DD_MAJOR } = require('../../../../version')
@@ -51,7 +50,6 @@ const defaults = {
   isServiceUserProvided: false,
   plugins: true,
   isCiVisibility: false,
-  lookup: dns.lookup,
   logger: undefined,
 }
 
@@ -218,6 +216,14 @@ for (const [canonicalName, entries] of Object.entries(supportedConfigurations))
     )
   }
   for (const entry of entries) {
+    // A deprecated entry that only aliases a canonical option must not surface as
+    // its own Config property/default: the canonical entry already owns the value
+    // and the alias is resolved by helper.js. helper.js drops these from the shared
+    // supported-configurations object (after registering the deprecation), but that
+    // mutation is order-dependent on which module loads first. Skip here too so
+    // `defaults` is identical regardless of load order (it differed in v5, where
+    // major-overrides keeps these entries instead of deleting them outright).
+    if (entry.deprecated && entry.aliases) continue
     if (entry.sensitive) {
       sensitiveConfigurations.add(canonicalName)
     }
@@ -285,7 +291,7 @@ for (const [canonicalName, entries] of Object.entries(supportedConfigurations))
 
 // Replace the alias with the canonical property name.
 for (const [fullPropertyName, alias] of fallbackConfigurations) {
-  if (configurationsTable[alias].property) {
+  if (configurationsTable[alias]?.property) {
     fallbackConfigurations.set(fullPropertyName, configurationsTable[alias].property)
   }
 }
@@ -347,3 +353,16 @@ module.exports = {
 
   generateTelemetry,
 }
+
+// `dns` is instrumented, so requiring it pulls in the dns plugin, which loads
+// `log`, whose bootstrap calls back into `require('./defaults')`. Resolve the
+// `lookup` default last — after the exports above are fully built — so that the
+// re-entrant require during that cascade sees the complete module instead of a
+// half-initialized one.
+defaults.lookup = require('dns').lookup
+configWithOrigin.set('lookupdefault', {
+  name: 'lookup',
+  value: defaults.lookup,
+  origin: 'default',
+  seq_id: seqId++,
+})