dd-trace 5.84.0 → 5.85.0

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

@@ -25,11 +25,11 @@ const PRODUCTS = {
   ASM: { id: 1 << 1, mechanism: SAMPLING_MECHANISM_APPSEC },
   DSM: { id: 1 << 2 },
   DJM: { id: 1 << 3 },
-  DBM: { id: 1 << 4 }
+  DBM: { id: 1 << 4 },
 }
 
 module.exports = {
   ...PRODUCTS,
 
-  getProductRateLimiter
+  getProductRateLimiter,
 }

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

@@ -32,5 +32,5 @@ function hasTraceSourcePropagationTag (tags) {
 
 module.exports = {
   addTraceSourceTag,
-  hasTraceSourcePropagationTag
+  hasTraceSourcePropagationTag,
 }

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

@@ -34,7 +34,7 @@ function startupLog (agentError) {
     warn('DATADOG TRACER DIAGNOSTIC - Agent Error: ' + agentError.message)
     errors.agentError = {
       code: agentError.status,
-      message: `Agent Error: ${agentError.message}`
+      message: `Agent Error: ${agentError.message}`,
     }
   }
 }
@@ -107,5 +107,5 @@ module.exports = {
   setStartupLogPluginManager,
   setSamplingRules,
   tracerInfo,
-  errors
+  errors,
 }

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

@@ -44,7 +44,9 @@ function add (carrier, keyValuePairs) {
         )
       }
     } else if (Array.isArray(keyValuePairs)) {
-      return keyValuePairs.forEach(tags => add(carrier, tags))
+      for (const tags of keyValuePairs) {
+        add(carrier, tags)
+      }
     } else {
       Object.assign(carrier, keyValuePairs)
     }

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

@@ -59,10 +59,10 @@ function waitAndSend (config, application, host) {
     if (retryData) {
       payload = [{
         request_type: 'app-dependencies-loaded',
-        payload
+        payload,
       }, {
         request_type: retryData.reqType,
-        payload: retryData.payload
+        payload: retryData.payload,
       }]
       reqType = 'message-batch'
     } else if (!dependencies.length) {
@@ -81,9 +81,9 @@ function waitAndSend (config, application, host) {
 function loadAllTheLoadedModules () {
   if (require.cache) {
     const filenames = Object.keys(require.cache)
-    filenames.forEach(filename => {
+    for (const filename of filenames) {
       onModuleLoad({ filename })
-    })
+    }
   }
 }
 

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

@@ -126,7 +126,7 @@ function buildEndpointObjects (endpoints) {
       method,
       path,
       operation_name: operationName,
-      resource_name: endpointKey(method, path)
+      resource_name: endpointKey(method, path),
     }
   })
 }
@@ -148,7 +148,7 @@ function flushAndSend () {
 
   const payloadObj = {
     is_first: isFirstPayload,
-    endpoints: buildEndpointObjects(batchEndpoints)
+    endpoints: buildEndpointObjects(batchEndpoints),
   }
 
   /** @type {import('./send-data').TelemetryRequestType} */
@@ -161,7 +161,7 @@ function flushAndSend () {
   if (retryData) {
     payload = [
       { request_type: 'app-endpoints', payload: payloadObj },
-      { request_type: retryData.reqType, payload: retryData.payload }
+      { request_type: retryData.reqType, payload: retryData.payload },
     ]
     reqType = 'message-batch'
   }
@@ -208,5 +208,5 @@ function stop () {
 
 module.exports = {
   start,
-  stop
+  stop,
 }

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

@@ -22,5 +22,5 @@ module.exports = {
   },
   appClosing () {
     telemetry?.appClosing()
-  }
+  },
 }

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

@@ -43,7 +43,7 @@ function onErrorLog (msg) {
     count: 1,
 
     // existing log.error(err) without message will be reported as 'Generic Error'
-    message: message ?? 'Generic Error'
+    message: message ?? 'Generic Error',
   }
 
   if (cause) {
@@ -86,5 +86,5 @@ function send (config, application, host) {
 module.exports = {
   start,
   stop,
-  send
+  send,
 }

package/packages/dd-trace/src/telemetry/logs/log-collector.js

@@ -104,7 +104,7 @@ const logCollector = {
     if (overflowedCount > 0) {
       drained.push({
         message: `Omitted ${overflowedCount} entries due to overflowing`,
-        level: 'ERROR'
+        level: 'ERROR',
       })
     }
 
@@ -120,7 +120,7 @@ const logCollector = {
     if (max) {
       maxEntries = max
     }
-  }
+  },
 }
 
 logCollector.reset()

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

@@ -64,7 +64,7 @@ class Metric {
       interval,
       type,
       tags,
-      common
+      common,
     }
   }
 }
@@ -106,7 +106,7 @@ class DistributionMetric extends Metric {
       metric,
       points,
       common,
-      tags
+      tags,
     }
   }
 }
@@ -153,7 +153,7 @@ const metricsTypes = {
   count: CountMetric,
   distribution: DistributionMetric,
   gauge: GaugeMetric,
-  rate: RateMetric
+  rate: RateMetric,
 }
 
 class MetricsCollection extends Map {
@@ -182,7 +182,7 @@ class MetricsCollection extends Map {
     const { namespace } = this
     return {
       namespace,
-      series
+      series,
     }
   }
 }
@@ -235,7 +235,7 @@ class Namespace {
     const { distributions, metrics } = this
     return {
       distributions: distributions.toJSON(),
-      metrics: metrics.toJSON()
+      metrics: metrics.toJSON(),
     }
   }
 }
@@ -284,5 +284,5 @@ module.exports = {
   MetricsCollection,
   Namespace,
   NamespaceManager,
-  manager
+  manager,
 }

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

@@ -96,7 +96,7 @@ function getHeaders (config, application, reqType) {
     'dd-telemetry-api-version': 'v2',
     'dd-telemetry-request-type': reqType,
     'dd-client-library-language': application.language_name,
-    'dd-client-library-version': application.tracer_version
+    'dd-client-library-version': application.tracer_version,
   }
   const debug = config.telemetry && config.telemetry.debug
   if (debug) {
@@ -147,7 +147,7 @@ function sendData (config, application, host, reqType, payload = {}, cb = () =>
   const {
     hostname,
     port,
-    isCiVisibility
+    isCiVisibility,
   } = config
 
   let url = config.url
@@ -171,7 +171,7 @@ function sendData (config, application, host, reqType, payload = {}, cb = () =>
     port,
     method: 'POST',
     path: isCiVisibilityAgentlessMode ? '/api/v2/apmtelemetry' : '/telemetry/proxy/api/v2/apmtelemetry',
-    headers: getHeaders(config, application, reqType)
+    headers: getHeaders(config, application, reqType),
   }
 
   const data = JSON.stringify({
@@ -183,7 +183,7 @@ function sendData (config, application, host, reqType, payload = {}, cb = () =>
     seq_id: ++seqId,
     payload: getPayload(payload),
     application,
-    host
+    host,
   })
 
   request(data, options, (error) => {
@@ -199,7 +199,7 @@ function sendData (config, application, host, reqType, payload = {}, cb = () =>
         ...options,
         url: backendUrl,
         headers: backendHeader,
-        path: '/api/v2/apmtelemetry'
+        path: '/api/v2/apmtelemetry',
       }
       if (backendUrl) {
         request(data, backendOptions, (error) => {

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

@@ -174,7 +174,7 @@ function getIntegrations () {
         name: pluginName,
         enabled: pluginManager._pluginsByName[pluginName]._enabled,
         auto_enabled: true,
-        [processTags.TELEMETRY_FIELD_NAME]: processTags.tagsObject
+        [processTags.TELEMETRY_FIELD_NAME]: processTags.tagsObject,
       })
       sentIntegrations.add(pluginName)
     }
@@ -188,12 +188,12 @@ function getIntegrations () {
 function getProducts (config) {
   return {
     appsec: {
-      enabled: config.appsec.enabled
+      enabled: config.appsec.enabled,
     },
     profiler: {
       version: tracerVersion,
-      enabled: profilingEnabledToBoolean(config.profiling.enabled)
-    }
+      enabled: profilingEnabledToBoolean(config.profiling.enabled),
+    },
   }
 }
 
@@ -206,7 +206,7 @@ function getInstallSignature (config) {
     return {
       install_id: sig.id,
       install_time: sig.time,
-      install_type: sig.type
+      install_type: sig.type,
     }
   }
 }
@@ -217,7 +217,7 @@ function getInstallSignature (config) {
 function appStarted (config) {
   const app = {
     products: getProducts(config),
-    configuration: [...configWithOrigin.values()]
+    configuration: [...configWithOrigin.values()],
   }
   const installSignature = getInstallSignature(config)
   if (installSignature) {
@@ -255,7 +255,7 @@ function createAppObject (config) {
     tracer_version: tracerVersion,
     language_name: 'nodejs',
     language_version: process.versions.node,
-    process_tags: processTags.tagsObject
+    process_tags: processTags.tagsObject,
   }
 }
 
@@ -292,7 +292,7 @@ function createBatchPayload (payload) {
   return payload.map(item => {
     return {
       request_type: item.reqType,
-      payload: item.payload
+      payload: item.payload,
     }
   })
 }
@@ -510,7 +510,7 @@ function updateConfig (changes, config) {
   if (changed) {
     // update configWithOrigin to contain up-to-date full list of config values for app-extended-heartbeat
     const { reqType, payload } = createPayload('app-client-configuration-change', {
-      configuration: [...configWithOrigin.values()]
+      configuration: [...configWithOrigin.values()],
     })
     sendData(config, application, host, reqType, payload, updateRetryData)
   }
@@ -531,5 +531,5 @@ module.exports = {
   stop,
   updateIntegrations,
   updateConfig,
-  appClosing
+  appClosing,
 }

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

@@ -8,6 +8,7 @@ const Scope = require('./scope')
 const { isError } = require('./util')
 const { setStartupLogConfig } = require('./startup-log')
 const { DataStreamsCheckpointer, DataStreamsManager, DataStreamsProcessor } = require('./datastreams')
+const { IS_SERVERLESS } = require('./serverless')
 const log = require('./log/writer')
 
 const SPAN_TYPE = tags.SPAN_TYPE
@@ -25,7 +26,7 @@ class DatadogTracer extends Tracer {
     setStartupLogConfig(config)
     flushStartupLogs(log)
 
-    if (!config._isInServerlessEnvironment()) {
+    if (!IS_SERVERLESS) {
       const storeConfig = require('./tracer_metadata')
       // Keep a reference to the handle, to keep the memfd alive in memory.
       // It is read by the service discovery feature.
@@ -150,7 +151,7 @@ function addError (span, error) {
     span.addTags({
       [ERROR_TYPE]: error.name,
       [ERROR_MESSAGE]: error.message,
-      [ERROR_STACK]: error.stack
+      [ERROR_STACK]: error.stack,
     })
   }
 }

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

@@ -90,5 +90,5 @@ module.exports = {
   globMatch,
   ddBasePath: globalThis.__DD_ESBUILD_BASEPATH || calculateDDBasePath(__dirname),
   normalizeProfilingEnabledValue,
-  normalizePluginEnvName
+  normalizePluginEnvName,
 }

package/scripts/preinstall.js

@@ -5,7 +5,7 @@
 const npmArgv = (() => {
   try {
     return JSON.parse(process.env.npm_config_argv)
-  } catch (e) {
+  } catch {
     return { original: [] }
   }
 })()