dd-trace 5.85.0 → 5.86.0

package/packages/datadog-plugin-http/src/server.js

@@ -13,12 +13,11 @@ class HttpServerPlugin extends ServerPlugin {
 
   constructor (...args) {
     super(...args)
-    this._parentStore = undefined
     this.addTraceSub('exit', message => this.exit(message))
   }
 
   start ({ req, res, abortController }) {
-    const store = storage('legacy').getStore()
+    let store = storage('legacy').getStore()
     const span = web.startSpan(
       this.tracer,
       {
@@ -32,11 +31,21 @@ class HttpServerPlugin extends ServerPlugin {
     span.setTag(COMPONENT, this.constructor.id)
     span._integrationName = this.constructor.id
 
-    this._parentStore = store
-    this.enter(span, { ...store, req, res })
-
     const context = web.getContext(req)
 
+    if (context) {
+      context.parentStore = store
+    }
+
+    // Only AppSec needs the request scope to be active for any async work that
+    // may be scheduled after the synchronous `request` event returns (e.g.
+    // Fastify).
+    if (incomingHttpRequestStart.hasSubscribers) {
+      store = { ...store, req, res }
+    }
+
+    this.enter(span, store)
+
     if (!context.instrumented) {
       context.res.writeHead = web.wrapWriteHead(context)
       context.instrumented = true
@@ -64,9 +73,15 @@ class HttpServerPlugin extends ServerPlugin {
   }
 
   exit ({ req }) {
-    const span = this._parentStore && this._parentStore.span
-    this.enter(span, this._parentStore)
-    this._parentStore = undefined
+    const context = web.getContext(req)
+    const parentStore = context?.parentStore
+
+    const span = parentStore?.span
+    this.enter(span, parentStore)
+
+    if (context) {
+      context.parentStore = undefined
+    }
   }
 
   configure (config) {

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

@@ -3,6 +3,7 @@
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
 const { getEnvironmentVariable, getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
+const { appClosing: appClosingTelemetry } = require('../../dd-trace/src/telemetry')
 
 const {
   TEST_STATUS,
@@ -25,8 +26,6 @@ const {
   TEST_EARLY_FLAKE_ENABLED,
   TEST_EARLY_FLAKE_ABORT_REASON,
   JEST_DISPLAY_NAME,
-  TEST_IS_RUM_ACTIVE,
-  TEST_BROWSER_DRIVER,
   getFormattedError,
   TEST_RETRY_REASON,
   TEST_MANAGEMENT_ENABLED,
@@ -157,7 +156,9 @@ class JestPlugin extends CiPlugin {
       this.testModuleSpan.finish()
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'module')
       this.testSessionSpan.finish()
-      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
+      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session', {
+        hasFailedTestReplay: this.libraryConfig?.isDiEnabled || undefined,
+      })
       finishAllTraceSpans(this.testSessionSpan)
 
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
@@ -165,6 +166,7 @@ class JestPlugin extends CiPlugin {
         autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER'),
       })
 
+      appClosingTelemetry()
       this.tracer._exporter.flush(() => {
         if (onDone) {
           onDone()
@@ -277,6 +279,23 @@ class JestPlugin extends CiPlugin {
       }
     })
 
+    this.addSub('ci:jest:worker-report:telemetry', data => {
+      const telemetryEvents = JSON.parse(data)
+      for (const event of telemetryEvents) {
+        if (event.type === 'ciVisEvent') {
+          this.telemetry.ciVisEvent(event.name, event.testLevel, {
+            ...event.tags,
+            testFramework: event.testFramework,
+            isUnsupportedCIProvider: event.isUnsupportedCIProvider,
+          })
+        } else if (event.type === 'count') {
+          this.telemetry.count(event.name, event.tags, event.value)
+        } else if (event.type === 'distribution') {
+          this.telemetry.distribution(event.name, event.tags, event.measure)
+        }
+      }
+    })
+
     this.addSub('ci:jest:test-suite:finish', ({ status, errorMessage, error, testSuiteAbsolutePath }) => {
       const testSuiteSpan = this.testSuiteSpanPerTestSuiteAbsolutePath.get(testSuiteAbsolutePath)
       if (!testSuiteSpan) {
@@ -391,16 +410,10 @@ class JestPlugin extends CiPlugin {
         span.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.atr)
       }
 
-      const spanTags = span.context()._tags
       this.telemetry.ciVisEvent(
         TELEMETRY_EVENT_FINISHED,
         'test',
-        {
-          hasCodeOwners: !!spanTags[TEST_CODE_OWNERS],
-          isNew: spanTags[TEST_IS_NEW] === 'true',
-          isRum: spanTags[TEST_IS_RUM_ACTIVE] === 'true',
-          browserDriver: spanTags[TEST_BROWSER_DRIVER],
-        }
+        this.getTestTelemetryTags(span)
       )
 
       span.finish()
@@ -433,6 +446,12 @@ class JestPlugin extends CiPlugin {
         span.setTag(TEST_MANAGEMENT_IS_DISABLED, 'true')
       }
 
+      this.telemetry.ciVisEvent(
+        TELEMETRY_EVENT_FINISHED,
+        'test',
+        this.getTestTelemetryTags(span)
+      )
+
       span.finish()
     })
 

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

@@ -166,4 +166,10 @@ function getJestSuitesToRun (skippableSuites, originalTests, rootDir) {
   }
 }
 
-module.exports = { getFormattedJestTestParameters, getJestTestName, getJestSuitesToRun, isMarkedAsUnskippable }
+module.exports = {
+  SEED_SUFFIX_RE,
+  getFormattedJestTestParameters,
+  getJestTestName,
+  getJestSuitesToRun,
+  isMarkedAsUnskippable,
+}

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

@@ -23,8 +23,6 @@ const {
   TEST_EARLY_FLAKE_ENABLED,
   TEST_EARLY_FLAKE_ABORT_REASON,
   MOCHA_IS_PARALLEL,
-  TEST_IS_RUM_ACTIVE,
-  TEST_BROWSER_DRIVER,
   TEST_RETRY_REASON,
   TEST_MANAGEMENT_ENABLED,
   TEST_MANAGEMENT_IS_QUARANTINED,
@@ -236,16 +234,10 @@ class MochaPlugin extends CiPlugin {
           span.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.atf)
         }
 
-        const spanTags = span.context()._tags
         this.telemetry.ciVisEvent(
           TELEMETRY_EVENT_FINISHED,
           'test',
-          {
-            hasCodeOwners: !!spanTags[TEST_CODE_OWNERS],
-            isNew: spanTags[TEST_IS_NEW] === 'true',
-            isRum: spanTags[TEST_IS_RUM_ACTIVE] === 'true',
-            browserDriver: spanTags[TEST_BROWSER_DRIVER],
-          }
+          this.getTestTelemetryTags(span)
         )
 
         span.finish()
@@ -310,16 +302,10 @@ class MochaPlugin extends CiPlugin {
           span.setTag('error', err)
         }
 
-        const spanTags = span.context()._tags
         this.telemetry.ciVisEvent(
           TELEMETRY_EVENT_FINISHED,
           'test',
-          {
-            hasCodeOwners: !!spanTags[TEST_CODE_OWNERS],
-            isNew: spanTags[TEST_IS_NEW] === 'true',
-            isRum: spanTags[TEST_IS_RUM_ACTIVE] === 'true',
-            browserDriver: spanTags[TEST_BROWSER_DRIVER],
-          }
+          this.getTestTelemetryTags(span)
         )
         if (isFirstAttempt && willBeRetried && this.di && this.libraryConfig?.isDiEnabled) {
           const probeInformation = this.addDiProbe(err)
@@ -402,7 +388,9 @@ class MochaPlugin extends CiPlugin {
         this.testModuleSpan.finish()
         this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'module')
         this.testSessionSpan.finish()
-        this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
+        this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session', {
+          hasFailedTestReplay: this.libraryConfig?.isDiEnabled || undefined,
+        })
         finishAllTraceSpans(this.testSessionSpan)
         this.telemetry.count(TELEMETRY_TEST_SESSION, {
           provider: this.ciProviderName,

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

@@ -388,6 +388,9 @@ class PlaywrightPlugin extends CiPlugin {
           isNew,
           isRum: isRUMActive,
           browserDriver: 'playwright',
+          isQuarantined,
+          isDisabled,
+          isModified,
         }
       )
       span.finish()

package/packages/datadog-plugin-prisma/src/datadog-tracing-helper.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const tracingChannel = require('dc-polyfill').tracingChannel
+const { tracingChannel } = /** @type {import('node:diagnostics_channel')} */ (require('dc-polyfill'))
 const clientCH = tracingChannel('apm:prisma')
 const { storage } = require('../../datadog-core')
 
@@ -10,21 +10,12 @@ const allowedClientSpanOperations = new Set([
   'transaction',
 ])
 
-/**
- * @typedef {object} DbConfig
- * @property {string} [user]
- * @property {string} [password]
- * @property {string} [host]
- * @property {string} [port]
- * @property {string} [database]
- */
-
 class DatadogTracingHelper {
   #prismaClient
   #dbConfig
 
   /**
-   * @param {DbConfig|undefined} dbConfig
+   * @param {import('../../datadog-instrumentations/src/prisma').DbConfig|undefined} dbConfig
    * @param {import('./index')} prismaClient
    */
   constructor (dbConfig, prismaClient) {
@@ -36,7 +27,12 @@ class DatadogTracingHelper {
     return true
   }
 
-  // needs a sampled tracecontext to generate engine spans
+  /**
+   * Needs a sampled tracecontext to generate engine spans
+   *
+   * @param {object} [context]
+   * @returns {string}
+   */
   getTraceParent (context) {
     const store = storage('legacy').getStore()
     const span = store?.span
@@ -57,12 +53,31 @@ class DatadogTracingHelper {
     return '00-00000000000000000000000000000000-0000000000000000-01'
   }
 
+  /**
+   * @param {object[]} spans
+   */
   dispatchEngineSpans (spans) {
+    if (!spans?.length) {
+      return
+    }
+    const childrenByParent = new Map()
     for (const span of spans) {
-      if (span.parentId === null) {
-        this.#prismaClient.startEngineSpan({ engineSpan: span, allEngineSpans: spans, dbConfig: this.#dbConfig })
+      const parentId = span.parentId
+      const children = childrenByParent.get(parentId)
+      if (children) {
+        children.push(span)
+      } else {
+        childrenByParent.set(parentId, [span])
       }
     }
+
+    const roots = childrenByParent.get(null)
+    if (!roots) {
+      return
+    }
+    for (const span of roots) {
+      this.#prismaClient.startEngineSpan({ engineSpan: span, childrenByParent, dbConfig: this.#dbConfig })
+    }
   }
 
   getActiveContext () {
@@ -70,7 +85,15 @@ class DatadogTracingHelper {
     return store?.span?._spanContext
   }
 
+  /**
+   * @param {object} options
+   * @param {Function} callback
+   * @returns {unknown}
+   */
   runInChildSpan (options, callback) {
+    if (!clientCH.start?.hasSubscribers) {
+      return callback.apply(this, arguments)
+    }
     if (typeof options === 'string') {
       options = {
         name: options,

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

@@ -32,13 +32,15 @@ class PrismaPlugin extends DatabasePlugin {
     super(...args)
 
     // Subscribe to helper initialization to inject callbacks
-    this.addSub('apm:prisma:helper:init', (prismaHelperCtx) => {
+    this.addSub('apm:prisma:helper:init', (ctx) => {
+      const prismaHelperCtx =
+        /** @type {import('../../datadog-instrumentations/src/prisma').PrismaHelperCtx} */ (ctx)
       prismaHelperCtx.helper = new DatadogTracingHelper(prismaHelperCtx.dbConfig, this)
     })
   }
 
   startEngineSpan (ctx) {
-    const { engineSpan, allEngineSpans, childOf, dbConfig } = ctx
+    const { engineSpan, childrenByParent, childOf, dbConfig } = ctx
     const service = this.serviceName({ pluginConfig: this.config, system: this.system })
     const spanName = engineSpan.name.slice(14) // remove 'prisma:engine:' prefix
     const options = {
@@ -71,9 +73,10 @@ class PrismaPlugin extends DatabasePlugin {
 
     const activeSpan = this.startSpan(this.operationName({ operation: 'engine' }), options)
     activeSpan._startTime = hrTimeToUnixTimeMs(engineSpan.startTime)
-    for (const span of allEngineSpans) {
-      if (span.parentId === engineSpan.id) {
-        const startCtx = { engineSpan: span, allEngineSpans, childOf: activeSpan, dbConfig }
+    const children = childrenByParent.get(engineSpan.id)
+    if (children) {
+      for (const span of children) {
+        const startCtx = { engineSpan: span, childrenByParent, childOf: activeSpan, dbConfig }
         this.startEngineSpan(startCtx)
       }
     }

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

@@ -9,26 +9,31 @@ const { COMPONENT } = require('../../dd-trace/src/constants')
 class RouterPlugin extends WebPlugin {
   static id = 'router'
 
+  #storeStacks = new WeakMap()
+  #contexts = new WeakMap()
+
   constructor (...args) {
     super(...args)
 
-    this._storeStack = []
-    this._contexts = new WeakMap()
-
     this.addSub(`apm:${this.constructor.id}:middleware:enter`, ({ req, name, route }) => {
-      const childOf = this._getActive(req) || this._getStoreSpan()
+      const childOf = this.#getActive(req) || this.#getStoreSpan()
 
       if (!childOf) return
 
-      const span = this._getMiddlewareSpan(name, childOf)
-      const context = this._createContext(req, route, childOf)
+      const span = this.#getMiddlewareSpan(name, childOf)
+      const context = this.#createContext(req, route, childOf)
 
       if (childOf !== span) {
         context.middleware.push(span)
       }
 
       const store = storage('legacy').getStore()
-      this._storeStack.push(store)
+      let storeStack = this.#storeStacks.get(req)
+      if (!storeStack) {
+        storeStack = []
+        this.#storeStacks.set(req, storeStack)
+      }
+      storeStack.push(store)
       this.enter(span, store)
 
       web.patch(req)
@@ -36,7 +41,7 @@ class RouterPlugin extends WebPlugin {
     })
 
     this.addSub(`apm:${this.constructor.id}:middleware:next`, ({ req }) => {
-      const context = this._contexts.get(req)
+      const context = this.#contexts.get(req)
 
       if (!context) return
 
@@ -44,7 +49,7 @@ class RouterPlugin extends WebPlugin {
     })
 
     this.addSub(`apm:${this.constructor.id}:middleware:finish`, ({ req }) => {
-      const context = this._contexts.get(req)
+      const context = this.#contexts.get(req)
 
       if (!context || context.middleware.length === 0) return
 
@@ -52,7 +57,11 @@ class RouterPlugin extends WebPlugin {
     })
 
     this.addSub(`apm:${this.constructor.id}:middleware:exit`, ({ req }) => {
-      const savedStore = this._storeStack.pop()
+      const storeStack = this.#storeStacks.get(req)
+      const savedStore = storeStack && storeStack.pop()
+      if (storeStack && storeStack.length === 0) {
+        this.#storeStacks.delete(req)
+      }
       const span = savedStore && savedStore.span
       this.enter(span, savedStore)
     })
@@ -62,7 +71,7 @@ class RouterPlugin extends WebPlugin {
 
       if (!this.config.middleware) return
 
-      const span = this._getActive(req)
+      const span = this.#getActive(req)
 
       if (!span) return
 
@@ -70,7 +79,7 @@ class RouterPlugin extends WebPlugin {
     })
 
     this.addSub('apm:http:server:request:finish', ({ req }) => {
-      const context = this._contexts.get(req)
+      const context = this.#contexts.get(req)
 
       if (!context) return
 
@@ -82,8 +91,8 @@ class RouterPlugin extends WebPlugin {
     })
   }
 
-  _getActive (req) {
-    const context = this._contexts.get(req)
+  #getActive (req) {
+    const context = this.#contexts.get(req)
 
     if (!context) return
     if (context.middleware.length === 0) return context.span
@@ -91,13 +100,13 @@ class RouterPlugin extends WebPlugin {
     return context.middleware.at(-1)
   }
 
-  _getStoreSpan () {
+  #getStoreSpan () {
     const store = storage('legacy').getStore()
 
     return store && store.span
   }
 
-  _getMiddlewareSpan (name, childOf) {
+  #getMiddlewareSpan (name, childOf) {
     if (this.config.middleware === false) {
       return childOf
     }
@@ -116,8 +125,8 @@ class RouterPlugin extends WebPlugin {
     return span
   }
 
-  _createContext (req, route, span) {
-    let context = this._contexts.get(req)
+  #createContext (req, route, span) {
+    let context = this.#contexts.get(req)
 
     if (!route || route === '/' || route === '*') {
       route = ''
@@ -140,7 +149,7 @@ class RouterPlugin extends WebPlugin {
         middleware: [],
       }
 
-      this._contexts.set(req, context)
+      this.#contexts.set(req, context)
     }
 
     return context

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

@@ -206,9 +206,7 @@ class VitestPlugin extends CiPlugin {
 
     this.addSub('ci:vitest:test:pass', ({ span, task }) => {
       if (span) {
-        this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', {
-          hasCodeowners: !!span.context()._tags[TEST_CODE_OWNERS],
-        })
+        this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', this.getTestTelemetryTags(span))
         span.setTag(TEST_STATUS, 'pass')
         span.finish(this.taskToFinishTime.get(task))
         finishAllTraceSpans(span)
@@ -236,9 +234,7 @@ class VitestPlugin extends CiPlugin {
           promises.setProbePromise = setProbePromise
         }
       }
-      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', {
-        hasCodeowners: !!span.context()._tags[TEST_CODE_OWNERS],
-      })
+      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', this.getTestTelemetryTags(span))
       span.setTag(TEST_STATUS, 'fail')
 
       if (error) {
@@ -272,9 +268,7 @@ class VitestPlugin extends CiPlugin {
           ...(isNew ? { [TEST_IS_NEW]: 'true' } : {}),
         }
       )
-      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', {
-        hasCodeowners: !!testSpan.context()._tags[TEST_CODE_OWNERS],
-      })
+      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', this.getTestTelemetryTags(testSpan))
       testSpan.finish()
     })
 
@@ -401,7 +395,9 @@ class VitestPlugin extends CiPlugin {
       this.testModuleSpan.finish()
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'module')
       this.testSessionSpan.finish()
-      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
+      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session', {
+        hasFailedTestReplay: this.libraryConfig?.isDiEnabled || undefined,
+      })
       finishAllTraceSpans(this.testSessionSpan)
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,

package/packages/datadog-plugin-ws/src/server.js

@@ -17,6 +17,14 @@ class WSServerPlugin extends TracingPlugin {
   static get type () { return 'websocket' }
   static get kind () { return 'request' }
 
+  constructor (...args) {
+    super(...args)
+
+    // Bind the setSocket channel so internal ws event handlers (data, close)
+    // don't capture their async context.
+    this.addBind('tracing:ws:server:connect:setSocket', () => {})
+  }
+
   bindStart (ctx) {
     const req = ctx.req
 

package/packages/dd-trace/src/appsec/iast/path-line.js

@@ -22,6 +22,7 @@ const EXCLUDED_PATH_PREFIXES = [
   'child_process',
   'node:async_hooks',
   'async_hooks',
+  'node:internal/async_local_storage',
 ]
 
 function getNonDDCallSiteFrames (callSiteFrames, externallyExcludedPaths) {

package/packages/dd-trace/src/ci-visibility/early-flake-detection/get-known-tests.js

@@ -95,7 +95,7 @@ function getKnownTests ({
 
         const numTests = getNumFromKnownTests(knownTests)
 
-        incrementCountMetric(TELEMETRY_KNOWN_TESTS_RESPONSE_TESTS, {}, numTests)
+        distributionMetric(TELEMETRY_KNOWN_TESTS_RESPONSE_TESTS, {}, numTests)
         distributionMetric(TELEMETRY_KNOWN_TESTS_RESPONSE_BYTES, {}, res.length)
 
         log.debug('Number of received known tests:', numTests)

package/packages/dd-trace/src/ci-visibility/exporters/test-worker/index.js

@@ -3,6 +3,7 @@
 const {
   JEST_WORKER_COVERAGE_PAYLOAD_CODE,
   JEST_WORKER_TRACE_PAYLOAD_CODE,
+  JEST_WORKER_TELEMETRY_PAYLOAD_CODE,
   CUCUMBER_WORKER_TRACE_PAYLOAD_CODE,
   MOCHA_WORKER_TRACE_PAYLOAD_CODE,
   JEST_WORKER_LOGS_PAYLOAD_CODE,
@@ -56,6 +57,13 @@ function getInterprocessLogsCode () {
   return null
 }
 
+function getInterprocessTelemetryCode () {
+  if (getEnvironmentVariable('JEST_WORKER_ID')) {
+    return JEST_WORKER_TELEMETRY_PAYLOAD_CODE
+  }
+  return null
+}
+
 /**
  * Lightweight exporter whose writers only do simple JSON serialization
  * of trace, coverage and logs payloads, which they send to the test framework's main process.
@@ -66,10 +74,18 @@ class TestWorkerCiVisibilityExporter {
     const interprocessTraceCode = getInterprocessTraceCode()
     const interprocessCoverageCode = getInterprocessCoverageCode()
     const interprocessLogsCode = getInterprocessLogsCode()
+    const interprocessTelemetryCode = getInterprocessTelemetryCode()
 
     this._writer = new Writer(interprocessTraceCode)
     this._coverageWriter = new Writer(interprocessCoverageCode)
     this._logsWriter = new Writer(interprocessLogsCode)
+    // TODO: add support for test workers other than Jest
+    if (interprocessTelemetryCode) {
+      this._telemetryWriter = new Writer(interprocessTelemetryCode)
+      this.exportTelemetry = function (telemetryEvent) {
+        this._telemetryWriter.append(telemetryEvent)
+      }
+    }
   }
 
   export (payload) {
@@ -89,6 +105,9 @@ class TestWorkerCiVisibilityExporter {
     this._writer.flush(onDone)
     this._coverageWriter.flush()
     this._logsWriter.flush()
+    if (this._telemetryWriter) {
+      this._telemetryWriter.flush()
+    }
   }
 }
 

package/packages/dd-trace/src/ci-visibility/requests/upload-coverage-report.js

@@ -7,6 +7,14 @@ const FormData = require('../../exporters/common/form-data')
 const request = require('../../exporters/common/request')
 const log = require('../../log')
 const { getValueFromEnvSources } = require('../../config/helper')
+const {
+  incrementCountMetric,
+  distributionMetric,
+  TELEMETRY_COVERAGE_UPLOAD,
+  TELEMETRY_COVERAGE_UPLOAD_MS,
+  TELEMETRY_COVERAGE_UPLOAD_ERRORS,
+  TELEMETRY_COVERAGE_UPLOAD_BYTES,
+} = require('../telemetry')
 
 const UPLOAD_TIMEOUT_MS = 30_000
 
@@ -79,8 +87,15 @@ function uploadCoverageReport (
 
   log.debug('Uploading coverage report %s to %s%s', filePath, url, options.path)
 
+  incrementCountMetric(TELEMETRY_COVERAGE_UPLOAD)
+  distributionMetric(TELEMETRY_COVERAGE_UPLOAD_BYTES, {}, compressedCoverage.length)
+
+  const startTime = Date.now()
+
   request(form, options, (err, res, statusCode) => {
+    distributionMetric(TELEMETRY_COVERAGE_UPLOAD_MS, {}, Date.now() - startTime)
     if (err) {
+      incrementCountMetric(TELEMETRY_COVERAGE_UPLOAD_ERRORS, { statusCode })
       log.error('Error uploading coverage report: %s', err.message)
       return callback(err)
     }