dd-trace 1.5.1 → 1.6.0

package/ci/cypress/plugin.js

@@ -0,0 +1,3 @@
+require('../init')
+
+module.exports = require('../../packages/datadog-plugin-cypress/src/plugin')

package/ci/cypress/support.js

@@ -0,0 +1 @@
+require('../../packages/datadog-plugin-cypress/src/support')

package/ci/init.js

@@ -0,0 +1,9 @@
+const tracer = require('../packages/dd-trace')
+
+tracer.init({
+  startupLogs: false
+})
+
+tracer.use('fs', false)
+
+module.exports = tracer

package/ci/jest/env.js

@@ -0,0 +1,10 @@
+const tracer = require('../../packages/dd-trace')
+
+tracer.init({
+  startupLogs: false,
+  flushInterval: 400000
+})
+
+tracer.use('fs', false)
+
+module.exports = tracer

package/index.d.ts

@@ -978,12 +978,12 @@ declare namespace plugins {
     /**
      * Configuration for HTTP clients.
      */
-    client?: HttpClient,
+    client?: HttpClient | boolean,
 
     /**
      * Configuration for HTTP servers.
      */
-    server?: HttpServer
+    server?: HttpServer | boolean
 
     /**
      * Hooks to run before spans are finished.
@@ -1012,12 +1012,12 @@ declare namespace plugins {
     /**
      * Configuration for HTTP clients.
      */
-    client?: Http2Client,
+    client?: Http2Client | boolean,
 
     /**
      * Configuration for HTTP servers.
      */
-    server?: Http2Server
+    server?: Http2Server | boolean
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -56,10 +56,10 @@
     "node": ">=12"
   },
   "dependencies": {
-    "@datadog/native-metrics": "^1.0.1",
+    "@datadog/native-metrics": "^1.1.0",
     "@datadog/pprof": "^0.3.0",
     "@datadog/sketches-js": "^1.0.4",
-    "@types/node": "^10.12.18",
+    "@types/node": ">=12",
     "crypto-randomuuid": "^1.0.0",
     "form-data": "^3.0.0",
     "import-in-the-middle": "^1.1.2",

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

@@ -5,6 +5,7 @@ const {
   TEST_NAME,
   TEST_SUITE,
   TEST_STATUS,
+  TEST_FRAMEWORK_VERSION,
   TEST_SKIP_REASON,
   CI_APP_ORIGIN,
   ERROR_MESSAGE,
@@ -52,6 +53,7 @@ function createWrapRun (tracer, testEnvironmentMetadata, sourceRoot, setStatus)
         [TEST_NAME]: testName,
         [TEST_SUITE]: testSuite,
         [SAMPLING_RULE_DECISION]: 1,
+        [TEST_FRAMEWORK_VERSION]: tracer._version,
         ...testEnvironmentMetadata
       }
 

package/packages/datadog-plugin-cypress/src/plugin.js

@@ -3,6 +3,7 @@ const {
   TEST_NAME,
   TEST_SUITE,
   TEST_STATUS,
+  TEST_FRAMEWORK_VERSION,
   getTestEnvironmentMetadata,
   CI_APP_ORIGIN,
   getTestParentSpan
@@ -19,7 +20,7 @@ const CYPRESS_STATUS_TO_TEST_STATUS = {
   skipped: 'skip'
 }
 
-function getTestSpanMetadata (tracer, testName, testSuite) {
+function getTestSpanMetadata (tracer, testName, testSuite, cypressConfig) {
   const childOf = getTestParentSpan(tracer)
 
   return {
@@ -29,7 +30,8 @@ function getTestSpanMetadata (tracer, testName, testSuite) {
     [TEST_NAME]: testName,
     [TEST_SUITE]: testSuite,
     [SAMPLING_RULE_DECISION]: 1,
-    [SAMPLING_PRIORITY]: AUTO_KEEP
+    [SAMPLING_PRIORITY]: AUTO_KEEP,
+    [TEST_FRAMEWORK_VERSION]: cypressConfig.version
   }
 }
 
@@ -50,7 +52,7 @@ module.exports = (on, config) => {
         childOf,
         resource,
         ...testSpanMetadata
-      } = getTestSpanMetadata(tracer, testName, testSuite)
+      } = getTestSpanMetadata(tracer, testName, testSuite, config)
 
       if (!activeSpan) {
         activeSpan = tracer.startSpan('cypress.test', {

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

@@ -5,6 +5,8 @@ const {
   TEST_NAME,
   TEST_SUITE,
   TEST_STATUS,
+  TEST_FRAMEWORK_VERSION,
+  JEST_TEST_RUNNER,
   ERROR_MESSAGE,
   ERROR_TYPE,
   TEST_PARAMETERS,
@@ -138,7 +140,9 @@ function createHandleTestEvent (tracer, testEnvironmentMetadata, instrumenter) {
     const spanTags = {
       ...commonSpanTags,
       [TEST_NAME]: testName,
-      [TEST_SUITE]: this.testSuite
+      [TEST_SUITE]: this.testSuite,
+      [TEST_FRAMEWORK_VERSION]: tracer._version,
+      [JEST_TEST_RUNNER]: 'jest-circus'
     }
 
     const testParametersString = getTestParametersString(nameToParams, event.test.name)

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

@@ -5,6 +5,8 @@ const {
   TEST_NAME,
   TEST_SUITE,
   TEST_STATUS,
+  TEST_FRAMEWORK_VERSION,
+  JEST_TEST_RUNNER,
   CI_APP_ORIGIN,
   getTestEnvironmentMetadata,
   finishAllTraceSpans,
@@ -29,7 +31,12 @@ function createWrapIt (tracer, globalConfig, globalInput, testEnvironmentMetadat
         {
           type: 'test',
           childOf,
-          tags: { ...commonSpanTags, [TEST_SUITE]: testSuite }
+          tags: {
+            ...commonSpanTags,
+            [TEST_SUITE]: testSuite,
+            [TEST_FRAMEWORK_VERSION]: tracer._version,
+            [JEST_TEST_RUNNER]: 'jest-jasmine2'
+          }
         },
         async (done) => {
           const testSpan = tracer.scope().active()
@@ -124,7 +131,9 @@ function createWrapItSkip (tracer, globalConfig, globalInput, testEnvironmentMet
             [RESOURCE_NAME]: resource,
             [TEST_NAME]: testName,
             [TEST_SUITE]: testSuite,
-            [TEST_STATUS]: 'skip'
+            [TEST_STATUS]: 'skip',
+            [TEST_FRAMEWORK_VERSION]: tracer._version,
+            [JEST_TEST_RUNNER]: 'jest-jasmine2'
           }
         }
       )

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

@@ -9,6 +9,7 @@ const {
   TEST_SUITE,
   TEST_STATUS,
   TEST_PARAMETERS,
+  TEST_FRAMEWORK_VERSION,
   CI_APP_ORIGIN,
   getTestEnvironmentMetadata,
   getTestParametersString,
@@ -31,7 +32,8 @@ function getTestSpanMetadata (tracer, test, sourceRoot) {
     [TEST_NAME]: fullTestName,
     [TEST_SUITE]: testSuite,
     [SAMPLING_RULE_DECISION]: 1,
-    [SAMPLING_PRIORITY]: AUTO_KEEP
+    [SAMPLING_PRIORITY]: AUTO_KEEP,
+    [TEST_FRAMEWORK_VERSION]: tracer._version
   }
 }
 

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

@@ -1,7 +1,25 @@
 'use strict'
 
+// TODO: always use uppercase for command names
+
 const tx = require('../../dd-trace/src/plugins/util/redis')
 
+function createWrapAddCommand (tracer, config) {
+  return function wrapAddCommand (addCommand) {
+    return function addCommandWithTrace (command) {
+      const name = command[0]
+      const args = command.slice(1)
+
+      if (!config.filter(name)) return addCommand.apply(this, arguments)
+
+      const scope = tracer.scope()
+      const span = startSpan(tracer, config, this, name, args)
+
+      return tx.wrap(span, scope.bind(addCommand, span).apply(this, arguments))
+    }
+  }
+}
+
 function createWrapInternalSendCommand (tracer, config) {
   return function wrapInternalSendCommand (internalSendCommand) {
     return function internalSendCommandWithTrace (options) {
@@ -49,9 +67,21 @@ function startSpan (tracer, config, client, command, args) {
 }
 
 module.exports = [
+  {
+    name: '@node-redis/client',
+    versions: ['>=1'],
+    file: 'dist/lib/client/commands-queue.js',
+    patch (redis, tracer, config) {
+      config = tx.normalizeConfig(config)
+      this.wrap(redis.default.prototype, 'addCommand', createWrapAddCommand(tracer, config))
+    },
+    unpatch (redis) {
+      this.unwrap(redis.default.prototype, 'addCommand')
+    }
+  },
   {
     name: 'redis',
-    versions: ['>=2.6'],
+    versions: ['>=2.6 <4'],
     patch (redis, tracer, config) {
       config = tx.normalizeConfig(config)
       this.wrap(redis.RedisClient.prototype, 'internal_send_command', createWrapInternalSendCommand(tracer, config))

package/packages/dd-trace/lib/version.js

@@ -1 +1 @@
-module.exports = '1.5.1'
+module.exports = '1.6.0'

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

@@ -70,6 +70,7 @@ function resolveTilde (filePath) {
 }
 
 module.exports = {
+  normalizeRef,
   getCIMetadata () {
     const { env } = process
 
@@ -124,7 +125,7 @@ module.exports = {
         CI_PIPELINE_IID,
         CI_PIPELINE_URL: GITLAB_PIPELINE_URL,
         CI_PROJECT_DIR,
-        CI_COMMIT_BRANCH,
+        CI_COMMIT_REF_NAME,
         CI_COMMIT_TAG,
         CI_COMMIT_SHA,
         CI_REPOSITORY_URL,
@@ -143,7 +144,7 @@ module.exports = {
         [GIT_REPOSITORY_URL]: CI_REPOSITORY_URL,
         [CI_JOB_URL]: GITLAB_CI_JOB_URL,
         [GIT_TAG]: CI_COMMIT_TAG,
-        [GIT_BRANCH]: CI_COMMIT_BRANCH,
+        [GIT_BRANCH]: CI_COMMIT_REF_NAME,
         [CI_WORKSPACE_PATH]: CI_PROJECT_DIR,
         [CI_PIPELINE_URL]: GITLAB_PIPELINE_URL && GITLAB_PIPELINE_URL.replace('/-/pipelines/', '/pipelines/'),
         [CI_STAGE_NAME]: CI_JOB_STAGE,
@@ -190,11 +191,19 @@ module.exports = {
         GITHUB_HEAD_REF,
         GITHUB_REF,
         GITHUB_SHA,
-        GITHUB_REPOSITORY
+        GITHUB_REPOSITORY,
+        GITHUB_SERVER_URL,
+        GITHUB_RUN_ATTEMPT
       } = env
 
-      const repositoryURL = `https://github.com/${GITHUB_REPOSITORY}.git`
-      const pipelineURL = `https://github.com/${GITHUB_REPOSITORY}/commit/${GITHUB_SHA}/checks`
+      const repositoryURL = `${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git`
+      let pipelineURL = `${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}`
+
+      if (GITHUB_RUN_ATTEMPT) {
+        pipelineURL = `${pipelineURL}/attempts/${GITHUB_RUN_ATTEMPT}`
+      }
+
+      const jobUrl = `${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/commit/${GITHUB_SHA}/checks`
 
       const ref = GITHUB_HEAD_REF || GITHUB_REF || ''
       const refKey = ref.includes('tags') ? GIT_TAG : GIT_BRANCH
@@ -207,7 +216,7 @@ module.exports = {
         [CI_PROVIDER_NAME]: 'github',
         [GIT_COMMIT_SHA]: GITHUB_SHA,
         [GIT_REPOSITORY_URL]: repositoryURL,
-        [CI_JOB_URL]: pipelineURL,
+        [CI_JOB_URL]: jobUrl,
         [CI_WORKSPACE_PATH]: GITHUB_WORKSPACE,
         [refKey]: ref
       }
@@ -274,11 +283,13 @@ module.exports = {
         BUILD_SOURCEVERSION,
         BUILD_REQUESTEDFORID,
         BUILD_REQUESTEDFOREMAIL,
-        BUILD_SOURCEVERSIONMESSAGE
+        BUILD_SOURCEVERSIONMESSAGE,
+        SYSTEM_STAGEDISPLAYNAME,
+        SYSTEM_JOBDISPLAYNAME
       } = env
 
       const ref = SYSTEM_PULLREQUEST_SOURCEBRANCH || BUILD_SOURCEBRANCH || BUILD_SOURCEBRANCHNAME
-      const refKey = ref.includes('tags') ? GIT_TAG : GIT_BRANCH
+      const refKey = (ref || '').includes('tags') ? GIT_TAG : GIT_BRANCH
 
       tags = {
         [CI_PROVIDER_NAME]: 'azurepipelines',
@@ -291,7 +302,9 @@ module.exports = {
         [refKey]: ref,
         [GIT_COMMIT_AUTHOR_NAME]: BUILD_REQUESTEDFORID,
         [GIT_COMMIT_AUTHOR_EMAIL]: BUILD_REQUESTEDFOREMAIL,
-        [GIT_COMMIT_MESSAGE]: BUILD_SOURCEVERSIONMESSAGE
+        [GIT_COMMIT_MESSAGE]: BUILD_SOURCEVERSIONMESSAGE,
+        [CI_STAGE_NAME]: SYSTEM_STAGEDISPLAYNAME,
+        [CI_JOB_NAME]: SYSTEM_JOBDISPLAYNAME
       }
 
       if (SYSTEM_TEAMFOUNDATIONSERVERURI && SYSTEM_TEAMPROJECTID && BUILD_BUILDID) {

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

@@ -39,34 +39,20 @@ function getGitMetadata (ciMetadata) {
     committerDate
   ] = sanitizedExec('git show -s --format=%an,%ae,%ad,%cn,%ce,%cd', { stdio: 'pipe' }).split(',')
 
-  const {
-    DD_GIT_REPOSITORY_URL,
-    DD_GIT_COMMIT_SHA,
-    DD_GIT_BRANCH,
-    DD_GIT_TAG,
-    DD_GIT_COMMIT_MESSAGE,
-    DD_GIT_COMMIT_AUTHOR_NAME,
-    DD_GIT_COMMIT_AUTHOR_EMAIL,
-    DD_GIT_COMMIT_AUTHOR_DATE,
-    DD_GIT_COMMIT_COMMITTER_NAME,
-    DD_GIT_COMMIT_COMMITTER_EMAIL,
-    DD_GIT_COMMIT_COMMITTER_DATE
-  } = process.env
-
   return {
     [GIT_REPOSITORY_URL]:
-      DD_GIT_REPOSITORY_URL || repositoryUrl || sanitizedExec('git ls-remote --get-url', { stdio: 'pipe' }),
+      repositoryUrl || sanitizedExec('git ls-remote --get-url', { stdio: 'pipe' }),
     [GIT_COMMIT_MESSAGE]:
-      DD_GIT_COMMIT_MESSAGE || commitMessage || sanitizedExec('git show -s --format=%s', { stdio: 'pipe' }),
-    [GIT_COMMIT_AUTHOR_DATE]: DD_GIT_COMMIT_AUTHOR_DATE || authorDate,
-    [GIT_COMMIT_AUTHOR_NAME]: DD_GIT_COMMIT_AUTHOR_NAME || ciAuthorName || authorName,
-    [GIT_COMMIT_AUTHOR_EMAIL]: DD_GIT_COMMIT_AUTHOR_EMAIL || ciAuthorEmail || authorEmail,
-    [GIT_COMMIT_COMMITTER_DATE]: DD_GIT_COMMIT_COMMITTER_DATE || committerDate,
-    [GIT_COMMIT_COMMITTER_NAME]: DD_GIT_COMMIT_COMMITTER_NAME || committerName,
-    [GIT_COMMIT_COMMITTER_EMAIL]: DD_GIT_COMMIT_COMMITTER_EMAIL || committerEmail,
-    [GIT_BRANCH]: DD_GIT_BRANCH || branch || sanitizedExec('git rev-parse --abbrev-ref HEAD', { stdio: 'pipe' }),
-    [GIT_COMMIT_SHA]: DD_GIT_COMMIT_SHA || commitSHA || sanitizedExec('git rev-parse HEAD', { stdio: 'pipe' }),
-    [GIT_TAG]: DD_GIT_TAG || tag,
+      commitMessage || sanitizedExec('git show -s --format=%s', { stdio: 'pipe' }),
+    [GIT_COMMIT_AUTHOR_DATE]: authorDate,
+    [GIT_COMMIT_AUTHOR_NAME]: ciAuthorName || authorName,
+    [GIT_COMMIT_AUTHOR_EMAIL]: ciAuthorEmail || authorEmail,
+    [GIT_COMMIT_COMMITTER_DATE]: committerDate,
+    [GIT_COMMIT_COMMITTER_NAME]: committerName,
+    [GIT_COMMIT_COMMITTER_EMAIL]: committerEmail,
+    [GIT_BRANCH]: branch || sanitizedExec('git rev-parse --abbrev-ref HEAD', { stdio: 'pipe' }),
+    [GIT_COMMIT_SHA]: commitSHA || sanitizedExec('git rev-parse HEAD', { stdio: 'pipe' }),
+    [GIT_TAG]: tag,
     [CI_WORKSPACE_PATH]: ciWorkspacePath || sanitizedExec('git rev-parse --show-toplevel', { stdio: 'pipe' })
   }
 }

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

@@ -25,8 +25,6 @@ const redis = {
         'span.type': 'redis',
         'db.type': 'redis',
         'db.name': db || '0',
-        'out.host': '127.0.0.1',
-        'out.port': String(6379),
         'redis.raw_command': formatCommand(command, args)
       }
     })

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

@@ -1,6 +1,7 @@
 const path = require('path')
 
 const { getGitMetadata } = require('./git')
+const { getUserProviderGitMetadata } = require('./user-provided-git')
 const { getCIMetadata } = require('./ci')
 const { getRuntimeAndOSMetadata } = require('./env')
 const {
@@ -16,6 +17,7 @@ const {
 const id = require('../../id')
 
 const TEST_FRAMEWORK = 'test.framework'
+const TEST_FRAMEWORK_VERSION = 'test.framework_version'
 const TEST_TYPE = 'test.type'
 const TEST_NAME = 'test.name'
 const TEST_SUITE = 'test.suite'
@@ -29,8 +31,12 @@ const ERROR_STACK = 'error.stack'
 
 const CI_APP_ORIGIN = 'ciapp-test'
 
+const JEST_TEST_RUNNER = 'test.jest.test_runner'
+
 module.exports = {
   TEST_FRAMEWORK,
+  TEST_FRAMEWORK_VERSION,
+  JEST_TEST_RUNNER,
   TEST_TYPE,
   TEST_NAME,
   TEST_SUITE,
@@ -73,12 +79,15 @@ function getTestEnvironmentMetadata (testFramework) {
     ciWorkspacePath
   })
 
+  const userProvidedGitMetadata = getUserProviderGitMetadata()
+
   const runtimeAndOSMetadata = getRuntimeAndOSMetadata()
 
   return {
     [TEST_FRAMEWORK]: testFramework,
     ...gitMetadata,
     ...ciMetadata,
+    ...userProvidedGitMetadata,
     ...runtimeAndOSMetadata
   }
 }

package/packages/dd-trace/src/plugins/util/user-provided-git.js

@@ -0,0 +1,72 @@
+const {
+  GIT_COMMIT_SHA,
+  GIT_BRANCH,
+  GIT_REPOSITORY_URL,
+  GIT_TAG,
+  GIT_COMMIT_MESSAGE,
+  GIT_COMMIT_COMMITTER_DATE,
+  GIT_COMMIT_COMMITTER_EMAIL,
+  GIT_COMMIT_COMMITTER_NAME,
+  GIT_COMMIT_AUTHOR_DATE,
+  GIT_COMMIT_AUTHOR_EMAIL,
+  GIT_COMMIT_AUTHOR_NAME
+} = require('./tags')
+
+const { normalizeRef } = require('./ci')
+
+function removeEmptyValues (tags) {
+  return Object.keys(tags).reduce((filteredTags, tag) => {
+    if (!tags[tag]) {
+      return filteredTags
+    }
+    return {
+      ...filteredTags,
+      [tag]: tags[tag]
+    }
+  }, {})
+}
+
+function getUserProviderGitMetadata () {
+  const {
+    DD_GIT_COMMIT_SHA,
+    DD_GIT_BRANCH,
+    DD_GIT_REPOSITORY_URL,
+    DD_GIT_TAG,
+    DD_GIT_COMMIT_MESSAGE,
+    DD_GIT_COMMIT_COMMITTER_NAME,
+    DD_GIT_COMMIT_COMMITTER_EMAIL,
+    DD_GIT_COMMIT_COMMITTER_DATE,
+    DD_GIT_COMMIT_AUTHOR_NAME,
+    DD_GIT_COMMIT_AUTHOR_EMAIL,
+    DD_GIT_COMMIT_AUTHOR_DATE
+  } = process.env
+
+  let branch = normalizeRef(DD_GIT_BRANCH)
+  let tag = normalizeRef(DD_GIT_TAG)
+
+  if (DD_GIT_TAG) {
+    branch = undefined
+  }
+
+  // if DD_GIT_BRANCH is a tag, we associate its value to TAG instead of BRANCH
+  if ((DD_GIT_BRANCH || '').includes('origin/tags') || (DD_GIT_BRANCH || '').includes('refs/heads/tags')) {
+    branch = undefined
+    tag = normalizeRef(DD_GIT_BRANCH)
+  }
+
+  return removeEmptyValues({
+    [GIT_COMMIT_SHA]: DD_GIT_COMMIT_SHA,
+    [GIT_BRANCH]: branch,
+    [GIT_REPOSITORY_URL]: DD_GIT_REPOSITORY_URL,
+    [GIT_TAG]: tag,
+    [GIT_COMMIT_MESSAGE]: DD_GIT_COMMIT_MESSAGE,
+    [GIT_COMMIT_COMMITTER_NAME]: DD_GIT_COMMIT_COMMITTER_NAME,
+    [GIT_COMMIT_COMMITTER_DATE]: DD_GIT_COMMIT_COMMITTER_DATE,
+    [GIT_COMMIT_COMMITTER_EMAIL]: DD_GIT_COMMIT_COMMITTER_EMAIL,
+    [GIT_COMMIT_AUTHOR_NAME]: DD_GIT_COMMIT_AUTHOR_NAME,
+    [GIT_COMMIT_AUTHOR_EMAIL]: DD_GIT_COMMIT_AUTHOR_EMAIL,
+    [GIT_COMMIT_AUTHOR_DATE]: DD_GIT_COMMIT_AUTHOR_DATE
+  })
+}
+
+module.exports = { getUserProviderGitMetadata }

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

@@ -33,12 +33,8 @@ class PrioritySampler {
   }
 
   isSampled (span) {
-    const context = this._getContext(span)
-    const rule = this._findRule(context)
-
-    return rule
-      ? this._isSampledByRule(context, rule) && this._isSampledByRateLimit(context)
-      : this._isSampledByAgent(context)
+    const priority = this._getPriorityFromAuto(span)
+    return priority === USER_KEEP || priority === AUTO_KEEP
   }
 
   sample (span, auto = true) {
@@ -50,7 +46,7 @@ class PrioritySampler {
     if (context._sampling.priority !== undefined) return
     if (!root) return // noop span
 
-    const tag = this._getPriority(context._tags)
+    const tag = this._getPriorityFromTags(context._tags)
 
     if (this.validate(tag)) {
       context._sampling.priority = tag
@@ -58,7 +54,7 @@ class PrioritySampler {
     }
 
     if (auto) {
-      context._sampling.priority = this.isSampled(root) ? AUTO_KEEP : AUTO_REJECT
+      context._sampling.priority = this._getPriorityFromAuto(root)
     }
   }
 
@@ -93,7 +89,16 @@ class PrioritySampler {
     return typeof span.context === 'function' ? span.context() : span
   }
 
-  _getPriority (tags) {
+  _getPriorityFromAuto (span) {
+    const context = this._getContext(span)
+    const rule = this._findRule(context)
+
+    return rule
+      ? this._getPriorityByRule(context, rule)
+      : this._getPriorityByAgent(context)
+  }
+
+  _getPriorityFromTags (tags) {
     if (tags.hasOwnProperty(MANUAL_KEEP) && tags[MANUAL_KEEP] !== false) {
       return USER_KEEP
     } else if (tags.hasOwnProperty(MANUAL_DROP) && tags[MANUAL_DROP] !== false) {
@@ -109,10 +114,10 @@ class PrioritySampler {
     }
   }
 
-  _isSampledByRule (context, rule) {
+  _getPriorityByRule (context, rule) {
     context._trace[SAMPLING_RULE_DECISION] = rule.sampleRate
 
-    return rule.sampler.isSampled(context)
+    return rule.sampler.isSampled(context) && this._isSampledByRateLimit(context) ? USER_KEEP : USER_REJECT
   }
 
   _isSampledByRateLimit (context) {
@@ -123,13 +128,13 @@ class PrioritySampler {
     return allowed
   }
 
-  _isSampledByAgent (context) {
+  _getPriorityByAgent (context) {
     const key = `service:${context._tags[SERVICE_NAME]},env:${this._env}`
     const sampler = this._samplers[key] || this._samplers[DEFAULT_KEY]
 
     context._trace[SAMPLING_AGENT_DECISION] = sampler.rate()
 
-    return sampler.isSampled(context)
+    return sampler.isSampled(context) ? AUTO_KEEP : AUTO_REJECT
   }
 
   _normalizeRules (rules, sampleRate) {
@@ -151,9 +156,9 @@ class PrioritySampler {
     const service = context._tags['service.name']
 
     if (rule.name instanceof RegExp && !rule.name.test(name)) return false
-    if (rule.name && rule.name !== name) return false
+    if (typeof rule.name === 'string' && rule.name !== name) return false
     if (rule.service instanceof RegExp && !rule.service.test(service)) return false
-    if (rule.service && rule.service !== service) return false
+    if (typeof rule.service === 'string' && rule.service !== service) return false
 
     return true
   }

package/packages/dd-trace/src/profiling/exporters/agent.js

@@ -40,7 +40,7 @@ function computeRetries (uploadTimeout) {
     tries++
     uploadTimeout /= 2
   }
-  return [tries, uploadTimeout]
+  return [tries, Math.floor(uploadTimeout)]
 }
 
 class AgentExporter {
@@ -131,7 +131,7 @@ class AgentExporter {
       })
 
       operation.attempt((attempt) => {
-        const timeout = Math.pow(this._backoffTime, attempt)
+        const timeout = this._backoffTime * Math.pow(2, attempt)
         sendRequest({ ...options, timeout }, form, (err, response) => {
           if (operation.retry(err)) {
             this._logger.error(`Error from the agent: ${err.message}`)
@@ -159,4 +159,4 @@ class AgentExporter {
   }
 }
 
-module.exports = { AgentExporter }
+module.exports = { AgentExporter, computeRetries }

package/packages/dd-trace/src/plugins/util/ci-app-spec.json

@@ -1,35 +0,0 @@
-[
-  "test.type",
-  "test.status",
-  "test.framework",
-  "test.suite",
-  "test.name",
-  "test.skip_reason",
-  "ci.pipeline.id",
-  "ci.pipeline.name",
-  "ci.pipeline.number",
-  "ci.pipeline.url",
-  "ci.provider.name",
-  "ci.workspace_path",
-  "git.repository_url",
-  "ci.job.url",
-  "ci.job.name",
-  "ci.stage.name",
-  "git.commit.sha",
-  "git.branch",
-  "git.tag",
-  "git.commit.message",
-  "git.commit.committer.date",
-  "git.commit.committer.email",
-  "git.commit.committer.name",
-  "git.commit.author.date",
-  "git.commit.author.email",
-  "git.commit.author.name",
-  "os.platform",
-  "os.version",
-  "os.architecture",
-  "runtime.name",
-  "runtime.version",
-  "test.parameters",
-  "_dd.origin"
-]