dd-trace 5.53.0 → 5.55.0

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

@@ -107,6 +107,12 @@ class DatadogTracer {
   }
 }
 
+/**
+ * Get the span context from a span or a span context.
+ *
+ * @param {Span|SpanContext} spanContext
+ * @returns {SpanContext}
+ */
 function getContext (spanContext) {
   if (spanContext instanceof Span) {
     spanContext = spanContext.context()
@@ -122,17 +128,14 @@ function getContext (spanContext) {
 function getParent (references = []) {
   let parent = null
 
-  for (let i = 0; i < references.length; i++) {
-    const ref = references[i]
+  for (const ref of references) {
     const type = ref.type()
 
     if (type === REFERENCE_CHILD_OF) {
       parent = ref.referencedContext()
       break
-    } else if (type === REFERENCE_FOLLOWS_FROM) {
-      if (!parent) {
-        parent = ref.referencedContext()
-      }
+    } else if (type === REFERENCE_FOLLOWS_FROM && !parent) {
+      parent = ref.referencedContext()
     }
   }
 

package/packages/dd-trace/src/payload-tagging/config/index.js

@@ -2,29 +2,25 @@ const aws = require('./aws.json')
 const sdks = { aws }
 
 function getSDKRules (sdk, requestInput, responseInput) {
-  return Object.fromEntries(
-    Object.entries(sdk).map(([service, serviceRules]) => {
-      return [
-        service,
-        {
-          request: serviceRules.request.concat(requestInput || []),
-          response: serviceRules.response.concat(responseInput || []),
-          expand: serviceRules.expand || []
-        }
-      ]
-    })
-  )
+  const sdkServiceRules = {}
+  for (const [service, serviceRules] of Object.entries(sdk)) {
+    sdkServiceRules[service] = {
+      // Make a copy. Otherwise calling the function multiple times would append
+      // the rules to the same object.
+      request: [...serviceRules.request, ...requestInput],
+      response: [...serviceRules.response, ...responseInput],
+      expand: serviceRules.expand
+    }
+  }
+  return sdkServiceRules
 }
 
-function appendRules (requestInput, responseInput) {
-  return Object.fromEntries(
-    Object.entries(sdks).map(([name, sdk]) => {
-      return [
-        name,
-        getSDKRules(sdk, requestInput, responseInput)
-      ]
-    })
-  )
+function appendRules (requestInput = [], responseInput = []) {
+  const sdkRules = {}
+  for (const [name, sdk] of Object.entries(sdks)) {
+    sdkRules[name] = getSDKRules(sdk, requestInput, responseInput)
+  }
+  return sdkRules
 }
 
 module.exports = { appendRules }

package/packages/dd-trace/src/payload-tagging/index.js

@@ -22,7 +22,7 @@ function maybeJSONParseValue (value) {
 
   try {
     return JSON.parse(value)
-  } catch (e) {
+  } catch {
     return value
   }
 }

package/packages/dd-trace/src/payload-tagging/tagging.js

@@ -1,13 +1,13 @@
 const { PAYLOAD_TAGGING_MAX_TAGS } = require('../constants')
 
-const redactedKeys = [
+const redactedKeys = new Set([
   'authorization', 'x-authorization', 'password', 'token'
-]
+])
 const truncated = 'truncated'
 const redacted = 'redacted'
 
 function escapeKey (key) {
-  return key.replaceAll('.', '\\.')
+  return key.replaceAll('.', String.raw`\.`)
 }
 
 /**
@@ -56,18 +56,18 @@ function tagsFromObject (object, opts) {
 
     if (['number', 'boolean'].includes(typeof object) || Buffer.isBuffer(object)) {
       tagCount += 1
-      result[prefix] = object.toString().substring(0, 5000)
+      result[prefix] = object.toString().slice(0, 5000)
       return
     }
 
     if (typeof object === 'string') {
       tagCount += 1
-      result[prefix] = object.substring(0, 5000)
+      result[prefix] = object.slice(0, 5000)
     }
 
     if (typeof object === 'object') {
       for (const [key, value] of Object.entries(object)) {
-        if (redactedKeys.includes(key.toLowerCase())) {
+        if (redactedKeys.has(key.toLowerCase())) {
           tagCount += 1
           result[`${prefix}.${escapeKey(key)}`] = redacted
         } else {

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

@@ -22,7 +22,7 @@ function findPkg () {
 
   try {
     return JSON.parse(fs.readFileSync(filePath, 'utf8'))
-  } catch (e) {
+  } catch {
     return {}
   }
 }

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

@@ -4,17 +4,18 @@ const { channel } = require('dc-polyfill')
 const { isFalse } = require('./util')
 const plugins = require('./plugins')
 const log = require('./log')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 const loadChannel = channel('dd-trace:instrumentation:load')
 
 // instrument everything that needs Plugin System V2 instrumentation
 require('../../datadog-instrumentations')
-if (process.env.AWS_LAMBDA_FUNCTION_NAME !== undefined) {
+if (getEnvironmentVariable('AWS_LAMBDA_FUNCTION_NAME') !== undefined) {
   // instrument lambda environment
   require('./lambda')
 }
 
-const { DD_TRACE_DISABLED_PLUGINS } = process.env
+const DD_TRACE_DISABLED_PLUGINS = getEnvironmentVariable('DD_TRACE_DISABLED_PLUGINS')
 
 const disabledPlugins = new Set(
   DD_TRACE_DISABLED_PLUGINS && DD_TRACE_DISABLED_PLUGINS.split(',').map(plugin => plugin.trim())
@@ -32,7 +33,7 @@ function maybeEnable (Plugin) {
   if (!Plugin || typeof Plugin !== 'function') return
   if (!pluginClasses[Plugin.id]) {
     const envName = `DD_TRACE_${Plugin.id.toUpperCase()}_ENABLED`
-    const enabled = process.env[envName.replace(/[^a-z0-9_]/ig, '_')]
+    const enabled = getEnvironmentVariable(envName.replaceAll(/[^a-z0-9_]/ig, '_'))
 
     // TODO: remove the need to load the plugin class in order to disable the plugin
     if (isFalse(enabled) || disabledPlugins.has(Plugin.id)) {

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

@@ -1,3 +1,4 @@
+const { storage } = require('../../../datadog-core')
 const {
   getTestEnvironmentMetadata,
   getTestSessionName,
@@ -28,7 +29,10 @@ const {
   DI_DEBUG_ERROR_SNAPSHOT_ID_SUFFIX,
   DI_DEBUG_ERROR_FILE_SUFFIX,
   DI_DEBUG_ERROR_LINE_SUFFIX,
-  getLibraryCapabilitiesTags
+  getLibraryCapabilitiesTags,
+  getPullRequestDiff,
+  getModifiedTestsFromDiff,
+  getPullRequestBaseBranch
 } = require('./util/test')
 const Plugin = require('./plugin')
 const { COMPONENT } = require('../constants')
@@ -45,10 +49,23 @@ const {
   GIT_COMMIT_SHA,
   GIT_BRANCH,
   CI_WORKSPACE_PATH,
-  GIT_COMMIT_MESSAGE
+  GIT_COMMIT_MESSAGE,
+  GIT_TAG,
+  GIT_PULL_REQUEST_BASE_BRANCH_SHA,
+  GIT_COMMIT_HEAD_SHA,
+  GIT_PULL_REQUEST_BASE_BRANCH
 } = require('./util/tags')
 const { OS_VERSION, OS_PLATFORM, OS_ARCHITECTURE, RUNTIME_NAME, RUNTIME_VERSION } = require('./util/env')
 const getDiClient = require('../ci-visibility/dynamic-instrumentation')
+const { DD_MAJOR } = require('../../../../version')
+
+const FRAMEWORK_TO_TRIMMED_COMMAND = {
+  vitest: 'vitest run',
+  mocha: 'mocha',
+  cucumber: 'cucumber-js',
+  playwright: 'playwright test',
+  jest: 'jest'
+}
 
 module.exports = class CiPlugin extends Plugin {
   constructor (...args) {
@@ -57,7 +74,10 @@ module.exports = class CiPlugin extends Plugin {
     this.fileLineToProbeId = new Map()
     this.rootDir = process.cwd() // fallback in case :session:start events are not emitted
 
-    this.addSub(`ci:${this.constructor.id}:library-configuration`, ({ onDone, isParallel }) => {
+    this.addSub(`ci:${this.constructor.id}:library-configuration`, (ctx) => {
+      const { onDone, isParallel } = ctx
+      ctx.currentStore = storage('legacy').getStore()
+
       if (!this.tracer._exporter || !this.tracer._exporter.getLibraryConfiguration) {
         return onDone({ err: new Error('Test optimization was not initialized correctly') })
       }
@@ -79,6 +99,10 @@ module.exports = class CiPlugin extends Plugin {
       })
     })
 
+    this.addBind(`ci:${this.constructor.id}:test-suite:skippable`, (ctx) => {
+      return ctx.currentStore
+    })
+
     this.addSub(`ci:${this.constructor.id}:test-suite:skippable`, ({ onDone }) => {
       if (!this.tracer._exporter?.getSkippableSuites) {
         return onDone({ err: new Error('Test optimization was not initialized correctly') })
@@ -103,7 +127,11 @@ module.exports = class CiPlugin extends Plugin {
       // only for playwright
       this.rootDir = rootDir
 
-      const testSessionName = getTestSessionName(this.config, this.command, this.testEnvironmentMetadata)
+      const testSessionName = getTestSessionName(
+        this.config,
+        DD_MAJOR < 6 ? this.command : FRAMEWORK_TO_TRIMMED_COMMAND[this.constructor.id],
+        this.testEnvironmentMetadata
+      )
 
       const metadataTags = {}
       for (const testLevel of TEST_LEVEL_EVENT_TYPES) {
@@ -138,8 +166,12 @@ module.exports = class CiPlugin extends Plugin {
       // only for vitest
       // These are added for the worker threads to use
       if (this.constructor.id === 'vitest') {
+        // TODO: Figure out alternative ways to pass this information to the worker threads
+        // eslint-disable-next-line eslint-rules/eslint-process-env
         process.env.DD_CIVISIBILITY_TEST_SESSION_ID = this.testSessionSpan.context().toTraceId()
+        // eslint-disable-next-line eslint-rules/eslint-process-env
         process.env.DD_CIVISIBILITY_TEST_MODULE_ID = this.testModuleSpan.context().toSpanId()
+        // eslint-disable-next-line eslint-rules/eslint-process-env
         process.env.DD_CIVISIBILITY_TEST_COMMAND = this.command
       }
 
@@ -168,6 +200,10 @@ module.exports = class CiPlugin extends Plugin {
       this.telemetry.count(TELEMETRY_ITR_SKIPPED, { testLevel: 'suite' }, skippedSuites.length)
     })
 
+    this.addBind(`ci:${this.constructor.id}:known-tests`, (ctx) => {
+      return ctx.currentStore
+    })
+
     this.addSub(`ci:${this.constructor.id}:known-tests`, ({ onDone }) => {
       if (!this.tracer._exporter?.getKnownTests) {
         return onDone({ err: new Error('Test optimization was not initialized correctly') })
@@ -182,6 +218,10 @@ module.exports = class CiPlugin extends Plugin {
       })
     })
 
+    this.addBind(`ci:${this.constructor.id}:test-management-tests`, (ctx) => {
+      return ctx.currentStore
+    })
+
     this.addSub(`ci:${this.constructor.id}:test-management-tests`, ({ onDone }) => {
       if (!this.tracer._exporter?.getTestManagementTests) {
         return onDone({ err: new Error('Test optimization was not initialized correctly') })
@@ -194,6 +234,31 @@ module.exports = class CiPlugin extends Plugin {
         onDone({ err, testManagementTests })
       })
     })
+
+    this.addBind(`ci:${this.constructor.id}:modified-tests`, (ctx) => {
+      return ctx.currentStore
+    })
+
+    this.addSub(`ci:${this.constructor.id}:modified-tests`, ({ onDone }) => {
+      const {
+        [GIT_PULL_REQUEST_BASE_BRANCH]: pullRequestBaseBranch,
+        [GIT_PULL_REQUEST_BASE_BRANCH_SHA]: pullRequestBaseBranchSha,
+        [GIT_COMMIT_HEAD_SHA]: commitHeadSha
+      } = this.testEnvironmentMetadata
+
+      const baseBranchSha = pullRequestBaseBranchSha || getPullRequestBaseBranch(pullRequestBaseBranch)
+
+      if (baseBranchSha) {
+        const diff = getPullRequestDiff(baseBranchSha, commitHeadSha)
+        const modifiedTests = getModifiedTestsFromDiff(diff)
+        if (modifiedTests) {
+          return onDone({ err: null, modifiedTests })
+        }
+      }
+
+      // TODO: Add telemetry for this type of error
+      return onDone({ err: new Error('No modified tests could have been retrieved') })
+    })
   }
 
   get telemetry () {
@@ -240,7 +305,10 @@ module.exports = class CiPlugin extends Plugin {
       [GIT_BRANCH]: branch,
       [CI_PROVIDER_NAME]: ciProviderName,
       [CI_WORKSPACE_PATH]: repositoryRoot,
-      [GIT_COMMIT_MESSAGE]: commitMessage
+      [GIT_COMMIT_MESSAGE]: commitMessage,
+      [GIT_TAG]: tag,
+      [GIT_PULL_REQUEST_BASE_BRANCH_SHA]: pullRequestBaseSha,
+      [GIT_COMMIT_HEAD_SHA]: commitHeadSha
     } = this.testEnvironmentMetadata
 
     this.repositoryRoot = repositoryRoot || process.cwd()
@@ -259,7 +327,10 @@ module.exports = class CiPlugin extends Plugin {
       runtimeVersion,
       branch,
       testLevel: 'suite',
-      commitMessage
+      commitMessage,
+      tag,
+      pullRequestBaseSha,
+      commitHeadSha
     }
   }
 
@@ -372,11 +443,12 @@ module.exports = class CiPlugin extends Plugin {
       return Promise.resolve()
     }
     log.debug('Removing all Dynamic Instrumentation probes')
-    return Promise.all(Array.from(this.fileLineToProbeId.keys())
-      .map((fileLine) => {
-        const [file, line] = fileLine.split(':')
-        return this.removeDiProbe({ file, line })
-      }))
+    const promises = []
+    for (const fileLine of this.fileLineToProbeId.keys()) {
+      const [file, line] = fileLine.split(':')
+      promises.push(this.removeDiProbe({ file, line }))
+    }
+    return Promise.all(promises)
   }
 
   removeDiProbe ({ file, line }) {
@@ -387,6 +459,10 @@ module.exports = class CiPlugin extends Plugin {
   }
 
   addDiProbe (err) {
+    if (!err?.stack) {
+      log.warn('Can not add breakpoint if the test error does not have a stack')
+      return
+    }
     const [file, line, stackIndex] = getFileAndLineNumberFromError(err, this.repositoryRoot)
 
     if (!file || !Number.isInteger(line)) {

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

@@ -7,14 +7,14 @@ class ConsumerPlugin extends InboundPlugin {
   static get kind () { return 'consumer' }
   static get type () { return 'messaging' }
 
-  startSpan (options) {
+  startSpan (options, enterOrCtx) {
     if (!options.service) {
       options.service = this.config.service || this.serviceName()
     }
     if (!options.kind) {
       options.kind = this.constructor.kind
     }
-    return super.startSpan(this.operationName(), options)
+    return super.startSpan(this.operationName(), options, enterOrCtx)
   }
 }
 

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

@@ -2,6 +2,10 @@
 
 const TracingPlugin = require('./tracing')
 
-class InboundPlugin extends TracingPlugin {}
+class InboundPlugin extends TracingPlugin {
+  bindFinish (ctx) {
+    return ctx.parentStore
+  }
+}
 
 module.exports = InboundPlugin

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

@@ -84,7 +84,6 @@ module.exports = {
   get nyc () { return require('../../../datadog-plugin-nyc/src') },
   get oracledb () { return require('../../../datadog-plugin-oracledb/src') },
   get openai () { return require('../../../datadog-plugin-openai/src') },
-  get paperplane () { return require('../../../datadog-plugin-paperplane/src') },
   get pg () { return require('../../../datadog-plugin-pg/src') },
   get pino () { return require('../../../datadog-plugin-pino/src') },
   get 'pino-pretty' () { return require('../../../datadog-plugin-pino/src') },

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

@@ -26,6 +26,10 @@ class OutboundPlugin extends TracingPlugin {
     })
   }
 
+  bindFinish (ctx) {
+    return ctx.parentStore
+  }
+
   startSpan (...args) {
     const span = super.startSpan(...args)
     if (
@@ -67,7 +71,6 @@ class OutboundPlugin extends TracingPlugin {
         }
       }
     }
-    return undefined
   }
 
   getPeerServiceRemap (peerData) {
@@ -87,10 +90,6 @@ class OutboundPlugin extends TracingPlugin {
     return peerData
   }
 
-  bindFinish (ctx) {
-    return ctx.parentStore
-  }
-
   finish (ctx) {
     const span = ctx?.currentStore?.span || this.activeSpan
     this.tagPeerService(span)

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

@@ -34,7 +34,7 @@ class StoreBinding {
     this._transform = data => {
       const store = storage('legacy').getStore()
 
-      return !store || !store.noop
+      return !store || !store.noop || (data && Object.hasOwn(data, 'currentStore'))
         ? transform(data)
         : store
     }

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

@@ -7,7 +7,7 @@ class ProducerPlugin extends OutboundPlugin {
   static get kind () { return 'producer' }
   static get type () { return 'messaging' }
 
-  startSpan (options) {
+  startSpan (options, enterOrCtx) {
     const spanDefaults = {
       kind: this.constructor.kind
     }
@@ -19,7 +19,7 @@ class ProducerPlugin extends OutboundPlugin {
         if (!options[key]) options[key] = spanDefaults[key]
       }
     )
-    return super.startSpan(this.operationName(), options)
+    return super.startSpan(this.operationName(), options, enterOrCtx)
   }
 }
 

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

@@ -11,12 +11,12 @@ class StoragePlugin extends ClientPlugin {
     this.system = this.constructor.system || this.component
   }
 
-  startSpan (name, options) {
+  startSpan (name, options, ctx) {
     if (!options.service && this.system) {
       options.service = `${this.tracer._service}-${this.system}`
     }
 
-    return super.startSpan(name, options)
+    return super.startSpan(name, options, ctx)
   }
 }
 

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

@@ -27,6 +27,7 @@ const {
   CI_NODE_NAME
 } = require('./tags')
 const { filterSensitiveInfoFromRepository } = require('./url')
+const { getEnvironmentVariable } = 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' }
@@ -67,7 +68,7 @@ function normalizeRef (ref) {
   if (!ref) {
     return ref
   }
-  return ref.replace(/origin\/|refs\/heads\/|tags\//gm, '')
+  return ref.replaceAll(/origin\/|refs\/heads\/|tags\//gm, '')
 }
 
 function resolveTilde (filePath) {
@@ -76,16 +77,16 @@ function resolveTilde (filePath) {
   }
   // '~/folder/path' or '~'
   if (filePath[0] === '~' && (filePath[1] === '/' || filePath.length === 1)) {
-    return filePath.replace('~', process.env.HOME)
+    return filePath.replace('~', getEnvironmentVariable('HOME'))
   }
   return filePath
 }
 
 function getGitHubEventPayload () {
-  if (!process.env.GITHUB_EVENT_PATH) {
+  if (!getEnvironmentVariable('GITHUB_EVENT_PATH')) {
     return
   }
-  return JSON.parse(readFileSync(process.env.GITHUB_EVENT_PATH, 'utf8'))
+  return JSON.parse(readFileSync(getEnvironmentVariable('GITHUB_EVENT_PATH'), 'utf8'))
 }
 
 module.exports = {
@@ -128,7 +129,7 @@ module.exports = {
         try {
           nodeLabels = JSON.stringify(NODE_LABELS.split(' '))
           tags[CI_NODE_LABELS] = nodeLabels
-        } catch (e) {
+        } catch {
           // ignore errors
         }
       }
@@ -139,15 +140,12 @@ module.exports = {
 
       tags[refKey] = ref
 
-      let finalPipelineName = ''
       if (JOB_NAME) {
         // Job names can contain parameters, e.g. jobName/KEY1=VALUE1,KEY2=VALUE2/branchName
         const jobNameAndParams = JOB_NAME.split('/')
-        if (jobNameAndParams.length > 1 && jobNameAndParams[1].includes('=')) {
-          finalPipelineName = jobNameAndParams[0]
-        } else {
-          finalPipelineName = JOB_NAME.replace(`/${ref}`, '')
-        }
+        const finalPipelineName = jobNameAndParams.length > 1 && jobNameAndParams[1].includes('=')
+          ? jobNameAndParams[0]
+          : JOB_NAME.replace(`/${ref}`, '')
         tags[CI_PIPELINE_NAME] = finalPipelineName
       }
     }
@@ -172,7 +170,9 @@ module.exports = {
         CI_PROJECT_URL: GITLAB_PROJECT_URL,
         CI_JOB_ID: GITLAB_CI_JOB_ID,
         CI_RUNNER_ID,
-        CI_RUNNER_TAGS
+        CI_RUNNER_TAGS,
+        CI_MERGE_REQUEST_TARGET_BRANCH_NAME,
+        CI_MERGE_REQUEST_TARGET_BRANCH_SHA
       } = env
 
       const { name, email } = parseEmailAndName(CI_COMMIT_AUTHOR)
@@ -201,7 +201,9 @@ module.exports = {
           CI_JOB_ID: GITLAB_CI_JOB_ID
         }),
         [CI_NODE_LABELS]: CI_RUNNER_TAGS,
-        [CI_NODE_NAME]: CI_RUNNER_ID
+        [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
       }
     }
 
@@ -295,7 +297,7 @@ module.exports = {
           const eventContent = getGitHubEventPayload()
           tags[GIT_PULL_REQUEST_BASE_BRANCH_SHA] = eventContent.pull_request.base.sha
           tags[GIT_COMMIT_HEAD_SHA] = eventContent.pull_request.head.sha
-        } catch (e) {
+        } catch {
           // ignore malformed event content
         }
       }
@@ -330,7 +332,8 @@ 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 + '\n' + APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED
+        [GIT_COMMIT_MESSAGE]: APPVEYOR_REPO_COMMIT_MESSAGE + '\n' + APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED,
+        [GIT_PULL_REQUEST_BASE_BRANCH]: APPVEYOR_REPO_BRANCH
       }
 
       if (APPVEYOR_REPO_PROVIDER === 'github') {
@@ -411,7 +414,8 @@ module.exports = {
         BITBUCKET_GIT_HTTP_ORIGIN,
         BITBUCKET_TAG,
         BITBUCKET_PIPELINE_UUID,
-        BITBUCKET_CLONE_DIR
+        BITBUCKET_CLONE_DIR,
+        BITBUCKET_PR_DESTINATION_BRANCH
       } = env
 
       const url =
@@ -428,7 +432,8 @@ module.exports = {
         [GIT_TAG]: BITBUCKET_TAG,
         [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.replace(/{|}/gm, '')
+        [CI_PIPELINE_ID]: BITBUCKET_PIPELINE_UUID && BITBUCKET_PIPELINE_UUID.replaceAll(/{|}/gm, ''),
+        [GIT_PULL_REQUEST_BASE_BRANCH]: BITBUCKET_PR_DESTINATION_BRANCH
       }
     }
 
@@ -459,7 +464,8 @@ module.exports = {
         [CI_WORKSPACE_PATH]: BITRISE_SOURCE_DIR,
         [GIT_TAG]: BITRISE_GIT_TAG,
         [GIT_BRANCH]: BITRISEIO_GIT_BRANCH_DEST || BITRISE_GIT_BRANCH,
-        [GIT_COMMIT_MESSAGE]: BITRISE_GIT_MESSAGE
+        [GIT_COMMIT_MESSAGE]: BITRISE_GIT_MESSAGE,
+        [GIT_PULL_REQUEST_BASE_BRANCH]: BITRISEIO_GIT_BRANCH_DEST
       }
     }
 
@@ -555,7 +561,8 @@ module.exports = {
         BUDDY_EXECUTION_URL,
         BUDDY_PIPELINE_ID,
         BUDDY_PIPELINE_NAME,
-        BUDDY_SCM_URL
+        BUDDY_SCM_URL,
+        BUDDY_RUN_PR_BASE_BRANCH
       } = env
       tags = {
         [CI_PROVIDER_NAME]: 'buddy',
@@ -569,7 +576,8 @@ module.exports = {
         [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
+        [GIT_COMMIT_COMMITTER_EMAIL]: BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL,
+        [GIT_PULL_REQUEST_BASE_BRANCH]: BUDDY_RUN_PR_BASE_BRANCH
       }
     }