dd-trace 5.55.0 → 5.57.0

package/packages/dd-trace/src/opentracing/span.js

@@ -240,6 +240,7 @@ class DatadogSpan {
     }
 
     getIntegrationCounter('spans_finished', this._integrationName).inc()
+    this._spanContext._tags['_dd.integration'] = this._integrationName
 
     if (DD_TRACE_EXPERIMENTAL_SPAN_COUNTS && finishedRegistry) {
       runtimeMetrics.decrement('runtime.node.spans.unfinished')

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

@@ -1,7 +1,7 @@
 'use strict'
 
 const { channel } = require('dc-polyfill')
-const { isFalse } = require('./util')
+const { isFalse, normalizePluginEnvName } = require('./util')
 const plugins = require('./plugins')
 const log = require('./log')
 const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
@@ -33,11 +33,11 @@ function maybeEnable (Plugin) {
   if (!Plugin || typeof Plugin !== 'function') return
   if (!pluginClasses[Plugin.id]) {
     const envName = `DD_TRACE_${Plugin.id.toUpperCase()}_ENABLED`
-    const enabled = getEnvironmentVariable(envName.replaceAll(/[^a-z0-9_]/ig, '_'))
+    const enabled = getEnvironmentVariable(normalizePluginEnvName(envName))
 
     // TODO: remove the need to load the plugin class in order to disable the plugin
     if (isFalse(enabled) || disabledPlugins.has(Plugin.id)) {
-      log.debug(`Plugin "${Plugin.id}" was disabled via configuration option.`)
+      log.debug('Plugin "%s" was disabled via configuration option.', Plugin.id)
 
       pluginClasses[Plugin.id] = null
     } else {

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

@@ -5,11 +5,11 @@ const StoragePlugin = require('./storage')
 class CachePlugin extends StoragePlugin {
   static get operation () { return 'command' }
 
-  startSpan (options) {
+  startSpan (options, ctx) {
     if (!options.kind) {
       options.kind = this.constructor.kind
     }
-    return super.startSpan(this.operationName(), options)
+    return super.startSpan(this.operationName(), options, ctx)
   }
 }
 

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

@@ -75,7 +75,7 @@ module.exports = class CiPlugin extends Plugin {
     this.rootDir = process.cwd() // fallback in case :session:start events are not emitted
 
     this.addSub(`ci:${this.constructor.id}:library-configuration`, (ctx) => {
-      const { onDone, isParallel } = ctx
+      const { onDone, isParallel, frameworkVersion } = ctx
       ctx.currentStore = storage('legacy').getStore()
 
       if (!this.tracer._exporter || !this.tracer._exporter.getLibraryConfiguration) {
@@ -88,7 +88,7 @@ module.exports = class CiPlugin extends Plugin {
           this.libraryConfig = libraryConfig
         }
 
-        const libraryCapabilitiesTags = getLibraryCapabilitiesTags(this.constructor.id, isParallel)
+        const libraryCapabilitiesTags = getLibraryCapabilitiesTags(this.constructor.id, isParallel, frameworkVersion)
         const metadataTags = {
           test: {
             ...libraryCapabilitiesTags
@@ -150,7 +150,8 @@ module.exports = class CiPlugin extends Plugin {
           [COMPONENT]: this.constructor.id,
           ...this.testEnvironmentMetadata,
           ...testSessionSpanMetadata
-        }
+        },
+        integrationName: this.constructor.id
       })
       // TODO: add telemetry tag when we can add `is_agentless_log_submission_enabled` for agentless log submission
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_CREATED, 'session')
@@ -161,7 +162,8 @@ module.exports = class CiPlugin extends Plugin {
           [COMPONENT]: this.constructor.id,
           ...this.testEnvironmentMetadata,
           ...testModuleSpanMetadata
-        }
+        },
+        integrationName: this.constructor.id
       })
       // only for vitest
       // These are added for the worker threads to use
@@ -194,7 +196,8 @@ module.exports = class CiPlugin extends Plugin {
             ...testSuiteMetadata,
             [TEST_STATUS]: 'skip',
             [TEST_SKIPPED_BY_ITR]: 'true'
-          }
+          },
+          integrationName: this.constructor.id
         }).finish()
       })
       this.telemetry.count(TELEMETRY_ITR_SKIPPED, { testLevel: 'suite' }, skippedSuites.length)
@@ -396,7 +399,8 @@ module.exports = class CiPlugin extends Plugin {
         tags: {
           ...this.testEnvironmentMetadata,
           ...testTags
-        }
+        },
+        integrationName: this.constructor.id
       })
 
     testSpan.context()._trace.origin = CI_APP_ORIGIN
@@ -453,7 +457,7 @@ module.exports = class CiPlugin extends Plugin {
 
   removeDiProbe ({ file, line }) {
     const probeId = this.fileLineToProbeId.get(`${file}:${line}`)
-    log.warn(`Removing probe from ${file}:${line}, with id: ${probeId}`)
+    log.warn('Removing probe from %s:%s, with id: %s', file, line, probeId)
     this.fileLineToProbeId.delete(probeId)
     return this.di.removeProbe(probeId)
   }

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

@@ -89,7 +89,9 @@ class DatabasePlugin extends StoragePlugin {
       return query
     }
 
-    return `/*${dbmTraceComment}*/ ${query}`
+    return this.config.appendComment
+      ? `${query} /*${dbmTraceComment}*/`
+      : `/*${dbmTraceComment}*/ ${query}`
   }
 
   maybeTruncate (query) {

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

@@ -20,6 +20,7 @@ module.exports = {
   get '@langchain/openai' () { return require('../../../datadog-plugin-langchain/src') },
   get '@node-redis/client' () { return require('../../../datadog-plugin-redis/src') },
   get '@opensearch-project/opensearch' () { return require('../../../datadog-plugin-opensearch/src') },
+  get '@prisma/client' () { return require('../../../datadog-plugin-prisma/src') },
   get '@redis/client' () { return require('../../../datadog-plugin-redis/src') },
   get '@smithy/smithy-client' () { return require('../../../datadog-plugin-aws-sdk/src') },
   get '@vitest/runner' () { return require('../../../datadog-plugin-vitest/src') },

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

@@ -45,10 +45,14 @@ module.exports = class LogPlugin extends Plugin {
     })
   }
 
+  _isEnabled (config) {
+    return config.enabled && (config.logInjection === true || config.ciVisAgentlessLogSubmissionEnabled)
+  }
+
   configure (config) {
     return super.configure({
       ...config,
-      enabled: config.enabled && (config.logInjection || config.ciVisAgentlessLogSubmissionEnabled)
+      enabled: this._isEnabled(config)
     })
   }
 }

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

@@ -21,8 +21,8 @@ class OutboundPlugin extends TracingPlugin {
   constructor (...args) {
     super(...args)
 
-    this.addTraceSub('connect', message => {
-      this.connect(message)
+    this.addTraceSub('connect', ctx => {
+      this.connect(ctx)
     })
   }
 
@@ -105,12 +105,14 @@ class OutboundPlugin extends TracingPlugin {
     }
   }
 
-  connect (url) {
-    this.addHost(url.hostname, url.port)
+  connect (ctx) {
+    this.addHost(ctx)
   }
 
-  addHost (hostname, port) {
-    const span = this.activeSpan
+  addHost (ctx) {
+    const { hostname, port } = ctx
+
+    const span = ctx?.currentStore?.span || this.activeSpan
 
     if (!span) return
 

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

@@ -0,0 +1,9 @@
+'use strict'
+
+const LogPlugin = require('./log_plugin')
+
+module.exports = class StructuredLogPlugin extends LogPlugin {
+  _isEnabled (config) {
+    return super._isEnabled(config) || (config.enabled && config.logInjection === 'structured')
+  }
+}

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

@@ -119,7 +119,7 @@ class TracingPlugin extends Plugin {
         ...meta,
         ...metrics
       },
-      integrationName: type,
+      integrationName: this.component,
       links: childOf?._links
     })
 

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

@@ -24,10 +24,11 @@ const {
   GIT_COMMIT_COMMITTER_NAME,
   GIT_COMMIT_COMMITTER_EMAIL,
   CI_NODE_LABELS,
-  CI_NODE_NAME
+  CI_NODE_NAME,
+  PR_NUMBER
 } = require('./tags')
 const { filterSensitiveInfoFromRepository } = require('./url')
-const { getEnvironmentVariable } = require('../../config-helper')
+const { getEnvironmentVariable, getEnvironmentVariables } = require('../../config-helper')
 
 // Receives a string with the form 'John Doe <john.doe@gmail.com>'
 // and returns { name: 'John Doe', email: 'john.doe@gmail.com' }
@@ -92,7 +93,7 @@ function getGitHubEventPayload () {
 module.exports = {
   normalizeRef,
   getCIMetadata () {
-    const { env } = process
+    const env = getEnvironmentVariables()
 
     let tags = {}
 
@@ -109,7 +110,9 @@ module.exports = {
         GIT_URL_1: JENKINS_GIT_REPOSITORY_URL_1,
         DD_CUSTOM_TRACE_ID,
         NODE_NAME,
-        NODE_LABELS
+        NODE_LABELS,
+        CHANGE_ID,
+        CHANGE_TARGET
       } = env
 
       tags = {
@@ -121,7 +124,9 @@ module.exports = {
         [GIT_REPOSITORY_URL]: JENKINS_GIT_REPOSITORY_URL || JENKINS_GIT_REPOSITORY_URL_1,
         [CI_WORKSPACE_PATH]: WORKSPACE,
         [CI_ENV_VARS]: JSON.stringify({ DD_CUSTOM_TRACE_ID }),
-        [CI_NODE_NAME]: NODE_NAME
+        [CI_NODE_NAME]: NODE_NAME,
+        [PR_NUMBER]: CHANGE_ID,
+        [GIT_PULL_REQUEST_BASE_BRANCH]: CHANGE_TARGET
       }
 
       if (NODE_LABELS) {
@@ -172,7 +177,7 @@ module.exports = {
         CI_RUNNER_ID,
         CI_RUNNER_TAGS,
         CI_MERGE_REQUEST_TARGET_BRANCH_NAME,
-        CI_MERGE_REQUEST_TARGET_BRANCH_SHA
+        CI_MERGE_REQUEST_IID
       } = env
 
       const { name, email } = parseEmailAndName(CI_COMMIT_AUTHOR)
@@ -203,7 +208,7 @@ module.exports = {
         [CI_NODE_LABELS]: CI_RUNNER_TAGS,
         [CI_NODE_NAME]: CI_RUNNER_ID,
         [GIT_PULL_REQUEST_BASE_BRANCH]: CI_MERGE_REQUEST_TARGET_BRANCH_NAME,
-        [GIT_PULL_REQUEST_BASE_BRANCH_SHA]: CI_MERGE_REQUEST_TARGET_BRANCH_SHA
+        [PR_NUMBER]: CI_MERGE_REQUEST_IID
       }
     }
 
@@ -218,7 +223,8 @@ module.exports = {
         CIRCLE_SHA1,
         CIRCLE_REPOSITORY_URL,
         CIRCLE_JOB,
-        CIRCLE_BUILD_NUM
+        CIRCLE_BUILD_NUM,
+        CIRCLE_PR_NUMBER
       } = env
 
       const pipelineUrl = `https://app.circleci.com/pipelines/workflows/${CIRCLE_WORKFLOW_ID}`
@@ -237,8 +243,9 @@ module.exports = {
         [GIT_BRANCH]: CIRCLE_BRANCH,
         [CI_ENV_VARS]: JSON.stringify({
           CIRCLE_WORKFLOW_ID,
-          CIRCLE_BUILD_NUM
-        })
+          CIRCLE_BUILD_NUM,
+        }),
+        [PR_NUMBER]: CIRCLE_PR_NUMBER
       }
     }
 
@@ -317,7 +324,9 @@ module.exports = {
         APPVEYOR_REPO_COMMIT_AUTHOR,
         APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL,
         APPVEYOR_REPO_COMMIT_MESSAGE,
-        APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED
+        APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED,
+        APPVEYOR_PULL_REQUEST_HEAD_COMMIT,
+        APPVEYOR_PULL_REQUEST_NUMBER
       } = env
 
       const pipelineUrl = `https://ci.appveyor.com/project/${APPVEYOR_REPO_NAME}/builds/${APPVEYOR_BUILD_ID}`
@@ -333,7 +342,12 @@ module.exports = {
         [GIT_COMMIT_AUTHOR_NAME]: APPVEYOR_REPO_COMMIT_AUTHOR,
         [GIT_COMMIT_AUTHOR_EMAIL]: APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL,
         [GIT_COMMIT_MESSAGE]: APPVEYOR_REPO_COMMIT_MESSAGE + '\n' + APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED,
-        [GIT_PULL_REQUEST_BASE_BRANCH]: APPVEYOR_REPO_BRANCH
+        [GIT_COMMIT_HEAD_SHA]: APPVEYOR_PULL_REQUEST_HEAD_COMMIT,
+        [PR_NUMBER]: APPVEYOR_PULL_REQUEST_NUMBER
+      }
+
+      if (APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH) {
+        tags[GIT_PULL_REQUEST_BASE_BRANCH] = APPVEYOR_REPO_BRANCH
       }
 
       if (APPVEYOR_REPO_PROVIDER === 'github') {
@@ -367,7 +381,9 @@ module.exports = {
         BUILD_REQUESTEDFOREMAIL,
         BUILD_SOURCEVERSIONMESSAGE,
         SYSTEM_STAGEDISPLAYNAME,
-        SYSTEM_JOBDISPLAYNAME
+        SYSTEM_JOBDISPLAYNAME,
+        SYSTEM_PULLREQUEST_PULLREQUESTNUMBER,
+        SYSTEM_PULLREQUEST_TARGETBRANCH
       } = env
 
       const ref = SYSTEM_PULLREQUEST_SOURCEBRANCH || BUILD_SOURCEBRANCH || BUILD_SOURCEBRANCHNAME
@@ -387,7 +403,9 @@ module.exports = {
         [GIT_COMMIT_MESSAGE]: BUILD_SOURCEVERSIONMESSAGE,
         [CI_STAGE_NAME]: SYSTEM_STAGEDISPLAYNAME,
         [CI_JOB_NAME]: SYSTEM_JOBDISPLAYNAME,
-        [CI_ENV_VARS]: JSON.stringify({ SYSTEM_TEAMPROJECTID, BUILD_BUILDID, SYSTEM_JOBID })
+        [CI_ENV_VARS]: JSON.stringify({ SYSTEM_TEAMPROJECTID, BUILD_BUILDID, SYSTEM_JOBID }),
+        [PR_NUMBER]: SYSTEM_PULLREQUEST_PULLREQUESTNUMBER,
+        [GIT_PULL_REQUEST_BASE_BRANCH]: SYSTEM_PULLREQUEST_TARGETBRANCH
       }
 
       if (SYSTEM_TEAMFOUNDATIONSERVERURI && SYSTEM_TEAMPROJECTID && BUILD_BUILDID) {
@@ -415,7 +433,8 @@ module.exports = {
         BITBUCKET_TAG,
         BITBUCKET_PIPELINE_UUID,
         BITBUCKET_CLONE_DIR,
-        BITBUCKET_PR_DESTINATION_BRANCH
+        BITBUCKET_PR_DESTINATION_BRANCH,
+        BITBUCKET_PR_ID
       } = env
 
       const url =
@@ -433,7 +452,8 @@ module.exports = {
         [GIT_REPOSITORY_URL]: BITBUCKET_GIT_SSH_ORIGIN || BITBUCKET_GIT_HTTP_ORIGIN,
         [CI_WORKSPACE_PATH]: BITBUCKET_CLONE_DIR,
         [CI_PIPELINE_ID]: BITBUCKET_PIPELINE_UUID && BITBUCKET_PIPELINE_UUID.replaceAll(/{|}/gm, ''),
-        [GIT_PULL_REQUEST_BASE_BRANCH]: BITBUCKET_PR_DESTINATION_BRANCH
+        [GIT_PULL_REQUEST_BASE_BRANCH]: BITBUCKET_PR_DESTINATION_BRANCH,
+        [PR_NUMBER]: BITBUCKET_PR_ID
       }
     }
 
@@ -450,7 +470,8 @@ module.exports = {
         BITRISE_SOURCE_DIR,
         GIT_REPOSITORY_URL: BITRISE_GIT_REPOSITORY_URL,
         BITRISE_GIT_TAG,
-        BITRISE_GIT_MESSAGE
+        BITRISE_GIT_MESSAGE,
+        BITRISE_PULL_REQUEST
       } = env
 
       tags = {
@@ -465,7 +486,8 @@ module.exports = {
         [GIT_TAG]: BITRISE_GIT_TAG,
         [GIT_BRANCH]: BITRISEIO_GIT_BRANCH_DEST || BITRISE_GIT_BRANCH,
         [GIT_COMMIT_MESSAGE]: BITRISE_GIT_MESSAGE,
-        [GIT_PULL_REQUEST_BASE_BRANCH]: BITRISEIO_GIT_BRANCH_DEST
+        [GIT_PULL_REQUEST_BASE_BRANCH]: BITRISEIO_GIT_BRANCH_DEST,
+        [PR_NUMBER]: BITRISE_PULL_REQUEST
       }
     }
 
@@ -484,7 +506,9 @@ module.exports = {
         BUILDKITE_BUILD_AUTHOR,
         BUILDKITE_BUILD_AUTHOR_EMAIL,
         BUILDKITE_MESSAGE,
-        BUILDKITE_AGENT_ID
+        BUILDKITE_AGENT_ID,
+        BUILDKITE_PULL_REQUEST,
+        BUILDKITE_PULL_REQUEST_BASE_BRANCH
       } = env
 
       const extraTags = Object.keys(env).filter(envVar =>
@@ -514,7 +538,12 @@ module.exports = {
           BUILDKITE_JOB_ID
         }),
         [CI_NODE_NAME]: BUILDKITE_AGENT_ID,
-        [CI_NODE_LABELS]: JSON.stringify(extraTags)
+        [CI_NODE_LABELS]: JSON.stringify(extraTags),
+        [PR_NUMBER]: BUILDKITE_PULL_REQUEST,
+      }
+
+      if (BUILDKITE_PULL_REQUEST) {
+        tags[GIT_PULL_REQUEST_BASE_BRANCH] = BUILDKITE_PULL_REQUEST_BASE_BRANCH
       }
     }
 
@@ -530,7 +559,9 @@ module.exports = {
         TRAVIS_BUILD_NUMBER,
         TRAVIS_BUILD_WEB_URL,
         TRAVIS_BUILD_DIR,
-        TRAVIS_COMMIT_MESSAGE
+        TRAVIS_COMMIT_MESSAGE,
+        TRAVIS_PULL_REQUEST,
+        TRAVIS_PULL_REQUEST_SHA
       } = env
 
       tags = {
@@ -545,7 +576,10 @@ module.exports = {
         [CI_WORKSPACE_PATH]: TRAVIS_BUILD_DIR,
         [GIT_TAG]: TRAVIS_TAG,
         [GIT_BRANCH]: TRAVIS_PULL_REQUEST_BRANCH || TRAVIS_BRANCH,
-        [GIT_COMMIT_MESSAGE]: TRAVIS_COMMIT_MESSAGE
+        [GIT_COMMIT_MESSAGE]: TRAVIS_COMMIT_MESSAGE,
+        [GIT_COMMIT_HEAD_SHA]: TRAVIS_PULL_REQUEST_SHA,
+        [GIT_PULL_REQUEST_BASE_BRANCH]: TRAVIS_BRANCH,
+        [PR_NUMBER]: TRAVIS_PULL_REQUEST
       }
     }
 
@@ -562,7 +596,8 @@ module.exports = {
         BUDDY_PIPELINE_ID,
         BUDDY_PIPELINE_NAME,
         BUDDY_SCM_URL,
-        BUDDY_RUN_PR_BASE_BRANCH
+        BUDDY_RUN_PR_BASE_BRANCH,
+        BUDDY_RUN_PR_NO
       } = env
       tags = {
         [CI_PROVIDER_NAME]: 'buddy',
@@ -577,19 +612,28 @@ module.exports = {
         [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,
-        [GIT_PULL_REQUEST_BASE_BRANCH]: BUDDY_RUN_PR_BASE_BRANCH
+        [GIT_PULL_REQUEST_BASE_BRANCH]: BUDDY_RUN_PR_BASE_BRANCH,
+        [PR_NUMBER]: BUDDY_RUN_PR_NO
       }
     }
 
     if (env.TEAMCITY_VERSION) {
-      const { BUILD_URL, TEAMCITY_BUILDCONF_NAME, DATADOG_BUILD_ID } = env
+      const {
+        BUILD_URL,
+        TEAMCITY_BUILDCONF_NAME,
+        DATADOG_BUILD_ID,
+        TEAMCITY_PULLREQUEST_NUMBER,
+        TEAMCITY_PULLREQUEST_TARGET_BRANCH
+      } = env
       tags = {
         [CI_PROVIDER_NAME]: 'teamcity',
         [CI_JOB_URL]: BUILD_URL,
         [CI_JOB_NAME]: TEAMCITY_BUILDCONF_NAME,
         [CI_ENV_VARS]: JSON.stringify({
           DATADOG_BUILD_ID
-        })
+        }),
+        [PR_NUMBER]: TEAMCITY_PULLREQUEST_NUMBER,
+        [GIT_PULL_REQUEST_BASE_BRANCH]: TEAMCITY_PULLREQUEST_TARGET_BRANCH
       }
     }
 
@@ -599,7 +643,9 @@ module.exports = {
         CF_PIPELINE_NAME,
         CF_BUILD_URL,
         CF_STEP_NAME,
-        CF_BRANCH
+        CF_BRANCH,
+        CF_PULL_REQUEST_NUMBER,
+        CF_PULL_REQUEST_TARGET
       } = env
       tags = {
         [CI_PROVIDER_NAME]: 'codefresh',
@@ -609,7 +655,9 @@ module.exports = {
         [CI_JOB_NAME]: CF_STEP_NAME,
         [CI_ENV_VARS]: JSON.stringify({
           CF_BUILD_ID
-        })
+        }),
+        [PR_NUMBER]: CF_PULL_REQUEST_NUMBER,
+        [GIT_PULL_REQUEST_BASE_BRANCH]: CF_PULL_REQUEST_TARGET
       }
 
       const isTag = CF_BRANCH && CF_BRANCH.includes('tags/')
@@ -649,7 +697,9 @@ module.exports = {
         DRONE_TAG,
         DRONE_COMMIT_AUTHOR_NAME,
         DRONE_COMMIT_AUTHOR_EMAIL,
-        DRONE_COMMIT_MESSAGE
+        DRONE_COMMIT_MESSAGE,
+        DRONE_PULL_REQUEST,
+        DRONE_TARGET_BRANCH
       } = env
       tags = {
         [CI_PROVIDER_NAME]: 'drone',
@@ -664,7 +714,9 @@ module.exports = {
         [GIT_TAG]: DRONE_TAG,
         [GIT_COMMIT_AUTHOR_NAME]: DRONE_COMMIT_AUTHOR_NAME,
         [GIT_COMMIT_AUTHOR_EMAIL]: DRONE_COMMIT_AUTHOR_EMAIL,
-        [GIT_COMMIT_MESSAGE]: DRONE_COMMIT_MESSAGE
+        [GIT_COMMIT_MESSAGE]: DRONE_COMMIT_MESSAGE,
+        [PR_NUMBER]: DRONE_PULL_REQUEST,
+        [GIT_PULL_REQUEST_BASE_BRANCH]: DRONE_TARGET_BRANCH
       }
     }
 
@@ -672,6 +724,7 @@ module.exports = {
     normalizeTag(tags, GIT_REPOSITORY_URL, filterSensitiveInfoFromRepository)
     normalizeTag(tags, GIT_BRANCH, normalizeRef)
     normalizeTag(tags, GIT_TAG, normalizeRef)
+    normalizeTag(tags, GIT_PULL_REQUEST_BASE_BRANCH, normalizeRef)
 
     return removeEmptyValues(tags)
   }

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

@@ -380,6 +380,7 @@ function generatePackFilesForCommits (commitsToUpload) {
   const tmpFolder = os.tmpdir()
 
   if (!isDirectory(tmpFolder)) {
+    // TODO: Do we need the stack trace for this error? If not, just log the string
     log.error(new Error('Provided path to generate packfiles is not a directory'))
     return []
   }

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

@@ -37,7 +37,7 @@ function createInferredProxySpan (headers, childOf, tracer, context) {
 
   const proxySpanInfo = supportedProxies[proxyContext.proxySystemName]
 
-  log.debug(`Successfully extracted inferred span info ${proxyContext} for proxy: ${proxyContext.proxySystemName}`)
+  log.debug('Successfully extracted inferred span info %s for proxy:', proxyContext, proxyContext.proxySystemName)
 
   const span = tracer.startSpan(
     proxySpanInfo.spanName,
@@ -45,6 +45,7 @@ function createInferredProxySpan (headers, childOf, tracer, context) {
       childOf,
       type: 'web',
       startTime: proxyContext.requestTime,
+      integrationName: proxySpanInfo.component,
       tags: {
         service: proxyContext.domainName || tracer._config.service,
         component: proxySpanInfo.component,
@@ -79,7 +80,7 @@ function extractInferredProxyContext (headers) {
   }
 
   if (!(PROXY_HEADER_SYSTEM in headers && headers[PROXY_HEADER_SYSTEM] in supportedProxies)) {
-    log.debug(`Received headers to create inferred proxy span but headers include an unsupported proxy type ${headers}`)
+    log.debug('Received headers to create inferred proxy span but headers include an unsupported proxy type', headers)
     return null
   }
 

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

@@ -21,6 +21,7 @@ const privateCIDRs = [
   '172.16.0.0/12',
   '192.168.0.0/16',
   '169.254.0.0/16',
+  '100.65.0.0/10',
   '::1/128',
   'fec0::/10',
   'fe80::/10',

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

@@ -28,6 +28,8 @@ const CI_NODE_LABELS = 'ci.node.labels'
 
 const CI_ENV_VARS = '_dd.ci.env_vars'
 
+const PR_NUMBER = 'pr.number'
+
 module.exports = {
   GIT_COMMIT_SHA,
   GIT_BRANCH,
@@ -54,5 +56,6 @@ module.exports = {
   CI_STAGE_NAME,
   CI_ENV_VARS,
   CI_NODE_NAME,
-  CI_NODE_LABELS
+  CI_NODE_LABELS,
+  PR_NUMBER
 }