no keen projects

jumper_logging_agent/agent.py

@@ -85,7 +85,7 @@ def __init__(
         self.default_event_type = default_event_type
         self.on_listening = on_listening
 
-        self.event_store.project_id = project_id
+        self.project_id = self.event_store.project_id = project_id
         self.event_store.write_key = write_key
 
     def start(self):
@@ -183,7 +183,7 @@ def write_events(self, events):
             if timestamp:
                 event['keen'] = dict(timestamp=datetime.datetime.fromtimestamp(timestamp).isoformat())
 
-        events_dict = dict(log=events)
+        events_dict = {self.project_id: events}
         self.event_store.add_events(events_dict)
 
     @property

jumper_logging_agent/tests/test_agent.py

@@ -122,6 +122,10 @@ def tearDown(self):
         self.stop_agent()
         delete_file(self.agent_filename)
 
+    @property
+    def agent_project_id(self):
+        raise NotImplementedError()
+
     def thread_local_agent_file(self):
         agent_file = getattr(local, 'agent_file', None)
         if not agent_file:
@@ -228,6 +232,10 @@ def start_agent(self, **kwargs):
         if not listening_event.wait(3.0):
             raise Exception('Agent has not started in time')
 
+    @property
+    def agent_project_id(self):
+        return self.agent.project_id
+
     def stop_agent(self):
         if self.agent:
             self.agent.stop()
@@ -237,7 +245,7 @@ def stop_agent(self):
                 raise Exception('Agent thread has not ended')
 
     def written_events(self, t=None):
-        events = self.mock_event_store.events['log']
+        events = self.mock_event_store.events[self.agent_project_id]
 
         if t is None:
             return events
@@ -271,6 +279,11 @@ def tearDown(self):
         super(AgentProcessTests, self).tearDown()
         delete_file(self.mock_event_store_json)
 
+    @property
+    def agent_project_id(self):
+        with open(DEFAULT_CONFIG_FILE, b'r') as f:
+            return json.load(f)['project_id']
+
     def start_agent(self, **kwargs):
         args = ['python', '-u', '%s/agent_main.py' % (MAIN_DIR,)]
         args.extend(['--input', self.agent_filename])
@@ -307,7 +320,7 @@ def written_events(self, t=None):
         except (ValueError, IOError):
             events = collections.defaultdict(list)
 
-        events = events['log']
+        events = events[self.agent_project_id]
         return [e for e in events if e['type'] == t] if t is not None else events