fix: adjust tests

Author: Hweinstock

packages/core/src/shared/telemetry/util.ts

@@ -346,7 +346,8 @@ function validateMetadata(metricName: string, metadata: MetadataObj, fatal: bool
 
     // TODO: there are many instances in the toolkit where we emit metrics with missing fields. If those can be removed, we can configure this to throw in CI.
     if (metadata.missingFields) {
-        logWarningOnce(`"${metricName}" emitted with missing fields: ${metadata.missingFields}`)
+        const logMsg = `${msgPrefix} "${metricName}" emitted with missing fields: ${metadata.missingFields}`
+        logWarningOnce(logMsg)
     }
 }
 

packages/core/src/shared/utilities/processUtils.ts

@@ -8,7 +8,6 @@ import * as crossSpawn from 'cross-spawn'
 import * as logger from '../logger/logger'
 import { Timeout, CancellationError, waitUntil } from './timeoutUtils'
 import { PollingSet } from './pollingSet'
-import { CircularBuffer } from './collectionUtils'
 import { oncePerUniqueArg } from './functionUtils'
 
 export interface RunParameterContext {
@@ -82,7 +81,6 @@ export interface ProcessStats {
 export class ChildProcessTracker {
     static readonly pollingInterval: number = 10000 // Check usage every 10 seconds
     static readonly logger = logger.getLogger('childProcess')
-    static readonly loggedPids = new CircularBuffer(1000)
     #processByPid: Map<number, ChildProcess> = new Map<number, ChildProcess>()
     #pids: PollingSet<number>
 

packages/core/src/test/shared/utilities/processUtils.test.ts

@@ -395,10 +395,6 @@ describe('ChildProcessTracker', function () {
         usageMock = sinon.stub(ChildProcessTracker.prototype, 'getUsage')
     })
 
-    beforeEach(function () {
-        ChildProcessTracker.loggedPids.clear()
-    })
-
     afterEach(function () {
         tracker.clear()
         usageMock.reset()
@@ -451,26 +447,33 @@ describe('ChildProcessTracker', function () {
         assert.strictEqual(tracker.size, 0, 'expected tracker to be empty')
     })
 
-    it('logs a warning message when system usage exceeds threshold', async function () {
+    it('logs a warning message when cpu usage exceeds threshold', async function () {
         const runningProcess = startSleepProcess()
         tracker.add(runningProcess.childProcess)
 
         const highCpu: ProcessStats = {
             cpu: defaultProcessWarnThresholds.cpu + 1,
             memory: 0,
         }
-        const highMemory: ProcessStats = {
-            cpu: 0,
-            memory: defaultProcessWarnThresholds.memory + 1,
-        }
 
         usageMock.returns(highCpu)
 
         await clock.tickAsync(ChildProcessTracker.pollingInterval)
         assertLogsContain('exceeded cpu threshold', false, 'warn')
 
-        ChildProcessTracker.loggedPids.clear()
+        await stopAndWait(runningProcess)
+    })
+
+    it('logs a warning message when memory usage exceeds threshold', async function () {
+        const runningProcess = startSleepProcess()
+        tracker.add(runningProcess.childProcess)
+
+        const highMemory: ProcessStats = {
+            cpu: 0,
+            memory: defaultProcessWarnThresholds.memory + 1,
+        }
         usageMock.returns(highMemory)
+
         await clock.tickAsync(ChildProcessTracker.pollingInterval)
         assertLogsContain('exceeded memory threshold', false, 'warn')