diff --git a/packages/dd-trace/src/runtime_metrics/runtime_metrics.js b/packages/dd-trace/src/runtime_metrics/runtime_metrics.js index 7b3bb30136e..fc9cb546adc 100644 --- a/packages/dd-trace/src/runtime_metrics/runtime_metrics.js +++ b/packages/dd-trace/src/runtime_metrics/runtime_metrics.js @@ -22,7 +22,7 @@ let nativeMetrics = null let gcObserver = null let interval = null let client = null -let lastTime = 0n +let lastTime = 0 let lastCpuUsage = null let eventLoopDelayObserver = null @@ -103,7 +103,6 @@ module.exports = { interval = null client = null - lastTime = 0n lastCpuUsage = null gcObserver?.disconnect() @@ -339,6 +338,7 @@ function startGCObserver () { gcObserver = new PerformanceObserver(list => { for (const entry of list.getEntries()) { + // @ts-expect-error - entry.detail?.kind and entry.kind are not typed const type = gcType(entry.detail?.kind || entry.kind) const duration = entry.duration * 1_000_000 diff --git a/packages/dd-trace/test/runtime_metrics.spec.js b/packages/dd-trace/test/runtime_metrics.spec.js index b01631891b7..00b2def33d6 100644 --- a/packages/dd-trace/test/runtime_metrics.spec.js +++ b/packages/dd-trace/test/runtime_metrics.spec.js @@ -23,7 +23,9 @@ function createGarbage (count = 50) { for (let i = 0; i < count; i++) { last.next = { circular: obj, last, obj: { a: 1, b: 2, c: true } } + // @ts-expect-error - Difficult to define type last = last.next + // @ts-expect-error - Difficult to define type last.map = new Map([['a', 1], ['b', 2], ['c', true]]) obj[i] = last } @@ -133,7 +135,7 @@ function createGarbage (count = 50) { expect(runtimeMetrics.decrement).to.not.have.been.called expect(runtimeMetrics.stop).to.have.been.calledOnce }) - }, { skip: isWindows }) + }, { skip: isWindows && !nativeMetrics }) describe('runtimeMetrics', () => { let runtimeMetrics @@ -260,7 +262,7 @@ function createGarbage (count = 50) { // Wait for GC observer to trigger. const startTime = Date.now() - const waitTime = 200 + const waitTime = 200 + (nativeMetrics ? 0 : 200) let iterations = 0 while (Date.now() - startTime < waitTime) { // Need ticks for the event loop delay @@ -582,7 +584,7 @@ function createGarbage (count = 50) { ) client.gauge.resetHistory() - const nowStub3 = sinon.stub(performance, 'now').returns(startPerformanceNow + 20_001) + const nowStub3 = sinon.stub(performance, 'now').returns(startPerformanceNow + 20_000) clock.tick(10000) // Advance another 10 seconds nowStub3.restore() @@ -782,6 +784,6 @@ function createGarbage (count = 50) { }) }) }) - }, { skip: isWindows }) + }, { skip: isWindows && !nativeMetrics }) }) })