Address review comments

Author: watson

packages/dd-trace/src/debugger/devtools_client/breakpoints.js

@@ -320,11 +320,13 @@ function lock (fn) {
  * @returns {Promise<void>}
  */
 async function removeProbeFromSampler (id) {
-  await session.post('Runtime.evaluate', {
-    expression: getRemoveProbeExpression(id),
-  }).catch(err => {
+  try {
+    await session.post('Runtime.evaluate', {
+      expression: getRemoveProbeExpression(id),
+    })
+  } catch (err) {
     log.error('[debugger:devtools_client] Error removing probe %s from sampler', id, err)
-  })
+  }
 }
 
 function generateLocationKey (scriptId, lineNumber, columnNumber) {

packages/dd-trace/src/debugger/devtools_client/probe_sampler.js

@@ -2,6 +2,9 @@
 
 const { DD_TRACE_SYMBOL, PROBE_SAMPLER_SYMBOL } = require('../probe_sampler_constants')
 
+const SAMPLER_EXPRESSION = `globalThis[Symbol.for(${JSON.stringify(DD_TRACE_SYMBOL)})]?.` +
+  `[Symbol.for(${JSON.stringify(PROBE_SAMPLER_SYMBOL)})]`
+
 module.exports = {
   compileBreakpointCondition,
   getRemoveProbeExpression,
@@ -15,7 +18,7 @@ module.exports = {
  * @returns {string}
  */
 function getRemoveProbeExpression (id) {
-  return `${getSamplerExpression()}?.remove(${JSON.stringify(id)})`
+  return `${SAMPLER_EXPRESSION}?.remove(${JSON.stringify(id)})`
 }
 
 /**
@@ -43,7 +46,7 @@ function compileBreakpointCondition (probes) {
   // file-path filename) won't see it and will silently never fire. Known limitation: a breakpoint
   // condition has no realm-independent handle to reach, so we degrade rather than crash.
   return `(() => {
-    const $dd_sampler = ${getSamplerExpression()}
+    const $dd_sampler = ${SAMPLER_EXPRESSION}
     if ($dd_sampler === undefined) return false
     let $dd_sampled = false
     ${probeConditions.join('\n    ')}
@@ -78,8 +81,3 @@ function compileProbeCondition (probe) {
       }
     } catch {}`
 }
-
-function getSamplerExpression () {
-  return `globalThis[Symbol.for(${JSON.stringify(DD_TRACE_SYMBOL)})]?.` +
-    `[Symbol.for(${JSON.stringify(PROBE_SAMPLER_SYMBOL)})]`
-}

packages/dd-trace/src/debugger/probe_sampler.js

@@ -10,6 +10,10 @@ const {
   SAMPLED_PROBE_OVERFLOW_INDEX,
 } = require('./probe_sampler_constants')
 
+const ddTraceGlobal = /** @type {Record<symbol, SharedArrayBuffer | object | undefined>} */ (
+  /** @type {Record<symbol, unknown>} */ (globalThis)[Symbol.for(DD_TRACE_SYMBOL)]
+)
+
 module.exports = {
   installProbeSampler,
   uninstallProbeSampler,
@@ -21,7 +25,6 @@ module.exports = {
  * @returns {SharedArrayBuffer} The shared sampler buffer to pass to the debugger worker.
  */
 function installProbeSampler () {
-  const ddTrace = getDatadogGlobal()
   const buffer = createProbeSamplerBuffer()
 
   const lastCaptureNsByProbeId = new Map()
@@ -33,7 +36,7 @@ function installProbeSampler () {
   let globalSnapshotSamplingRateWindowStart = 0n
   let snapshotsSampledWithinTheLastSecond = 0
 
-  ddTrace[Symbol.for(PROBE_SAMPLER_SYMBOL)] = {
+  ddTraceGlobal[Symbol.for(PROBE_SAMPLER_SYMBOL)] = {
     /**
      * Decide if a probe should be sampled and store sampled probe indexes for the debugger worker.
      *
@@ -94,19 +97,7 @@ function installProbeSampler () {
  * Remove the runtime sampler from the debuggee context.
  */
 function uninstallProbeSampler () {
-  const ddTrace = getDatadogGlobal()
-  delete ddTrace[Symbol.for(PROBE_SAMPLER_SYMBOL)]
-}
-
-/**
- * Get the Datadog global object.
- *
- * @returns {Record<symbol, SharedArrayBuffer | object | undefined>}
- */
-function getDatadogGlobal () {
-  return /** @type {Record<symbol, SharedArrayBuffer | object | undefined>} */ (
-    /** @type {Record<symbol, unknown>} */ (globalThis)[Symbol.for(DD_TRACE_SYMBOL)]
-  )
+  delete ddTraceGlobal[Symbol.for(PROBE_SAMPLER_SYMBOL)]
 }
 
 /**