Remove the Analytics shim that compensated for a broken timestamp. (#144)

The backend now sends a correct timestamp, making this additional shim obsolete.

Author: Robert-Jan Huijsman

spec/providers/analytics.spec.input.ts

@@ -121,15 +121,15 @@ export const fullPayload = JSON.parse(`{
   "eventId": "1486080145623867projects/analytics-integration-fd82a/events/i_made_this_upproviders/google.firebase.analytics/eventTypes/event.sendprojects/f949d1bb9ef782579-tp/topics/cloud-functions-u54ejabpzs4prfjh7433eklhae",
   "eventType": "providers/google.firebase.analytics/eventTypes/event.send",
   "resource": "projects/analytics-integration-fd82a/events/i_made_this_up",
-  "timestamp": "1969-12-31T23:59:59.986371388Z"
+  "timestamp": "2017-03-29T23:59:59.986371388Z"
 }`);
 
 // The event data that we expect would be constructed if the payload above were to arrive.
 export const fullEvent: Event<AnalyticsEvent> = {
   eventId: '1486080145623867projects/analytics-integration-fd82a/events/i_made_this_upproviders/google.firebase.analytics/eventTypes/event.sendprojects/f949d1bb9ef782579-tp/topics/cloud-functions-u54ejabpzs4prfjh7433eklhae',
   eventType: 'providers/google.firebase.analytics/eventTypes/event.send',
   resource: 'projects/analytics-integration-fd82a/events/i_made_this_up',
-  timestamp: '2017-02-02T23:06:26.124Z',
+  timestamp: '2017-03-29T23:59:59.986371388Z',
   params: {},
   data: {
     reportingDate: '20170202',

src/providers/analytics.ts

@@ -65,23 +65,9 @@ export class AnalyticsEventBuilder {
     const dataConstructor = (raw: Event<any>) => {
       return new AnalyticsEvent(raw.data);
     };
-    const attemptTimestampFix = (event: Event<AnalyticsEvent>) => {
-      // This is a temporary shim, to mask an issue in which Analytics events may carry an
-      // incorrect Event.timestamp. Often there's a correct timestamp present in
-      // Event.data.logTime, so until the production backend sends correct top-level timestamps
-      // we can pull a timestamp from there.
-      // BUG(36001921).
-      if (event.timestamp && (event.timestamp.substr(0, 4) === '1969' || event.timestamp.substr(0, 4) === '1970')) {
-        event.timestamp = undefined;  // If we don't have a good timestamp, prefer no timestamp at all.
-        if (event.data && event.data.logTime) {
-          event.timestamp = event.data.logTime;
-        }
-      }
-      return handler(event);
-    };
     return makeCloudFunction({
       provider,
-      handler: attemptTimestampFix,
+      handler,
       eventType: 'event.log',
       resource: this.resource,
       dataConstructor,