dd-trace 3.3.1 → 3.12.1

package/packages/dd-trace/src/plugins/tracing.js

@@ -0,0 +1,94 @@
+'use strict'
+
+const Plugin = require('./plugin')
+const { storage } = require('../../../datadog-core')
+const analyticsSampler = require('../analytics_sampler')
+const { COMPONENT } = require('../constants')
+
+class TracingPlugin extends Plugin {
+  constructor (...args) {
+    super(...args)
+
+    this.component = this.constructor.component || this.constructor.name
+    this.operation = this.constructor.operation
+
+    this.addTraceSub('start', message => {
+      this.start(message)
+    })
+
+    this.addTraceSub('error', err => {
+      this.error(err)
+    })
+
+    this.addTraceSub('finish', message => {
+      this.finish(message)
+    })
+  }
+
+  get activeSpan () {
+    const store = storage.getStore()
+
+    return store && store.span
+  }
+
+  configure (config) {
+    return super.configure({
+      ...config,
+      hooks: {
+        [this.operation]: () => {},
+        ...config.hooks
+      }
+    })
+  }
+
+  start () {} // implemented by individual plugins
+
+  finish () {
+    this.activeSpan.finish()
+  }
+
+  error (error) {
+    this.addError(error)
+  }
+
+  addTraceSub (eventName, handler) {
+    this.addSub(`apm:${this.component}:${this.operation}:${eventName}`, handler)
+  }
+
+  addError (error) {
+    const span = this.activeSpan
+
+    if (!span._spanContext._tags['error']) {
+      span.setTag('error', error || 1)
+    }
+  }
+
+  startSpan (name, { childOf, kind, meta, metrics, service, resource, type } = {}) {
+    const store = storage.getStore()
+
+    if (store && childOf === undefined) {
+      childOf = store.span
+    }
+
+    const span = this.tracer.startSpan(name, {
+      childOf,
+      tags: {
+        [COMPONENT]: this.component,
+        'service.name': service || this.tracer._service,
+        'resource.name': resource,
+        'span.kind': kind,
+        'span.type': type,
+        ...meta,
+        ...metrics
+      }
+    })
+
+    analyticsSampler.sample(span, this.config.measured)
+
+    storage.enterWith({ ...store, span })
+
+    return span
+  }
+}
+
+module.exports = TracingPlugin

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

@@ -18,7 +18,9 @@ const {
   CI_JOB_URL,
   CI_JOB_NAME,
   CI_STAGE_NAME,
-  CI_ENV_VARS
+  CI_ENV_VARS,
+  GIT_COMMIT_COMMITTER_NAME,
+  GIT_COMMIT_COMMITTER_EMAIL
 } = require('./tags')
 
 // Receives a string with the form 'John Doe <john.doe@gmail.com>'
@@ -233,7 +235,8 @@ module.exports = {
         GITHUB_SHA,
         GITHUB_REPOSITORY,
         GITHUB_SERVER_URL,
-        GITHUB_RUN_ATTEMPT
+        GITHUB_RUN_ATTEMPT,
+        GITHUB_JOB
       } = env
 
       const repositoryURL = `${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git`
@@ -257,6 +260,7 @@ module.exports = {
         [GIT_COMMIT_SHA]: GITHUB_SHA,
         [GIT_REPOSITORY_URL]: repositoryURL,
         [CI_JOB_URL]: jobUrl,
+        [CI_JOB_NAME]: GITHUB_JOB,
         [CI_WORKSPACE_PATH]: GITHUB_WORKSPACE,
         [refKey]: ref,
         [CI_ENV_VARS]: JSON.stringify({
@@ -281,6 +285,7 @@ module.exports = {
         APPVEYOR_REPO_TAG_NAME,
         APPVEYOR_REPO_COMMIT_AUTHOR,
         APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL,
+        APPVEYOR_REPO_COMMIT_MESSAGE,
         APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED
       } = env
 
@@ -296,7 +301,7 @@ module.exports = {
         [CI_WORKSPACE_PATH]: APPVEYOR_BUILD_FOLDER,
         [GIT_COMMIT_AUTHOR_NAME]: APPVEYOR_REPO_COMMIT_AUTHOR,
         [GIT_COMMIT_AUTHOR_EMAIL]: APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL,
-        [GIT_COMMIT_MESSAGE]: APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED
+        [GIT_COMMIT_MESSAGE]: APPVEYOR_REPO_COMMIT_MESSAGE + '\n' + APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED
       }
 
       if (APPVEYOR_REPO_PROVIDER === 'github') {
@@ -350,7 +355,8 @@ module.exports = {
         [GIT_COMMIT_AUTHOR_EMAIL]: BUILD_REQUESTEDFOREMAIL,
         [GIT_COMMIT_MESSAGE]: BUILD_SOURCEVERSIONMESSAGE,
         [CI_STAGE_NAME]: SYSTEM_STAGEDISPLAYNAME,
-        [CI_JOB_NAME]: SYSTEM_JOBDISPLAYNAME
+        [CI_JOB_NAME]: SYSTEM_JOBDISPLAYNAME,
+        [CI_ENV_VARS]: JSON.stringify({ SYSTEM_TEAMPROJECTID, BUILD_BUILDID, SYSTEM_JOBID })
       }
 
       if (SYSTEM_TEAMFOUNDATIONSERVERURI && SYSTEM_TEAMPROJECTID && BUILD_BUILDID) {
@@ -506,6 +512,36 @@ module.exports = {
       }
     }
 
+    if (env.BUDDY) {
+      const {
+        BUDDY_EXECUTION_BRANCH,
+        BUDDY_EXECUTION_ID,
+        BUDDY_EXECUTION_REVISION,
+        BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL,
+        BUDDY_EXECUTION_REVISION_COMMITTER_NAME,
+        BUDDY_EXECUTION_REVISION_MESSAGE,
+        BUDDY_EXECUTION_TAG,
+        BUDDY_EXECUTION_URL,
+        BUDDY_PIPELINE_ID,
+        BUDDY_PIPELINE_NAME,
+        BUDDY_SCM_URL
+      } = env
+      tags = {
+        [CI_PROVIDER_NAME]: 'buddy',
+        [CI_PIPELINE_ID]: `${BUDDY_PIPELINE_ID}/${BUDDY_EXECUTION_ID}`,
+        [CI_PIPELINE_NAME]: BUDDY_PIPELINE_NAME,
+        [CI_PIPELINE_NUMBER]: BUDDY_EXECUTION_ID,
+        [CI_PIPELINE_URL]: BUDDY_EXECUTION_URL,
+        [GIT_COMMIT_SHA]: BUDDY_EXECUTION_REVISION,
+        [GIT_REPOSITORY_URL]: BUDDY_SCM_URL,
+        [GIT_BRANCH]: BUDDY_EXECUTION_BRANCH,
+        [GIT_TAG]: BUDDY_EXECUTION_TAG,
+        [GIT_COMMIT_MESSAGE]: BUDDY_EXECUTION_REVISION_MESSAGE,
+        [GIT_COMMIT_COMMITTER_NAME]: BUDDY_EXECUTION_REVISION_COMMITTER_NAME,
+        [GIT_COMMIT_COMMITTER_EMAIL]: BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL
+      }
+    }
+
     normalizeTag(tags, CI_WORKSPACE_PATH, resolveTilde)
     normalizeTag(tags, GIT_REPOSITORY_URL, filterSensitiveInfoFromRepository)
     normalizeTag(tags, GIT_BRANCH, normalizeRef)

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

@@ -1,6 +1,8 @@
 const { execSync } = require('child_process')
 const os = require('os')
+const path = require('path')
 
+const log = require('../../log')
 const { sanitizedExec } = require('./exec')
 const {
   GIT_COMMIT_SHA,
@@ -17,15 +19,22 @@ const {
   CI_WORKSPACE_PATH
 } = require('./tags')
 
+const GIT_REV_LIST_MAX_BUFFER = 8 * 1024 * 1024 // 8MB
+
 function getRepositoryUrl () {
   return sanitizedExec('git config --get remote.origin.url', { stdio: 'pipe' })
 }
 
 function getLatestCommits () {
-  return execSync('git log --format=%H -n 1000 --since="1 month ago"', { stdio: 'pipe' })
-    .toString()
-    .split('\n')
-    .filter(commit => !!commit)
+  try {
+    return execSync('git log --format=%H -n 1000 --since="1 month ago"', { stdio: 'pipe' })
+      .toString()
+      .split('\n')
+      .filter(commit => commit)
+  } catch (err) {
+    log.error(err)
+    return []
+  }
 }
 
 function getCommitsToUpload (commitsToExclude) {
@@ -36,27 +45,57 @@ function getCommitsToUpload (commitsToExclude) {
     gitCommandToGetCommitsToUpload = `${gitCommandToGetCommitsToUpload} ^${commit}`
   })
 
-  return execSync(gitCommandToGetCommitsToUpload, { stdio: 'pipe' })
-    .toString()
-    .split('\n')
-    .filter(commit => !!commit)
+  try {
+    return execSync(gitCommandToGetCommitsToUpload, { stdio: 'pipe', maxBuffer: GIT_REV_LIST_MAX_BUFFER })
+      .toString()
+      .split('\n')
+      .filter(commit => commit)
+  } catch (err) {
+    log.error(err)
+    return []
+  }
 }
 
-// Generates pack files to upload and
-// returns the ordered list of packfiles' paths
 function generatePackFilesForCommits (commitsToUpload) {
   const tmpFolder = os.tmpdir()
 
-  const prefix = Math.floor(Math.random() * 10000)
-  const path = `${tmpFolder}/${prefix}`
+  const randomPrefix = String(Math.floor(Math.random() * 10000))
+  const temporaryPath = path.join(tmpFolder, randomPrefix)
+  const cwdPath = path.join(process.cwd(), randomPrefix)
 
-  const orderedCommits =
-    execSync(
-      `git pack-objects --compression=9 --max-pack-size=3m ${path}`,
+  // Generates pack files to upload and
+  // returns the ordered list of packfiles' paths
+  function execGitPackObjects (targetPath) {
+    return execSync(
+      `git pack-objects --compression=9 --max-pack-size=3m ${targetPath}`,
       { input: commitsToUpload.join('\n') }
-    ).toString().split('\n').filter(commit => !!commit)
+    ).toString().split('\n').filter(commit => commit).map(commit => `${targetPath}-${commit}.pack`)
+  }
+
+  try {
+    return execGitPackObjects(temporaryPath, commitsToUpload)
+  } catch (err) {
+    log.error(err)
+    /**
+     * The generation of pack files in the temporary folder (from `os.tmpdir()`)
+     * sometimes fails in certain CI setups with the error message
+     * `unable to rename temporary pack file: Invalid cross-device link`.
+     * The reason why is unclear.
+     *
+     * A workaround is to attempt to generate the pack files in `process.cwd()`.
+     * While this works most of the times, it's not ideal since it affects the git status.
+     * This workaround is intended to be temporary.
+     *
+     * TODO: fix issue and remove workaround.
+     */
+    try {
+      return execGitPackObjects(cwdPath, commitsToUpload)
+    } catch (err) {
+      log.error(err)
+    }
 
-  return orderedCommits.map(commit => `${path}-${commit}.pack`)
+    return []
+  }
 }
 
 // If there is ciMetadata, it takes precedence.
@@ -106,5 +145,6 @@ module.exports = {
   getLatestCommits,
   getRepositoryUrl,
   generatePackFilesForCommits,
-  getCommitsToUpload
+  getCommitsToUpload,
+  GIT_REV_LIST_MAX_BUFFER
 }

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

@@ -1,6 +1,7 @@
 const path = require('path')
 const fs = require('fs')
 
+const istanbul = require('istanbul-lib-coverage')
 const ignore = require('ignore')
 
 const { getGitMetadata } = require('./git')
@@ -40,14 +41,16 @@ const TEST_COMMAND = 'test.command'
 const TEST_SESSION_ID = 'test_session_id'
 const TEST_SUITE_ID = 'test_suite_id'
 
-const ERROR_TYPE = 'error.type'
-const ERROR_MESSAGE = 'error.msg'
-const ERROR_STACK = 'error.stack'
-
 const CI_APP_ORIGIN = 'ciapp-test'
 
 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_CODE_COVERAGE_LINES_TOTAL = 'test.codecov_lines_total'
+
 module.exports = {
   TEST_CODE_OWNERS,
   TEST_FRAMEWORK,
@@ -61,9 +64,6 @@ module.exports = {
   TEST_SKIP_REASON,
   TEST_IS_RUM_ACTIVE,
   TEST_SOURCE_FILE,
-  ERROR_TYPE,
-  ERROR_MESSAGE,
-  ERROR_STACK,
   CI_APP_ORIGIN,
   LIBRARY_VERSION,
   getTestEnvironmentMetadata,
@@ -78,7 +78,15 @@ module.exports = {
   getTestSuiteCommonTags,
   TEST_COMMAND,
   TEST_SESSION_ID,
-  TEST_SUITE_ID
+  TEST_SUITE_ID,
+  TEST_ITR_TESTS_SKIPPED,
+  TEST_SESSION_ITR_SKIPPING_ENABLED,
+  TEST_SESSION_CODE_COVERAGE_ENABLED,
+  TEST_CODE_COVERAGE_LINES_TOTAL,
+  getCoveredFilenamesFromCoverage,
+  resetCoverage,
+  mergeCoverage,
+  fromCoverageMapToCoverage
 }
 
 function getTestEnvironmentMetadata (testFramework, config) {
@@ -256,3 +264,58 @@ function getTestSuiteCommonTags (command, version, testSuite) {
     [TEST_COMMAND]: command
   }
 }
+
+function getCoveredFilenamesFromCoverage (coverage) {
+  const coverageMap = istanbul.createCoverageMap(coverage)
+
+  return coverageMap
+    .files()
+    .filter(filename => {
+      const fileCoverage = coverageMap.fileCoverageFor(filename)
+      const lineCoverage = fileCoverage.getLineCoverage()
+      const isAnyLineExecuted = Object.entries(lineCoverage).some(([, numExecutions]) => !!numExecutions)
+
+      return isAnyLineExecuted
+    })
+}
+
+function resetCoverage (coverage) {
+  const coverageMap = istanbul.createCoverageMap(coverage)
+
+  return coverageMap
+    .files()
+    .forEach(filename => {
+      const fileCoverage = coverageMap.fileCoverageFor(filename)
+      fileCoverage.resetHits()
+    })
+}
+
+function mergeCoverage (coverage, targetCoverage) {
+  const coverageMap = istanbul.createCoverageMap(coverage)
+  return coverageMap
+    .files()
+    .forEach(filename => {
+      const fileCoverage = coverageMap.fileCoverageFor(filename)
+
+      // If the fileCoverage is not there for this filename,
+      // we create it to force a merge between the fileCoverages
+      // instead of a reference assignment (which would not work if the coverage is reset later on)
+      if (!targetCoverage.data[filename]) {
+        targetCoverage.addFileCoverage(istanbul.createFileCoverage(filename))
+      }
+      targetCoverage.addFileCoverage(fileCoverage)
+      const targetFileCoverage = targetCoverage.fileCoverageFor(filename)
+
+      // branches (.b) are copied by reference, so `resetHits` affects the copy, so we need to copy it manually
+      Object.entries(targetFileCoverage.data.b).forEach(([key, value]) => {
+        targetFileCoverage.data.b[key] = [...value]
+      })
+    })
+}
+
+function fromCoverageMapToCoverage (coverageMap) {
+  return Object.entries(coverageMap.data).reduce((acc, [filename, fileCoverage]) => {
+    acc[filename] = fileCoverage.data
+    return acc
+  }, {})
+}

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

@@ -26,6 +26,19 @@ function removeEmptyValues (tags) {
   }, {})
 }
 
+function filterSensitiveInfoFromRepository (repositoryUrl) {
+  try {
+    if (repositoryUrl.startsWith('git@')) {
+      return repositoryUrl
+    }
+    const { protocol, hostname, pathname } = new URL(repositoryUrl)
+
+    return `${protocol}//${hostname}${pathname}`
+  } catch (e) {
+    return repositoryUrl
+  }
+}
+
 function getUserProviderGitMetadata () {
   const {
     DD_GIT_COMMIT_SHA,
@@ -57,7 +70,7 @@ function getUserProviderGitMetadata () {
   return removeEmptyValues({
     [GIT_COMMIT_SHA]: DD_GIT_COMMIT_SHA,
     [GIT_BRANCH]: branch,
-    [GIT_REPOSITORY_URL]: DD_GIT_REPOSITORY_URL,
+    [GIT_REPOSITORY_URL]: filterSensitiveInfoFromRepository(DD_GIT_REPOSITORY_URL),
     [GIT_TAG]: tag,
     [GIT_COMMIT_MESSAGE]: DD_GIT_COMMIT_MESSAGE,
     [GIT_COMMIT_COMMITTER_NAME]: DD_GIT_COMMIT_COMMITTER_NAME,

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

@@ -1,6 +1,5 @@
 'use strict'
 
-const net = require('net')
 const uniq = require('lodash.uniq')
 const analyticsSampler = require('../../analytics_sampler')
 const FORMAT_HTTP_HEADERS = 'http_headers'
@@ -9,8 +8,7 @@ const tags = require('../../../../../ext/tags')
 const types = require('../../../../../ext/types')
 const kinds = require('../../../../../ext/kinds')
 const urlFilter = require('./urlfilter')
-const BlockList = require('./ip_blocklist')
-const { incomingHttpRequestEnd } = require('../../appsec/gateway/channels')
+const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../constants')
 
 const WEB = types.WEB
 const SERVER = kinds.SERVER
@@ -26,33 +24,18 @@ 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'
 const HTTP2_HEADER_SCHEME = ':scheme'
 const HTTP2_HEADER_PATH = ':path'
 
-const ipHeaderList = [
-  'x-forwarded-for',
-  'x-real-ip',
-  'client-ip',
-  'x-forwarded',
-  'x-cluster-client-ip',
-  'forwarded-for',
-  'forwarded',
-  'via',
-  'true-client-ip'
-]
-
 const contexts = new WeakMap()
 const ends = new WeakMap()
 
 const web = {
   // Ensure the configuration has the correct structure and defaults.
   normalizeConfig (config) {
-    config = config.server || config
-
     const headers = getHeadersToRecord(config)
     const validateStatus = getStatusValidator(config)
     const hooks = getHooks(config)
@@ -60,14 +43,15 @@ const web = {
     const middleware = getMiddlewareSetting(config)
     const queryStringObfuscation = getQsObfuscator(config)
 
-    return Object.assign({}, config, {
+    return {
+      ...config,
       headers,
       validateStatus,
       hooks,
       filter,
       middleware,
       queryStringObfuscation
-    })
+    }
   },
 
   setFramework (req, name, config) {
@@ -77,6 +61,7 @@ const web = {
     if (!span) return
 
     span.context()._name = `${name}.request`
+    span.context()._tags['component'] = name
 
     web.setConfig(req, config)
   },
@@ -204,9 +189,9 @@ const web = {
     if (span) {
       if (error) {
         span.addTags({
-          'error.type': error.name,
-          'error.msg': error.message,
-          'error.stack': error.stack
+          [ERROR_TYPE]: error.name,
+          [ERROR_MESSAGE]: error.message,
+          [ERROR_STACK]: error.stack
         })
       }
 
@@ -264,8 +249,7 @@ const web = {
 
   // Extract the parent span from the headers and start a new span as its child
   startChildSpan (tracer, name, headers) {
-    const childOf = tracer.scope().active() || tracer.extract(FORMAT_HTTP_HEADERS, headers)
-
+    const childOf = tracer.extract(FORMAT_HTTP_HEADERS, headers)
     const span = tracer.startSpan(name, { childOf })
 
     return span
@@ -276,7 +260,7 @@ const web = {
     const context = contexts.get(req)
     const span = context.span
     const error = context.error
-    const hasExistingError = span.context()._tags['error'] || span.context()._tags['error.msg']
+    const hasExistingError = span.context()._tags['error'] || span.context()._tags[ERROR_MESSAGE]
 
     if (!hasExistingError && !context.config.validateStatus(statusCode)) {
       span.setTag(ERROR, error || true)
@@ -320,18 +304,12 @@ const web = {
   },
 
   finishAll (context) {
-    const { req, res } = context
-
     for (const beforeEnd of context.beforeEnd) {
       beforeEnd()
     }
 
     web.finishMiddleware(context)
 
-    if (incomingHttpRequestEnd.hasSubscribers) {
-      incomingHttpRequestEnd.publish({ req, res })
-    }
-
     web.finishSpan(context)
   },
 
@@ -353,41 +331,6 @@ const web = {
     return `${path}?${qs}`
   },
 
-  extractIp (context) {
-    const { req, config } = context
-
-    if (config.clientIpHeaderDisabled) return
-
-    const headers = req.headers
-
-    if (config.clientIpHeader) {
-      const header = headers[config.clientIpHeader]
-      if (!header) return
-
-      return findFirstIp(header)
-    }
-
-    const foundHeaders = []
-
-    for (let i = 0; i < ipHeaderList.length; i++) {
-      if (headers[ipHeaderList[i]]) {
-        foundHeaders.push(ipHeaderList[i])
-      }
-    }
-
-    if (foundHeaders.length === 1) {
-      const header = headers[foundHeaders[0]]
-      const firstIp = findFirstIp(header)
-
-      if (firstIp) return firstIp
-    } else if (foundHeaders.length > 1) {
-      log.error(`Cannot find client IP: multiple IP headers detected ${foundHeaders}`)
-      return
-    }
-
-    return req.socket && req.socket.remoteAddress
-  },
-
   wrapWriteHead (context) {
     const { req, res } = context
     const writeHead = res.writeHead
@@ -486,8 +429,7 @@ function addRequestTags (context) {
     [HTTP_METHOD]: req.method,
     [SPAN_KIND]: SERVER,
     [SPAN_TYPE]: WEB,
-    [HTTP_USERAGENT]: req.headers['user-agent'],
-    [HTTP_CLIENT_IP]: web.extractIp(context)
+    [HTTP_USERAGENT]: req.headers['user-agent']
   })
 
   addHeaders(context)
@@ -555,51 +497,6 @@ function getProtocol (req) {
   return 'http'
 }
 
-const privateCIDRs = [
-  '127.0.0.0/8',
-  '10.0.0.0/8',
-  '172.16.0.0/12',
-  '192.168.0.0/16',
-  '169.254.0.0/16',
-  '::1/128',
-  'fec0::/10',
-  'fe80::/10',
-  'fc00::/7',
-  'fd00::/8'
-]
-
-const privateIPMatcher = new BlockList()
-
-for (const cidr of privateCIDRs) {
-  const [ address, prefix ] = cidr.split('/')
-
-  privateIPMatcher.addSubnet(address, parseInt(prefix), net.isIPv6(address) ? 'ipv6' : 'ipv4')
-}
-
-function findFirstIp (str) {
-  let firstPrivateIp
-  const splitted = str.split(',')
-
-  for (let i = 0; i < splitted.length; i++) {
-    const chunk = splitted[i].trim()
-
-    // TODO: strip port and interface data ?
-
-    const type = net.isIP(chunk)
-    if (!type) continue
-
-    if (!privateIPMatcher.check(chunk, type === 6 ? 'ipv6' : 'ipv4')) {
-      // it's public, return it immediately
-      return chunk
-    }
-
-    // it's private, only save the first one found
-    if (!firstPrivateIp) firstPrivateIp = chunk
-  }
-
-  return firstPrivateIp
-}
-
 function getHeadersToRecord (config) {
   if (Array.isArray(config.headers)) {
     try {

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

@@ -109,9 +109,9 @@ class PrioritySampler {
   }
 
   _getPriorityFromTags (tags) {
-    if (tags.hasOwnProperty(MANUAL_KEEP) && tags[MANUAL_KEEP] !== false) {
+    if (hasOwn(tags, MANUAL_KEEP) && tags[MANUAL_KEEP] !== false) {
       return USER_KEEP
-    } else if (tags.hasOwnProperty(MANUAL_DROP) && tags[MANUAL_DROP] !== false) {
+    } else if (hasOwn(tags, MANUAL_DROP) && tags[MANUAL_DROP] !== false) {
       return USER_REJECT
     } else {
       const priority = parseInt(tags[SAMPLING_PRIORITY], 10)
@@ -198,4 +198,8 @@ class PrioritySampler {
   }
 }
 
+function hasOwn (object, prop) {
+  return Object.prototype.hasOwnProperty.call(object, prop)
+}
+
 module.exports = PrioritySampler