refactor: extract standalone assertTelemetry helper

Author: Hweinstock

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

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

integ-tests/help.test.ts

@@ -1,4 +1,4 @@
-import { createAuditContext } from '../src/test-utils/audit.js';
+import { assertTelemetry, createAuditContext } from '../src/test-utils/audit.js';
 import { spawnAndCollect } from '../src/test-utils/cli-runner.js';
 import { runCLI } from '../src/test-utils/index.js';
 import { readdirSync } from 'node:fs';
@@ -63,9 +63,7 @@ describe('help modes telemetry', () => {
 
     const entries = audit.readEntries();
     expect(entries).toHaveLength(1);
-    expect(entries[0]!.attrs).toMatchObject({
-      'service.name': 'agentcore-cli',
-      'agentcore-cli.mode': 'cli',
+    assertTelemetry(entries, {
       command_group: 'help',
       command: 'help.modes',
       exit_reason: 'success',

src/test-utils/audit.ts

@@ -2,6 +2,7 @@ import { globSync } from 'glob';
 import { mkdtempSync, readFileSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
+import { expect } from 'vitest';
 
 export interface TelemetryEntry {
   value: number;
@@ -42,3 +43,9 @@ export function createAuditContext(): AuditContext {
     },
   };
 }
+
+/** 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();
+}

src/test-utils/index.ts

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