FEA: Add more originator and parent information to handled events

BREAKING CHANGE: Redeploy your cloud function and BigQuery table and use with events from `octue>=0.56.0`.

Author: cortadocodes

functions/event_handler/main.py

@@ -38,14 +38,18 @@ def store_pub_sub_event_in_bigquery(cloud_event):
         "uuid": attributes.pop("uuid"),
         "kind": event.pop("kind"),
         "event": event,
+        # Any attributes not popped below will end up in the `other_attributes` column.
         "other_attributes": attributes,
         # Pull out some attributes into columns for querying.
+        "parent": attributes.pop("parent"),
         "originator": attributes.pop("originator"),
         "sender": attributes.pop("sender"),
         "sender_type": attributes.pop("sender_type"),
         "sender_sdk_version": attributes.pop("sender_sdk_version"),
         "recipient": attributes.pop("recipient"),
         "question_uuid": attributes.pop("question_uuid"),
+        "parent_question_uuid": attributes.pop("parent_question_uuid"),
+        "originator_question_uuid": attributes.pop("originator_question_uuid"),
         "order": attributes.pop("order"),
         # Backend-specific metadata.
         "backend": BACKEND,

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name="twined-gcp",
-    version="0.5.1",
+    version="0.6.0",
     author="Marcus Lugg <marcus@octue.com>",
     install_requires=[
         "setuptools",

tests/test_event_handler.py

@@ -20,12 +20,15 @@ def test_store_pub_sub_event_in_bigquery(self):
                     "attributes": {
                         "datetime": "2024-04-11T09:26:39.144818",
                         "uuid": "c8bda9fa-f072-4330-92b1-96920d06b28d",
-                        "originator": "octue/test-service:5.6.3",
+                        "parent": "octue/parent-test-service:5.6.3",
+                        "originator": "octue/ancestor-test-service:5.6.3",
                         "sender": "octue/test-service:5.6.3",
                         "sender_type": "PARENT",
                         "sender_sdk_version": "1.0.3",
                         "recipient": "octue/another-service:1.0.0",
                         "question_uuid": "ca534cdd-24cb-4ed2-af57-e36757192acb",
+                        "parent_question_uuid": "1d897229-155d-498d-b6ae-21960fab3754",
+                        "originator_question_uuid": "fb6cf9a3-84fb-45ce-a4da-0d2257bec319",
                         "order": "0",
                         "forward_logs": True,
                     },
@@ -49,12 +52,15 @@ def test_store_pub_sub_event_in_bigquery(self):
                 "other_attributes": {
                     "forward_logs": True,
                 },
-                "originator": "octue/test-service:5.6.3",
+                "parent": "octue/parent-test-service:5.6.3",
+                "originator": "octue/ancestor-test-service:5.6.3",
                 "sender": "octue/test-service:5.6.3",
                 "sender_type": "PARENT",
                 "sender_sdk_version": "1.0.3",
                 "recipient": "octue/another-service:1.0.0",
                 "question_uuid": "ca534cdd-24cb-4ed2-af57-e36757192acb",
+                "parent_question_uuid": "1d897229-155d-498d-b6ae-21960fab3754",
+                "originator_question_uuid": "fb6cf9a3-84fb-45ce-a4da-0d2257bec319",
                 "order": "0",
                 "backend": "GoogleCloudPubSub",
                 "backend_metadata": {"message_id": "1234", "ordering_key": None},