dd-trace 5.97.0 → 5.99.0

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

@@ -5,7 +5,6 @@ const spanFormat = require('./span_format')
 const SpanSampler = require('./span_sampler')
 const GitMetadataTagger = require('./git_metadata_tagger')
 const processTags = require('./process-tags')
-const { getValueFromEnvSources } = require('./config/helper')
 
 const startedSpans = new WeakSet()
 const finishedSpans = new WeakSet()
@@ -88,7 +87,7 @@ class SpanProcessor {
   }
 
   _erase (trace, active) {
-    if (getValueFromEnvSources('DD_TRACE_EXPERIMENTAL_STATE_TRACKING') === 'true') {
+    if (this._config.DD_TRACE_EXPERIMENTAL_STATE_TRACKING) {
       const started = new Set()
       const startedIds = new Set()
       const finished = new Set()

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

@@ -11,7 +11,7 @@ const {
   HTTP_ROUTE,
   HTTP_METHOD,
 } = require('../../../ext/tags')
-const { ORIGIN_KEY, TOP_LEVEL_KEY } = require('./constants')
+const { ORIGIN_KEY, TOP_LEVEL_KEY, SVC_SRC_KEY } = require('./constants')
 const { version } = require('./pkg')
 const processTags = require('./process-tags')
 
@@ -60,6 +60,7 @@ class SpanAggStats {
       synthetics,
       method,
       endpoint,
+      srvSrc,
     } = this.aggKey
 
     return {
@@ -71,6 +72,7 @@ class SpanAggStats {
       Synthetics: synthetics,
       HTTPMethod: method,
       HTTPEndpoint: endpoint,
+      srv_src: srvSrc,
       Hits: this.hits,
       TopLevelHits: this.topLevelHits,
       Errors: this.errors,
@@ -91,6 +93,7 @@ class SpanAggKey {
     this.synthetics = span.meta[ORIGIN_KEY] === 'synthetics'
     this.endpoint = span.meta[HTTP_ROUTE] || span.meta[HTTP_ENDPOINT] || ''
     this.method = span.meta[HTTP_METHOD] || ''
+    this.srvSrc = span.meta[SVC_SRC_KEY] || ''
   }
 
   toString () {
@@ -103,6 +106,7 @@ class SpanAggKey {
       this.synthetics,
       this.method,
       this.endpoint,
+      this.srvSrc,
     ].join(',')
   }
 }

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

@@ -8,7 +8,7 @@ function addNonEmpty (carrier, key, value) {
   }
 }
 
-function add (carrier, keyValuePairs) {
+function add (carrier, keyValuePairs, valueSeparator = ':') {
   if (!carrier) return
 
   if (typeof keyValuePairs === 'string') {
@@ -18,7 +18,7 @@ function add (carrier, keyValuePairs) {
     for (let i = 0; i < keyValuePairs.length; i++) {
       const char = keyValuePairs[i]
 
-      if (char === ':') {
+      if (char === valueSeparator) {
         if (valueStart === 0) {
           valueStart = i
         }

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

@@ -2,8 +2,6 @@
 
 const request = require('../exporters/common/request')
 const log = require('../log')
-const { isTrue } = require('../util')
-const { getValueFromEnvSources } = require('../config/helper')
 
 /**
  * @typedef {Record<string, unknown>} TelemetryPayloadObject
@@ -139,16 +137,16 @@ function sendData (config, application, host, reqType, payload = {}, cb = () =>
     hostname,
     port,
     isCiVisibility,
+    DD_CIVISIBILITY_AGENTLESS_ENABLED,
   } = config
 
   let url = config.url
 
-  const isCiVisibilityAgentlessMode = isCiVisibility &&
-                                      isTrue(getValueFromEnvSources('DD_CIVISIBILITY_AGENTLESS_ENABLED'))
+  const isCiVisibilityAgentlessMode = isCiVisibility && DD_CIVISIBILITY_AGENTLESS_ENABLED
 
   if (isCiVisibilityAgentlessMode) {
     try {
-      url = url || new URL(getAgentlessTelemetryEndpoint(config.site))
+      url ||= new URL(getAgentlessTelemetryEndpoint(config.site))
     } catch (err) {
       log.error('Telemetry endpoint url is invalid', err)
       // No point to do the request if the URL is invalid
@@ -178,14 +176,14 @@ function sendData (config, application, host, reqType, payload = {}, cb = () =>
   })
 
   request(data, options, (error) => {
-    if (error && getValueFromEnvSources('DD_API_KEY') && config.site) {
+    if (error && config.apiKey && config.site) {
       if (agentTelemetry) {
         log.warn('Agent telemetry failed, started agentless telemetry')
         agentTelemetry = false
       }
       // figure out which data center to send to
       const backendUrl = getAgentlessTelemetryEndpoint(config.site)
-      const backendHeader = { ...options.headers, 'DD-API-KEY': getValueFromEnvSources('DD_API_KEY') }
+      const backendHeader = { ...options.headers, 'DD-API-KEY': config.apiKey }
       const backendOptions = {
         ...options,
         url: backendUrl,