Merge pull request #1899 from mozilla/default-event-timestamp

Bug 1886113 - Add wall-clock timestamps to all events

Author: rosahbruno

glean/src/core/metrics/types/event.ts

@@ -49,6 +49,8 @@ export class InternalEventMetricType<
       return;
     }
 
+    const ts = Date.now();
+
     try {
       // Create metric here, in order to run the validations and throw in case input in invalid.
       const metric = new RecordedEvent({
@@ -59,9 +61,8 @@ export class InternalEventMetricType<
       });
 
       // Truncate the extra keys, if needed.
-      let truncatedExtra: ExtraMap | undefined = undefined;
+      const truncatedExtra: ExtraMap = {};
       if (extra && this.allowedExtraKeys) {
-        truncatedExtra = {};
         for (const [name, value] of Object.entries(extra)) {
           if (this.allowedExtraKeys.includes(name)) {
             if (isString(value)) {
@@ -84,6 +85,8 @@ export class InternalEventMetricType<
         }
       }
 
+      // Glean wall-clock timestamp added to all events
+      truncatedExtra["glean_timestamp"] = ts.toString();
       metric.set({
         ...metric.get(),
         extra: truncatedExtra
@@ -111,7 +114,19 @@ export class InternalEventMetricType<
    */
   testGetValue(ping: string = this.sendInPings[0]): Event[] | undefined {
     if (testOnlyCheck("testGetValue", LOG_TAG)) {
-      return Context.eventsDatabase.getEvents(ping, this);
+      const events = Context.eventsDatabase.getEvents(ping, this);
+      if (!events) return events;
+
+      events.forEach((ev) => {
+        if (ev.extra) {
+          delete ev.extra["glean_timestamp"];
+          if (Object.keys(ev.extra).length == 0) {
+            ev.extra = undefined;
+          }
+        }
+      });
+
+      return events;
     }
   }
 }