Merge pull request #19853 from mozilla/FXA-12846

chore(event-broker): Stop including clientId in statsd

Author: nshirley

packages/fxa-event-broker/src/queueworker/queueworker.service.spec.ts

@@ -359,11 +359,19 @@ describe('QueueworkerService', () => {
       webHookService.hasWebhookRegistered = jest.fn().mockReturnValue(false);
       const msg = updateStubMessage(baseDeleteMessage);
       await (service as any).handleMessage(msg);
-      expect(logger.debug).toBeCalledTimes(3);
+      expect(logger.debug).toHaveBeenCalledTimes(3);
+
       expect(logger.debug.mock.calls[1][0]).toBe('noWebhookRegistered');
-      expect(metrics.increment).toBeCalledWith('message.webhookNotFound', {
-        clientId: baseLoginMessage.clientId,
+      expect(logger.debug.mock.calls[1][1]).toEqual({
+        clientId: '444c5d137fc34d82ae65441d7f26a504',
+        eventType: 'delete',
       });
+      expect(metrics.increment).toHaveBeenCalledWith(
+        'message.webhookNotFound',
+        {
+          eventType: 'delete',
+        }
+      );
     });
   });
 });

packages/fxa-event-broker/src/queueworker/queueworker.service.ts

@@ -134,11 +134,17 @@ export class QueueworkerService
    * Publish a message to the pubsub topic for the client.
    */
   private async publishMessage(clientId: string, json: any) {
+    const eventType = json.event ?? 'unknown';
     // Ensure clientId is normalized
     clientId = clientId.toLowerCase();
     if (!this.clientWebhooks.hasWebhookRegistered(clientId)) {
-      this.log.debug('noWebhookRegistered', { clientId });
-      this.metrics.increment('message.webhookNotFound', { clientId });
+      this.log.debug('noWebhookRegistered', {
+        clientId,
+        eventType,
+      });
+      this.metrics.increment('message.webhookNotFound', {
+        eventType,
+      });
       return;
     }
     const topicName = this.topicPrefix + clientId;