dd-trace 4.31.0 → 4.33.0

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

@@ -15,6 +15,8 @@ const MS_TO_NS = 1000000
 const pprofValueType = 'timeline'
 const pprofValueUnit = 'nanoseconds'
 
+const dateOffset = BigInt(Math.round(performance.timeOrigin * MS_TO_NS))
+
 function labelFromStr (stringTable, key, valStr) {
   return new Label({ key, str: stringTable.dedup(valStr) })
 }
@@ -146,6 +148,76 @@ if (node16) {
   decoratorTypes.net = NetDecorator
 }
 
+// Translates performance entries into pprof samples.
+class EventSerializer {
+  constructor () {
+    this.stringTable = new StringTable()
+    this.samples = []
+    this.locations = []
+    this.functions = []
+    this.decorators = {}
+
+    // A synthetic single-frame location to serve as the location for timeline
+    // samples. We need these as the profiling backend (mimicking official pprof
+    // tool's behavior) ignores these.
+    const fn = new Function({ id: this.functions.length + 1, name: this.stringTable.dedup('') })
+    this.functions.push(fn)
+    const line = new Line({ functionId: fn.id })
+    const location = new Location({ id: this.locations.length + 1, line: [line] })
+    this.locations.push(location)
+    this.locationId = [location.id]
+
+    this.timestampLabelKey = this.stringTable.dedup(END_TIMESTAMP_LABEL)
+  }
+
+  addEvent (item) {
+    const { entryType, startTime, duration } = item
+    let decorator = this.decorators[entryType]
+    if (!decorator) {
+      const DecoratorCtor = decoratorTypes[entryType]
+      if (DecoratorCtor) {
+        decorator = new DecoratorCtor(this.stringTable)
+        decorator.eventTypeLabel = labelFromStrStr(this.stringTable, 'event', entryType)
+        this.decorators[entryType] = decorator
+      } else {
+        // Shouldn't happen but it's better to not rely on observer only getting
+        // requested event types.
+        return
+      }
+    }
+    const endTime = startTime + duration
+    const sampleInput = {
+      value: [Math.round(duration * MS_TO_NS)],
+      locationId: this.locationId,
+      label: [
+        decorator.eventTypeLabel,
+        new Label({ key: this.timestampLabelKey, num: dateOffset + BigInt(Math.round(endTime * MS_TO_NS)) })
+      ]
+    }
+    decorator.decorateSample(sampleInput, item)
+    this.samples.push(new Sample(sampleInput))
+  }
+
+  createProfile (startDate, endDate) {
+    const timeValueType = new ValueType({
+      type: this.stringTable.dedup(pprofValueType),
+      unit: this.stringTable.dedup(pprofValueUnit)
+    })
+
+    return new Profile({
+      sampleType: [timeValueType],
+      timeNanos: endDate.getTime() * MS_TO_NS,
+      periodType: timeValueType,
+      period: 1,
+      durationNanos: (endDate.getTime() - startDate.getTime()) * MS_TO_NS,
+      sample: this.samples,
+      location: this.locations,
+      function: this.functions,
+      stringTable: this.stringTable
+    })
+  }
+}
+
 /**
  * This class generates pprof files with timeline events sourced from Node.js
  * performance measurement APIs.
@@ -155,7 +227,7 @@ class EventsProfiler {
     this.type = 'events'
     this._flushIntervalNanos = (options.flushInterval || 60000) * 1e6 // 60 sec
     this._observer = undefined
-    this.entries = []
+    this.eventSerializer = new EventSerializer()
   }
 
   start () {
@@ -163,7 +235,9 @@ class EventsProfiler {
     if (this._observer) return
 
     function add (items) {
-      this.entries.push(...items.getEntries())
+      for (const item of items.getEntries()) {
+        this.eventSerializer.addEvent(item)
+      }
     }
     this._observer = new PerformanceObserver(add.bind(this))
     this._observer.observe({ entryTypes: Object.keys(decoratorTypes) })
@@ -177,89 +251,12 @@ class EventsProfiler {
   }
 
   profile (restart, startDate, endDate) {
-    if (this.entries.length === 0) {
-      // No events in the period; don't produce a profile
-      return null
-    }
-
-    const stringTable = new StringTable()
-    const locations = []
-    const functions = []
-
-    // A synthetic single-frame location to serve as the location for timeline
-    // samples. We need these as the profiling backend (mimicking official pprof
-    // tool's behavior) ignores these.
-    const locationId = (() => {
-      const fn = new Function({ id: functions.length + 1, name: stringTable.dedup('') })
-      functions.push(fn)
-      const line = new Line({ functionId: fn.id })
-      const location = new Location({ id: locations.length + 1, line: [line] })
-      locations.push(location)
-      return [location.id]
-    })()
-
-    const decorators = {}
-    for (const [eventType, DecoratorCtor] of Object.entries(decoratorTypes)) {
-      const decorator = new DecoratorCtor(stringTable)
-      decorator.eventTypeLabel = labelFromStrStr(stringTable, 'event', eventType)
-      decorators[eventType] = decorator
-    }
-    const timestampLabelKey = stringTable.dedup(END_TIMESTAMP_LABEL)
-
-    const dateOffset = BigInt(Math.round(performance.timeOrigin * MS_TO_NS))
-    const lateEntries = []
-    const perfEndDate = endDate.getTime() - performance.timeOrigin
-    const samples = this.entries.map((item) => {
-      const decorator = decorators[item.entryType]
-      if (!decorator) {
-        // Shouldn't happen but it's better to not rely on observer only getting
-        // requested event types.
-        return null
-      }
-      const { startTime, duration } = item
-      if (startTime >= perfEndDate) {
-        // An event past the current recording end date; save it for the next
-        // profile. Not supposed to happen as long as there's no async activity
-        // between capture of the endDate value in profiler.js _collect() and
-        // here, but better be safe than sorry.
-        lateEntries.push(item)
-        return null
-      }
-      const endTime = startTime + duration
-      const sampleInput = {
-        value: [Math.round(duration * MS_TO_NS)],
-        locationId,
-        label: [
-          decorator.eventTypeLabel,
-          new Label({ key: timestampLabelKey, num: dateOffset + BigInt(Math.round(endTime * MS_TO_NS)) })
-        ]
-      }
-      decorator.decorateSample(sampleInput, item)
-      return new Sample(sampleInput)
-    }).filter(v => v)
-
-    this.entries = lateEntries
-
-    const timeValueType = new ValueType({
-      type: stringTable.dedup(pprofValueType),
-      unit: stringTable.dedup(pprofValueUnit)
-    })
-
     if (!restart) {
       this.stop()
     }
-
-    return new Profile({
-      sampleType: [timeValueType],
-      timeNanos: endDate.getTime() * MS_TO_NS,
-      periodType: timeValueType,
-      period: 1,
-      durationNanos: (endDate.getTime() - startDate.getTime()) * MS_TO_NS,
-      sample: samples,
-      location: locations,
-      function: functions,
-      stringTable: stringTable
-    })
+    const profile = this.eventSerializer.createProfile(startDate, endDate)
+    this.eventSerializer = new EventSerializer()
+    return profile
   }
 
   encode (profile) {

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

@@ -6,6 +6,7 @@ const runtimeMetrics = require('./runtime_metrics')
 const log = require('./log')
 const { setStartupLogPluginManager } = require('./startup-log')
 const telemetry = require('./telemetry')
+const nomenclature = require('./service-naming')
 const PluginManager = require('./plugin_manager')
 const remoteConfig = require('./appsec/remote_config')
 const AppsecSdk = require('./appsec/sdk')
@@ -17,6 +18,7 @@ class Tracer extends NoopProxy {
     super()
 
     this._initialized = false
+    this._nomenclature = nomenclature
     this._pluginManager = new PluginManager(this)
     this.dogstatsd = new dogstatsd.NoopDogStatsDClient()
     this._tracingInitialized = false

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

@@ -238,12 +238,15 @@ function captureHistograms () {
  *
  * performance.eventLoopUtilization available in Node.js >= v14.10, >= v12.19, >= v16
  */
-const captureELU = ('eventLoopUtilization' in performance) ? () => {
-  // if elu is undefined (first run) the measurement is from start of process
-  elu = performance.eventLoopUtilization(elu)
+let captureELU = () => {}
+if ('eventLoopUtilization' in performance) {
+  captureELU = () => {
+    // if elu is undefined (first run) the measurement is from start of process
+    elu = performance.eventLoopUtilization(elu)
 
-  client.gauge('runtime.node.event_loop.utilization', elu.utilization)
-} : () => {}
+    client.gauge('runtime.node.event_loop.utilization', elu.utilization)
+  }
+}
 
 function captureCommonMetrics () {
   captureMemoryUsage()

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

@@ -4,7 +4,7 @@ const log = require('./log')
 
 function maybeStartServerlessMiniAgent (config) {
   if (process.platform !== 'win32' && process.platform !== 'linux') {
-    log.error(`Serverless Mini Agent is only supported on Windows and Linux.`)
+    log.error('Serverless Mini Agent is only supported on Windows and Linux.')
     return
   }
 
@@ -34,7 +34,8 @@ function getRustBinaryPath (config) {
 
   const rustBinaryPathRoot = config.isGCPFunction ? '/workspace' : '/home/site/wwwroot'
   const rustBinaryPathOsFolder = process.platform === 'win32'
-    ? 'datadog-serverless-agent-windows-amd64' : 'datadog-serverless-agent-linux-amd64'
+    ? 'datadog-serverless-agent-windows-amd64'
+    : 'datadog-serverless-agent-linux-amd64'
 
   const rustBinaryExtension = process.platform === 'win32' ? '.exe' : ''
 

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

@@ -33,6 +33,30 @@ const web = {
     }
   },
   server: {
+    'apollo.gateway.request': {
+      opName: () => 'apollo.gateway.request',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    },
+    'apollo.gateway.plan': {
+      opName: () => 'apollo.gateway.plan',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    },
+    'apollo.gateway.validate': {
+      opName: () => 'apollo.gateway.validate',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    },
+    'apollo.gateway.execute': {
+      opName: () => 'apollo.gateway.execute',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    },
+    'apollo.gateway.fetch': {
+      opName: () => 'apollo.gateway.fetch',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    },
+    'apollo.gateway.postprocessing': {
+      opName: () => 'apollo.gateway.postprocessing',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    },
     grpc: {
       opName: () => DD_MAJOR <= 2 ? 'grpc.request' : 'grpc.server',
       serviceName: identityService

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

@@ -1,4 +1,3 @@
-
 function configWithFallback ({ tracerService, pluginConfig }) {
   return pluginConfig.service || tracerService
 }

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

@@ -32,6 +32,30 @@ const web = {
     }
   },
   server: {
+    'apollo.gateway.request': {
+      opName: () => 'apollo.gateway.request',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    },
+    'apollo.gateway.plan': {
+      opName: () => 'apollo.gateway.plan',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    },
+    'apollo.gateway.validate': {
+      opName: () => 'apollo.gateway.validate',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    },
+    'apollo.gateway.execute': {
+      opName: () => 'apollo.gateway.execute',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    },
+    'apollo.gateway.fetch': {
+      opName: () => 'apollo.gateway.fetch',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    },
+    'apollo.gateway.postprocessing': {
+      opName: () => 'apollo.gateway.postprocessing',
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+    },
     grpc: {
       opName: () => 'grpc.server.request',
       serviceName: identityService

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

@@ -58,11 +58,11 @@ class SpanProcessor {
     }
 
     if (this._killAll) {
-      started.map(startedSpan => {
+      for (const startedSpan of started) {
         if (!startedSpan._finished) {
           startedSpan.finish()
         }
-      })
+      }
     }
   }
 

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

@@ -181,7 +181,7 @@ class SpanStatsProcessor {
     const { bucketSizeNs } = this
     const serializedBuckets = []
 
-    for (const [ timeNs, bucket ] of this.buckets.entries()) {
+    for (const [timeNs, bucket] of this.buckets.entries()) {
       const bucketAggStats = []
 
       for (const stats of bucket.values()) {

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

@@ -12,7 +12,7 @@ const savedDependenciesToSend = new Set()
 const detectedDependencyKeys = new Set()
 const detectedDependencyVersions = new Set()
 
-const FILE_URI_START = `file://`
+const FILE_URI_START = 'file://'
 const moduleLoadStartChannel = dc.channel('dd-trace:moduleLoadStart')
 
 let immediate, config, application, host, initialLoad
@@ -21,12 +21,11 @@ let getRetryData
 let updateRetryData
 
 function createBatchPayload (payload) {
-  const batchPayload = []
-  payload.map(item => {
-    batchPayload.push({
+  const batchPayload = payload.map(item => {
+    return {
       request_type: item.reqType,
       payload: item.payload
-    })
+    }
   })
 
   return batchPayload

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

@@ -35,7 +35,7 @@ function updateRetryData (error, retryObj) {
     if (retryObj.reqType === 'message-batch') {
       const payload = retryObj.payload[0].payload
       const reqType = retryObj.payload[0].request_type
-      retryData = { payload: payload, reqType: reqType }
+      retryData = { payload, reqType }
 
       // Since this payload failed twice it now gets save in to the extended heartbeat
       const failedPayload = retryObj.payload[1].payload
@@ -43,17 +43,17 @@ function updateRetryData (error, retryObj) {
 
       // save away the dependencies and integration request for extended heartbeat.
       if (failedReqType === 'app-integrations-change') {
-        if (extendedHeartbeatPayload['integrations']) {
-          extendedHeartbeatPayload['integrations'].push(failedPayload)
+        if (extendedHeartbeatPayload.integrations) {
+          extendedHeartbeatPayload.integrations.push(failedPayload)
         } else {
-          extendedHeartbeatPayload['integrations'] = [failedPayload]
+          extendedHeartbeatPayload.integrations = [failedPayload]
         }
       }
       if (failedReqType === 'app-dependencies-loaded') {
-        if (extendedHeartbeatPayload['dependencies']) {
-          extendedHeartbeatPayload['dependencies'].push(failedPayload)
+        if (extendedHeartbeatPayload.dependencies) {
+          extendedHeartbeatPayload.dependencies.push(failedPayload)
         } else {
-          extendedHeartbeatPayload['dependencies'] = [failedPayload]
+          extendedHeartbeatPayload.dependencies = [failedPayload]
         }
       }
     } else {
@@ -187,12 +187,11 @@ function getTelemetryData () {
 }
 
 function createBatchPayload (payload) {
-  const batchPayload = []
-  payload.map(item => {
-    batchPayload.push({
+  const batchPayload = payload.map(item => {
+    return {
       request_type: item.reqType,
       payload: item.payload
-    })
+    }
   })
 
   return batchPayload
@@ -202,10 +201,10 @@ function createPayload (currReqType, currPayload = {}) {
   if (getRetryData()) {
     const payload = { reqType: currReqType, payload: currPayload }
     const batchPayload = createBatchPayload([payload, retryData])
-    return { 'reqType': 'message-batch', 'payload': batchPayload }
+    return { reqType: 'message-batch', payload: batchPayload }
   }
 
-  return { 'reqType': currReqType, 'payload': currPayload }
+  return { reqType: currReqType, payload: currPayload }
 }
 
 function heartbeat (config, application, host) {

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

@@ -1,4 +1,3 @@
-
 const request = require('../exporters/common/request')
 const log = require('../log')
 const { isTrue } = require('../util')

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

@@ -32,13 +32,6 @@ function globMatch (pattern, subject) {
     if (px < pattern.length) {
       const c = pattern[px]
       switch (c) {
-        default: // ordinary character
-          if (sx < subject.length && subject[sx] === c) {
-            px++
-            sx++
-            continue
-          }
-          break
         case '?':
           if (sx < subject.length) {
             px++
@@ -51,6 +44,13 @@ function globMatch (pattern, subject) {
           nextSx = sx + 1
           px++
           continue
+        default: // ordinary character
+          if (sx < subject.length && subject[sx] === c) {
+            px++
+            sx++
+            continue
+          }
+          break
       }
     }
     if (nextSx > 0 && nextSx <= subject.length) {