dd-trace 5.81.0 → 5.82.0

package/packages/dd-trace/src/require-package-json.js

@@ -12,7 +12,7 @@ const fs = require('fs')
  * @typedef { import('module').Module } Module
  * @param {string} name
  * @param {Module} module
- * @returns {Object} The parsed package.json
+ * @returns {object} The parsed package.json
  */
 function requirePackageJson (name, module) {
   if (path.isAbsolute(name)) {

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

@@ -1,13 +1,16 @@
 'use strict'
 
 const path = require('path')
+const fs = require('fs')
 const Module = require('module')
-const parse = require('../../../vendor/dist/module-details-from-path')
+
 const dc = require('dc-polyfill')
+
+const parse = require('../../../vendor/dist/module-details-from-path')
 const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { isRelativeRequire } = require('../../datadog-instrumentations/src/helpers/shared-utils')
 
 const origRequire = Module.prototype.require
-
 // derived from require-in-the-middle@3 with tweaks
 
 module.exports = Hook
@@ -64,7 +67,6 @@ function Hook (modules, options, onrequire) {
     } catch {
       return _origRequire.apply(this, arguments)
     }
-
     const core = !filename.includes(path.sep)
     let name, basedir, hooks
     // return known patched modules immediately
@@ -117,32 +119,41 @@ function Hook (modules, options, onrequire) {
       // decide how to assign the stat
       // first case will only happen when patching an AWS Lambda Handler
       const stat = inAWSLambda && hasLambdaHandler && !filenameFromNodeModule ? { name: filename } : parse(filename)
-      if (!stat) return exports // abort if filename could not be parsed
-      name = stat.name
-      basedir = stat.basedir
-
-      hooks = moduleHooks[name]
-      if (!hooks) return exports // abort if module name isn't on whitelist
 
-      // figure out if this is the main module file, or a file inside the module
-      const paths = Module._resolveLookupPaths(name, this, true)
-      if (!paths) {
-        // abort if _resolveLookupPaths return null
-        return exports
-      }
-
-      let res
-      try {
-        res = Module._findPath(name, [basedir, ...paths])
-      } catch {
-        // case where the file specified in package.json "main" doesn't exist
-        // in this case, the file is treated as module-internal
-      }
+      if (stat) {
+        name = stat.name
+        basedir = stat.basedir
+
+        hooks = moduleHooks[name]
+        if (!hooks) return exports // abort if module name isn't on whitelist
+
+        const paths = Module._resolveLookupPaths(name, this, true)
+        if (!paths) {
+          // abort if _resolveLookupPaths return null
+          return exports
+        }
+
+        let res
+        try {
+          res = Module._findPath(name, [basedir, ...paths])
+        } catch {
+          // case where the file specified in package.json "main" doesn't exist
+          // in this case, the file is treated as module-internal
+        }
+
+        if (!res || res !== filename) {
+          // this is a module-internal file
+          // use the module-relative path to the file, prefixed by original module name
+          name = name + path.sep + path.relative(basedir, filename)
+        }
+      } else {
+        if (isRelativeRequire(request) && moduleHooks[request]) {
+          hooks = moduleHooks[request]
+          name = request
+          basedir = findProjectRoot(filename)
+        }
 
-      if (!res || res !== filename) {
-        // this is a module-internal file
-        // use the module-relative path to the file, prefixed by original module name
-        name = name + path.sep + path.relative(basedir, filename)
+        if (!hooks) return exports
       }
     }
 
@@ -167,6 +178,18 @@ Hook.reset = function () {
   moduleHooks = Object.create(null)
 }
 
+function findProjectRoot (startDir) {
+  let dir = startDir
+
+  while (!fs.existsSync(path.join(dir, 'package.json'))) {
+    const parent = path.dirname(dir)
+    if (parent === dir) break
+    dir = parent
+  }
+
+  return dir
+}
+
 Hook.prototype.unhook = function () {
   for (const mod of this.modules) {
     const hooks = (moduleHooks[mod] || []).filter(hook => hook !== this.onrequire)

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

@@ -5,9 +5,9 @@
 const v8 = require('v8')
 const os = require('os')
 const process = require('process')
+const { performance, PerformanceObserver, monitorEventLoopDelay } = require('perf_hooks')
 const { DogStatsDClient, MetricsAggregationClient } = require('../dogstatsd')
 const log = require('../log')
-const { performance, PerformanceObserver, monitorEventLoopDelay } = require('perf_hooks')
 const { getEnvironmentVariable } = require('../config-helper')
 
 const { NODE_MAJOR } = require('../../../../version')

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

@@ -1,6 +1,7 @@
 'use strict'
 
 const { getEnvironmentVariable } = require('./config-helper')
+const { isFalse } = require('./util')
 
 function getIsGCPFunction () {
   const isDeprecatedGCPFunction =
@@ -13,6 +14,15 @@ function getIsGCPFunction () {
   return isDeprecatedGCPFunction || isNewerGCPFunction
 }
 
+/**
+ * Enable GCP Pub/Sub PUSH subscription tracing for Cloud Run (K_SERVICE present).
+ * PUSH: GCP sends HTTP POST requests to the service with message data in headers.
+ */
+function enableGCPPubSubPushSubscription () {
+  const isGCPPubSubPushSubscriptionEnabled = getEnvironmentVariable('DD_TRACE_GCP_PUBSUB_PUSH_ENABLED')
+  return getEnvironmentVariable('K_SERVICE') !== undefined && !isFalse(isGCPPubSubPushSubscriptionEnabled)
+}
+
 function getIsAzureFunction () {
   const isAzureFunction =
     getEnvironmentVariable('FUNCTIONS_EXTENSION_VERSION') !== undefined &&
@@ -21,6 +31,10 @@ function getIsAzureFunction () {
   return isAzureFunction
 }
 
+function getIsFlexConsumptionAzureFunction () {
+  return getIsAzureFunction() && getEnvironmentVariable('WEBSITE_SKU') === 'FlexConsumption'
+}
+
 function isInServerlessEnvironment () {
   const inAWSLambda = getEnvironmentVariable('AWS_LAMBDA_FUNCTION_NAME') !== undefined
   const isGCPFunction = getIsGCPFunction()
@@ -32,5 +46,7 @@ function isInServerlessEnvironment () {
 module.exports = {
   getIsGCPFunction,
   getIsAzureFunction,
+  enableGCPPubSubPushSubscription,
+  getIsFlexConsumptionAzureFunction,
   isInServerlessEnvironment
 }

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

@@ -47,6 +47,10 @@ const messaging = {
     sns: {
       opName: () => 'aws.request',
       serviceName: awsServiceV0
+    },
+    bullmq: {
+      opName: () => 'bullmq.add',
+      serviceName: ({ tracerService }) => `${tracerService}-bullmq`
     }
   },
   consumer: {
@@ -77,6 +81,10 @@ const messaging = {
     sqs: {
       opName: () => 'aws.request',
       serviceName: awsServiceV0
+    },
+    bullmq: {
+      opName: () => 'bullmq.processJob',
+      serviceName: ({ tracerService }) => `${tracerService}-bullmq`
     }
   },
   client: {

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

@@ -44,6 +44,10 @@ const messaging = {
     sns: {
       opName: () => 'aws.sns.send',
       serviceName: identityService
+    },
+    bullmq: {
+      opName: () => 'bullmq.add',
+      serviceName: identityService
     }
   },
   consumer: {
@@ -65,6 +69,10 @@ const messaging = {
     sqs: {
       opName: () => 'aws.sqs.process',
       serviceName: identityService
+    },
+    bullmq: {
+      opName: () => 'bullmq.processJob',
+      serviceName: identityService
     }
   },
   client: {

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

@@ -1,7 +1,7 @@
 'use strict'
 
-const constants = require('./constants')
 const tags = require('../../../ext/tags')
+const constants = require('./constants')
 const id = require('./id')
 const { isError } = require('./util')
 const { registerExtraService } = require('./service-naming/extra-services')

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

@@ -5,7 +5,7 @@ const spanFormat = require('./span_format')
 const SpanSampler = require('./span_sampler')
 const GitMetadataTagger = require('./git_metadata_tagger')
 const { getEnvironmentVariable } = require('./config-helper')
-const getProcessTags = require('./process-tags')
+const processTags = require('./process-tags')
 
 const startedSpans = new WeakSet()
 const finishedSpans = new WeakSet()
@@ -27,7 +27,7 @@ class SpanProcessor {
     this._gitMetadataTagger = new GitMetadataTagger(config)
 
     this._processTags = config.propagateProcessTags?.enabled
-      ? getProcessTags().serialized
+      ? processTags.serialized
       : false
   }
 

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

@@ -1,11 +1,9 @@
 'use strict'
 
-const os = require('os')
-const { version } = require('./pkg')
+const os = require('node:os')
 const pkg = require('../../../package.json')
 
 const { LogCollapsingLowestDenseDDSketch } = require('../../../vendor/dist/@datadog/sketches-js')
-const { ORIGIN_KEY, TOP_LEVEL_KEY } = require('./constants')
 const {
   MEASURED,
   HTTP_STATUS_CODE,
@@ -13,6 +11,9 @@ const {
   HTTP_ROUTE,
   HTTP_METHOD
 } = require('../../../ext/tags')
+const { ORIGIN_KEY, TOP_LEVEL_KEY } = require('./constants')
+const { version } = require('./pkg')
+const processTags = require('./process-tags')
 
 const { SpanStatsExporter } = require('./exporters/span-stats')
 
@@ -176,7 +177,8 @@ class SpanStatsProcessor {
       Lang: 'javascript',
       TracerVersion: pkg.version,
       RuntimeID: this.tags['runtime-id'],
-      Sequence: ++this.sequence
+      Sequence: ++this.sequence,
+      ProcessTags: processTags.serialized
     })
   }
 

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

@@ -1,10 +1,10 @@
 'use strict'
 
 const { channel } = require('dc-polyfill')
-const TraceSourcePrioritySampler = require('./tracesource_priority_sampler')
 const { USER_KEEP } = require('../../../../ext/priority')
 const TraceState = require('../opentracing/propagation/tracestate')
 const { APM_TRACING_ENABLED_KEY } = require('../constants')
+const TraceSourcePrioritySampler = require('./tracesource_priority_sampler')
 const { hasTraceSourcePropagationTag } = require('./tracesource')
 
 const startCh = channel('dd-trace:span:start')

package/packages/dd-trace/src/startup-log.js

@@ -1,11 +1,11 @@
 'use strict'
 
-const { info, warn } = require('./log/writer')
-
 const os = require('os')
 const { inspect } = require('util')
-const defaults = require('./config_defaults')
+
 const tracerVersion = require('../../../package.json').version
+const defaults = require('./config_defaults')
+const { info, warn } = require('./log/writer')
 
 const errors = {}
 let config

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

@@ -37,6 +37,7 @@
     "DD_APPSEC_STACK_TRACE_ENABLED": ["A"],
     "DD_APPSEC_TRACE_RATE_LIMIT": ["A"],
     "DD_APPSEC_WAF_TIMEOUT": ["A"],
+    "DD_AZURE_RESOURCE_GROUP": ["A"],
     "DD_CIVISIBILITY_AGENTLESS_ENABLED": ["A"],
     "DD_CIVISIBILITY_AGENTLESS_URL": ["A"],
     "DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER": ["A"],
@@ -162,6 +163,7 @@
     "DD_RUNTIME_METRICS_GC_ENABLED": ["A"],
     "DD_RUNTIME_METRICS_FLUSH_INTERVAL": ["A"],
     "DD_RUNTIME_METRICS_RUNTIME_ID_ENABLED": ["A"],
+    "DD_TRACE_GCP_PUBSUB_PUSH_ENABLED": ["A"],
     "DD_SERVICE_MAPPING": ["A"],
     "DD_SERVICE": ["A"],
     "DD_SITE": ["A"],
@@ -243,6 +245,7 @@
     "DD_TRACE_BAGGAGE_TAG_KEYS": ["A"],
     "DD_TRACE_BEAUTIFUL_LOGS": ["A"],
     "DD_TRACE_BLUEBIRD_ENABLED": ["A"],
+    "DD_TRACE_BULLMQ_ENABLED": ["A"],
     "DD_TRACE_BODY_PARSER_ENABLED": ["A"],
     "DD_TRACE_BSON_ENABLED": ["A"],
     "DD_TRACE_BUNYAN_ENABLED": ["A"],

package/packages/dd-trace/src/telemetry/dependencies.js

@@ -1,12 +1,12 @@
 'use strict'
 
 const path = require('path')
+const { fileURLToPath } = require('url')
+const dc = require('dc-polyfill')
 const parse = require('../../../../vendor/dist/module-details-from-path')
 const requirePackageJson = require('../require-package-json')
-const { sendData } = require('./send-data')
-const dc = require('dc-polyfill')
-const { fileURLToPath } = require('url')
 const { isTrue } = require('../../src/util')
+const { sendData } = require('./send-data')
 
 /** @type {Set<string>} */
 const savedDependenciesToSend = new Set()

package/packages/dd-trace/src/telemetry/endpoints.js

@@ -15,7 +15,7 @@ let updateRetryData
 
 /**
  * Keep track of endpoints that still need to be sent.
- * Map key is `${METHOD} ${PATH}`, value is { method, path }
+ * Map key is `${METHOD} ${PATH}`, value is { method, path, operationName }
  */
 const pendingEndpoints = new Map()
 const wildcardEndpoints = new Set()
@@ -32,11 +32,11 @@ function scheduleFlush () {
   setImmediate(flushAndSend).unref()
 }
 
-function recordEndpoint (method, path) {
+function recordEndpoint (method, path, operationName) {
   const key = endpointKey(method, path)
   if (pendingEndpoints.has(key)) return
 
-  pendingEndpoints.set(key, { method: method.toUpperCase(), path })
+  pendingEndpoints.set(key, { method: method.toUpperCase(), path, operationName })
   scheduleFlush()
 }
 
@@ -46,7 +46,7 @@ function onFastifyRoute (routeData) {
 
   const methods = Array.isArray(routeOptions.method) ? routeOptions.method : [routeOptions.method]
   for (const method of methods) {
-    recordEndpoint(method, routeOptions.path)
+    recordEndpoint(method, routeOptions.path, 'fastify.request')
   }
 }
 
@@ -56,7 +56,7 @@ function onExpressRoute ({ method, path }) {
   // If wildcard already recorded for this path, skip specific methods
   if (wildcardEndpoints.has(path)) return
 
-  recordEndpoint(method, path)
+  recordEndpoint(method, path, 'express.request')
 
   // If this is a wildcard event, record it and mark path as wildcarded
   if (method === '*') {
@@ -66,17 +66,17 @@ function onExpressRoute ({ method, path }) {
 
   // Express automatically adds HEAD support for GET routes
   if (method.toUpperCase() === 'GET') {
-    recordEndpoint('HEAD', path)
+    recordEndpoint('HEAD', path, 'express.request')
   }
 }
 
 function buildEndpointObjects (endpoints) {
-  return endpoints.map(({ method, path }) => {
+  return endpoints.map(({ method, path, operationName }) => {
     return {
       type: 'REST',
       method,
       path,
-      operation_name: 'http.request',
+      operation_name: operationName,
       resource_name: endpointKey(method, path)
     }
   })

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

@@ -1,8 +1,8 @@
 'use strict'
 
 const dc = require('dc-polyfill')
-const logCollector = require('./log-collector')
 const { sendData } = require('../send-data')
+const logCollector = require('./log-collector')
 
 const telemetryLog = dc.channel('datadog:telemetry:log')
 const errorLog = dc.channel('datadog:log:error')

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

@@ -1,14 +1,17 @@
 'use strict'
-const tracerVersion = require('../../../../package.json').version
-const dc = require('dc-polyfill')
+
 const os = require('os')
+const dc = require('dc-polyfill')
+
+const tracerVersion = require('../../../../package.json').version
+const { errors } = require('../startup-log')
+const logger = require('../log')
+const processTags = require('../process-tags')
 const dependencies = require('./dependencies')
 const endpoints = require('./endpoints')
 const { sendData } = require('./send-data')
-const { errors } = require('../startup-log')
 const { manager: metricsManager } = require('./metrics')
 const telemetryLogger = require('./logs')
-const logger = require('../log')
 
 const telemetryStartChannel = dc.channel('datadog:telemetry:start')
 const telemetryStopChannel = dc.channel('datadog:telemetry:stop')
@@ -78,7 +81,8 @@ function getIntegrations () {
     newIntegrations.push({
       name: pluginName,
       enabled: pluginManager._pluginsByName[pluginName]._enabled,
-      auto_enabled: true
+      auto_enabled: true,
+      [processTags.TELEMETRY_FIELD_NAME]: processTags.tagsObject
     })
     sentIntegrations.add(pluginName)
   }
@@ -155,7 +159,8 @@ function createAppObject (config) {
     service_version: config.version,
     tracer_version: tracerVersion,
     language_name: 'nodejs',
-    language_version: process.versions.node
+    language_version: process.versions.node,
+    process_tags: processTags.tagsObject
   }
 }
 

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

@@ -1,13 +1,13 @@
 'use strict'
 
-const Tracer = require('./opentracing/tracer')
 const tags = require('../../../ext/tags')
+const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../dd-trace/src/constants')
+const { flushStartupLogs } = require('../../datadog-instrumentations/src/helpers/check-require-cache')
+const Tracer = require('./opentracing/tracer')
 const Scope = require('./scope')
 const { isError } = require('./util')
 const { setStartupLogConfig } = require('./startup-log')
-const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../dd-trace/src/constants')
 const { DataStreamsCheckpointer, DataStreamsManager, DataStreamsProcessor } = require('./datastreams')
-const { flushStartupLogs } = require('../../datadog-instrumentations/src/helpers/check-require-cache')
 const log = require('./log/writer')
 
 const SPAN_TYPE = tags.SPAN_TYPE

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

@@ -1,25 +1,29 @@
 'use strict'
 
-// Load binding first to not import other modules if it throws
-const libdatadog = require('@datadog/libdatadog')
 const tracerVersion = require('../../../version').VERSION
 
 function storeConfig (config) {
-  const processDiscovery = libdatadog.maybeLoad('process-discovery')
-  if (processDiscovery === undefined) {
-    return
-  }
+  try {
+    // Load binding first to not import other modules if it throws
+    const libdatadog = require('@datadog/libdatadog')
+    const processDiscovery = libdatadog.maybeLoad('process-discovery')
+    if (processDiscovery === undefined) {
+      return
+    }
 
-  const metadata = new processDiscovery.TracerMetadata(
-    config.tags['runtime-id'],
-    tracerVersion,
-    config.hostname,
-    config.service || null,
-    config.env || null,
-    config.version || null
-  )
+    const metadata = new processDiscovery.TracerMetadata(
+      config.tags['runtime-id'],
+      tracerVersion,
+      config.hostname,
+      config.service || null,
+      config.env || null,
+      config.version || null
+    )
 
-  return processDiscovery.storeMetadata(metadata)
+    return processDiscovery.storeMetadata(metadata)
+  } catch {
+    // Either libdatadog or process-discovery is unavailable.
+  }
 }
 
 module.exports = storeConfig