dd-trace 5.65.0 → 5.66.0

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

@@ -145,7 +145,10 @@ module.exports = class PluginManager {
       ciVisAgentlessLogSubmissionEnabled,
       isTestDynamicInstrumentationEnabled,
       isServiceUserProvided,
-      middlewareTracingEnabled
+      middlewareTracingEnabled,
+      traceWebsocketMessagesEnabled,
+      traceWebsocketMessagesInheritSampling,
+      traceWebsocketMessagesSeparateTraces
     } = this._tracerConfig
 
     const sharedConfig = {
@@ -160,7 +163,10 @@ module.exports = class PluginManager {
       ciVisibilityTestSessionName,
       ciVisAgentlessLogSubmissionEnabled,
       isTestDynamicInstrumentationEnabled,
-      isServiceUserProvided
+      isServiceUserProvided,
+      traceWebsocketMessagesEnabled,
+      traceWebsocketMessagesInheritSampling,
+      traceWebsocketMessagesSeparateTraces
     }
 
     if (logInjection !== undefined) {

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

@@ -102,5 +102,6 @@ module.exports = {
   get sharedb () { return require('../../../datadog-plugin-sharedb/src') },
   get tedious () { return require('../../../datadog-plugin-tedious/src') },
   get undici () { return require('../../../datadog-plugin-undici/src') },
-  get winston () { return require('../../../datadog-plugin-winston/src') }
+  get winston () { return require('../../../datadog-plugin-winston/src') },
+  get ws () { return require('../../../datadog-plugin-ws/src') }
 }

package/packages/dd-trace/src/plugins/util/ip_extractor.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const { BlockList } = require('net')
 const net = require('net')
 
 const FORWARED_HEADER_NAME = 'forwarded'
@@ -32,7 +31,7 @@ const privateCIDRs = [
   'fd00::/8'
 ]
 
-const privateIPMatcher = new BlockList()
+const privateIPMatcher = new net.BlockList()
 
 for (const cidr of privateCIDRs) {
   const [address, prefix] = cidr.split('/')
@@ -45,7 +44,11 @@ function extractIp (config, req) {
   if (config.clientIpHeader) {
     if (!headers) return
 
-    const ip = findFirstIp(headers[config.clientIpHeader])
+    const ipHeaderName = config.clientIpHeader
+    const header = headers[ipHeaderName]
+    if (typeof header !== 'string') return
+
+    const ip = findFirstIp(header, ipHeaderName === FORWARED_HEADER_NAME)
     return ip.public || ip.private
   }
 
@@ -53,12 +56,14 @@ function extractIp (config, req) {
   if (headers) {
     for (const ipHeaderName of ipHeaderList) {
       const header = headers[ipHeaderName]
-      const firstIp = ipHeaderName === FORWARED_HEADER_NAME ? findFirstIpForwardedFormat(header) : findFirstIp(header)
+      if (typeof header !== 'string') continue
+
+      const ip = findFirstIp(header, ipHeaderName === FORWARED_HEADER_NAME)
 
-      if (firstIp.public) {
-        return firstIp.public
-      } else if (!firstPrivateIp && firstIp.private) {
-        firstPrivateIp = firstIp.private
+      if (ip.public) {
+        return ip.public
+      } else if (!firstPrivateIp && ip.private) {
+        firstPrivateIp = ip.private
       }
     }
   }
@@ -66,25 +71,39 @@ function extractIp (config, req) {
   return firstPrivateIp || req.socket?.remoteAddress
 }
 
-function isPublicIp (ip, type) {
-  return !privateIPMatcher.check(ip, type === 6 ? 'ipv6' : 'ipv4')
-}
-
-function findFirstIp (str) {
+function findFirstIp (str, isForwardedHeader) {
   const result = {}
   if (!str) return result
 
   const splitted = str.split(',')
 
-  for (const part of splitted) {
-    const chunk = part.trim()
+  for (let chunk of splitted) {
+    if (isForwardedHeader) {
+      // find "for" directive
+      const forDirective = chunk.split(';').find(subchunk => subchunk.trim().toLowerCase().startsWith('for='))
+
+      // if found remove the "for=" prefix
+      // else keep going as is
+      if (forDirective) {
+        chunk = forDirective.slice(4)
+      }
+    }
+
+    chunk = chunk.trim()
+
+    // trim potential double quotes
+    if (chunk.startsWith('"') && chunk.endsWith('"')) {
+      chunk = chunk.slice(1, -1).trim()
+    }
 
-    // TODO: strip port and interface data ?
+    // TODO: when min node support is v24 we can instead use net.SocketAddress.parse()
+    chunk = cleanIp(chunk)
+    if (!chunk) continue
 
     const type = net.isIP(chunk)
     if (!type) continue
 
-    if (isPublicIp(chunk, type)) {
+    if (!privateIPMatcher.check(chunk, type === 6 ? 'ipv6' : 'ipv4')) {
       // it's public, return it immediately
       result.public = chunk
       return result
@@ -97,37 +116,21 @@ function findFirstIp (str) {
   return result
 }
 
-const forwardedForRegexp = /for="?\[?(([0-9]+\.)+[0-9]+|[0-9a-f:]*:[0-9a-f]*)/i
-const forwardedByRegexp = /by="?\[?(([0-9]+\.)+[0-9]+|[0-9a-f:]*:[0-9a-f]*)/i
-const forwardedRegexps = [forwardedForRegexp, forwardedByRegexp]
-
-function findFirstIpForwardedFormat (str) {
-  const result = {}
-  if (!str) return result
-
-  const splitted = str.split(',')
-
-  for (const part of splitted) {
-    const chunk = part.trim()
-
-    for (const regex of forwardedRegexps) {
-      const ip = regex.exec(chunk)?.[1]
-
-      const type = net.isIP(ip)
-      if (!type) continue
-
-      if (isPublicIp(ip, type)) {
-        // it's public, return it immediately
-        result.public = ip
-        return result
-      }
+function cleanIp (input) {
+  const colonIndex = input.indexOf(':')
+  if (colonIndex !== -1 && input.includes('.')) {
+    // treat it as ipv4 with port
+    return input.slice(0, colonIndex).trim()
+  }
 
-      // it's private, only save the first one found
-      if (!result.private) result.private = ip
-    }
+  const closingBracketIndex = input.indexOf(']')
+  if (closingBracketIndex !== -1 && input.startsWith('[')) {
+    // treat as ipv6 with brackets
+    return input.slice(1, closingBracketIndex).trim()
   }
 
-  return result
+  // no need to clean it
+  return input
 }
 
 module.exports = {

package/packages/dd-trace/src/profiling/profilers/wall.js

@@ -13,6 +13,7 @@ const {
   getThreadLabels,
   encodeProfileAsync
 } = require('./shared')
+const TRACE_ENDPOINT_LABEL = 'trace endpoint'
 
 const { isWebServerSpan, endpointNameFromTags, getStartedSpans } = require('../webspan-utils')
 
@@ -251,7 +252,12 @@ class NativeWallProfiler {
       this._enter()
       this._lastSampleCount = 0
     }
-    const profile = this._pprof.time.stop(restart, this._generateLabels)
+
+    // Mark thread labels and trace endpoint label as good deduplication candidates
+    const lowCardinalityLabels = Object.keys(getThreadLabels())
+    lowCardinalityLabels.push(TRACE_ENDPOINT_LABEL)
+
+    const profile = this._pprof.time.stop(restart, this._generateLabels, lowCardinalityLabels)
 
     if (restart) {
       const v8BugDetected = this._pprof.time.v8ProfilerStuckEventLoopDetected()
@@ -312,10 +318,10 @@ class NativeWallProfiler {
       labels[LOCAL_ROOT_SPAN_ID_LABEL] = rootSpanId
     }
     if (webTags !== undefined && Object.keys(webTags).length !== 0) {
-      labels['trace endpoint'] = endpointNameFromTags(webTags)
+      labels[TRACE_ENDPOINT_LABEL] = endpointNameFromTags(webTags)
     } else if (endpoint) {
       // fallback to endpoint computed when sample was taken
-      labels['trace endpoint'] = endpoint
+      labels[TRACE_ENDPOINT_LABEL] = endpoint
     }
 
     return labels

package/packages/dd-trace/src/service-naming/schemas/v0/index.js

@@ -6,5 +6,6 @@ const storage = require('./storage')
 const graphql = require('./graphql')
 const web = require('./web')
 const serverless = require('./serverless')
+const websocket = require('./websocket')
 
-module.exports = new SchemaDefinition({ messaging, storage, web, graphql, serverless })
+module.exports = new SchemaDefinition({ messaging, storage, web, graphql, serverless, websocket })

package/packages/dd-trace/src/service-naming/schemas/v0/websocket.js

@@ -0,0 +1,30 @@
+'use strict'
+
+const websocket = {
+  request: {
+    ws: {
+      opName: () => 'web.request',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    }
+  },
+  producer: {
+    ws: {
+      opName: () => 'websocket.send',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    }
+  },
+  consumer: {
+    ws: {
+      opName: () => 'websocket.receive',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    }
+  },
+  close: {
+    ws: {
+      opName: () => 'websocket.close',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    }
+  }
+}
+
+module.exports = websocket

package/packages/dd-trace/src/service-naming/schemas/v1/index.js

@@ -6,5 +6,6 @@ const storage = require('./storage')
 const graphql = require('./graphql')
 const web = require('./web')
 const serverless = require('./serverless')
+const websocket = require('./websocket')
 
-module.exports = new SchemaDefinition({ messaging, storage, web, graphql, serverless })
+module.exports = new SchemaDefinition({ messaging, storage, web, graphql, serverless, websocket })

package/packages/dd-trace/src/service-naming/schemas/v1/websocket.js

@@ -0,0 +1,30 @@
+'use strict'
+
+const websocket = {
+  request: {
+    ws: {
+      opName: () => 'web.request',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    }
+  },
+  producer: {
+    ws: {
+      opName: () => 'websocket.send',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    }
+  },
+  consumer: {
+    ws: {
+      opName: () => 'websocket.receive',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    }
+  },
+  close: {
+    ws: {
+      opName: () => 'websocket.close',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    }
+  }
+}
+
+module.exports = websocket

package/packages/dd-trace/src/supported-configurations.json

@@ -414,6 +414,9 @@
     "DD_TRACE_VITEST_ENABLED": ["A"],
     "DD_TRACE_VITEST_RUNNER_ENABLED": ["A"],
     "DD_TRACE_VM_ENABLED": ["A"],
+    "DD_TRACE_WEBSOCKET_MESSAGES_ENABLED":["A"],
+    "DD_TRACE_WEBSOCKET_MESSAGES_INHERIT_SAMPLING": ["A"],
+    "DD_TRACE_WEBSOCKET_MESSAGES_SEPARATE_TRACES":["A"],
     "DD_TRACE_WHEN_ENABLED": ["A"],
     "DD_TRACE_WINSTON_ENABLED": ["A"],
     "DD_TRACE_WORKERPOOL_ENABLED": ["A"],