Active tracing configuration

packages/dd-trace/src/config.js

@@ -142,7 +142,7 @@
       process.env.DD_API_KEY
     )
 
     const isJestWorker = !!process.env.JEST_WORKER_ID
 
     // TODO: Remove the experimental env vars as a major?
     const DD_TRACE_B3_ENABLED = coalesce(
@@ -378,91 +378,83 @@
     this._setValue(defaults, 'appsec.blockedTemplateHtml', undefined)
     this._setValue(defaults, 'appsec.blockedTemplateJson', undefined)
     this._setValue(defaults, 'appsec.customRulesProvided', false)
-    this._setBoolean(defaults, 'appsec.enabled', undefined)
+    this._setValue(defaults, 'appsec.enabled', undefined)
     this._setValue(defaults, 'appsec.obfuscatorKeyRegex', defaultWafObfuscatorKeyRegex)
     this._setValue(defaults, 'appsec.obfuscatorValueRegex', defaultWafObfuscatorValueRegex)
     this._setValue(defaults, 'appsec.rateLimit', 100)
     this._setValue(defaults, 'appsec.rules', undefined)
     this._setValue(defaults, 'appsec.wafTimeout', 5e3) // µs
-    this._setBoolean(defaults, 'clientIpEnabled', false)
+    this._setValue(defaults, 'clientIpEnabled', false)
     this._setValue(defaults, 'clientIpHeader', null)
     this._setValue(defaults, 'dbmPropagationMode', 'disabled')
     this._setValue(defaults, 'dogstatsd.hostname', '127.0.0.1')
     this._setValue(defaults, 'dogstatsd.port', '8125')
-    this._setBoolean(defaults, 'dsmEnabled', false)
+    this._setValue(defaults, 'dsmEnabled', false)
     this._setValue(defaults, 'env', undefined)
-    this._setBoolean(defaults, 'experimental.enableGetRumData', false)
+    this._setValue(defaults, 'experimental.enableGetRumData', false)
     this._setValue(defaults, 'experimental.exporter', undefined)
-    this._setBoolean(defaults, 'experimental.runtimeId', false)
+    this._setValue(defaults, 'experimental.runtimeId', false)
     this._setValue(defaults, 'flushInterval', 2000)
     this._setValue(defaults, 'flushMinSpans', 1000)
-    this._setBoolean(defaults, 'gitMetadataEnabled', true)
-    this._setArray(defaults, 'headerTags', [])
+    this._setValue(defaults, 'gitMetadataEnabled', true)
+    this._setValue(defaults, 'headerTags', [])
     this._setValue(defaults, 'hostname', '127.0.0.1')
-    this._setBoolean(defaults, 'iast.deduplicationEnabled', true)
-    this._setBoolean(defaults, 'iast.enabled', false)
+    this._setValue(defaults, 'iast.deduplicationEnabled', true)
+    this._setValue(defaults, 'iast.enabled', false)
     this._setValue(defaults, 'iast.maxConcurrentRequests', 2)
     this._setValue(defaults, 'iast.maxContextOperations', 2)
-    this._setBoolean(defaults, 'iast.redactionEnabled', true)
+    this._setValue(defaults, 'iast.redactionEnabled', true)
     this._setValue(defaults, 'iast.redactionNamePattern', null)
     this._setValue(defaults, 'iast.redactionValuePattern', null)
     this._setValue(defaults, 'iast.requestSampling', 30)
     this._setValue(defaults, 'iast.telemetryVerbosity', 'INFORMATION')
-    this._setBoolean(defaults, 'isCiVisibility', false)
-    this._setBoolean(defaults, 'isEarlyFlakeDetectionEnabled', false)
-    this._setBoolean(defaults, 'isGCPFunction', false)
-    this._setBoolean(defaults, 'isGitUploadEnabled', false)
-    this._setBoolean(defaults, 'isIntelligentTestRunnerEnabled', false)
-    this._setBoolean(defaults, 'isManualApiEnabled', false)
-    this._setBoolean(defaults, 'logInjection', false)
+    this._setValue(defaults, 'isCiVisibility', false)
+    this._setValue(defaults, 'isEarlyFlakeDetectionEnabled', false)
+    this._setValue(defaults, 'isGCPFunction', false)
+    this._setValue(defaults, 'isGitUploadEnabled', false)
+    this._setValue(defaults, 'isIntelligentTestRunnerEnabled', false)
+    this._setValue(defaults, 'isManualApiEnabled', false)
+    this._setValue(defaults, 'logInjection', false)
     this._setValue(defaults, 'lookup', undefined)
-    this._setBoolean(defaults, 'openAiLogsEnabled', false)
+    this._setValue(defaults, 'openAiLogsEnabled', false)
     this._setValue(defaults, 'openaiSpanCharLimit', 128)
     this._setValue(defaults, 'peerServiceMapping', {})
-    this._setBoolean(defaults, 'plugins', true)
+    this._setValue(defaults, 'plugins', true)
     this._setValue(defaults, 'port', '8126')
-    this._setBoolean(defaults, 'profiling.enabled', false)
+    this._setValue(defaults, 'profiling.enabled', false)
     this._setValue(defaults, 'profiling.exporters', 'agent')
-    this._setBoolean(defaults, 'profiling.sourceMap', true)
+    this._setValue(defaults, 'profiling.sourceMap', true)
     this._setValue(defaults, 'protocolVersion', '0.4')
     this._setValue(defaults, 'queryStringObfuscation', qsRegex)
-    this._setBoolean(defaults, 'remoteConfig.enabled', true)
+    this._setValue(defaults, 'remoteConfig.enabled', true)
     this._setValue(defaults, 'remoteConfig.pollInterval', 5) // seconds
-    this._setBoolean(defaults, 'reportHostname', false)
-    this._setBoolean(defaults, 'runtimeMetrics', false)
-    this._setUnit(defaults, 'sampleRate', undefined)
+    this._setValue(defaults, 'reportHostname', false)
+    this._setValue(defaults, 'runtimeMetrics', false)
+    this._setValue(defaults, 'sampleRate', undefined)
     this._setValue(defaults, 'sampler.rateLimit', undefined)
     this._setValue(defaults, 'scope', undefined)
     this._setValue(defaults, 'service', service)
     this._setValue(defaults, 'site', 'datadoghq.com')
     this._setValue(defaults, 'spanAttributeSchema', 'v0')
     this._setValue(defaults, 'spanComputePeerService', false)
     this._setValue(defaults, 'spanRemoveIntegrationFromService', false)
-    this._setBoolean(defaults, 'startupLogs', false)
-    this._setBoolean(defaults, 'stats.enabled', false)
+    this._setValue(defaults, 'startupLogs', false)
+    this._setValue(defaults, 'stats.enabled', false)
     this._setValue(defaults, 'tags', {})
     this._setValue(defaults, 'tagsHeaderMaxLength', 512)
-    this._setBoolean(defaults, 'telemetry.debug', false)
-    this._setBoolean(defaults, 'telemetry.dependencyCollection', true)
-    this._setBoolean(defaults, 'telemetry.enabled', true)
+    this._setValue(defaults, 'telemetry.debug', false)
+    this._setValue(defaults, 'telemetry.dependencyCollection', true)
+    this._setValue(defaults, 'telemetry.enabled', true)
     this._setValue(defaults, 'telemetry.heartbeatInterval', 60000)
-    this._setBoolean(defaults, 'telemetry.logCollection', false)
-    this._setBoolean(defaults, 'telemetry.metrics', true)
-    this._setBoolean(defaults, 'traceId128BitGenerationEnabled', true)
-    this._setBoolean(defaults, 'traceId128BitLoggingEnabled', false)
-    this._setBoolean(defaults, 'tracing', true)
+    this._setValue(defaults, 'telemetry.logCollection', false)
+    this._setValue(defaults, 'telemetry.metrics', true)
+    this._setValue(defaults, 'traceId128BitGenerationEnabled', true)
+    this._setValue(defaults, 'traceId128BitLoggingEnabled', false)
+    this._setValue(defaults, 'tracing', true)
     this._setValue(defaults, 'url', undefined)
     this._setValue(defaults, 'version', pkg.version)
   }
 
-  _isInstrumentationTelemetryEnabled () {
-    return coalesce(
-      process.env.DD_TRACE_TELEMETRY_ENABLED, // for backward compatibility
-      process.env.DD_INSTRUMENTATION_TELEMETRY_ENABLED, // to comply with instrumentation telemetry specs
-      !this._isInServerlessEnvironment()
-    )
-  }
-
   _applyEnvironment () {
     const {
       AWS_LAMBDA_FUNCTION_NAME,
@@ -481,6 +473,7 @@
       DD_DOGSTATSD_PORT,
       DD_ENV,
       DD_EXPERIMENTAL_PROFILING_ENABLED,
+      JEST_WORKER_ID,
       DD_IAST_DEDUPLICATION_ENABLED,
       DD_IAST_ENABLED,
       DD_IAST_MAX_CONCURRENT_REQUESTS,
@@ -619,7 +612,7 @@
     this._setBoolean(env, 'telemetry.enabled', coalesce(
       DD_TRACE_TELEMETRY_ENABLED, // for backward compatibility
       DD_INSTRUMENTATION_TELEMETRY_ENABLED, // to comply with instrumentation telemetry specs
-      !this._isInServerlessEnvironment()
+      !(this._isInServerlessEnvironment() || !!JEST_WORKER_ID)
     ))
     this._setBoolean(env, 'telemetry.debug', DD_TELEMETRY_DEBUG)
     this._setBoolean(env, 'telemetry.dependencyCollection', DD_TELEMETRY_DEPENDENCY_COLLECTION_ENABLED)
@@ -815,15 +808,13 @@
     if (this._isCiVisibility()) {
       this._setBoolean(calc, 'isEarlyFlakeDetectionEnabled',
         coalesce(process.env.DD_CIVISIBILITY_EARLY_FLAKE_DETECTION_ENABLED, true))
+      this._setBoolean(calc, 'isIntelligentTestRunnerEnabled', isTrue(this._isCiVisibilityItrEnabled()))
+      this._setBoolean(calc, 'isManualApiEnabled', isTrue(this._isCiVisibilityManualApiEnabled()))
     }
     this._setString(calc, 'dogstatsd.hostname', this._getHostname())
-    this._setBoolean(calc, 'spanComputePeerService', this._getSpanComputePeerService())
-    this._setBoolean(calc, 'isIntelligentTestRunnerEnabled',
-      isTrue(this._isCiVisibility()) && isTrue(this._isCiVisibilityItrEnabled()))
     this._setBoolean(calc, 'isGitUploadEnabled',
       calc['isIntelligentTestRunnerEnabled'] && !isFalse(this._isCiVisibilityGitUploadEnabled()))
-    this._setBoolean(calc, 'isManualApiEnabled',
-      isTrue(this._isCiVisibility()) && isTrue(this._isCiVisibilityManualApiEnabled()))
+    this._setBoolean(calc, 'spanComputePeerService', this._getSpanComputePeerService())
     this._setBoolean(calc, 'stats.enabled', this._isTraceStatsComputationEnabled())
   }