support regex in the telemetry matcher

Author: Hweinstock

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

@@ -122,9 +122,7 @@ export class TelemetryLogger {
     /**
      * Queries telemetry for metrics with metadata containing a keyword in the key or value
      */
-    public queryRegex(re: RegExp): MetricDatum[] {
-        return this._metrics.filter((m) =>
-            m.Metadata?.some((md) => md.Value?.includes(keyword) || md.Key?.includes(keyword))
-        )
+    public queryRegex(re: RegExp | string): MetricDatum[] {
+        return this._metrics.filter((m) => m.Metadata?.some((md) => md.Value?.match(re) || md.Key?.match(re)))
     }
 }

packages/core/src/test/awsService/ec2/model.test.ts

@@ -13,7 +13,7 @@ import { ToolkitError } from '../../../shared/errors'
 import { IAM } from 'aws-sdk'
 import { SshKeyPair } from '../../../awsService/ec2/sshKeyPair'
 import { DefaultIamClient } from '../../../shared/clients/iamClient'
-import { assertNotInTelemetryMetadata, createTestWorkspaceFolder } from '../../testUtil'
+import { assertNoTelemetryMatch, createTestWorkspaceFolder } from '../../testUtil'
 import { fs } from '../../../shared'
 import path from 'path'
 
@@ -159,7 +159,7 @@ describe('Ec2ConnectClient', function () {
             const keys = await SshKeyPair.getSshKeyPair(keyPath, 30000)
             await client.sendSshKeyToInstance(testSelection, keys, 'test-user')
             const privKey = await fs.readFileText(keys.getPrivateKeyPath())
-            assertNotInTelemetryMetadata(privKey)
+            assertNoTelemetryMatch(privKey)
             sinon.restore()
             await keys.delete()
         })

packages/core/src/test/testUtil.ts

@@ -299,8 +299,8 @@ export function partialDeepCompare<T>(actual: unknown, expected: T, message?: st
  * Asserts that no metrics metadata (key OR value) matches the given regex.
  * @param keyword target substring to search for
  */
-export function assertNoTelemetryMatch(re: RegExp): void | never {
-    return assert.ok(globals.telemetry.logger.queryKeyword(keyword).length === 0)
+export function assertNoTelemetryMatch(re: RegExp | string): void | never {
+    return assert.ok(globals.telemetry.logger.queryRegex(re).length === 0)
 }
 
 /**