dd-trace 3.12.1 → 3.15.0

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

@@ -122,7 +122,7 @@ module.exports = {
         [CI_ENV_VARS]: JSON.stringify({ DD_CUSTOM_TRACE_ID })
       }
 
-      const isTag = JENKINS_GIT_BRANCH && JENKINS_GIT_BRANCH.includes('tags')
+      const isTag = JENKINS_GIT_BRANCH && JENKINS_GIT_BRANCH.includes('tags/')
       const refKey = isTag ? GIT_TAG : GIT_BRANCH
       const ref = normalizeRef(JENKINS_GIT_BRANCH)
 
@@ -216,7 +216,8 @@ module.exports = {
         [GIT_REPOSITORY_URL]: CIRCLE_REPOSITORY_URL,
         [CI_JOB_URL]: CIRCLE_BUILD_URL,
         [CI_WORKSPACE_PATH]: CIRCLE_WORKING_DIRECTORY,
-        [CIRCLE_TAG ? GIT_TAG : GIT_BRANCH]: CIRCLE_TAG || CIRCLE_BRANCH,
+        [GIT_TAG]: CIRCLE_TAG,
+        [GIT_BRANCH]: CIRCLE_BRANCH,
         [CI_ENV_VARS]: JSON.stringify({
           CIRCLE_WORKFLOW_ID,
           CIRCLE_BUILD_NUM
@@ -249,7 +250,7 @@ module.exports = {
       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
+      const refKey = ref.includes('tags/') ? GIT_TAG : GIT_BRANCH
 
       tags = {
         [CI_PIPELINE_ID]: GITHUB_RUN_ID,
@@ -305,13 +306,12 @@ module.exports = {
       }
 
       if (APPVEYOR_REPO_PROVIDER === 'github') {
-        const refKey = APPVEYOR_REPO_TAG_NAME ? GIT_TAG : GIT_BRANCH
-        const ref = APPVEYOR_REPO_TAG_NAME || APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH || APPVEYOR_REPO_BRANCH
         tags = {
           ...tags,
           [GIT_REPOSITORY_URL]: `https://github.com/${APPVEYOR_REPO_NAME}.git`,
           [GIT_COMMIT_SHA]: APPVEYOR_REPO_COMMIT,
-          [refKey]: ref
+          [GIT_TAG]: APPVEYOR_REPO_TAG_NAME,
+          [GIT_BRANCH]: APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH || APPVEYOR_REPO_BRANCH
         }
       }
     }
@@ -340,7 +340,7 @@ module.exports = {
       } = 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',
@@ -419,10 +419,6 @@ module.exports = {
         BITRISE_GIT_MESSAGE
       } = env
 
-      const isTag = !!BITRISE_GIT_TAG
-      const refKey = isTag ? GIT_TAG : GIT_BRANCH
-      const ref = BITRISE_GIT_TAG || BITRISEIO_GIT_BRANCH_DEST || BITRISE_GIT_BRANCH
-
       tags = {
         [CI_PROVIDER_NAME]: 'bitrise',
         [CI_PIPELINE_ID]: BITRISE_BUILD_SLUG,
@@ -432,7 +428,8 @@ module.exports = {
         [GIT_COMMIT_SHA]: BITRISE_GIT_COMMIT || GIT_CLONE_COMMIT_HASH,
         [GIT_REPOSITORY_URL]: BITRISE_GIT_REPOSITORY_URL,
         [CI_WORKSPACE_PATH]: BITRISE_SOURCE_DIR,
-        [refKey]: ref,
+        [GIT_TAG]: BITRISE_GIT_TAG,
+        [GIT_BRANCH]: BITRISEIO_GIT_BRANCH_DEST || BITRISE_GIT_BRANCH,
         [GIT_COMMIT_MESSAGE]: BITRISE_GIT_MESSAGE
       }
     }
@@ -454,9 +451,6 @@ module.exports = {
         BUILDKITE_MESSAGE
       } = env
 
-      const ref = BUILDKITE_TAG || BUILDKITE_BRANCH
-      const refKey = BUILDKITE_TAG ? GIT_TAG : GIT_BRANCH
-
       tags = {
         [CI_PROVIDER_NAME]: 'buildkite',
         [CI_PIPELINE_ID]: BUILDKITE_BUILD_ID,
@@ -467,7 +461,8 @@ module.exports = {
         [GIT_COMMIT_SHA]: BUILDKITE_COMMIT,
         [CI_WORKSPACE_PATH]: BUILDKITE_BUILD_CHECKOUT_PATH,
         [GIT_REPOSITORY_URL]: BUILDKITE_REPO,
-        [refKey]: ref,
+        [GIT_TAG]: BUILDKITE_TAG,
+        [GIT_BRANCH]: BUILDKITE_BRANCH,
         [GIT_COMMIT_AUTHOR_NAME]: BUILDKITE_BUILD_AUTHOR,
         [GIT_COMMIT_AUTHOR_EMAIL]: BUILDKITE_BUILD_AUTHOR_EMAIL,
         [GIT_COMMIT_MESSAGE]: BUILDKITE_MESSAGE,
@@ -493,10 +488,6 @@ module.exports = {
         TRAVIS_COMMIT_MESSAGE
       } = env
 
-      const isTag = !!TRAVIS_TAG
-      const ref = TRAVIS_TAG || TRAVIS_PULL_REQUEST_BRANCH || TRAVIS_BRANCH
-      const refKey = isTag ? GIT_TAG : GIT_BRANCH
-
       tags = {
         [CI_PROVIDER_NAME]: 'travisci',
         [CI_JOB_URL]: TRAVIS_JOB_WEB_URL,
@@ -507,7 +498,8 @@ module.exports = {
         [GIT_COMMIT_SHA]: TRAVIS_COMMIT,
         [GIT_REPOSITORY_URL]: `https://github.com/${TRAVIS_REPO_SLUG}.git`,
         [CI_WORKSPACE_PATH]: TRAVIS_BUILD_DIR,
-        [refKey]: ref,
+        [GIT_TAG]: TRAVIS_TAG,
+        [GIT_BRANCH]: TRAVIS_PULL_REQUEST_BRANCH || TRAVIS_BRANCH,
         [GIT_COMMIT_MESSAGE]: TRAVIS_COMMIT_MESSAGE
       }
     }

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

@@ -1,8 +1,8 @@
-const { execSync } = require('child_process')
+const cp = require('child_process')
 
 const sanitizedExec = (cmd, options = {}) => {
   try {
-    return execSync(cmd, options).toString().replace(/(\r\n|\n|\r)/gm, '')
+    return cp.execSync(cmd, options).toString().replace(/(\r\n|\n|\r)/gm, '')
   } catch (e) {
     return ''
   }

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

@@ -21,6 +21,19 @@ const {
 
 const GIT_REV_LIST_MAX_BUFFER = 8 * 1024 * 1024 // 8MB
 
+function isShallowRepository () {
+  return sanitizedExec('git rev-parse --is-shallow-repository', { stdio: 'pipe' }) === 'true'
+}
+
+function unshallowRepository () {
+  try {
+    execSync('git config remote.origin.partialclonefilter "blob:none"', { stdio: 'pipe' })
+    execSync('git fetch --shallow-since="1 month ago" --update-shallow --refetch', { stdio: 'pipe' })
+  } catch (err) {
+    log.error(err)
+  }
+}
+
 function getRepositoryUrl () {
   return sanitizedExec('git config --get remote.origin.url', { stdio: 'pipe' })
 }
@@ -146,5 +159,7 @@ module.exports = {
   getRepositoryUrl,
   generatePackFilesForCommits,
   getCommitsToUpload,
-  GIT_REV_LIST_MAX_BUFFER
+  GIT_REV_LIST_MAX_BUFFER,
+  isShallowRepository,
+  unshallowRepository
 }

package/packages/dd-trace/src/{appsec → plugins/util}/ip_extractor.js

@@ -2,7 +2,7 @@
 
 const BlockList = require('./ip_blocklist')
 const net = require('net')
-const log = require('../log')
+const log = require('../../log')
 
 const ipHeaderList = [
   'x-forwarded-for',

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

@@ -38,7 +38,9 @@ const TEST_CODE_OWNERS = 'test.codeowners'
 const TEST_SOURCE_FILE = 'test.source.file'
 const LIBRARY_VERSION = 'library_version'
 const TEST_COMMAND = 'test.command'
+const TEST_BUNDLE = 'test.bundle'
 const TEST_SESSION_ID = 'test_session_id'
+const TEST_MODULE_ID = 'test_module_id'
 const TEST_SUITE_ID = 'test_suite_id'
 
 const CI_APP_ORIGIN = 'ciapp-test'
@@ -48,6 +50,8 @@ const JEST_TEST_RUNNER = 'test.jest.test_runner'
 const TEST_ITR_TESTS_SKIPPED = '_dd.ci.itr.tests_skipped'
 const TEST_SESSION_ITR_SKIPPING_ENABLED = 'test_session.itr.tests_skipping.enabled'
 const TEST_SESSION_CODE_COVERAGE_ENABLED = 'test_session.code_coverage.enabled'
+const TEST_MODULE_ITR_SKIPPING_ENABLED = 'test_module.itr.tests_skipping.enabled'
+const TEST_MODULE_CODE_COVERAGE_ENABLED = 'test_module.code_coverage.enabled'
 
 const TEST_CODE_COVERAGE_LINES_TOTAL = 'test.codecov_lines_total'
 
@@ -75,14 +79,20 @@ module.exports = {
   getCodeOwnersForFilename,
   getTestCommonTags,
   getTestSessionCommonTags,
+  getTestModuleCommonTags,
   getTestSuiteCommonTags,
   TEST_COMMAND,
   TEST_SESSION_ID,
+  TEST_MODULE_ID,
   TEST_SUITE_ID,
   TEST_ITR_TESTS_SKIPPED,
+  TEST_BUNDLE,
   TEST_SESSION_ITR_SKIPPING_ENABLED,
   TEST_SESSION_CODE_COVERAGE_ENABLED,
+  TEST_MODULE_ITR_SKIPPING_ENABLED,
+  TEST_MODULE_CODE_COVERAGE_ENABLED,
   TEST_CODE_COVERAGE_LINES_TOTAL,
+  addIntelligentTestRunnerSpanTags,
   getCoveredFilenamesFromCoverage,
   resetCoverage,
   mergeCoverage,
@@ -242,26 +252,59 @@ function getCodeOwnersForFilename (filename, entries) {
   return null
 }
 
-function getTestSessionCommonTags (command, version) {
+function getTestLevelCommonTags (command, testFrameworkVersion) {
+  return {
+    [TEST_FRAMEWORK_VERSION]: testFrameworkVersion,
+    [LIBRARY_VERSION]: ddTraceVersion,
+    [TEST_COMMAND]: command,
+    [TEST_TYPE]: 'test'
+  }
+}
+
+function getTestSessionCommonTags (command, testFrameworkVersion) {
   return {
     [SPAN_TYPE]: 'test_session_end',
-    [TEST_TYPE]: 'test',
     [RESOURCE_NAME]: `test_session.${command}`,
-    [TEST_FRAMEWORK_VERSION]: version,
-    [LIBRARY_VERSION]: ddTraceVersion,
-    [TEST_COMMAND]: command
+    ...getTestLevelCommonTags(command, testFrameworkVersion)
+  }
+}
+
+function getTestModuleCommonTags (command, testFrameworkVersion) {
+  return {
+    [SPAN_TYPE]: 'test_module_end',
+    [RESOURCE_NAME]: `test_module.${command}`,
+    [TEST_BUNDLE]: command,
+    ...getTestLevelCommonTags(command, testFrameworkVersion)
   }
 }
 
-function getTestSuiteCommonTags (command, version, testSuite) {
+function getTestSuiteCommonTags (command, testFrameworkVersion, testSuite) {
   return {
     [SPAN_TYPE]: 'test_suite_end',
-    [TEST_TYPE]: 'test',
     [RESOURCE_NAME]: `test_suite.${testSuite}`,
-    [TEST_FRAMEWORK_VERSION]: version,
-    [LIBRARY_VERSION]: ddTraceVersion,
+    [TEST_BUNDLE]: command,
     [TEST_SUITE]: testSuite,
-    [TEST_COMMAND]: command
+    ...getTestLevelCommonTags(command, testFrameworkVersion)
+  }
+}
+
+function addIntelligentTestRunnerSpanTags (
+  testSessionSpan,
+  testModuleSpan,
+  { isSuitesSkipped, isSuitesSkippingEnabled, isCodeCoverageEnabled, testCodeCoverageLinesTotal }
+) {
+  testSessionSpan.setTag(TEST_ITR_TESTS_SKIPPED, isSuitesSkipped ? 'true' : 'false')
+  testSessionSpan.setTag(TEST_SESSION_ITR_SKIPPING_ENABLED, isSuitesSkippingEnabled ? 'true' : 'false')
+  testSessionSpan.setTag(TEST_SESSION_CODE_COVERAGE_ENABLED, isCodeCoverageEnabled ? 'true' : 'false')
+
+  testModuleSpan.setTag(TEST_ITR_TESTS_SKIPPED, isSuitesSkipped ? 'true' : 'false')
+  testModuleSpan.setTag(TEST_MODULE_ITR_SKIPPING_ENABLED, isSuitesSkippingEnabled ? 'true' : 'false')
+  testModuleSpan.setTag(TEST_MODULE_CODE_COVERAGE_ENABLED, isCodeCoverageEnabled ? 'true' : 'false')
+
+  // If suites have been skipped we don't want to report the total coverage, as it will be wrong
+  if (testCodeCoverageLinesTotal !== undefined && !isSuitesSkipped) {
+    testSessionSpan.setTag(TEST_CODE_COVERAGE_LINES_TOTAL, testCodeCoverageLinesTotal)
+    testModuleSpan.setTag(TEST_CODE_COVERAGE_LINES_TOTAL, testCodeCoverageLinesTotal)
   }
 }
 

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

@@ -54,16 +54,11 @@ function getUserProviderGitMetadata () {
     DD_GIT_COMMIT_AUTHOR_DATE
   } = process.env
 
-  let branch = normalizeRef(DD_GIT_BRANCH)
+  const 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 is a tag, we associate its value to TAG too
   if ((DD_GIT_BRANCH || '').includes('origin/tags') || (DD_GIT_BRANCH || '').includes('refs/heads/tags')) {
-    branch = undefined
     tag = normalizeRef(DD_GIT_BRANCH)
   }
 

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

@@ -8,6 +8,7 @@ const tags = require('../../../../../ext/tags')
 const types = require('../../../../../ext/types')
 const kinds = require('../../../../../ext/kinds')
 const urlFilter = require('./urlfilter')
+const { extractIp } = require('./ip_extractor')
 const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../constants')
 
 const WEB = types.WEB
@@ -24,6 +25,7 @@ const HTTP_ROUTE = tags.HTTP_ROUTE
 const HTTP_REQUEST_HEADERS = tags.HTTP_REQUEST_HEADERS
 const HTTP_RESPONSE_HEADERS = tags.HTTP_RESPONSE_HEADERS
 const HTTP_USERAGENT = tags.HTTP_USERAGENT
+const HTTP_CLIENT_IP = tags.HTTP_CLIENT_IP
 const MANUAL_DROP = tags.MANUAL_DROP
 
 const HTTP2_HEADER_AUTHORITY = ':authority'
@@ -432,6 +434,15 @@ function addRequestTags (context) {
     [HTTP_USERAGENT]: req.headers['user-agent']
   })
 
+  // if client ip has already been set by appsec, no need to run it again
+  if (config.clientIpEnabled && !span.context()._tags.hasOwnProperty(HTTP_CLIENT_IP)) {
+    const clientIp = extractIp(config, req)
+
+    if (clientIp) {
+      span.setTag(HTTP_CLIENT_IP, clientIp)
+    }
+  }
+
   addHeaders(context)
 }
 

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

@@ -3,6 +3,9 @@
 const log = require('./log')
 const { profiler } = require('./profiling')
 
+// Stop profiler upon exit in order to collect and export the current profile
+process.once('beforeExit', () => { profiler.stop() })
+
 module.exports = {
   start: config => {
     const { service, version, env, url, hostname, port, tags } = config

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

@@ -23,7 +23,9 @@ const {
   DD_AGENT_HOST,
   DD_TRACE_AGENT_PORT,
   DD_PROFILING_UPLOAD_TIMEOUT,
-  DD_PROFILING_SOURCE_MAP
+  DD_PROFILING_SOURCE_MAP,
+  DD_PROFILING_UPLOAD_PERIOD,
+  DD_PROFILING_PPROF_PREFIX
 } = process.env
 
 class Config {
@@ -35,13 +37,15 @@ class Config {
     const version = coalesce(options.version, DD_VERSION)
     const functionname = process.env.AWS_LAMBDA_FUNCTION_NAME
     // Must be longer than one minute so pad with five seconds
-    const flushInterval = coalesce(options.interval, 65 * 1000)
+    const flushInterval = coalesce(options.interval, Number(DD_PROFILING_UPLOAD_PERIOD) * 1000, 65 * 1000)
     const uploadTimeout = coalesce(options.uploadTimeout,
-      DD_PROFILING_UPLOAD_TIMEOUT, 60 * 1000)
+      Number(DD_PROFILING_UPLOAD_TIMEOUT), 60 * 1000)
     const sourceMap = coalesce(options.sourceMap,
       DD_PROFILING_SOURCE_MAP, true)
     const endpointCollection = coalesce(options.endpointCollection,
       DD_PROFILING_ENDPOINT_COLLECTION_ENABLED, false)
+    const pprofPrefix = coalesce(options.pprofPrefix,
+      DD_PROFILING_PPROF_PREFIX)
 
     this.enabled = String(enabled) !== 'false'
     this.service = service
@@ -60,6 +64,7 @@ class Config {
     this.uploadTimeout = uploadTimeout
     this.sourceMap = sourceMap
     this.endpointCollection = endpointCollection
+    this.pprofPrefix = pprofPrefix
 
     const hostname = coalesce(options.hostname, DD_AGENT_HOST) || 'localhost'
     const port = coalesce(options.port, DD_TRACE_AGENT_PORT) || 8126

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

@@ -4,11 +4,22 @@ const fs = require('fs')
 const { promisify } = require('util')
 const writeFile = promisify(fs.writeFile)
 
+function formatDateTime (t) {
+  const pad = (n) => String(n).padStart(2, '0')
+  return `${t.getUTCFullYear()}${pad(t.getUTCMonth() + 1)}${pad(t.getUTCDate())}` +
+         `T${pad(t.getUTCHours())}${pad(t.getUTCMinutes())}${pad(t.getUTCSeconds())}Z`
+}
+
 class FileExporter {
-  export ({ profiles }) {
+  constructor ({ pprofPrefix } = {}) {
+    this._pprofPrefix = pprofPrefix || ''
+  }
+
+  export ({ profiles, end }) {
     const types = Object.keys(profiles)
+    const dateStr = formatDateTime(end)
     const tasks = types.map(type => {
-      return writeFile(`${type}.pb.gz`, profiles[type])
+      return writeFile(`${this._pprofPrefix}${type}_${dateStr}.pprof`, profiles[type])
     })
 
     return Promise.all(tasks)

package/packages/dd-trace/src/profiling/profiler.js

@@ -56,7 +56,7 @@ class Profiler extends EventEmitter {
       this._capture(this._timeoutInterval)
     } catch (e) {
       this._logger.error(e)
-      this.stop()
+      this._stop()
     }
   }
 
@@ -64,7 +64,16 @@ class Profiler extends EventEmitter {
     this._timeoutInterval = this._config.flushInterval
   }
 
-  stop () {
+  async stop () {
+    if (!this._enabled) return
+
+    // collect and export current profiles
+    // once collect returns, profilers can be safely stopped
+    this._collect()
+    this._stop()
+  }
+
+  _stop () {
     if (!this._enabled) return
 
     this._enabled = false
@@ -92,16 +101,24 @@ class Profiler extends EventEmitter {
   }
 
   async _collect () {
+    if (!this._enabled) return
+
     const start = this._lastStart
     const end = new Date()
-    const profiles = {}
+    const profiles = []
+    const encodedProfiles = {}
 
     try {
+      // collect profiles synchronously so that profilers can be safely stopped asynchronously
       for (const profiler of this._config.profilers) {
         const profile = profiler.profile()
         if (!profile) continue
+        profiles.push({ profiler, profile })
+      }
 
-        profiles[profiler.type] = await profiler.encode(profile)
+      // encode and export asynchronously
+      for (const { profiler, profile } of profiles) {
+        encodedProfiles[profiler.type] = await profiler.encode(profile)
         this._logger.debug(() => {
           const profileJson = JSON.stringify(profile, (key, value) => {
             return typeof value === 'bigint' ? value.toString() : value
@@ -111,11 +128,11 @@ class Profiler extends EventEmitter {
       }
 
       this._capture(this._timeoutInterval)
-      await this._submit(profiles, start, end)
+      await this._submit(encodedProfiles, start, end)
       this._logger.debug('Submitted profiles')
     } catch (err) {
       this._logger.error(err)
-      this.stop()
+      this._stop()
     }
   }
 

package/packages/dd-trace/src/profiling/profilers/wall.js

@@ -35,6 +35,7 @@ class NativeWallProfiler {
   stop () {
     if (!this._stop) return
     this._stop()
+    this._stop = undefined
   }
 
   _record () {

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

@@ -8,6 +8,7 @@ const { setStartupLogPluginManager } = require('./startup-log')
 const telemetry = require('./telemetry')
 const PluginManager = require('./plugin_manager')
 const remoteConfig = require('./appsec/remote_config')
+const AppsecSdk = require('./appsec/sdk')
 
 class Tracer extends NoopProxy {
   constructor () {
@@ -50,6 +51,7 @@ class Tracer extends NoopProxy {
         }
 
         this._tracer = new DatadogTracer(config)
+        this.appsec = new AppsecSdk(this._tracer, config)
 
         if (config.iast.enabled) {
           require('./appsec/iast').enable(config, this._tracer)

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

@@ -17,7 +17,7 @@ class SpanProcessor {
     this._killAll = false
 
     this._stats = new SpanStatsProcessor(config)
-    this._spanSampler = new SpanSampler(config)
+    this._spanSampler = new SpanSampler(config.sampler)
   }
 
   process (span) {

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

@@ -2,76 +2,92 @@
 const { globMatch } = require('../src/util')
 const { USER_KEEP, AUTO_KEEP } = require('../../../ext').priority
 const RateLimiter = require('./rate_limiter')
+const Sampler = require('./sampler')
 
-class SpanSampler {
-  constructor ({ spanSamplingRules = [] }) {
-    this._rules = spanSamplingRules
-    this._limiters = {}
+class SpanSamplingRule {
+  constructor ({ service, name, sampleRate = 1.0, maxPerSecond } = {}) {
+    this.service = service
+    this.name = name
+
+    this._sampler = new Sampler(sampleRate)
+    this._limiter = undefined
+
+    if (Number.isFinite(maxPerSecond)) {
+      this._limiter = new RateLimiter(maxPerSecond)
+    }
   }
 
-  sample (spanContext) {
-    const decision = spanContext._sampling.priority
-    if (decision === USER_KEEP || decision === AUTO_KEEP) return
+  get sampleRate () {
+    return this._sampler.rate()
+  }
 
-    const { started } = spanContext._trace
-    for (const span of started) {
-      const service = span.tracer()._service
-      const name = span._name
-      const rule = findRule(this._rules, service, name)
-      if (!rule) continue
+  get maxPerSecond () {
+    return this._limiter && this._limiter._rateLimit
+  }
 
-      const sampleRate = getSampleRate(rule.sampleRate)
-      const maxPerSecond = getMaxPerSecond(rule.maxPerSecond)
-      const sampled = sample(sampleRate)
-      if (!sampled) continue
+  static from (config) {
+    return new SpanSamplingRule(config)
+  }
 
-      const key = `${service}:${name}`
-      const limiter = getLimiter(this._limiters, key, maxPerSecond)
-      if (limiter.isAllowed()) {
-        span.context()._sampling.spanSampling = {
-          sampleRate,
-          maxPerSecond
-        }
-      }
+  match (service, name) {
+    if (this.service && !globMatch(this.service, service)) {
+      return false
     }
-  }
-}
 
-function findRule (rules, service, name) {
-  for (const rule of rules) {
-    const servicePattern = getService(rule.service)
-    const namePattern = getName(rule.name)
-    if (globMatch(servicePattern, service) && globMatch(namePattern, name)) {
-      return rule
+    if (this.name && !globMatch(this.name, name)) {
+      return false
     }
+
+    return true
   }
-}
 
-function getLimiter (list, key, maxPerSecond) {
-  if (typeof list[key] === 'undefined') {
-    list[key] = new RateLimiter(maxPerSecond)
+  sample () {
+    if (!this._sampler.isSampled()) {
+      return false
+    }
+
+    if (this._limiter) {
+      return this._limiter.isAllowed()
+    }
+
+    return true
   }
-  return list[key]
 }
 
-function sample (sampleRate) {
-  return Math.random() < sampleRate
-}
+class SpanSampler {
+  constructor ({ spanSamplingRules = [] } = {}) {
+    this._rules = spanSamplingRules.map(SpanSamplingRule.from)
+  }
 
-function getService (service) {
-  return service || '*'
-}
+  findRule (service, name) {
+    for (const rule of this._rules) {
+      if (rule.match(service, name)) {
+        return rule
+      }
+    }
+  }
 
-function getName (name) {
-  return name || '*'
-}
+  sample (spanContext) {
+    const decision = spanContext._sampling.priority
+    if (decision === USER_KEEP || decision === AUTO_KEEP) return
 
-function getSampleRate (sampleRate) {
-  return sampleRate || 1.0
-}
+    const { started } = spanContext._trace
+    for (const span of started) {
+      const tags = span.context()._tags || {}
+      const name = span._name
+      const service = tags.service ||
+        tags['service.name'] ||
+        span.tracer()._service
 
-function getMaxPerSecond (maxPerSecond) {
-  return maxPerSecond || Infinity
+      const rule = this.findRule(service, name)
+      if (rule && rule.sample()) {
+        span.context()._sampling.spanSampling = {
+          sampleRate: rule.sampleRate,
+          maxPerSecond: rule.maxPerSecond
+        }
+      }
+    }
+  }
 }
 
 module.exports = SpanSampler

package/packages/dd-trace/src/startup-log.js

@@ -1,14 +1,11 @@
 'use strict'
 
-const mainLogger = require('./log')
+const { info, warn } = require('./log/writer')
 
 const os = require('os')
 const { inspect } = require('util')
 const tracerVersion = require('../../../package.json').version
 
-const logger = Object.create(mainLogger)
-logger._enabled = true
-
 let config
 let pluginManager
 let samplingRules = []
@@ -89,9 +86,9 @@ function startupLog ({ agentError } = {}) {
   // out.service_mapping
   // out.service_mapping_error
 
-  logger.info('DATADOG TRACER CONFIGURATION - ' + out)
+  info('DATADOG TRACER CONFIGURATION - ' + out)
   if (agentError) {
-    logger.warn('DATADOG TRACER DIAGNOSTIC - Agent Error: ' + agentError.message)
+    warn('DATADOG TRACER DIAGNOSTIC - Agent Error: ' + agentError.message)
   }
 
   config = undefined