dd-trace 2.0.0-appsec-beta.4 → 2.0.0-appsec-beta.5

package/ci/init.js

@@ -1,7 +1,11 @@
 const tracer = require('../packages/dd-trace')
+const { ORIGIN_KEY } = require('../packages/dd-trace/src/constants')
 
 tracer.init({
-  startupLogs: false
+  startupLogs: false,
+  tags: {
+    [ORIGIN_KEY]: 'ciapp-test'
+  }
 })
 
 tracer.use('fs', false)

package/ci/jest/env.js

@@ -1,8 +1,12 @@
 const tracer = require('../../packages/dd-trace')
+const { ORIGIN_KEY } = require('../../packages/dd-trace/src/constants')
 
 tracer.init({
   startupLogs: false,
-  flushInterval: 400000
+  flushInterval: 400000,
+  tags: {
+    [ORIGIN_KEY]: 'ciapp-test'
+  }
 })
 
 tracer.use('fs', false)

package/index.d.ts

@@ -786,7 +786,7 @@ declare namespace plugins {
    * This plugin automatically instruments the
    * [cucumber](https://www.npmjs.com/package/@cucumber/cucumber) module.
    */
-  interface cucumber extends Instrumentation {}
+  interface cucumber extends Integration {}
 
   /**
    * This plugin automatically instruments the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "2.0.0-appsec-beta.4",
+  "version": "2.0.0-appsec-beta.5",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -10,6 +10,7 @@
     "bench": "node benchmark",
     "bench:profiler": "node benchmark/profiler",
     "bench:e2e": "SERVICES=mongo yarn services && cd benchmark/e2e && node benchmark-run.js --duration=30",
+    "bench:e2e:ci-visibility": "node benchmark/e2e-ci/benchmark-run.js",
     "type:doc": "cd docs && yarn && yarn build",
     "type:test": "cd docs && yarn && yarn test",
     "lint": "node scripts/check_licenses.js && eslint . && yarn audit --groups dependencies",

package/packages/datadog-instrumentations/index.js

@@ -2,3 +2,4 @@
 
 require('./src/dns')
 require('./src/memcached')
+require('./src/mysql')

package/packages/datadog-instrumentations/src/mysql.js

@@ -0,0 +1,69 @@
+'use strict'
+
+const { AsyncResource } = require('async_hooks')
+const {
+  channel,
+  addHook,
+  bind,
+  bindAsyncResource
+} = require('./helpers/instrument')
+const shimmer = require('../../datadog-shimmer')
+
+addHook({ name: 'mysql', file: 'lib/Connection.js', versions: ['>=2'] }, Connection => {
+  const startCh = channel('apm:mysql:query:start')
+  const asyncEndCh = channel('apm:mysql:query:async-end')
+  const endCh = channel('apm:mysql:query:end')
+  const errorCh = channel('apm:mysql:query:error')
+
+  shimmer.wrap(Connection.prototype, 'query', query => function () {
+    const asyncResource = new AsyncResource('bound-anonymous-fn')
+    if (!startCh.hasSubscribers) {
+      return query.apply(this, arguments)
+    }
+
+    const sql = arguments[0].sql ? arguments[0].sql : arguments[0]
+    const startArgs = [sql, this.config]
+
+    startCh.publish(startArgs)
+
+    try {
+      const res = query.apply(this, arguments)
+
+      if (res._callback) {
+        const cb = bindAsyncResource.call(asyncResource, res._callback)
+        res._callback = bind(function (error, result) {
+          if (error) {
+            errorCh.publish(error)
+          }
+          asyncEndCh.publish(result)
+
+          return cb.apply(this, arguments)
+        })
+      } else {
+        const cb = bind(function () {
+          asyncEndCh.publish(undefined)
+        })
+        res.on('end', cb)
+      }
+
+      return res
+    } catch (err) {
+      err.stack // trigger getting the stack at the original throwing point
+      errorCh.publish(err)
+
+      throw err
+    } finally {
+      endCh.publish(undefined)
+    }
+  })
+
+  return Connection
+})
+
+addHook({ name: 'mysql', file: 'lib/Pool.js', versions: ['>=2'] }, Pool => {
+  shimmer.wrap(Pool.prototype, 'getConnection', getConnection => function (cb) {
+    arguments[0] = bind(cb)
+    return getConnection.apply(this, arguments)
+  })
+  return Pool
+})

package/packages/datadog-plugin-cucumber/src/index.js

@@ -103,8 +103,8 @@ module.exports = [
     name: '@cucumber/cucumber',
     versions: ['7.0.0 - 7.2.1'],
     file: 'lib/runtime/pickle_runner.js',
-    patch (PickleRunner, tracer) {
-      const testEnvironmentMetadata = getTestEnvironmentMetadata('cucumber')
+    patch (PickleRunner, tracer, config) {
+      const testEnvironmentMetadata = getTestEnvironmentMetadata('cucumber', config)
       const sourceRoot = process.cwd()
       const pl = PickleRunner.default
       this.wrap(
@@ -127,8 +127,8 @@ module.exports = [
     name: '@cucumber/cucumber',
     versions: ['>=7.3.0'],
     file: 'lib/runtime/test_case_runner.js',
-    patch (TestCaseRunner, tracer) {
-      const testEnvironmentMetadata = getTestEnvironmentMetadata('cucumber')
+    patch (TestCaseRunner, tracer, config) {
+      const testEnvironmentMetadata = getTestEnvironmentMetadata('cucumber', config)
       const sourceRoot = process.cwd()
       const pl = TestCaseRunner.default
       this.wrap(

package/packages/datadog-plugin-cypress/src/plugin.js

@@ -4,6 +4,7 @@ const {
   TEST_SUITE,
   TEST_STATUS,
   TEST_FRAMEWORK_VERSION,
+  TEST_IS_RUM_ACTIVE,
   getTestEnvironmentMetadata,
   CI_APP_ORIGIN,
   getTestParentSpan
@@ -66,15 +67,18 @@ module.exports = (on, config) => {
           }
         })
       }
-      return null
+      return activeSpan ? activeSpan._spanContext._traceId.toString(10) : null
     },
     'dd:afterEach': (test) => {
-      const { state, error } = test
+      const { state, error, isRUMActive } = test
       if (activeSpan) {
         activeSpan.setTag(TEST_STATUS, CYPRESS_STATUS_TO_TEST_STATUS[state])
         if (error) {
           activeSpan.setTag('error', error)
         }
+        if (isRUMActive) {
+          activeSpan.setTag(TEST_IS_RUM_ACTIVE, true)
+        }
         activeSpan.finish()
       }
       activeSpan = null

package/packages/datadog-plugin-cypress/src/support.js

@@ -3,15 +3,30 @@ beforeEach(() => {
   cy.task('dd:beforeEach', {
     testName: Cypress.mocha.getRunner().suite.ctx.currentTest.fullTitle(),
     testSuite: Cypress.mocha.getRootSuite().file
+  }).then(traceId => {
+    Cypress.env('traceId', traceId)
   })
 })
 
+after(() => {
+  cy.window().then(win => {
+    win.dispatchEvent(new Event('beforeunload'))
+  })
+})
+
+
 afterEach(() => {
-  const currentTest = Cypress.mocha.getRunner().suite.ctx.currentTest
-  cy.task('dd:afterEach', {
-    testName: currentTest.fullTitle(),
-    testSuite: Cypress.mocha.getRootSuite().file,
-    state: currentTest.state,
-    error: currentTest.err
+  cy.window().then(win => {
+    const currentTest = Cypress.mocha.getRunner().suite.ctx.currentTest
+    const testInfo = {
+      testName: currentTest.fullTitle(),
+      testSuite: Cypress.mocha.getRootSuite().file,
+      state: currentTest.state,
+      error: currentTest.err,
+    }
+    if (win.DD_RUM) {
+      testInfo.isRUMActive = true
+    }
+    cy.task('dd:afterEach', testInfo)
   })
 })

package/packages/datadog-plugin-dns/src/index.js

@@ -82,7 +82,7 @@ function defaultAsyncEnd () {
 }
 
 function errorHandler (error) {
-  storage.getStore().addError(error)
+  storage.getStore().span.setTag('error', error)
 }
 
 module.exports = DNSPlugin

package/packages/datadog-plugin-jest/src/jest-environment.js

@@ -238,8 +238,8 @@ module.exports = [
   {
     name: 'jest-environment-node',
     versions: ['>=24.8.0'],
-    patch: function (NodeEnvironment, tracer) {
-      const testEnvironmentMetadata = getTestEnvironmentMetadata('jest')
+    patch: function (NodeEnvironment, tracer, config) {
+      const testEnvironmentMetadata = getTestEnvironmentMetadata('jest', config)
 
       this.wrap(NodeEnvironment.prototype, 'teardown', createWrapTeardown(tracer, this))
 
@@ -257,8 +257,8 @@ module.exports = [
   {
     name: 'jest-environment-jsdom',
     versions: ['>=24.8.0'],
-    patch: function (JsdomEnvironment, tracer) {
-      const testEnvironmentMetadata = getTestEnvironmentMetadata('jest')
+    patch: function (JsdomEnvironment, tracer, config) {
+      const testEnvironmentMetadata = getTestEnvironmentMetadata('jest', config)
 
       this.wrap(JsdomEnvironment.prototype, 'teardown', createWrapTeardown(tracer, this))
 

package/packages/datadog-plugin-jest/src/jest-jasmine2.js

@@ -169,8 +169,8 @@ module.exports = [
     name: 'jest-jasmine2',
     versions: ['>=24.8.0'],
     file: 'build/jasmineAsyncInstall.js',
-    patch: function (jasmineAsyncInstallExport, tracer) {
-      const testEnvironmentMetadata = getTestEnvironmentMetadata('jest')
+    patch: function (jasmineAsyncInstallExport, tracer, config) {
+      const testEnvironmentMetadata = getTestEnvironmentMetadata('jest', config)
       return this.wrapExport(
         jasmineAsyncInstallExport.default,
         createWrapJasmineAsyncInstall(tracer, this, testEnvironmentMetadata)(jasmineAsyncInstallExport.default)

package/packages/datadog-plugin-mocha/src/index.js

@@ -239,8 +239,8 @@ module.exports = [
     name: 'mocha',
     versions: ['>=5.2.0'],
     file: 'lib/runner.js',
-    patch (Runner, tracer) {
-      const testEnvironmentMetadata = getTestEnvironmentMetadata('mocha')
+    patch (Runner, tracer, config) {
+      const testEnvironmentMetadata = getTestEnvironmentMetadata('mocha', config)
       const sourceRoot = process.cwd()
       this.wrap(Runner.prototype, 'runTests', createWrapRunTests(tracer, testEnvironmentMetadata, sourceRoot))
       this.wrap(Runner.prototype, 'runTest', createWrapRunTest(tracer, testEnvironmentMetadata, sourceRoot))

package/packages/datadog-plugin-mysql/src/index.js

@@ -1,110 +1,58 @@
 'use strict'
 
-const Tags = require('opentracing').Tags
+const Plugin = require('../../dd-trace/src/plugins/plugin')
+const { storage } = require('../../datadog-core')
 const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
 
-function createWrapQuery (tracer, config) {
-  return function wrapQuery (query) {
-    return function queryWithTrace (sql, values, cb) {
-      const scope = tracer.scope()
-      const childOf = scope.active()
-      const span = tracer.startSpan('mysql.query', {
+class MySQLPlugin extends Plugin {
+  static get name () {
+    return 'mysql'
+  }
+
+  constructor (...args) {
+    super(...args)
+
+    this.addSub('apm:mysql:query:start', ([sql, conf]) => {
+      const store = storage.getStore()
+      const childOf = store ? store.span : store
+      const span = this.tracer.startSpan('mysql.query', {
         childOf,
         tags: {
-          [Tags.SPAN_KIND]: Tags.SPAN_KIND_RPC_CLIENT,
-          'service.name': config.service || `${tracer._service}-mysql`,
+          'service.name': this.config.service || `${this.tracer._service}-mysql`,
           'span.type': 'sql',
           'span.kind': 'client',
           'db.type': 'mysql',
-          'db.user': this.config.user,
-          'out.host': this.config.host,
-          'out.port': this.config.port
+          'db.user': conf.user,
+          'out.host': conf.host,
+          'out.port': conf.port,
+          'resource.name': sql
         }
       })
 
-      if (this.config.database) {
-        span.setTag('db.name', this.config.database)
+      if (conf.database) {
+        span.setTag('db.name', conf.database)
       }
 
-      analyticsSampler.sample(span, config.measured)
+      analyticsSampler.sample(span, this.config.measured)
+      this.enter(span, store)
+    })
 
-      const sequence = scope.bind(query, span).apply(this, arguments)
+    this.addSub('apm:mysql:query:end', () => {
+      this.exit()
+    })
 
-      scope.bind(sequence)
-
-      span.setTag('resource.name', sequence.sql)
-
-      if (sequence._callback) {
-        sequence._callback = wrapCallback(tracer, span, childOf, sequence._callback)
-      } else {
-        sequence.on('end', () => {
-          span.finish()
-        })
+    this.addSub('apm:mysql:query:error', err => {
+      if (err) {
+        const span = storage.getStore().span
+        span.setTag('error', err)
       }
+    })
 
-      return sequence
-    }
-  }
-}
-
-function createWrapGetConnection (tracer, config) {
-  return function wrapGetConnection (getConnection) {
-    return function getConnectionWithTrace (cb) {
-      const scope = tracer.scope()
-
-      arguments[0] = scope.bind(cb)
-
-      return scope.bind(getConnection).apply(this, arguments)
-    }
+    this.addSub('apm:mysql:query:async-end', () => {
+      const span = storage.getStore().span
+      span.finish()
+    })
   }
 }
 
-function wrapCallback (tracer, span, parent, done) {
-  return tracer.scope().bind((...args) => {
-    const err = args[0]
-    if (err) {
-      span.addTags({
-        'error.type': err.name,
-        'error.msg': err.message,
-        'error.stack': err.stack
-      })
-    }
-
-    span.finish()
-
-    done(...args)
-  }, parent)
-}
-
-function patchConnection (Connection, tracer, config) {
-  this.wrap(Connection.prototype, 'query', createWrapQuery(tracer, config))
-}
-
-function unpatchConnection (Connection) {
-  this.unwrap(Connection.prototype, 'query')
-}
-
-function patchPool (Pool, tracer, config) {
-  this.wrap(Pool.prototype, 'getConnection', createWrapGetConnection(tracer, config))
-}
-
-function unpatchPool (Pool) {
-  this.unwrap(Pool.prototype, 'getConnection')
-}
-
-module.exports = [
-  {
-    name: 'mysql',
-    file: 'lib/Connection.js',
-    versions: ['>=2'],
-    patch: patchConnection,
-    unpatch: unpatchConnection
-  },
-  {
-    name: 'mysql',
-    file: 'lib/Pool.js',
-    versions: ['>=2'],
-    patch: patchPool,
-    unpatch: unpatchPool
-  }
-]
+module.exports = MySQLPlugin

package/packages/dd-trace/lib/version.js

@@ -1 +1 @@
-module.exports = '2.0.0-pre'
+module.exports = '2.0.0-appsec-beta.5'

package/packages/dd-trace/src/appsec/gateway/engine/engine.js

@@ -43,10 +43,10 @@ class SubscriptionManager {
     const knownSubscriptions = new Set()
 
     // TODO: possible optimization: collect matchedSubscriptions on the fly in Context#setValue
-    for (let i = 0; i < newAddresses.length; ++i) {
-      const matchedSubscriptions = this.addressToSubscriptions.get(newAddresses[i])
+    newAddresses.forEach((newAddress) => {
+      const matchedSubscriptions = this.addressToSubscriptions.get(newAddress)
 
-      if (matchedSubscriptions === undefined) continue
+      if (matchedSubscriptions === undefined) return
 
       for (let j = 0; j < matchedSubscriptions.length; ++j) {
         const subscription = matchedSubscriptions[j]
@@ -64,24 +64,24 @@ class SubscriptionManager {
           subscriptions.add(subscription)
         }
       }
-    }
+    })
 
     return { addresses, subscriptions }
   }
 
   dispatch (newAddresses, allAddresses, context) {
-    const { addresses, subscriptions } = this.matchSubscriptions(newAddresses, allAddresses)
+    const matches = this.matchSubscriptions(newAddresses, allAddresses)
 
     // TODO: possible optimization
-    // if(!subscriptions.size) return []
+    // check if matches.subscriptions is empty here instead of in runner.js
 
     const params = {}
 
-    addresses.forEach((address) => {
+    matches.addresses.forEach((address) => {
       params[address] = context.resolve(address)
     })
 
-    return Runner.runSubscriptions(subscriptions, params)
+    return Runner.runSubscriptions(matches.subscriptions, params)
   }
 }
 
@@ -93,48 +93,37 @@ class Context {
   constructor () {
     this.store = new Map()
     this.allAddresses = new Set()
-    this.newAddresses = [] // TODO: maybe this should be a Set
+    this.newAddresses = new Set()
   }
 
   clear () {
     this.store = new Map()
     this.allAddresses = new Set()
-    this.newAddresses = []
+    this.newAddresses = new Set()
   }
 
   setValue (address, value) {
     if (this.allAddresses.size >= MAX_CONTEXT_SIZE) return this
 
-    const oldValue = this.store.get(address)
-    if (oldValue === value) return this
-
-    this.store.set(address, value)
-
-    if (!this.newAddresses.includes(address)) {
-      this.allAddresses.add(address)
-      this.newAddresses.push(address)
+    // cannot optimize for objects because they're pointers
+    if (typeof value !== 'object') {
+      const oldValue = this.store.get(address)
+      if (oldValue === value) return this
     }
 
-    return this
-  }
-
-  setMultipleValues (params) {
-    const addresses = Object.keys(params)
-
-    for (let i = 0; i < addresses.length; ++i) {
-      const address = addresses[i]
-      this.setValue(address, params[address])
-    }
+    this.store.set(address, value)
+    this.allAddresses.add(address)
+    this.newAddresses.add(address)
 
     return this
   }
 
   dispatch () {
-    if (this.newAddresses.length === 0) return []
+    if (this.newAddresses.size === 0) return []
 
     const result = Context.manager.dispatch(this.newAddresses, this.allAddresses, this)
 
-    this.newAddresses = []
+    this.newAddresses.clear()
 
     return result
   }

package/packages/dd-trace/src/appsec/gateway/engine/runner.js

@@ -12,6 +12,8 @@ function runSubscriptions (subscriptions, params) {
 
   const store = als.getStore()
 
+  // TODO: possible optimization
+  // can we deduplicate those before ?
   const executedCallbacks = new Set()
 
   for (const subscription of subscriptions) {

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

@@ -27,13 +27,9 @@ function enable (config) {
   incomingHttpRequestStart.subscribe(incomingHttpStartTranslator)
   incomingHttpRequestEnd.subscribe(incomingHttpEndTranslator)
 
-  // add needed fields for HTTP context reporting
-  Gateway.manager.addresses.add(addresses.HTTP_INCOMING_URL)
+  // add fields needed for HTTP context reporting
   Gateway.manager.addresses.add(addresses.HTTP_INCOMING_HEADERS)
-  Gateway.manager.addresses.add(addresses.HTTP_INCOMING_METHOD)
   Gateway.manager.addresses.add(addresses.HTTP_INCOMING_REMOTE_IP)
-  Gateway.manager.addresses.add(addresses.HTTP_INCOMING_REMOTE_PORT)
-  Gateway.manager.addresses.add(addresses.HTTP_INCOMING_RESPONSE_CODE)
   Gateway.manager.addresses.add(addresses.HTTP_INCOMING_RESPONSE_HEADERS)
 }
 
@@ -85,6 +81,7 @@ function incomingHttpEndTranslator (data) {
 function disable () {
   RuleManager.clearAllRules()
 
+  // Channel#unsubscribe() is undefined for non active channels
   if (incomingHttpRequestStart.hasSubscribers) incomingHttpRequestStart.unsubscribe(incomingHttpStartTranslator)
   if (incomingHttpRequestEnd.hasSubscribers) incomingHttpRequestEnd.unsubscribe(incomingHttpEndTranslator)
 }

package/packages/dd-trace/src/appsec/reporter.js

@@ -61,16 +61,16 @@ function filterHeaders (headers, passlist, prefix) {
     const headerName = passlist[i]
 
     if (headers[headerName]) {
-      result[`${prefix}${formatHeaderName(headerName)}`] = headers[headerName].toString()
+      result[`${prefix}${formatHeaderName(headerName)}`] = headers[headerName] + ''
     }
   }
 
   return result
 }
 
+// TODO: this can be precomputed at start time
 function formatHeaderName (name) {
   return name
-    .toString()
     .trim()
     .slice(0, 200)
     .replace(/[^a-zA-Z0-9_\-:/]/g, '_')

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

@@ -24,6 +24,7 @@ const TEST_SUITE = 'test.suite'
 const TEST_STATUS = 'test.status'
 const TEST_PARAMETERS = 'test.parameters'
 const TEST_SKIP_REASON = 'test.skip_reason'
+const TEST_IS_RUM_ACTIVE = 'test.is_rum_active'
 
 const ERROR_TYPE = 'error.type'
 const ERROR_MESSAGE = 'error.msg'
@@ -43,6 +44,7 @@ module.exports = {
   TEST_STATUS,
   TEST_PARAMETERS,
   TEST_SKIP_REASON,
+  TEST_IS_RUM_ACTIVE,
   ERROR_TYPE,
   ERROR_MESSAGE,
   ERROR_STACK,
@@ -54,7 +56,7 @@ module.exports = {
   getTestSuitePath
 }
 
-function getTestEnvironmentMetadata (testFramework) {
+function getTestEnvironmentMetadata (testFramework, config) {
   // TODO: eventually these will come from the tracer (generally available)
   const ciMetadata = getCIMetadata()
   const {
@@ -83,13 +85,17 @@ function getTestEnvironmentMetadata (testFramework) {
 
   const runtimeAndOSMetadata = getRuntimeAndOSMetadata()
 
-  return {
+  const metadata = {
     [TEST_FRAMEWORK]: testFramework,
     ...gitMetadata,
     ...ciMetadata,
     ...userProvidedGitMetadata,
     ...runtimeAndOSMetadata
   }
+  if (config && config.service) {
+    metadata['service.name'] = config.service
+  }
+  return metadata
 }
 
 function getTestParametersString (parametersByTestName, testName) {

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

@@ -55,7 +55,6 @@ class AgentExporter {
   }
 
   export ({ profiles, start, end, tags }) {
-    const form = new FormData()
     const types = Object.keys(profiles)
 
     const fields = [
@@ -75,10 +74,6 @@ class AgentExporter {
       ...Object.entries(tags).map(([key, value]) => ['tags[]', `${key}:${value}`])
     ]
 
-    for (const [key, value] of fields) {
-      form.append(key, value)
-    }
-
     this._logger.debug(() => {
       const body = fields.map(([key, value]) => `  ${key}: ${value}`).join('\n')
       return `Building agent export report: ${'\n' + body}`
@@ -93,36 +88,14 @@ class AgentExporter {
         return `Adding ${type} profile to agent export: ` + bytes
       })
 
-      form.append(`types[${index}]`, type)
-      form.append(`data[${index}]`, buffer, {
+      fields.push([`types[${index}]`, type])
+      fields.push([`data[${index}]`, buffer, {
         filename: `${type}.pb.gz`,
         contentType: 'application/octet-stream',
         knownLength: buffer.length
-      })
-    }
-
-    const options = {
-      method: 'POST',
-      path: '/profiling/v1/input',
-      headers: form.getHeaders()
-    }
-
-    if (containerId) {
-      options.headers['Datadog-Container-ID'] = containerId
+      }])
     }
 
-    if (this._url.protocol === 'unix:') {
-      options.socketPath = this._url.pathname
-    } else {
-      options.protocol = this._url.protocol
-      options.hostname = this._url.hostname
-      options.port = this._url.port
-    }
-
-    this._logger.debug(() => {
-      return `Submitting agent report to: ${JSON.stringify(options)}`
-    })
-
     return new Promise((resolve, reject) => {
       const operation = retry.operation({
         randomize: true,
@@ -131,8 +104,36 @@ class AgentExporter {
       })
 
       operation.attempt((attempt) => {
-        const timeout = this._backoffTime * Math.pow(2, attempt)
-        sendRequest({ ...options, timeout }, form, (err, response) => {
+        const form = new FormData()
+
+        for (const [key, value, options] of fields) {
+          form.append(key, value, options)
+        }
+
+        const options = {
+          method: 'POST',
+          path: '/profiling/v1/input',
+          headers: form.getHeaders(),
+          timeout: this._backoffTime * Math.pow(2, attempt)
+        }
+
+        if (containerId) {
+          options.headers['Datadog-Container-ID'] = containerId
+        }
+
+        if (this._url.protocol === 'unix:') {
+          options.socketPath = this._url.pathname
+        } else {
+          options.protocol = this._url.protocol
+          options.hostname = this._url.hostname
+          options.port = this._url.port
+        }
+
+        this._logger.debug(() => {
+          return `Submitting profiler agent report attempt #${attempt} to: ${JSON.stringify(options)}`
+        })
+
+        sendRequest(options, form, (err, response) => {
           if (operation.retry(err)) {
             this._logger.error(`Error from the agent: ${err.message}`)
             return