refactor: move assertTelemetry into TelemetryHelper as assertMetricEmitted

Author: Hweinstock

integ-tests/add-remove-resources.test.ts

@@ -1,6 +1,6 @@
 import { createTestProject, readProjectConfig, runCLI } from '../src/test-utils/index.js';
 import type { TestProject } from '../src/test-utils/index.js';
-import { assertTelemetry, createTelemetryHelper } from '../src/test-utils/telemetry-helper.js';
+import { createTelemetryHelper } from '../src/test-utils/telemetry-helper.js';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 
 const telemetry = createTelemetryHelper();
@@ -42,7 +42,7 @@ describe('integration: add and remove resources', () => {
       expect(found, `Memory "${memoryName}" should be in config`).toBe(true);
 
       // Verify telemetry
-      assertTelemetry(telemetry.readEntries(), { command: 'add.memory', exit_reason: 'success' });
+      telemetry.assertMetricEmitted({ command: 'add.memory', exit_reason: 'success' });
     });
 
     it('adds a memory with EPISODIC strategy and verifies reflectionNamespaces', async () => {
@@ -111,7 +111,7 @@ describe('integration: add and remove resources', () => {
       expect(found, `Credential "${credentialName}" should be in config`).toBe(true);
 
       // Verify telemetry
-      assertTelemetry(telemetry.readEntries(), {
+      telemetry.assertMetricEmitted({
         command: 'add.credential',
         exit_reason: 'success',
         credential_type: 'api-key',

integ-tests/help.test.ts

@@ -1,6 +1,6 @@
 import { spawnAndCollect } from '../src/test-utils/cli-runner.js';
 import { runCLI } from '../src/test-utils/index.js';
-import { assertTelemetry, createTelemetryHelper } from '../src/test-utils/telemetry-helper.js';
+import { createTelemetryHelper } from '../src/test-utils/telemetry-helper.js';
 import { readdirSync } from 'node:fs';
 import { join } from 'node:path';
 import { afterAll, describe, expect, it } from 'vitest';
@@ -63,7 +63,7 @@ describe('help modes telemetry', () => {
 
     const entries = telemetry.readEntries();
     expect(entries).toHaveLength(1);
-    assertTelemetry(entries, {
+    telemetry.assertMetricEmitted({
       command_group: 'help',
       command: 'help.modes',
       exit_reason: 'success',

src/test-utils/index.ts

@@ -4,12 +4,7 @@
  */
 
 export { runCLI, spawnAndCollect, cleanSpawnEnv, type RunResult } from './cli-runner.js';
-export {
-  createTelemetryHelper,
-  assertTelemetry,
-  type TelemetryHelper,
-  type TelemetryEntry,
-} from './telemetry-helper.js';
+export { createTelemetryHelper, type TelemetryHelper, type TelemetryEntry } from './telemetry-helper.js';
 export { exists } from './fs-helpers.js';
 export { hasCommand, hasAwsCredentials, prereqs } from './prereqs.js';
 export { createTestProject, type TestProject, type CreateTestProjectOptions } from './project-factory.js';

src/test-utils/telemetry-helper.ts

@@ -16,6 +16,8 @@ export interface TelemetryHelper {
   env: { AGENTCORE_TELEMETRY_AUDIT: '1'; AGENTCORE_CONFIG_DIR: string };
   /** Read all JSONL entries from the audit telemetry directory */
   readEntries: () => TelemetryEntry[];
+  /** Assert a metric was emitted with attrs matching the given subset */
+  assertMetricEmitted: (expected: Record<string, string | number | boolean>) => void;
   /** Delete telemetry entries only (keeps the config dir) */
   clearEntries: () => void;
   /** Delete the entire config directory — call in afterAll */
@@ -24,7 +26,7 @@ export interface TelemetryHelper {
 
 export function createTelemetryHelper(): TelemetryHelper {
   const dir = mkdtempSync(join(tmpdir(), 'agentcore-audit-'));
-  return {
+  const helper: TelemetryHelper = {
     dir,
     env: { AGENTCORE_TELEMETRY_AUDIT: '1', AGENTCORE_CONFIG_DIR: dir },
     readEntries() {
@@ -35,17 +37,17 @@ export function createTelemetryHelper(): TelemetryHelper {
           .map(line => JSON.parse(line) as TelemetryEntry)
       );
     },
+    assertMetricEmitted(expected) {
+      const entries = helper.readEntries();
+      const match = entries.find(e => Object.entries(expected).every(([k, v]) => String(e.attrs[k]) === String(v)));
+      expect(match, `No telemetry entry matching ${JSON.stringify(expected)}`).toBeDefined();
+    },
     clearEntries() {
       rmSync(join(dir, 'telemetry'), { recursive: true, force: true });
     },
     destroy() {
       rmSync(dir, { recursive: true, force: true });
     },
   };
-}
-
-/** Assert that at least one telemetry entry was emitted matching the given attrs. */
-export function assertTelemetry(entries: TelemetryEntry[], expected: Record<string, string | number | boolean>): void {
-  const match = entries.find(e => Object.entries(expected).every(([k, v]) => String(e.attrs[k]) === String(v)));
-  expect(match, `No telemetry entry matching ${JSON.stringify(expected)}`).toBeDefined();
+  return helper;
 }