dd-trace 2.22.2 → 2.23.0

package/packages/dd-trace/src/ci-visibility/exporters/git/git_metadata.js

@@ -44,7 +44,7 @@ function getCommonRequestOptions (url) {
  * The response are the commits for which the backend already has information
  * This response is used to know which commits can be ignored from there on
  */
-function getCommitsToExclude ({ url, repositoryUrl }, callback) {
+function getCommitsToExclude ({ url, isEvpProxy, repositoryUrl }, callback) {
   const latestCommits = getLatestCommits()
   const [headCommit] = latestCommits
 
@@ -59,6 +59,12 @@ function getCommitsToExclude ({ url, repositoryUrl }, callback) {
     path: '/api/v2/git/repository/search_commits'
   }
 
+  if (isEvpProxy) {
+    options.path = '/evp_proxy/v2/api/v2/git/repository/search_commits'
+    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
+    delete options.headers['dd-api-key']
+  }
+
   const localCommitData = JSON.stringify({
     meta: {
       repository_url: repositoryUrl
@@ -87,7 +93,7 @@ function getCommitsToExclude ({ url, repositoryUrl }, callback) {
 /**
  * This function uploads a git packfile
  */
-function uploadPackFile ({ url, packFileToUpload, repositoryUrl, headCommit }, callback) {
+function uploadPackFile ({ url, isEvpProxy, packFileToUpload, repositoryUrl, headCommit }, callback) {
   const form = new FormData()
 
   const pushedSha = JSON.stringify({
@@ -125,6 +131,13 @@ function uploadPackFile ({ url, packFileToUpload, repositoryUrl, headCommit }, c
       ...form.getHeaders()
     }
   }
+
+  if (isEvpProxy) {
+    options.path = '/evp_proxy/v2/api/v2/git/repository/packfile'
+    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
+    delete options.headers['dd-api-key']
+  }
+
   request(form, options, (err, _, statusCode) => {
     if (err) {
       const error = new Error(`Could not upload packfiles: status code ${statusCode}: ${err.message}`)
@@ -137,16 +150,14 @@ function uploadPackFile ({ url, packFileToUpload, repositoryUrl, headCommit }, c
 /**
  * This function uploads git metadata to CI Visibility's backend.
 */
-function sendGitMetadata (site, callback) {
-  const url = new URL(`https://api.${site}`)
-
+function sendGitMetadata (url, isEvpProxy, callback) {
   const repositoryUrl = getRepositoryUrl()
 
   if (!repositoryUrl) {
     return callback(new Error('Repository URL is empty'))
   }
 
-  getCommitsToExclude({ url, repositoryUrl }, (err, commitsToExclude, headCommit) => {
+  getCommitsToExclude({ url, repositoryUrl, isEvpProxy }, (err, commitsToExclude, headCommit) => {
     if (err) {
       return callback(err)
     }
@@ -172,6 +183,7 @@ function sendGitMetadata (site, callback) {
         {
           packFileToUpload: packFilesToUpload[packFileIndex++],
           url,
+          isEvpProxy,
           repositoryUrl,
           headCommit
         },
@@ -181,8 +193,9 @@ function sendGitMetadata (site, callback) {
 
     uploadPackFile(
       {
-        url,
         packFileToUpload: packFilesToUpload[packFileIndex++],
+        url,
+        isEvpProxy,
         repositoryUrl,
         headCommit
       },

package/packages/dd-trace/src/ci-visibility/intelligent-test-runner/get-itr-configuration.js

@@ -3,7 +3,7 @@ const id = require('../../id')
 
 function getItrConfiguration ({
   url,
-  site,
+  isEvpProxy,
   env,
   service,
   repositoryUrl,
@@ -15,28 +15,31 @@ function getItrConfiguration ({
   runtimeVersion,
   branch
 }, done) {
-  const intakeUrl = url || new URL(`https://api.${site}`)
-
-  const apiKey = process.env.DATADOG_API_KEY || process.env.DD_API_KEY
-  const appKey = process.env.DATADOG_APP_KEY ||
-    process.env.DD_APP_KEY ||
-    process.env.DATADOG_APPLICATION_KEY ||
-    process.env.DD_APPLICATION_KEY
-
-  if (!apiKey || !appKey) {
-    done(new Error('App key or API key undefined'))
-    return
-  }
-
   const options = {
     path: '/api/v2/libraries/tests/services/setting',
     method: 'POST',
     headers: {
-      'dd-api-key': apiKey,
-      'dd-application-key': appKey,
       'Content-Type': 'application/json'
     },
-    url: intakeUrl
+    url
+  }
+
+  if (isEvpProxy) {
+    options.path = '/evp_proxy/v2/api/v2/libraries/tests/services/setting'
+    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
+    options.headers['X-Datadog-NeedsAppKey'] = 'true'
+  } else {
+    const apiKey = process.env.DATADOG_API_KEY || process.env.DD_API_KEY
+    const appKey = process.env.DATADOG_APP_KEY ||
+      process.env.DD_APP_KEY ||
+      process.env.DATADOG_APPLICATION_KEY ||
+      process.env.DD_APPLICATION_KEY
+
+    if (!apiKey || !appKey) {
+      return done(new Error('App key or API key undefined'))
+    }
+    options.headers['dd-api-key'] = apiKey
+    options.headers['dd-application-key'] = appKey
   }
 
   const data = JSON.stringify({
@@ -76,8 +79,8 @@ function getItrConfiguration ({
         } = JSON.parse(res)
 
         done(null, { isCodeCoverageEnabled, isSuitesSkippingEnabled })
-      } catch (e) {
-        done(e)
+      } catch (err) {
+        done(err)
       }
     }
   })

package/packages/dd-trace/src/ci-visibility/intelligent-test-runner/get-skippable-suites.js

@@ -2,7 +2,7 @@ const request = require('../../exporters/common/request')
 
 function getSkippableSuites ({
   url,
-  site,
+  isEvpProxy,
   env,
   service,
   repositoryUrl,
@@ -13,28 +13,32 @@ function getSkippableSuites ({
   runtimeName,
   runtimeVersion
 }, done) {
-  const intakeUrl = url || new URL(`https://api.${site}`)
-
-  const apiKey = process.env.DATADOG_API_KEY || process.env.DD_API_KEY
-  const appKey = process.env.DATADOG_APP_KEY ||
-    process.env.DD_APP_KEY ||
-    process.env.DATADOG_APPLICATION_KEY ||
-    process.env.DD_APPLICATION_KEY
-
-  if (!apiKey || !appKey) {
-    return done(new Error('API key or Application key are undefined.'))
-  }
-
   const options = {
     path: '/api/v2/ci/tests/skippable',
     method: 'POST',
     headers: {
-      'dd-api-key': apiKey,
-      'dd-application-key': appKey,
       'Content-Type': 'application/json'
     },
     timeout: 15000,
-    url: intakeUrl
+    url
+  }
+
+  if (isEvpProxy) {
+    options.path = '/evp_proxy/v2/api/v2/ci/tests/skippable'
+    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
+    options.headers['X-Datadog-NeedsAppKey'] = 'true'
+  } else {
+    const apiKey = process.env.DATADOG_API_KEY || process.env.DD_API_KEY
+    const appKey = process.env.DATADOG_APP_KEY ||
+      process.env.DD_APP_KEY ||
+      process.env.DATADOG_APPLICATION_KEY ||
+      process.env.DD_APPLICATION_KEY
+
+    if (!apiKey || !appKey) {
+      return done(new Error('App key or API key undefined'))
+    }
+    options.headers['dd-api-key'] = apiKey
+    options.headers['dd-application-key'] = appKey
   }
 
   const data = JSON.stringify({
@@ -68,8 +72,8 @@ function getSkippableSuites ({
           .filter(({ type }) => type === 'suite')
           .map(({ attributes: { suite } }) => suite)
         done(null, skippableSuites)
-      } catch (e) {
-        done(e)
+      } catch (err) {
+        done(err)
       }
     }
   })

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

@@ -3,7 +3,6 @@
 const fs = require('fs')
 const os = require('os')
 const URL = require('url').URL
-const path = require('path')
 const log = require('./log')
 const pkg = require('./pkg')
 const coalesce = require('koalas')
@@ -114,8 +113,11 @@ class Config {
       process.env.DD_TRACE_URL,
       null
     )
+    const DD_IS_CIVISIBILITY = coalesce(
+      options.isCiVisibility,
+      false
+    )
     const DD_CIVISIBILITY_AGENTLESS_URL = process.env.DD_CIVISIBILITY_AGENTLESS_URL
-    const DD_CIVISIBILITY_AGENTLESS_ENABLED = process.env.DD_CIVISIBILITY_AGENTLESS_ENABLED
 
     const DD_CIVISIBILITY_ITR_ENABLED = coalesce(
       process.env.DD_CIVISIBILITY_ITR_ENABLED,
@@ -221,8 +223,7 @@ class Config {
 
     const DD_APPSEC_RULES = coalesce(
       appsec.rules,
-      process.env.DD_APPSEC_RULES,
-      path.join(__dirname, 'appsec', 'recommended.json')
+      process.env.DD_APPSEC_RULES
     )
     const DD_APPSEC_TRACE_RATE_LIMIT = coalesce(
       parseInt(appsec.rateLimit),
@@ -379,10 +380,11 @@ ken|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)
       maxContextOperations: DD_IAST_MAX_CONTEXT_OPERATIONS
     }
 
-    const isCiVisibilityAgentlessEnabled = isTrue(DD_CIVISIBILITY_AGENTLESS_ENABLED)
-    this.isIntelligentTestRunnerEnabled = isCiVisibilityAgentlessEnabled && isTrue(DD_CIVISIBILITY_ITR_ENABLED)
-    this.isGitUploadEnabled = this.isIntelligentTestRunnerEnabled ||
-      (isCiVisibilityAgentlessEnabled && isTrue(DD_CIVISIBILITY_GIT_UPLOAD_ENABLED))
+    this.isCiVisibility = isTrue(DD_IS_CIVISIBILITY)
+
+    this.isIntelligentTestRunnerEnabled = this.isCiVisibility && isTrue(DD_CIVISIBILITY_ITR_ENABLED)
+    this.isGitUploadEnabled = this.isCiVisibility &&
+      (this.isIntelligentTestRunnerEnabled || isTrue(DD_CIVISIBILITY_GIT_UPLOAD_ENABLED))
 
     this.stats = {
       enabled: isTrue(DD_TRACE_STATS_COMPUTATION_ENABLED)

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

@@ -3,6 +3,7 @@
 const AgentExporter = require('./exporters/agent')
 const LogExporter = require('./exporters/log')
 const AgentlessCiVisibilityExporter = require('./ci-visibility/exporters/agentless')
+const AgentProxyCiVisibilityExporter = require('./ci-visibility/exporters/agent-proxy')
 const exporters = require('../../../ext/exporters')
 const fs = require('fs')
 const constants = require('./constants')
@@ -18,6 +19,8 @@ module.exports = name => {
       return AgentExporter
     case exporters.DATADOG:
       return AgentlessCiVisibilityExporter
+    case exporters.AGENT_PROXY:
+      return AgentProxyCiVisibilityExporter
     default:
       return inAWSLambda && !usingLambdaExtension ? LogExporter : AgentExporter
   }

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

@@ -55,6 +55,10 @@ class AgentExporter {
       }, flushInterval).unref()
     }
   }
+
+  flush (done = () => {}) {
+    this._writer.flush(done)
+  }
 }
 
 module.exports = AgentExporter

package/packages/dd-trace/src/exporters/common/agent-info-exporter.js

@@ -0,0 +1,82 @@
+const { URL, format } = require('url')
+
+const request = require('./request')
+
+function fetchAgentInfo (url, callback) {
+  request('', {
+    path: '/info',
+    url
+  }, (err, res) => {
+    if (err) {
+      return callback(err)
+    }
+    try {
+      const response = JSON.parse(res)
+      return callback(null, response)
+    } catch (e) {
+      return callback(e)
+    }
+  })
+}
+
+/**
+ * Exporter that exposes a way to query /info endpoint from the agent and gives you the response.
+ * While this._writer is not initialized, exported traces are stored as is.
+ */
+class AgentInfoExporter {
+  constructor (tracerConfig) {
+    this._config = tracerConfig
+    const { url, hostname, port } = this._config
+    this._url = url || new URL(format({
+      protocol: 'http:',
+      hostname: hostname || 'localhost',
+      port
+    }))
+    this._traceBuffer = []
+    this._isInitialized = false
+  }
+
+  getAgentInfo (onReceivedInfo) {
+    fetchAgentInfo(this._url, onReceivedInfo)
+  }
+
+  export (trace) {
+    if (!this._isInitialized) {
+      this._traceBuffer.push(trace)
+      return
+    }
+    this._export(trace)
+  }
+
+  _export (payload, writer = this._writer, timerKey = '_timer') {
+    writer.append(payload)
+
+    const { flushInterval } = this._config
+
+    if (flushInterval === 0) {
+      writer.flush()
+    } else if (flushInterval > 0 && !this[timerKey]) {
+      this[timerKey] = setTimeout(() => {
+        writer.flush()
+        this[timerKey] = clearTimeout(this[timerKey])
+      }, flushInterval).unref()
+    }
+  }
+
+  getUncodedTraces () {
+    return this._traceBuffer
+  }
+
+  exportUncodedTraces () {
+    this.getUncodedTraces().forEach(uncodedTrace => {
+      this.export(uncodedTrace)
+    })
+    this.resetUncodedTraces()
+  }
+
+  resetUncodedTraces () {
+    this._traceBuffer = []
+  }
+}
+
+module.exports = AgentInfoExporter

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

@@ -121,9 +121,7 @@ module.exports = class PluginManager {
       serviceMapping,
       clientIpHeaderDisabled,
       clientIpHeader,
-      isIntelligentTestRunnerEnabled,
       site,
-      experimental,
       queryStringObfuscation,
       url,
       dbmPropagationMode
@@ -147,12 +145,6 @@ module.exports = class PluginManager {
       sharedConfig.clientIpHeader = clientIpHeader
     }
 
-    if (experimental) {
-      sharedConfig.isAgentlessEnabled = experimental.exporter === 'datadog'
-    }
-
-    sharedConfig.isIntelligentTestRunnerEnabled = isIntelligentTestRunnerEnabled
-
     sharedConfig.dbmPropagationMode = dbmPropagationMode
 
     if (serviceMapping && serviceMapping[name]) {

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

@@ -1,5 +1,3 @@
-const { channel } = require('diagnostics_channel')
-
 const {
   getTestEnvironmentMetadata,
   getCodeOwnersFileEntries,
@@ -9,8 +7,6 @@ const {
   TEST_CODE_OWNERS,
   CI_APP_ORIGIN
 } = require('./util/test')
-const { getItrConfiguration } = require('../ci-visibility/intelligent-test-runner/get-itr-configuration')
-const { getSkippableSuites } = require('../ci-visibility/intelligent-test-runner/get-skippable-suites')
 const { COMPONENT } = require('../constants')
 
 const Plugin = require('./plugin')
@@ -19,52 +15,18 @@ module.exports = class CiPlugin extends Plugin {
   constructor (...args) {
     super(...args)
 
-    const gitMetadataUploadFinishCh = channel('ci:git-metadata-upload:finish')
-    // `gitMetadataPromise` is used to wait until git metadata is uploaded to
-    // proceed with calculating the suites to skip
-    // TODO: add timeout after which the promise is resolved
-    const gitMetadataPromise = new Promise(resolve => {
-      gitMetadataUploadFinishCh.subscribe(err => {
-        resolve(err)
-      })
-    })
-
-    this.codeOwnersEntries = getCodeOwnersFileEntries()
-
-    this.addSub(`ci:${this.constructor.name}:configuration`, ({ onDone }) => {
-      if (!this.config.isAgentlessEnabled || !this.config.isIntelligentTestRunnerEnabled) {
-        onDone({ config: {} })
-        return
-      }
-      getItrConfiguration(this.testConfiguration, (err, config) => {
-        if (err) {
-          onDone({ err })
-        } else {
-          this.itrConfig = config
-          onDone({ config })
+    this.addSub(`ci:${this.constructor.name}:itr-configuration`, ({ onDone }) => {
+      this.tracer._exporter.getItrConfiguration(this.testConfiguration, (err, itrConfig) => {
+        if (!err) {
+          this.itrConfig = itrConfig
         }
+        onDone({ err, itrConfig })
       })
     })
 
     this.addSub(`ci:${this.constructor.name}:test-suite:skippable`, ({ onDone }) => {
-      if (!this.config.isAgentlessEnabled || !this.config.isIntelligentTestRunnerEnabled) {
-        return onDone({ skippableSuites: [] })
-      }
-      // we only request after git upload has happened, if it didn't fail
-      gitMetadataPromise.then((gitUploadError) => {
-        if (gitUploadError) {
-          return onDone({ err: gitUploadError })
-        }
-        if (!this.itrConfig || !this.itrConfig.isSuitesSkippingEnabled) {
-          return onDone({ skippableSuites: [] })
-        }
-        getSkippableSuites(this.testConfiguration, (err, skippableSuites) => {
-          if (err) {
-            onDone({ err })
-          } else {
-            onDone({ skippableSuites })
-          }
-        })
+      this.tracer._exporter.getSkippableSuites(this.testConfiguration, (err, skippableSuites) => {
+        onDone({ err, skippableSuites })
       })
     })
   }
@@ -72,6 +34,7 @@ module.exports = class CiPlugin extends Plugin {
   configure (config) {
     super.configure(config)
     this.testEnvironmentMetadata = getTestEnvironmentMetadata(this.constructor.name, this.config)
+    this.codeOwnersEntries = getCodeOwnersFileEntries()
 
     const {
       'git.repository_url': repositoryUrl,
@@ -92,11 +55,7 @@ module.exports = class CiPlugin extends Plugin {
       osArchitecture,
       runtimeName,
       runtimeVersion,
-      branch,
-      url: this.config.url,
-      site: this.config.site,
-      env: this.tracer._env,
-      service: this.config.service || this.tracer._service
+      branch
     }
   }
 

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>'
@@ -281,6 +283,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 +299,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') {
@@ -506,6 +509,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/test.js

@@ -46,6 +46,8 @@ 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_ITR_CODE_COVERAGE_ENABLED = 'test_session.itr.code_coverage.enabled'
 
 const TEST_CODE_COVERAGE_LINES_TOTAL = 'test.codecov_lines_total'
 
@@ -78,6 +80,8 @@ module.exports = {
   TEST_SESSION_ID,
   TEST_SUITE_ID,
   TEST_ITR_TESTS_SKIPPED,
+  TEST_SESSION_ITR_SKIPPING_ENABLED,
+  TEST_SESSION_ITR_CODE_COVERAGE_ENABLED,
   TEST_CODE_COVERAGE_LINES_TOTAL,
   getCoveredFilenamesFromCoverage,
   resetCoverage,

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

@@ -265,8 +265,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

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

@@ -6,11 +6,14 @@ const { request } = require('http')
 // TODO: avoid using dd-trace internals. Make this a separate module?
 const docker = require('../../exporters/common/docker')
 const FormData = require('../../exporters/common/form-data')
+const { storage } = require('../../../../datadog-core')
 const version = require('../../../../../package.json').version
 
 const containerId = docker.id()
 
 function sendRequest (options, form, callback) {
+  const store = storage.getStore()
+  storage.enterWith({ noop: true })
   const req = request(options, res => {
     if (res.statusCode >= 400) {
       const error = new Error(`HTTP Error ${res.statusCode}`)
@@ -22,6 +25,7 @@ function sendRequest (options, form, callback) {
   })
   req.on('error', callback)
   if (form) form.pipe(req)
+  storage.enterWith(store)
 }
 
 function getBody (stream, callback) {

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

@@ -1,6 +1,5 @@
 'use strict'
-const { channel } = require('diagnostics_channel')
-
+const PluginManager = require('./plugin_manager')
 const NoopProxy = require('./noop/proxy')
 const DatadogTracer = require('./tracer')
 const Config = require('./config')
@@ -8,12 +7,8 @@ const metrics = require('./metrics')
 const log = require('./log')
 const { setStartupLogPluginManager } = require('./startup-log')
 const telemetry = require('./telemetry')
-const PluginManager = require('./plugin_manager')
-const { sendGitMetadata } = require('./ci-visibility/exporters/git/git_metadata')
 const remoteConfig = require('./appsec/remote_config')
 
-const gitMetadataUploadFinishCh = channel('ci:git-metadata-upload:finish')
-
 class Tracer extends NoopProxy {
   constructor () {
     super()
@@ -30,7 +25,9 @@ class Tracer extends NoopProxy {
     try {
       const config = new Config(options) // TODO: support dynamic config
 
-      remoteConfig.enable(config)
+      if (!config.isCiVisibility) {
+        remoteConfig.enable(config)
+      }
 
       if (config.profiling.enabled) {
         // do not stop tracer initialization if the profiler fails to be imported
@@ -61,17 +58,6 @@ class Tracer extends NoopProxy {
         setStartupLogPluginManager(this._pluginManager)
         telemetry.start(config, this._pluginManager)
       }
-
-      if (config.isGitUploadEnabled) {
-        sendGitMetadata(config.site, (err) => {
-          if (err) {
-            log.error(`Error uploading git metadata: ${err.message}`)
-          } else {
-            log.debug('Successfully uploaded git metadata')
-          }
-          gitMetadataUploadFinishCh.publish(err)
-        })
-      }
     } catch (e) {
       log.error(e)
     }