update telemetry tagging behavior

Author: haljac

src/ExpressBridge.ts

@@ -1,4 +1,3 @@
-import { v4 } from 'uuid';
 import type { handlerType, errorHandlerType } from './EventPattern';
 import type { TelemetryConfig } from './Telemetry';
 import { EventPattern } from './EventPattern';
@@ -35,12 +34,10 @@ export class ExpressBridge {
   }
 
   public async process(incomingEvent: EventType): Promise<void> {
-    console.log('Handling incoming event: ', incomingEvent);
     try {
       // if telemetry is defined, set uuid and call beacon
       console.log('Telemetry enabled: ', !!process.env.EB_TELEMETRY);
       if (process.env.EB_TELEMETRY && this.options.telemetry) {
-        console.log('Telemetry enabled, setting trace tag on event.');
         this.telemetry = new Telemetry(this.options.telemetry);
         this.telemetry.tagEvent(incomingEvent);
       }
@@ -54,8 +51,6 @@ export class ExpressBridge {
 
       const matchedPatterns = this.match(incomingEvent);
 
-      console.log('Patterns matched: ', matchedPatterns);
-
       if (matchedPatterns.length > 0) {
         await this.telemetry?.beacon('EB-MATCH', {
           description: 'Patterns matched for event. Calling assigned handlers.',

src/Telemetry.ts

@@ -35,22 +35,24 @@ export class Telemetry {
     const { body, detail, Records } = event;
     let payload = body ?? detail ?? Records;
 
-    console.log('Tagging payload: ', payload);
-
-    const tag = v4();
+    let tag = v4();
     if (Array.isArray(payload)) {
       for (const record of payload) {
-        record.eb_event_id = record.eb_event_id || tag;
+        tag = record.eb_event_id || tag;
+        record.eb_event_id = tag;
       }
     } else if (payload) {
       payload = typeof payload === 'string' ? JSON.parse(payload) : payload;
-      payload.eb_event_id = payload.eb_event_id || tag;
+      tag = payload.eb_event_id || tag;
+      payload.eb_event_id = tag;
       event[body ? 'body' : 'detail'] = payload;
     } else {
-      event.eb_event_id = event.eb_event_id || tag;
+      tag = event.eb_event_id || tag;
+      event.eb_event_id = tag;
     }
 
     this.eb_event_id = tag;
+
     return tag;
   }
 }