dd-trace 5.56.0 → 5.57.1

package/packages/dd-trace/src/profiling/exporter_cli.js

@@ -24,9 +24,7 @@ function exporterFromURL (url) {
     ? 'manual'
     : profilingEnabled === 'auto'
       ? 'auto'
-      : injectionEnabled.includes('profiling')
-        ? 'injection'
-        : 'unknown'
+      : 'unknown'
   return new AgentExporter({
     url,
     logger,

package/packages/dd-trace/src/profiling/ssi-heuristics.js

@@ -1,7 +1,5 @@
 'use strict'
 
-const telemetryMetrics = require('../telemetry/metrics')
-const profilersNamespace = telemetryMetrics.manager.namespace('profilers')
 const dc = require('dc-polyfill')
 const log = require('../log')
 
@@ -9,42 +7,17 @@ const log = require('../log')
 const DEFAULT_LONG_LIVED_THRESHOLD = 30_000
 
 /**
- * This class embodies the SSI profiler-triggering heuristics and also emits telemetry metrics about
- * the profiler behavior under SSI. It emits the following metrics:
- * - `number_of_profiles`: The number of profiles that were submitted
- * - `number_of_runtime_id`: The number of runtime IDs in the app (always 1 for Node.js, emitted
- *   once when the tags won't change for the remaineder of of the app's lifetime.)
- * It will also add tags describing the state of heuristics triggers, the enablement choice, and
- * whether actual profiles were sent (as opposed to mock profiles). There is a mock profiler that is
- * activated when the profiler is not enabled, and it will emit mock profile submission events at
- * the same cadence the profiler would, providing insight into how many profiles would've been
- * emitted if SSI enabled profiling. Note that heuristics (and thus telemetry) is per tracer
- * instance, and each worker thread will have its own instance.
+ * This class embodies the SSI profiler-triggering heuristics under SSI.
  */
 class SSIHeuristics {
   constructor (config) {
-    const injectionIncludesProfiler = config.injectionEnabled.includes('profiler')
-    this._heuristicsActive = injectionIncludesProfiler || config.profiling.enabled === 'auto'
-    this._emitsTelemetry = config.injectionEnabled.length > 0 && config.profiling.enabled !== 'false'
-
-    if (this._emitsTelemetry) {
-      if (config.profiling.enabled === 'true') {
-        this.enablementChoice = 'manually_enabled'
-      } else if (injectionIncludesProfiler) {
-        this.enablementChoice = 'ssi_enabled'
-      } else if (config.profiling.enabled === 'auto') {
-        this.enablementChoice = 'auto_enabled'
-      } else {
-        this.enablementChoice = 'ssi_not_enabled'
-      }
-    }
-
     const longLivedThreshold = config.profiling.longLivedThreshold || DEFAULT_LONG_LIVED_THRESHOLD
     if (typeof longLivedThreshold !== 'number' || longLivedThreshold <= 0) {
       this.longLivedThreshold = DEFAULT_LONG_LIVED_THRESHOLD
       log.warn(
-        `Invalid SSIHeuristics.longLivedThreshold value: ${config.profiling.longLivedThreshold}. ` +
-        `Using default value: ${DEFAULT_LONG_LIVED_THRESHOLD}`
+        'Invalid SSIHeuristics.longLivedThreshold value: %s. Using default value:',
+        config.profiling.longLivedThreshold,
+        DEFAULT_LONG_LIVED_THRESHOLD
       )
     } else {
       this.longLivedThreshold = longLivedThreshold
@@ -55,39 +28,21 @@ class SSIHeuristics {
     this.shortLived = true
   }
 
-  get emitsTelemetry () {
-    return this._emitsTelemetry
-  }
-
-  get heuristicsActive () {
-    return this._heuristicsActive
-  }
-
   start () {
-    if (this.heuristicsActive || this.emitsTelemetry) {
-      // Used to determine short-livedness of the process. We could use the process start time as the
-      // reference point, but the tracer initialization point is more relevant, as we couldn't be
-      // collecting profiles earlier anyway. The difference is not particularly significant if the
-      // tracer is initialized early in the process lifetime.
-      setTimeout(() => {
-        this.shortLived = false
-        this._maybeTriggered()
-      }, this.longLivedThreshold).unref()
-
-      this._onSpanCreated = this._onSpanCreated.bind(this)
-      dc.subscribe('dd-trace:span:start', this._onSpanCreated)
-
-      if (this.emitsTelemetry) {
-        this._onProfileSubmitted = this._onProfileSubmitted.bind(this)
-        this._onMockProfileSubmitted = this._onMockProfileSubmitted.bind(this)
-
-        dc.subscribe('datadog:profiling:profile-submitted', this._onProfileSubmitted)
-        dc.subscribe('datadog:profiling:mock-profile-submitted', this._onMockProfileSubmitted)
-      }
-
-      this._onAppClosing = this._onAppClosing.bind(this)
-      dc.subscribe('datadog:telemetry:app-closing', this._onAppClosing)
-    }
+    // Used to determine short-livedness of the process. We could use the process start time as the
+    // reference point, but the tracer initialization point is more relevant, as we couldn't be
+    // collecting profiles earlier anyway. The difference is not particularly significant if the
+    // tracer is initialized early in the process lifetime.
+    setTimeout(() => {
+      this.shortLived = false
+      this._maybeTriggered()
+    }, this.longLivedThreshold).unref()
+
+    this._onSpanCreated = this._onSpanCreated.bind(this)
+    dc.subscribe('dd-trace:span:start', this._onSpanCreated)
+
+    this._onAppClosing = this._onAppClosing.bind(this)
+    dc.subscribe('datadog:telemetry:app-closing', this._onAppClosing)
   }
 
   onTriggered (callback) {
@@ -118,70 +73,7 @@ class SSIHeuristics {
     dc.unsubscribe('dd-trace:span:start', this._onSpanCreated)
   }
 
-  _onProfileSubmitted () {
-    this.hasSentProfiles = true
-    this._incProfileCount()
-  }
-
-  _onMockProfileSubmitted () {
-    this._incProfileCount()
-  }
-
-  _incProfileCount () {
-    this._ensureProfileMetrics()
-    this._profileCount.inc()
-  }
-
-  _ensureProfileMetrics () {
-    const decision = []
-    if (this.noSpan) {
-      decision.push('no_span')
-    }
-    if (this.shortLived) {
-      decision.push('short_lived')
-    }
-    if (decision.length === 0) {
-      decision.push('triggered')
-    }
-
-    const tags = [
-      'installation:ssi',
-      `enablement_choice:${this.enablementChoice}`,
-      `has_sent_profiles:${this.hasSentProfiles}`,
-      `heuristic_hypothetical_decision:${decision.join('_')}`
-    ]
-
-    this._profileCount = profilersNamespace.count('ssi_heuristic.number_of_profiles', tags)
-    this._runtimeIdCount = profilersNamespace.count('ssi_heuristic.number_of_runtime_id', tags)
-
-    if (
-      !this._emittedRuntimeId &&
-      decision[0] === 'triggered' &&
-      // When heuristics are active, hasSentProfiles can transition from false to true when the
-      // profiler gets started and the first profile is submitted, so we have to wait for it.
-      (!this.heuristicsActive || this.hasSentProfiles)
-    ) {
-      // Tags won't change anymore, so we can emit the runtime ID metric now.
-      this._emittedRuntimeId = true
-      this._runtimeIdCount.inc()
-    }
-  }
-
   _onAppClosing () {
-    if (this.emitsTelemetry) {
-      this._ensureProfileMetrics()
-      // Last ditch effort to emit a runtime ID count metric
-      if (!this._emittedRuntimeId) {
-        this._emittedRuntimeId = true
-        this._runtimeIdCount.inc()
-      }
-      // So we have the metrics in the final state
-      this._profileCount.inc(0)
-
-      dc.unsubscribe('datadog:profiling:profile-submitted', this._onProfileSubmitted)
-      dc.unsubscribe('datadog:profiling:mock-profile-submitted', this._onMockProfileSubmitted)
-    }
-
     dc.unsubscribe('datadog:telemetry:app-closing', this._onAppClosing)
     if (this.noSpan) {
       dc.unsubscribe('dd-trace:span:start', this._onSpanCreated)

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

@@ -153,36 +153,22 @@ class Tracer extends NoopProxy {
         }
       }
 
-      if (config.profiling.enabled !== 'false') {
-        const { SSIHeuristics } = require('./profiling/ssi-heuristics')
-        const ssiHeuristics = new SSIHeuristics(config)
-        ssiHeuristics.start()
-        let mockProfiler = null
-        if (config.profiling.enabled === 'true') {
-          this._profilerStarted = this._startProfiler(config)
-        } else if (ssiHeuristics.emitsTelemetry) {
-          // Start a mock profiler that emits mock profile-submitted events for the telemetry.
-          // It will be stopped if the real profiler is started by the heuristics.
-          mockProfiler = require('./profiling/ssi-telemetry-mock-profiler')
-          mockProfiler.start(config)
-        }
-
-        if (ssiHeuristics.heuristicsActive) {
+      if (config.profiling.enabled === 'true') {
+        this._profilerStarted = this._startProfiler(config)
+      } else {
+        this._profilerStarted = Promise.resolve(false)
+        if (config.profiling.enabled === 'auto') {
+          const { SSIHeuristics } = require('./profiling/ssi-heuristics')
+          const ssiHeuristics = new SSIHeuristics(config)
+          ssiHeuristics.start()
           ssiHeuristics.onTriggered(() => {
-            if (mockProfiler) {
-              mockProfiler.stop()
-            }
             this._startProfiler(config)
             ssiHeuristics.onTriggered() // deregister this callback
           })
         }
-
-        if (!this._profilerStarted) {
-          this._profilerStarted = Promise.resolve(false)
-        }
       }
 
-      if (config.runtimeMetrics) {
+      if (config.runtimeMetrics.enabled) {
         runtimeMetrics.start(config)
       }
 
@@ -205,8 +191,8 @@ class Tracer extends NoopProxy {
           automaticLogPlugin.configure({ ...config, enabled: true })
         } else {
           log.warn(
-            'DD_AGENTLESS_LOG_SUBMISSION_ENABLED is set, ' +
-            'but DD_API_KEY is undefined, so no automatic log submission will be performed.'
+            // eslint-disable-next-line @stylistic/max-len
+            'DD_AGENTLESS_LOG_SUBMISSION_ENABLED is set, but DD_API_KEY is undefined, so no automatic log submission will be performed.'
           )
         }
       }
@@ -229,8 +215,7 @@ class Tracer extends NoopProxy {
       return require('./profiler').start(config)
     } catch (e) {
       log.error(
-        'Error starting profiler. For troubleshooting tips, see ' +
-        '<https://dtdg.co/nodejs-profiler-troubleshooting>',
+        'Error starting profiler. For troubleshooting tips, see <https://dtdg.co/nodejs-profiler-troubleshooting>',
         e
       )
     }

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

@@ -15,7 +15,7 @@ const noop = runtimeMetrics = {
 
 module.exports = {
   start (config) {
-    if (!config?.runtimeMetrics) return
+    if (!config?.runtimeMetrics.enabled) return
 
     runtimeMetrics = require('./runtime_metrics')
 

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

@@ -6,7 +6,6 @@ const v8 = require('v8')
 const os = require('os')
 const { DogStatsDClient, MetricsAggregationClient } = require('../dogstatsd')
 const log = require('../log')
-const Histogram = require('../histogram')
 const { performance, PerformanceObserver } = require('perf_hooks')
 const { getEnvironmentVariable } = require('../config-helper')
 
@@ -17,11 +16,9 @@ const INTERVAL = Number.parseInt(DD_RUNTIME_METRICS_FLUSH_INTERVAL, 10)
 // Node >=16 has PerformanceObserver with `gc` type, but <16.7 had a critical bug.
 // See: https://github.com/nodejs/node/issues/39548
 const hasGCObserver = NODE_MAJOR >= 18 || (NODE_MAJOR === 16 && NODE_MINOR >= 7)
-const hasGCProfiler = NODE_MAJOR >= 20 || (NODE_MAJOR === 18 && NODE_MINOR >= 15)
 
 let nativeMetrics = null
 let gcObserver = null
-let gcProfiler = null
 
 let interval
 let client
@@ -34,15 +31,23 @@ reset()
 const runtimeMetrics = module.exports = {
   start (config) {
     const clientConfig = DogStatsDClient.generateClientConfig(config)
+    const watchers = []
 
-    try {
-      nativeMetrics = require('@datadog/native-metrics')
-
+    if (config.runtimeMetrics.gc !== false) {
       if (hasGCObserver) {
-        nativeMetrics.start('loop') // Only add event loop watcher and not GC.
+        startGCObserver()
       } else {
-        nativeMetrics.start()
+        watchers.push('gc')
       }
+    }
+
+    if (config.runtimeMetrics.eventLoop !== false) {
+      watchers.push('loop')
+    }
+
+    try {
+      nativeMetrics = require('@datadog/native-metrics')
+      nativeMetrics.start(...watchers)
     } catch (e) {
       log.error('Error starting native metrics', e)
       nativeMetrics = null
@@ -52,9 +57,6 @@ const runtimeMetrics = module.exports = {
 
     time = process.hrtime()
 
-    startGCObserver()
-    startGCProfiler()
-
     if (nativeMetrics) {
       interval = setInterval(() => {
         captureCommonMetrics()
@@ -129,8 +131,6 @@ function reset () {
   nativeMetrics = null
   gcObserver && gcObserver.disconnect()
   gcObserver = null
-  gcProfiler && gcProfiler.stop()
-  gcProfiler = null
 }
 
 function captureCpuUsage () {
@@ -195,29 +195,6 @@ function captureHeapSpace () {
     client.gauge('runtime.node.heap.physical_size.by.space', stats[i].physical_space_size, tags)
   }
 }
-function captureGCMetrics () {
-  if (!gcProfiler) return
-
-  const profile = gcProfiler.stop()
-  const pauseAll = new Histogram()
-  const pause = {}
-
-  for (const stat of profile.statistics) {
-    const type = stat.gcType.replaceAll(/([a-z])([A-Z])/g, '$1_$2').toLowerCase()
-
-    pause[type] = pause[type] || new Histogram()
-    pause[type].record(stat.cost)
-    pauseAll.record(stat.cost)
-  }
-
-  histogram('runtime.node.gc.pause', pauseAll)
-
-  for (const type in pause) {
-    histogram('runtime.node.gc.pause.by.type', pause[type], `gc_type:${type}`)
-  }
-
-  gcProfiler.start()
-}
 
 /**
  * Gathers and reports Event Loop Utilization (ELU) since last run
@@ -242,7 +219,6 @@ function captureCommonMetrics () {
   captureProcess()
   captureHeapStats()
   captureELU()
-  captureGCMetrics()
 }
 
 function captureNativeMetrics () {
@@ -293,7 +269,7 @@ function histogram (name, stats, tag) {
 }
 
 function startGCObserver () {
-  if (gcObserver || hasGCProfiler || !hasGCObserver) return
+  if (gcObserver) return
 
   gcObserver = new PerformanceObserver(list => {
     for (const entry of list.getEntries()) {
@@ -307,13 +283,6 @@ function startGCObserver () {
   gcObserver.observe({ type: 'gc' })
 }
 
-function startGCProfiler () {
-  if (gcProfiler || !hasGCProfiler) return
-
-  gcProfiler = new v8.GCProfiler()
-  gcProfiler.start()
-}
-
 function gcType (kind) {
   if (NODE_MAJOR >= 22) {
     switch (kind) {

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

@@ -22,7 +22,7 @@ const messaging = {
       opName: () => 'kafka.produce',
       serviceName: ({ tracerService }) => `${tracerService}-kafka`
     },
-    '@confluentinc/kafka-javascript': {
+    'confluentinc-kafka-javascript': {
       opName: () => 'kafka.produce',
       serviceName: ({ tracerService }) => `${tracerService}-kafka`
     },
@@ -56,7 +56,7 @@ const messaging = {
       opName: () => 'kafka.consume',
       serviceName: ({ tracerService }) => `${tracerService}-kafka`
     },
-    '@confluentinc/kafka-javascript': {
+    'confluentinc-kafka-javascript': {
       opName: () => 'kafka.consume',
       serviceName: ({ tracerService }) => `${tracerService}-kafka`
     },

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

@@ -100,6 +100,10 @@ const storage = {
       opName: () => 'pg.query',
       serviceName: withSuffixFunction('postgres')
     },
+    prisma: {
+      opName: ({ operation }) => `prisma.${operation}`,
+      serviceName: withSuffixFunction('prisma')
+    },
     redis: redisConfig,
     tedious: {
       opName: () => 'tedious.request',

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

@@ -22,7 +22,7 @@ const messaging = {
       opName: () => 'kafka.send',
       serviceName: identityService
     },
-    '@confluentinc/kafka-javascript': {
+    'confluentinc-kafka-javascript': {
       opName: () => 'kafka.send',
       serviceName: identityService
     },
@@ -47,7 +47,7 @@ const messaging = {
       opName: () => 'kafka.process',
       serviceName: identityService
     },
-    '@confluentinc/kafka-javascript': {
+    'confluentinc-kafka-javascript': {
       opName: () => 'kafka.process',
       serviceName: identityService
     },

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

@@ -68,6 +68,10 @@ const storage = {
       opName: () => 'postgresql.query',
       serviceName: withFunction
     },
+    prisma: {
+      opName: ({ operation }) => `prisma.${operation}`,
+      serviceName: configWithFallback
+    },
     redis: redisNaming,
     tedious: {
       opName: () => 'mssql.query',

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

@@ -1,6 +1,7 @@
 {
   "supportedConfigurations": {
     "DD_AAS_DOTNET_EXTENSION_VERSION": ["A"],
+    "DD_ACTION_EXECUTION_ID": ["A"],
     "DD_AGENT_HOST": ["A"],
     "DD_AGENTLESS_LOG_SUBMISSION_ENABLED": ["A"],
     "DD_AGENTLESS_LOG_SUBMISSION_URL": ["A"],
@@ -49,6 +50,7 @@
     "DD_CODE_ORIGIN_FOR_SPANS_ENABLED": ["A"],
     "DD_CODE_ORIGIN_FOR_SPANS_EXPERIMENTAL_EXIT_SPANS_ENABLED": ["A"],
     "DD_CRASHTRACKING_ENABLED": ["A"],
+    "DD_CUSTOM_TRACE_ID": ["A"],
     "DD_DATA_STREAMS_ENABLED": ["A"],
     "DD_DBM_PROPAGATION_MODE": ["A"],
     "DD_DOGSTATSD_HOST": ["A"],
@@ -72,6 +74,8 @@
     "DD_GIT_PROPERTIES_FILE": ["A"],
     "DD_GIT_REPOSITORY_URL": ["A"],
     "DD_GIT_TAG": ["A"],
+    "DD_GIT_PULL_REQUEST_BASE_BRANCH": ["A"],
+    "DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA": ["A"],
     "DD_GRPC_CLIENT_ERROR_STATUSES": ["A"],
     "DD_GRPC_SERVER_ERROR_STATUSES": ["A"],
     "DD_IAST_DB_ROWS_TO_TAINT": ["A"],
@@ -106,6 +110,7 @@
     "DD_MINI_AGENT_PATH": ["A"],
     "DD_OPENAI_LOGS_ENABLED": ["A"],
     "DD_OPENAI_SPAN_CHAR_LIMIT": ["A"],
+    "DD_PIPELINE_EXECUTION_ID": ["A"],
     "DD_PLAYWRIGHT_WORKER": ["A"],
     "DD_PROFILING_CODEHOTSPOTS_ENABLED": ["A"],
     "DD_PROFILING_CPU_ENABLED": ["A"],
@@ -126,7 +131,10 @@
     "DD_REMOTE_CONFIG_POLL_INTERVAL_SECONDS": ["A"],
     "DD_REMOTE_CONFIGURATION_ENABLED": ["A"],
     "DD_RUNTIME_METRICS_ENABLED": ["A"],
+    "DD_RUNTIME_METRICS_EVENT_LOOP_ENABLED": ["A"],
+    "DD_RUNTIME_METRICS_GC_ENABLED": ["A"],
     "DD_RUNTIME_METRICS_FLUSH_INTERVAL": ["A"],
+    "DD_RUNTIME_METRICS_RUNTIME_ID_ENABLED": ["A"],
     "DD_SERVICE_MAPPING": ["A"],
     "DD_SERVICE": ["A"],
     "DD_SITE": ["A"],
@@ -145,7 +153,6 @@
     "DD_TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES": ["A"],
     "DD_TEST_MANAGEMENT_ENABLED": ["A"],
     "DD_TEST_SESSION_NAME": ["A"],
-    "DD_TRACE__CONFLUENTINC_KAFKA_JAVASCRIPT_ENABLED": ["A"],
     "DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED": ["A"],
     "DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED": ["A"],
     "DD_TRACE_AEROSPIKE_ENABLED": ["A"],
@@ -238,7 +245,6 @@
     "DD_TRACE_EXPERIMENTAL_B3_ENABLED": ["A"],
     "DD_TRACE_EXPERIMENTAL_EXPORTER": ["A"],
     "DD_TRACE_EXPERIMENTAL_GET_RUM_DATA_ENABLED": ["A"],
-    "DD_TRACE_EXPERIMENTAL_RUNTIME_ID_ENABLED": ["A"],
     "DD_TRACE_EXPERIMENTAL_SPAN_COUNTS": ["A"],
     "DD_TRACE_EXPERIMENTAL_STATE_TRACKING": ["A"],
     "DD_TRACE_EXPRESS_ENABLED": ["A"],
@@ -351,6 +357,7 @@
     "DD_TRACE_PLAYWRIGHT_CORE_ENABLED": ["A"],
     "DD_TRACE_PLAYWRIGHT_ENABLED": ["A"],
     "DD_TRACE_PLAYWRIGHT_TEST_ENABLED": ["A"],
+    "DD_TRACE_PRISMA_ENABLED": ["A"],
     "DD_TRACE_PROCESS_ENABLED": ["A"],
     "DD_TRACE_PROMISE_ENABLED": ["A"],
     "DD_TRACE_PROMISE_JS_ENABLED": ["A"],
@@ -427,6 +434,7 @@
     "DD_PROFILING_ENDPOINT_COLLECTION_ENABLED": ["DD_PROFILING_EXPERIMENTAL_ENDPOINT_COLLECTION_ENABLED"],
     "DD_PROFILING_TIMELINE_ENABLED": ["DD_PROFILING_EXPERIMENTAL_TIMELINE_ENABLED"],
     "DD_REMOTE_CONFIGURATION_ENABLED": ["DD_REMOTE_CONFIG_ENABLED" ],
+    "DD_RUNTIME_METRICS_RUNTIME_ID_ENABLED": ["DD_TRACE_EXPERIMENTAL_RUNTIME_ID_ENABLED"],
     "DD_SERVICE": ["DD_SERVICE_NAME"],
     "DD_TRACE_AGENT_URL": ["DD_TRACE_URL"]
   },
@@ -435,6 +443,7 @@
     "DD_PROFILING_EXPERIMENTAL_CPU_ENABLED": "DD_PROFILING_CPU_ENABLED",
     "DD_EXPERIMENTAL_PROFILING_ENABLED": "DD_PROFILING_ENABLED",
     "DD_PROFILING_EXPERIMENTAL_CODEHOTSPOTS_ENABLED": "DD_PROFILING_CODEHOTSPOTS_ENABLED",
-    "DD_PROFILING_EXPERIMENTAL_TIMELINE_ENABLED": "DD_PROFILING_TIMELINE_ENABLED"
+    "DD_PROFILING_EXPERIMENTAL_TIMELINE_ENABLED": "DD_PROFILING_TIMELINE_ENABLED",
+    "DD_TRACE_EXPERIMENTAL_RUNTIME_ID_ENABLED": "DD_RUNTIME_METRICS_RUNTIME_ID_ENABLED"
   }
 }

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

@@ -321,7 +321,11 @@ const nameMapping = {
   clientIpHeader: 'DD_TRACE_CLIENT_IP_HEADER',
   'grpc.client.error.statuses': 'DD_GRPC_CLIENT_ERROR_STATUSES',
   'grpc.server.error.statuses': 'DD_GRPC_SERVER_ERROR_STATUSES',
-  traceId128BitLoggingEnabled: 'DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED'
+  traceId128BitLoggingEnabled: 'DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED',
+  instrumentationSource: 'instrumentation_source',
+  injectionEnabled: 'ssi_injection_enabled',
+  injectForce: 'ssi_forced_injection_enabled',
+  'runtimeMetrics.enabled': 'runtimeMetrics'
 }
 
 const namesNeedFormatting = new Set(['DD_TAGS', 'peerServiceMapping', 'serviceMapping'])

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

@@ -24,6 +24,17 @@ class DatadogTracer extends Tracer {
     this._scope = new Scope()
     setStartupLogConfig(config)
     flushStartupLogs(log)
+
+    if (!config._isInServerlessEnvironment()) {
+      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.
+      const metadata = storeConfig(config)
+      if (metadata === undefined) {
+        log.warn('Could not store tracer configuration for service discovery')
+      }
+      this._inmem_cfg = metadata
+    }
   }
 
   configure (config) {

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

@@ -0,0 +1,25 @@
+'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
+  }
+
+  const metadata = new processDiscovery.TracerMetadata(
+    config.tags['runtime-id'],
+    tracerVersion,
+    config.hostname,
+    config.server || null,
+    config.env || null,
+    config.version || null
+  )
+
+  return processDiscovery.storeMetadata(metadata)
+}
+
+module.exports = storeConfig

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

@@ -61,12 +61,10 @@ function globMatch (pattern, subject) {
   return true
 }
 
-// TODO: this adds stack traces relative to packages/
-// shouldn't paths be relative to the root of dd-trace?
 function calculateDDBasePath (dirname) {
   const dirSteps = dirname.split(path.sep)
   const packagesIndex = dirSteps.lastIndexOf('packages')
-  return dirSteps.slice(0, packagesIndex + 1).join(path.sep) + path.sep
+  return dirSteps.slice(0, packagesIndex).join(path.sep) + path.sep
 }
 
 function normalizeProfilingEnabledValue (configValue) {
@@ -77,11 +75,20 @@ function normalizeProfilingEnabledValue (configValue) {
       : configValue === 'auto' ? 'auto' : undefined
 }
 
+function normalizePluginEnvName (envPluginName, makeLowercase = false) {
+  if (envPluginName.startsWith('@')) {
+    envPluginName = envPluginName.slice(1)
+  }
+  envPluginName = envPluginName.replaceAll(/[^a-z0-9_]/ig, '_')
+  return makeLowercase ? envPluginName.toLowerCase() : envPluginName
+}
+
 module.exports = {
   isTrue,
   isFalse,
   isError,
   globMatch,
   ddBasePath: calculateDDBasePath(__dirname),
-  normalizeProfilingEnabledValue
+  normalizeProfilingEnabledValue,
+  normalizePluginEnvName
 }

package/version.js

@@ -3,10 +3,12 @@
 /* eslint-disable no-var */
 /* eslint-disable unicorn/prefer-number-properties */
 
-var ddMatches = require('./package.json').version.match(/^(\d+)\.(\d+)\.(\d+)/)
+var version = require('./package.json').version
+var ddMatches = version.match(/^(\d+)\.(\d+)\.(\d+)/)
 var nodeMatches = process.versions.node.match(/^(\d+)\.(\d+)\.(\d+)/)
 
 module.exports = {
+  VERSION: version,
   DD_MAJOR: parseInt(ddMatches[1]),
   DD_MINOR: parseInt(ddMatches[2]),
   DD_PATCH: parseInt(ddMatches[3]),