dd-trace 3.36.0 → 3.38.0

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

@@ -23,7 +23,7 @@ function getStartedSpans (context) {
   return context._trace.started
 }
 
-function generateLabels ({ spanId, rootSpanId, webTags, endpoint }) {
+function generateLabels ({ context: { spanId, rootSpanId, webTags, endpoint }, timestamp }) {
   const labels = {}
   if (spanId) {
     labels['span id'] = spanId
@@ -37,6 +37,8 @@ function generateLabels ({ spanId, rootSpanId, webTags, endpoint }) {
     // fallback to endpoint computed when sample was taken
     labels['trace endpoint'] = endpoint
   }
+  // Incoming timestamps are in microseconds, we emit nanos.
+  labels['end_timestamp_ns'] = timestamp * 1000n
 
   return labels
 }
@@ -100,6 +102,10 @@ class NativeWallProfiler {
     return this._codeHotspotsEnabled
   }
 
+  endpointCollectionEnabled () {
+    return this._endpointCollectionEnabled
+  }
+
   start ({ mapper } = {}) {
     if (this._started) return
 

package/packages/dd-trace/src/service-naming/extra-services.js

@@ -0,0 +1,24 @@
+'use strict'
+
+const maxExtraServices = 64
+const extraServices = new Set()
+
+function getExtraServices () {
+  return [...extraServices]
+}
+
+function registerExtraService (serviceName) {
+  if (serviceName && extraServices.size < maxExtraServices) {
+    extraServices.add(serviceName)
+  }
+}
+
+function clear () {
+  extraServices.clear()
+}
+
+module.exports = {
+  registerExtraService,
+  getExtraServices,
+  clear
+}

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

@@ -57,11 +57,20 @@ function appStarted () {
   return {
     integrations: getIntegrations(),
     dependencies: [],
-    configuration: flatten(config),
+    configuration: flatten(formatConfig(config)),
     additional_payload: []
   }
 }
 
+function formatConfig (config) {
+  // format peerServiceMapping from an object to a string map in order for
+  // telemetry intake to accept the configuration
+  config.peerServiceMapping = config.peerServiceMapping
+    ? Object.entries(config.peerServiceMapping).map(([key, value]) => `${key}:${value}`).join(',')
+    : ''
+  return config
+}
+
 function onBeforeExit () {
   process.removeListener('beforeExit', onBeforeExit)
   sendData(config, application, host, 'app-closing')

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

@@ -1,7 +1,5 @@
 'use strict'
 
-const { version } = require('../../../../package.json')
-
 const { sendData } = require('./send-data')
 
 function getId (type, namespace, name, tags) {
@@ -35,10 +33,7 @@ class Metric {
     this.metric = common ? metric : `nodejs.${metric}`
     this.tags = tagArray(tags)
     if (common) {
-      this.tags.push('lib_language:nodejs')
       this.tags.push(`version:${process.version}`)
-    } else {
-      this.tags.push(`lib_version:${version}`)
     }
     this.common = common