dd-trace 2.20.1 → 2.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "2.20.1",
+  "version": "2.21.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -58,7 +58,7 @@
     "node": ">=12"
   },
   "dependencies": {
-    "@datadog/native-appsec": "^1.2.1",
+    "@datadog/native-appsec": "1.3.0",
     "@datadog/native-metrics": "^1.5.0",
     "@datadog/pprof": "^1.1.1",
     "@datadog/sketches-js": "^2.1.0",

package/packages/datadog-instrumentations/src/jest.js

@@ -263,6 +263,9 @@ function jestAdapterWrapper (jestAdapter) {
   const adapter = jestAdapter.default ? jestAdapter.default : jestAdapter
   const newAdapter = shimmer.wrap(adapter, function () {
     const environment = arguments[2]
+    if (!environment) {
+      return adapter.apply(this, arguments)
+    }
     const asyncResource = new AsyncResource('bound-anonymous-fn')
     return asyncResource.runInAsyncScope(() => {
       testSuiteStartCh.publish({
@@ -280,7 +283,9 @@ function jestAdapterWrapper (jestAdapter) {
         testSuiteFinishCh.publish({ status, errorMessage })
         if (environment.global.__coverage__) {
           const coverageFiles = extractCoverageInformation(environment.global.__coverage__, environment.rootDir)
-          if (coverageFiles.length) {
+          if (coverageFiles.length &&
+            environment.testEnvironmentOptions &&
+            environment.testEnvironmentOptions._ddTestCodeCoverageEnabled) {
             testSuiteCodeCoverageCh.publish([...coverageFiles, environment.testSuite])
           }
         }
@@ -314,6 +319,11 @@ function configureTestEnvironment (readConfigsResult) {
   sessionAsyncResource.runInAsyncScope(() => {
     testSessionConfigurationCh.publish(configs.map(config => config.testEnvironmentOptions))
   })
+  // We can't directly use isCodeCoverageEnabled when reporting coverage in `jestAdapterWrapper`
+  // because `jestAdapterWrapper` runs in a different process. We have to go through `testEnvironmentOptions`
+  configs.forEach(config => {
+    config.testEnvironmentOptions._ddTestCodeCoverageEnabled = isCodeCoverageEnabled
+  })
   if (isCodeCoverageEnabled) {
     const globalConfig = {
       ...readConfigsResult.globalConfig,

package/packages/datadog-plugin-http/src/client.js

@@ -31,9 +31,10 @@ class HttpClientPlugin extends Plugin {
       const host = options.port ? `${hostname}:${options.port}` : hostname
       const path = options.path ? options.path.split(/[?#]/)[0] : '/'
       const uri = `${protocol}//${host}${path}`
+      const allowed = this.config.filter(uri)
 
       const method = (options.method || 'GET').toUpperCase()
-      const childOf = store ? store.span : store
+      const childOf = store && allowed ? store.span : null
       const span = this.tracer.startSpan('http.request', {
         childOf,
         tags: {
@@ -46,6 +47,11 @@ class HttpClientPlugin extends Plugin {
         }
       })
 
+      // TODO: Figure out a better way to do this for any span.
+      if (!allowed) {
+        span._spanContext._trace.record = false
+      }
+
       if (!(hasAmazonSignature(options) || !this.config.propagationFilter(uri))) {
         this.tracer.inject(span, HTTP_HEADERS, options.headers)
       }
@@ -116,12 +122,14 @@ function addRequestHeaders (req, span, config) {
 
 function normalizeClientConfig (config) {
   const validateStatus = getStatusValidator(config)
+  const filter = getFilter(config)
   const propagationFilter = getFilter({ blocklist: config.propagationBlocklist })
   const headers = getHeaders(config)
   const hooks = getHooks(config)
 
   return Object.assign({}, config, {
     validateStatus,
+    filter,
     propagationFilter,
     headers,
     hooks

package/packages/datadog-plugin-http2/src/client.js

@@ -9,6 +9,7 @@ const tags = require('../../../ext/tags')
 const kinds = require('../../../ext/kinds')
 const formats = require('../../../ext/formats')
 const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
+const urlFilter = require('../../dd-trace/src/plugins/util/urlfilter')
 
 const HTTP_HEADERS = formats.HTTP_HEADERS
 const HTTP_STATUS_CODE = tags.HTTP_STATUS_CODE
@@ -36,9 +37,10 @@ class Http2ClientPlugin extends Plugin {
       const pathname = path.split(/[?#]/)[0]
       const method = headers[HTTP2_HEADER_METHOD] || HTTP2_METHOD_GET
       const uri = `${sessionDetails.protocol}//${sessionDetails.host}:${sessionDetails.port}${pathname}`
+      const allowed = this.config.filter(uri)
 
       const store = storage.getStore()
-      const childOf = store ? store.span : store
+      const childOf = store && allowed ? store.span : null
       const span = this.tracer.startSpan('http.request', {
         childOf,
         tags: {
@@ -51,6 +53,11 @@ class Http2ClientPlugin extends Plugin {
         }
       })
 
+      // TODO: Figure out a better way to do this for any span.
+      if (!allowed) {
+        span._spanContext._trace.record = false
+      }
+
       addHeaderTags(span, headers, HTTP_REQUEST_HEADERS, this.config)
 
       if (!hasAmazonSignature(headers, path)) {
@@ -155,14 +162,24 @@ function getStatusValidator (config) {
 
 function normalizeConfig (config) {
   const validateStatus = getStatusValidator(config)
+  const filter = getFilter(config)
   const headers = getHeaders(config)
 
   return Object.assign({}, config, {
     validateStatus,
+    filter,
     headers
   })
 }
 
+function getFilter (config) {
+  config = Object.assign({}, config, {
+    blocklist: config.blocklist || []
+  })
+
+  return urlFilter.getFilter(config)
+}
+
 function addHeaderTags (span, headers, prefix, config) {
   if (!headers) return
 

package/packages/datadog-plugin-jest/src/index.js

@@ -99,6 +99,7 @@ class JestPlugin extends Plugin {
         return
       }
       const testConfiguration = {
+        url: this.config.url,
         site: this.config.site,
         env: this.tracer._env,
         service: this.config.service || this.tracer._service,
@@ -130,6 +131,7 @@ class JestPlugin extends Plugin {
           return onError(gitUploadError)
         }
         const testConfiguration = {
+          url: this.config.url,
           site: this.config.site,
           env: this.tracer._env,
           service: this.config.service || this.tracer._service,

package/packages/datadog-plugin-oracledb/src/index.js

@@ -17,7 +17,6 @@ class OracledbPlugin extends DatabasePlugin {
       type: 'sql',
       kind: 'client',
       meta: {
-        'sql.query': query,
         'db.user': this.config.user,
         'db.instance': url.pathname && url.pathname.substring(1),
         'db.hostname': url.hostname,

package/packages/dd-trace/src/ci-visibility/intelligent-test-runner/get-itr-configuration.js

@@ -2,6 +2,7 @@ const request = require('../../exporters/common/request')
 const id = require('../../id')
 
 function getItrConfiguration ({
+  url,
   site,
   env,
   service,
@@ -14,7 +15,7 @@ function getItrConfiguration ({
   runtimeVersion,
   branch
 }, done) {
-  const url = new URL(`https://api.${site}`)
+  const intakeUrl = url || new URL(`https://api.${site}`)
 
   const apiKey = process.env.DATADOG_API_KEY || process.env.DD_API_KEY
   const appKey = process.env.DATADOG_APP_KEY ||
@@ -35,9 +36,9 @@ function getItrConfiguration ({
       'dd-application-key': appKey,
       'Content-Type': 'application/json'
     },
-    protocol: url.protocol,
-    hostname: url.hostname,
-    port: url.port
+    protocol: intakeUrl.protocol,
+    hostname: intakeUrl.hostname,
+    port: intakeUrl.port
   }
 
   const data = JSON.stringify({

package/packages/dd-trace/src/ci-visibility/intelligent-test-runner/get-skippable-suites.js

@@ -1,6 +1,7 @@
 const request = require('../../exporters/common/request')
 
 function getSkippableSuites ({
+  url,
   site,
   env,
   service,
@@ -12,7 +13,7 @@ function getSkippableSuites ({
   runtimeName,
   runtimeVersion
 }, done) {
-  const url = new URL(`https://api.${site}`)
+  const intakeUrl = url || new URL(`https://api.${site}`)
 
   const apiKey = process.env.DATADOG_API_KEY || process.env.DD_API_KEY
   const appKey = process.env.DATADOG_APP_KEY ||
@@ -33,9 +34,9 @@ function getSkippableSuites ({
       'Content-Type': 'application/json'
     },
     timeout: 15000,
-    protocol: url.protocol,
-    hostname: url.hostname,
-    port: url.port
+    protocol: intakeUrl.protocol,
+    hostname: intakeUrl.hostname,
+    port: intakeUrl.port
   }
 
   const data = JSON.stringify({

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

@@ -4,6 +4,7 @@ const fs = require('fs')
 const os = require('os')
 const URL = require('url').URL
 const path = require('path')
+const log = require('./log')
 const pkg = require('./pkg')
 const coalesce = require('koalas')
 const tagger = require('./tagger')
@@ -44,6 +45,21 @@ class Config {
   constructor (options) {
     options = options || {}
 
+    // Configure the logger first so it can be used to warn about other configs
+    this.debug = isTrue(coalesce(
+      process.env.DD_TRACE_DEBUG,
+      false
+    ))
+    this.logger = options.logger
+    this.logLevel = coalesce(
+      options.logLevel,
+      process.env.DD_TRACE_LOG_LEVEL,
+      'debug'
+    )
+
+    log.use(this.logger)
+    log.toggle(this.debug, this.logLevel, this)
+
     this.tags = {}
 
     tagger.add(this.tags, process.env.DD_TAGS)
@@ -128,10 +144,6 @@ class Config {
       process.env.DD_TRACE_TELEMETRY_ENABLED,
       !process.env.AWS_LAMBDA_FUNCTION_NAME
     )
-    const DD_TRACE_DEBUG = coalesce(
-      process.env.DD_TRACE_DEBUG,
-      false
-    )
     const DD_TRACE_AGENT_PROTOCOL_VERSION = coalesce(
       options.protocolVersion,
       process.env.DD_TRACE_AGENT_PROTOCOL_VERSION,
@@ -295,7 +307,6 @@ ken|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)
     const defaultFlushInterval = inAWSLambda ? 0 : 2000
 
     this.tracing = !isFalse(DD_TRACING_ENABLED)
-    this.debug = isTrue(DD_TRACE_DEBUG)
     this.logInjection = isTrue(DD_LOGS_INJECTION)
     this.env = DD_ENV
     this.url = DD_CIVISIBILITY_AGENTLESS_URL ? new URL(DD_CIVISIBILITY_AGENTLESS_URL)
@@ -309,7 +320,6 @@ ken|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)
     this.clientIpHeaderDisabled = !isTrue(DD_APPSEC_ENABLED)
     this.clientIpHeader = DD_TRACE_CLIENT_IP_HEADER
     this.queryStringObfuscation = DD_TRACE_OBFUSCATION_QUERY_STRING_REGEXP
-    this.logger = options.logger
     this.plugins = !!coalesce(options.plugins, true)
     this.service = DD_SERVICE
     this.serviceMapping = DD_SERVICE_MAPPING.length ? fromEntries(
@@ -331,11 +341,6 @@ ken|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)
     this.sampler = sampler
     this.reportHostname = isTrue(coalesce(options.reportHostname, process.env.DD_TRACE_REPORT_HOSTNAME, false))
     this.scope = process.env.DD_TRACE_SCOPE
-    this.logLevel = coalesce(
-      options.logLevel,
-      process.env.DD_TRACE_LOG_LEVEL,
-      'debug'
-    )
     this.profiling = {
       enabled: isTrue(DD_PROFILING_ENABLED),
       sourceMap: !isFalse(DD_PROFILING_SOURCE_MAP),

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

@@ -124,7 +124,8 @@ module.exports = class PluginManager {
       isIntelligentTestRunnerEnabled,
       site,
       experimental,
-      queryStringObfuscation
+      queryStringObfuscation,
+      url
     } = this._tracerConfig
 
     const sharedConfig = {}
@@ -156,6 +157,7 @@ module.exports = class PluginManager {
     }
 
     sharedConfig.site = site
+    sharedConfig.url = url
 
     return sharedConfig
   }

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

@@ -29,9 +29,6 @@ class Tracer extends NoopProxy {
     try {
       const config = new Config(options) // TODO: support dynamic config
 
-      log.use(config.logger)
-      log.toggle(config.debug, config.logLevel, this)
-
       if (config.profiling.enabled) {
         // do not stop tracer initialization if the profiler fails to be imported
         try {

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

@@ -27,6 +27,7 @@ class SpanProcessor {
     const { flushMinSpans } = this._config
     const { started, finished } = trace
 
+    if (trace.record === false) return
     if (started.length === finished.length || finished.length >= flushMinSpans) {
       this._prioritySampler.sample(spanContext)
       this._spanSampler.sample(spanContext)