From b71cc0abd18bf1f439e15d5164e3b190205265fc Mon Sep 17 00:00:00 2001 From: Michael Lavers Date: Tue, 25 Sep 2018 09:33:22 -0700 Subject: [PATCH] Add @iopipe/event-info.eventType for all key events Closes #262 --- iopipe/contrib/eventinfo/event_types.py | 5 ++++- tests/contrib/eventinfo/test_event_types.py | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/iopipe/contrib/eventinfo/event_types.py b/iopipe/contrib/eventinfo/event_types.py index d0e429cc..edf77fbb 100644 --- a/iopipe/contrib/eventinfo/event_types.py +++ b/iopipe/contrib/eventinfo/event_types.py @@ -19,9 +19,12 @@ def has_required_keys(self): def collect(self): if self.keys == "all": - return collect_all_keys( + event_info = collect_all_keys( self.event, "@iopipe/event-info.%s" % self.type, self.exclude_keys ) + event_info["@iopipe/event-info.eventType"] = self.type + return event_info + event_info = {} for key in self.keys: if isinstance(key, tuple): diff --git a/tests/contrib/eventinfo/test_event_types.py b/tests/contrib/eventinfo/test_event_types.py index ff52b12b..efeaabcd 100644 --- a/tests/contrib/eventinfo/test_event_types.py +++ b/tests/contrib/eventinfo/test_event_types.py @@ -7,9 +7,12 @@ def test__event_types__alexa_skill(event_alexa_skill): assert event.has_required_keys() is True event_info = event.collect() - assert event_info != {} - assert all([k.startswith("@iopipe/event-info.alexaSkill.") for k in event_info]) - assert len(list(event_info.keys())) == 31 + expected_keys = ["@iopipe/event-info.eventType"] + [ + "@iopipe/event-info.alexaSkill.%s" % key for key in event.keys + ] + assert list(event_info.keys()).sort() == expected_keys.sort() + + assert len(list(event_info.keys())) == 32 def test__event_types__apigw(event_apigw):