dd-trace 5.55.0 → 5.57.0

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"],
@@ -56,6 +58,7 @@
     "DD_DYNAMIC_INSTRUMENTATION_ENABLED": ["A"],
     "DD_DYNAMIC_INSTRUMENTATION_REDACTED_IDENTIFIERS": ["A"],
     "DD_DYNAMIC_INSTRUMENTATION_REDACTION_EXCLUDED_IDENTIFIERS": ["A"],
+    "DD_DYNAMIC_INSTRUMENTATION_UPLOAD_INTERVAL_SECONDS": ["A"],
     "DD_ENV": ["A"],
     "DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED": ["A"],
     "DD_EXTERNAL_ENV": ["A"],
@@ -71,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"],
@@ -105,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"],
@@ -125,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"],
@@ -144,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"],
@@ -237,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"],
@@ -350,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"],
@@ -426,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"]
   },
@@ -434,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

@@ -28,6 +28,8 @@ const extendedHeartbeatPayload = {}
 
 const sentIntegrations = new Set()
 
+let seqId = 0
+
 function getRetryData () {
   return retryData
 }
@@ -319,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'])
@@ -337,9 +343,8 @@ function updateConfig (changes, config) {
 
   for (const change of changes) {
     const name = nameMapping[change.name] || change.name
-
     const { origin, value } = change
-    const entry = { name, value, origin }
+    const entry = { name, value, origin, seq_id: seqId++ }
 
     if (namesNeedFormatting.has(entry.name)) {
       entry.value = formatMapForTelemetry(entry.value)
@@ -352,7 +357,9 @@ function updateConfig (changes, config) {
     } else if (Array.isArray(entry.value)) {
       entry.value = value.join(',')
     }
-    configWithOrigin.set(name, entry)
+
+    // Use composite key to support multiple origins for same config name
+    configWithOrigin.set(`${name}|${origin}`, entry)
   }
 
   if (changed) {

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]),

package/packages/datadog-core/src/utils/src/get.js

@@ -1,11 +0,0 @@
-'use strict'
-
-module.exports = function get (object, path) {
-  const pathArr = path.split('.')
-  let val = object
-  for (const p of pathArr) {
-    if (val === undefined) return val
-    val = val[p]
-  }
-  return val
-}

package/packages/datadog-core/src/utils/src/has.js

@@ -1,14 +0,0 @@
-'use strict'
-
-module.exports = function has (object, path) {
-  const pathArr = path.split('.')
-  let property = object
-  for (const n of pathArr) {
-    if (property.hasOwnProperty(n)) {
-      property = property[n]
-    } else {
-      return false
-    }
-  }
-  return true
-}

package/packages/dd-trace/src/profiling/ssi-telemetry-mock-profiler.js

@@ -1,30 +0,0 @@
-'use strict'
-
-const dc = require('dc-polyfill')
-const coalesce = require('koalas')
-const profileSubmittedChannel = dc.channel('datadog:profiling:mock-profile-submitted')
-const { getEnvironmentVariable } = require('../config-helper')
-
-const DD_PROFILING_UPLOAD_PERIOD = getEnvironmentVariable('DD_PROFILING_UPLOAD_PERIOD')
-
-let timerId
-
-module.exports = {
-  start: config => {
-    // Copied from packages/dd-trace/src/profiler.js
-    const flushInterval = coalesce(config.interval, Number(DD_PROFILING_UPLOAD_PERIOD) * 1000, 65 * 1000)
-
-    timerId = setTimeout(() => {
-      profileSubmittedChannel.publish()
-      timerId.refresh()
-    }, flushInterval)
-    timerId.unref()
-  },
-
-  stop: () => {
-    if (timerId !== undefined) {
-      clearTimeout(timerId)
-      timerId = undefined
-    }
-  }
-}