dd-trace 5.102.0 → 5.103.0

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

@@ -8,14 +8,9 @@ const process = require('process')
 const { performance, PerformanceObserver, monitorEventLoopDelay } = require('perf_hooks')
 const { DogStatsDClient, MetricsAggregationClient } = require('../dogstatsd')
 const log = require('../log')
-const { getValueFromEnvSources } = require('../config/helper')
 
 const { NODE_MAJOR } = require('../../../../version')
 const processTags = require('../process-tags')
-// TODO: This environment variable may not be changed, since the agent expects a flush every ten seconds.
-// It is only a variable for testing. Think about alternatives.
-const DD_RUNTIME_METRICS_FLUSH_INTERVAL = getValueFromEnvSources('DD_RUNTIME_METRICS_FLUSH_INTERVAL') ?? '10000'
-const INTERVAL = Number.parseInt(DD_RUNTIME_METRICS_FLUSH_INTERVAL, 10)
 
 const eventLoopDelayResolution = 4
 
@@ -40,6 +35,8 @@ module.exports = {
    */
   start (config) {
     this.stop()
+    // The agent expects a flush every ten seconds, so this is for tests only.
+    const flushIntervalMs = config.DD_RUNTIME_METRICS_FLUSH_INTERVAL
     const clientConfig = DogStatsDClient.generateClientConfig(config)
 
     if (config.DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED) {
@@ -81,7 +78,7 @@ module.exports = {
         captureNativeMetrics(trackEventLoop, trackGc)
         captureCommonMetrics(trackEventLoop)
         client.flush()
-      }, INTERVAL)
+      }, flushIntervalMs)
     } else {
       lastCpuUsage = process.cpuUsage()
 
@@ -103,10 +100,10 @@ module.exports = {
           captureEventLoopDelay()
         }
         client.flush()
-      }, INTERVAL)
+      }, flushIntervalMs)
     }
 
-    interval.unref()
+    interval.unref?.()
   },
 
   stop () {

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

@@ -17,10 +17,13 @@ function getIsGCPFunction () {
 /**
  * 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.
+ *
+ * Stays on the env helper to avoid closing the
+ * `config -> serverless -> config` import cycle.
  */
 function enableGCPPubSubPushSubscription () {
-  const isGCPPubSubPushSubscriptionEnabled = getValueFromEnvSources('DD_TRACE_GCP_PUBSUB_PUSH_ENABLED')
-  return getEnvironmentVariable('K_SERVICE') !== undefined && !isFalse(isGCPPubSubPushSubscriptionEnabled)
+  return getEnvironmentVariable('K_SERVICE') !== undefined &&
+    !isFalse(getValueFromEnvSources('DD_TRACE_GCP_PUBSUB_PUSH_ENABLED'))
 }
 
 function getIsAzureFunction () {

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

@@ -32,6 +32,14 @@ const messaging = {
       serviceName: ({ tracerService }) => `${tracerService}-azure-service-bus`,
       serviceSource: integrationSource('azure-service-bus'),
     },
+    'electron:ipc:main:send': {
+      opName: () => 'electron.main.send',
+      serviceName: identityService,
+    },
+    'electron:ipc:renderer:send': {
+      opName: () => 'electron.renderer.send',
+      serviceName: identityService,
+    },
     'google-cloud-pubsub': {
       opName: () => 'pubsub.request',
       serviceName: ({ tracerService }) => `${tracerService}-pubsub`,
@@ -79,6 +87,18 @@ const messaging = {
       serviceName: amqpServiceName,
       serviceSource: integrationSource('amqp'),
     },
+    'electron:ipc:main:receive': {
+      opName: () => 'electron.main.receive',
+      serviceName: identityService,
+    },
+    'electron:ipc:main:handle': {
+      opName: () => 'electron.main.handle',
+      serviceName: identityService,
+    },
+    'electron:ipc:renderer:receive': {
+      opName: () => 'electron.renderer.receive',
+      serviceName: identityService,
+    },
     'google-cloud-pubsub': {
       opName: () => 'pubsub.receive',
       serviceName: ({ tracerService }) => `${tracerService}-pubsub`,

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

@@ -54,6 +54,10 @@ const web = {
       serviceName: httpPluginClientService,
       serviceSource: optionServiceSource,
     },
+    'electron:net:request': {
+      opName: () => 'http.request',
+      serviceName: httpPluginClientService,
+    },
   },
   server: {
     'apollo.gateway.request': {

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

@@ -24,6 +24,14 @@ const messaging = {
       opName: () => 'azure.eventhubs.send',
       serviceName: identityService,
     },
+    'electron:ipc:main:send': {
+      opName: () => 'electron.main.send',
+      serviceName: identityService,
+    },
+    'electron:ipc:renderer:send': {
+      opName: () => 'electron.renderer.send',
+      serviceName: identityService,
+    },
     'google-cloud-pubsub': {
       opName: () => 'gcp.pubsub.send',
       serviceName: identityService,
@@ -53,6 +61,18 @@ const messaging = {
   consumer: {
     amqplib: amqpInbound,
     amqp10: amqpInbound,
+    'electron:ipc:main:receive': {
+      opName: () => 'electron.main.receive',
+      serviceName: identityService,
+    },
+    'electron:ipc:main:handle': {
+      opName: () => 'electron.main.handle',
+      serviceName: identityService,
+    },
+    'electron:ipc:renderer:receive': {
+      opName: () => 'electron.renderer.receive',
+      serviceName: identityService,
+    },
     'google-cloud-pubsub': {
       opName: () => 'gcp.pubsub.process',
       serviceName: identityService,

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

@@ -48,6 +48,10 @@ const web = {
       opName: () => 'undici.request',
       serviceName: httpPluginClientService,
     },
+    'electron:net:request': {
+      opName: () => 'http.client.request',
+      serviceName: httpPluginClientService,
+    },
   },
   server: {
     'apollo.gateway.request': {

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

@@ -165,7 +165,7 @@ class SpanStatsProcessor {
 
     if (this.enabled) {
       this.timer = setInterval(this.onInterval.bind(this), interval * 1e3)
-      this.timer.unref()
+      this.timer.unref?.()
     }
   }
 

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

@@ -75,7 +75,7 @@ function waitAndSend (config, application, host) {
     if (savedDependenciesToSend.size > 0) {
       waitAndSend(config, application, host)
     }
-  }).unref()
+  }).unref?.()
 }
 
 function loadAllTheLoadedModules () {

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

@@ -63,7 +63,7 @@ function scheduleFlush () {
   flushScheduled = true
   // this used to be setImmediate() instead, but it was making the system test flaky
   // don't ask me why
-  setTimeout(flushAndSend).unref()
+  setTimeout(flushAndSend).unref?.()
 }
 
 /**

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

@@ -291,7 +291,7 @@ function heartbeat (config, application) {
 
     const { reqType, payload } = createPayload('app-heartbeat')
     sendData(config, application, host, reqType, payload, updateRetryData)
-  }, config.telemetry.heartbeatInterval).unref()
+  }, config.telemetry.heartbeatInterval).unref?.()
 }
 
 /** @param {import('../config/config-base')} config */
@@ -307,7 +307,7 @@ function extendedHeartbeat (config) {
       heartbeatFailedDependencies = []
     }
     sendData(config, application, host, 'app-extended-heartbeat', appPayload)
-  }, config.telemetry.extendedHeartbeatInterval).unref()
+  }, config.telemetry.extendedHeartbeatInterval).unref?.()
 }
 
 /**

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

@@ -1,133 +0,0 @@
-/**
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * Modifications copyright 2022 Datadog, Inc.
- *
- * Some functions are part of aws-lambda-nodejs-runtime-interface-client
- * https://github.com/aws/aws-lambda-nodejs-runtime-interface-client/blob/v2.1.0/src/utils/UserFunction.ts
- */
-'use strict'
-
-const path = require('path')
-
-const log = require('../../log')
-const { getEnvironmentVariable, getValueFromEnvSources } = require('../../config/helper')
-const Hook = require('../../../../datadog-instrumentations/src/helpers/hook')
-const instrumentations = require('../../../../datadog-instrumentations/src/helpers/instrumentations')
-const {
-  filename,
-  pathSepExpr,
-} = require('../../../../datadog-instrumentations/src/helpers/register')
-
-/**
- * Breaks the full handler string into two pieces: the module root
- * and the actual handler string.
- *
- * @param {string} fullHandler user's lambda handler, commonly stored in `DD_LAMBDA_HANDLER`.
- * @returns {string[]} an array containing the module root and the handler string.
- *
- * ```js
- * _extractModuleRootAndHandler('./api/src/index.nested.handler')
- * // => ['./api/src', 'index.nested.handler']
- * ```
- */
-function _extractModuleRootAndHandler (fullHandler) {
-  const handlerString = path.basename(fullHandler)
-  const moduleRoot = fullHandler.slice(0, Math.max(0, fullHandler.indexOf(handlerString)))
-
-  return [moduleRoot, handlerString]
-}
-
-/**
- * Splits the handler string into two pieces: the module name
- * and the path to the handler function.
- *
- * @param {string} handler a handler string containing the module and the handler path.
- * @returns {string[]} an array containing the module name and the handler path.
- *
- * ```js
- * _extractModuleNameAndHandlerPath('index.nested.handler')
- * // => ['index', 'nested.handler']
- * ```
- */
-function _extractModuleNameAndHandlerPath (handler) {
-  const FUNCTION_EXPR = /^([^.]*)\.(.*)$/
-  const match = handler.match(FUNCTION_EXPR)
-  if (!match || match.length !== 3) {
-    throw new Error(`Malformed handler name: ${handler}`)
-  }
-  return [match[1], match[2]] // [module, handler-path]
-}
-
-/**
- * Returns all possible paths of the files to be patched when required.
- *
- * @param {string} lambdaStylePath the path comprised of the `LAMBDA_TASK_ROOT`,
- * the root of the module of the Lambda handler, and the module name.
- * @returns the lambdaStylePath with appropiate extensions for the hook.
- */
-function _getLambdaFilePaths (lambdaStylePath) {
-  return [
-    `${lambdaStylePath}.js`,
-    `${lambdaStylePath}.mjs`,
-    `${lambdaStylePath}.cjs`,
-  ]
-}
-
-/**
- * Register a hook for the Lambda handler to be executed when
- * the file is required.
- */
-const registerLambdaHook = () => {
-  const lambdaTaskRoot = getEnvironmentVariable('LAMBDA_TASK_ROOT')
-  const originalLambdaHandler = getValueFromEnvSources('DD_LAMBDA_HANDLER')
-
-  if (originalLambdaHandler !== undefined && lambdaTaskRoot !== undefined) {
-    const [moduleRoot, moduleAndHandler] = _extractModuleRootAndHandler(originalLambdaHandler)
-    const [_module] = _extractModuleNameAndHandlerPath(moduleAndHandler)
-
-    const lambdaStylePath = path.resolve(lambdaTaskRoot, moduleRoot, _module)
-    const lambdaFilePaths = _getLambdaFilePaths(lambdaStylePath)
-
-    // TODO: Redo this like any other instrumentation.
-    Hook(lambdaFilePaths, (moduleExports, name, _, moduleVersion) => {
-      require('./patch')
-
-      for (const { hook } of instrumentations[name]) {
-        try {
-          moduleExports = hook(moduleExports, moduleVersion) ?? moduleExports
-        } catch (e) {
-          log.error('Error executing lambda hook', e)
-        }
-      }
-
-      return moduleExports
-    })
-  } else {
-    const moduleToPatch = 'datadog-lambda-js'
-    Hook([moduleToPatch], (moduleExports, moduleName, _, moduleVersion) => {
-      moduleName = moduleName.replace(pathSepExpr, '/')
-
-      require('./patch')
-
-      for (const { file, hook } of instrumentations[moduleToPatch]) {
-        const fullFilename = filename(moduleToPatch, file)
-        if (moduleName === fullFilename) {
-          try {
-            moduleExports = hook(moduleExports, moduleVersion) ?? moduleExports
-          } catch (e) {
-            log.error('Error executing lambda hook for datadog-lambda-js', e)
-          }
-        }
-      }
-
-      return moduleExports
-    })
-  }
-}
-
-module.exports = {
-  _extractModuleRootAndHandler,
-  _extractModuleNameAndHandlerPath,
-  _getLambdaFilePaths,
-  registerLambdaHook,
-}