fix: refactor var names and update related unit tests

Author: kristian4res

lib/log_processor/log_types/cloud_run_revision.py

@@ -10,17 +10,17 @@ def attempt_create(entry: LogEntry) -> Optional[AppLogPayload]:
 
     message, data = get_message_and_data(entry)
 
-    function_name = entry.resource_labels.get("service_name")
+    service_name = entry.resource_labels.get("service_name")
     log_query = {"resource.type": "cloud_run_revision"}
 
-    if function_name:
-        log_query["resource.labels.service_name"] = function_name
+    if service_name:
+        log_query["resource.labels.service_name"] = service_name
 
     return AppLogPayload(
         message=message,
         data=data,
         platform=entry.resource_type,
-        application=function_name or "[unknown]",
+        application=service_name or "[unknown]",
         log_query=log_query,
     )
 

tests/lib/log_processor/log_types/test_cloud_run_revision.py

@@ -10,7 +10,7 @@
 def log_entry() -> LogEntry:
     return LogEntry(
         resource_type="cloud_run_revision",
-        resource_labels=dict(function_name="example-function"),
+        resource_labels=dict(service_name="example-function"),
         payload_type=PayloadType.TEXT,
         payload="Cloud function error message",
         severity="ERROR",
@@ -30,7 +30,7 @@ def test_attempt_create_succeeds_with_complete_entry(log_entry):
     assert instance.application == "example-function"
     assert instance.log_query == {
         "resource.type": "cloud_run_revision",
-        "resource.labels.function_name": "example-function",
+        "resource.labels.service_name": "example-function",
     }
 
 
@@ -41,16 +41,16 @@ def test_attempt_create_returns_none_if_resource_type_is_wrong(log_entry):
 
 
 def test_attempt_create_returns_unknown_application_if_label_is_missing(log_entry):
-    del log_entry.resource_labels["function_name"]
+    del log_entry.resource_labels["service_name"]
     instance = attempt_create(log_entry)
     assert instance is not None
     assert instance.application == "[unknown]"
 
 
-def test_attempt_create_returns_query_without_function_name_if_label_is_missing(
+def test_attempt_create_returns_query_without_service_name_if_label_is_missing(
     log_entry,
 ):
-    del log_entry.resource_labels["function_name"]
+    del log_entry.resource_labels["service_name"]
     instance = attempt_create(log_entry)
     assert instance is not None
     assert instance.log_query == {"resource.type": "cloud_run_revision"}

tests/test_main.py

@@ -205,7 +205,7 @@ def test_send_cloud_run_revision_slack_alert(run_slack_alerter, get_webhook_payl
         "receiveTimestamp": "2022-07-22T20:36:22.219592062Z",
         "resource": {
             "labels": {
-                "function_name": "log-error",
+                "service_name": "log-error",
             },
             "type": "cloud_run_revision",
         },
@@ -220,7 +220,7 @@ def test_send_cloud_run_revision_slack_alert(run_slack_alerter, get_webhook_payl
     expected_log_query_link = create_log_query_link(
         {
             "resource.type": "cloud_run_revision",
-            "resource.labels.function_name": "log-error",
+            "resource.labels.service_name": "log-error",
         },
         ["WARNING", "ERROR", "CRITICAL", "ALERT", "EMERGENCY", "DEBUG"],
         parse("2022-07-22T20:36:22.219592Z"),
@@ -257,7 +257,7 @@ def test_send_cloud_run_revision_timeout_slack_alert(
         "receiveTimestamp": "2022-12-15T04:09:02.428095884Z",
         "resource": {
             "labels": {
-                "function_name": "log-error",
+                "service_name": "log-error",
             },
             "type": "cloud_run_revision",
         },
@@ -272,7 +272,7 @@ def test_send_cloud_run_revision_timeout_slack_alert(
     expected_log_query_link = create_log_query_link(
         {
             "resource.type": "cloud_run_revision",
-            "resource.labels.function_name": "log-error",
+            "resource.labels.service_name": "log-error",
         },
         ["WARNING", "ERROR", "CRITICAL", "ALERT", "EMERGENCY", "DEBUG"],
         parse("2022-12-15T04:09:02.428095Z").astimezone(pytz.timezone("Europe/London")),
@@ -1148,7 +1148,7 @@ def test_skip_all_prod_aborted_where_no_available_instance_alerts(
             "labels": {
                 "project_id": "ons-blaise-v2-prod",
                 "region": "europe-west2",
-                "function_name": application_input,
+                "service_name": application_input,
             },
         },
         "timestamp": "2024-05-16T08:45:23.261465Z",