[DI] Log even more relevant debug info in case of exceptions (#5974)

Author: watson

integration-tests/debugger/basic.spec.js

@@ -674,20 +674,25 @@ describe('Dynamic Instrumentation', function () {
       })
 
       it('should report error if condition cannot be compiled', function (done) {
+        const rcConfig = t.generateRemoteConfig({
+          when: { dsl: 'original dsl', json: { ref: 'this is not a valid ref' } }
+        })
+
         t.agent.on('debugger-diagnostics', ({ payload }) => {
           payload.forEach(({ debugger: { diagnostics } }) => {
             if (diagnostics.status === 'ERROR') {
-              assert.strictEqual(diagnostics.exception.message, 'Cannot compile expression: original dsl')
+              assert.strictEqual(
+                diagnostics.exception.message,
+                `Cannot compile expression: original dsl (probe: ${rcConfig.config.id}, version: 0)`
+              )
               done()
             } else if (diagnostics.status === 'INSTALLED') {
               assert.fail('Should not install when condition cannot be compiled')
             }
           })
         })
 
-        t.agent.addRemoteConfig(t.generateRemoteConfig({
-          when: { dsl: 'original dsl', json: { ref: 'this is not a valid ref' } }
-        }))
+        t.agent.addRemoteConfig(rcConfig)
       })
     })
 

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

@@ -87,7 +87,10 @@ async function addBreakpoint (probe) {
   try {
     probe.condition = probe.when?.json && compileCondition(probe.when.json)
   } catch (err) {
-    throw new Error(`Cannot compile expression: ${probe.when.dsl}`, { cause: err })
+    throw new Error(
+      `Cannot compile expression: ${probe.when.dsl} (probe: ${probe.id}, version: ${probe.version})`,
+      { cause: err }
+    )
   }
 
   const locationKey = generateLocationKey(scriptId, lineNumber, columnNumber)
@@ -115,7 +118,7 @@ async function addBreakpoint (probe) {
         condition: probe.condition
       })
     } catch (err) {
-      throw new Error(`Error setting breakpoint for probe ${probe.id}`, { cause: err })
+      throw new Error(`Error setting breakpoint for probe ${probe.id} (version: ${probe.version})`, { cause: err })
     }
     probeToLocation.set(probe.id, locationKey)
     locationToBreakpoint.set(locationKey, { id: result.breakpointId, location, locationKey })
@@ -192,7 +195,7 @@ async function updateBreakpointInternal (breakpoint, probe) {
         condition
       })
     } catch (err) {
-      throw new Error(`Error setting breakpoint for probe ${probe.id}`, { cause: err })
+      throw new Error(`Error setting breakpoint for probe ${probe.id} (version: ${probe.version})`, { cause: err })
     }
     breakpointToProbes.set(result.breakpointId, probesAtLocation)
   }

packages/dd-trace/test/debugger/devtools_client/breakpoints.spec.js

@@ -217,7 +217,9 @@ describe('breakpoints', function () {
         })
         .catch((err) => {
           expect(err).to.be.instanceOf(Error)
-          expect(err.message).to.equal('Cannot compile expression: this is an invalid condition')
+          expect(err.message).to.equal(
+            'Cannot compile expression: this is an invalid condition (probe: probe-1, version: 1)'
+          )
         })
     })
   })