Fixes activity key error

Author: Mark Kasaboski

packages/flare/bin/cron_job_ingest_events.py

@@ -122,10 +122,10 @@ def main(
         flare_api_cls=flare_api_cls,
     ):
         save_last_fetched(kvstore=kvstore)
-
         save_next(kvstore=kvstore, tenant_id=tenant_id, next=next_token)
 
-        print(json.dumps(event), flush=True)
+        if event:
+            print(json.dumps(event), flush=True)
 
         events_fetched_count += 1
 

packages/flare/bin/flare.py

@@ -116,9 +116,12 @@ def _fetch_event_feed_metadata(
 
     def _fetch_full_event_from_uid(self, *, uid: str) -> dict:
         event_response = self.flare_client.get(url=f"/firework/v2/activities/{uid}")
-        event = event_response.json()["activity"]
+        event = event_response.json()
         self.logger.debug(event)
-        return event
+        if not event or "activity" not in event:
+            self.logger.info(f"Failed to fetch event with uid: {uid}")
+            return {}
+        return event["activity"]
 
     def fetch_api_key_validation(self) -> requests.Response:
         return self.flare_client.get(