Error logging fixes (#3)

* Fixing Error Reporting status codes

* Removing debug logging

* Fixing error logging

Author: Ben-Chapman

src/libs/http.py

@@ -44,7 +44,7 @@ async def get(self, uri: str, headers: dict, params: dict | None = None):
                     "method": e.request.method,
                     "url": str(e.request.url),
                     "user_agent": headers["User-Agent"],
-                    "response_status_code": "504",
+                    "status_code": "504",
                 },
             )
             return error_message
@@ -57,7 +57,7 @@ async def get(self, uri: str, headers: dict, params: dict | None = None):
                     "method": e.request.method,
                     "url": str(e.request.url),
                     "user_agent": headers["User-Agent"],
-                    "response_status_code": "503",
+                    "status_code": "503",
                 },
             )
             return error_message
@@ -71,7 +71,7 @@ async def get(self, uri: str, headers: dict, params: dict | None = None):
                     "method": e.request.method,
                     "url": str(e.request.url),
                     "user_agent": headers["User-Agent"],
-                    "response_status_code": "400",
+                    "status_code": "400",
                 },
             )
             return error_message
@@ -84,7 +84,7 @@ async def get(self, uri: str, headers: dict, params: dict | None = None):
                     "method": e.request.method,
                     "url": str(e.request.url),
                     "user_agent": headers["User-Agent"],
-                    "response_status_code": "429",
+                    "status_code": "429",
                 },
             )
             return error_message
@@ -112,7 +112,7 @@ async def get(self, uri: str, headers: dict, params: dict | None = None):
                     "method": e.request.method,
                     "url": str(e.request.url),
                     "user_agent": headers["User-Agent"],
-                    "response_status_code": "500",
+                    "status_code": "500",
                 },
             )
             return error_message
@@ -147,7 +147,7 @@ async def post(self, uri: str, headers: dict, post_data: dict):
                     "method": e.request.method,
                     "url": str(e.request.url),
                     "user_agent": headers["User-Agent"],
-                    "response_status_code": "504",
+                    "status_code": "504",
                 },
             )
             return error_message
@@ -160,7 +160,7 @@ async def post(self, uri: str, headers: dict, post_data: dict):
                     "method": e.request.method,
                     "url": str(e.request.url),
                     "user_agent": headers["User-Agent"],
-                    "response_status_code": "503",
+                    "status_code": "503",
                 },
             )
             return error_message
@@ -174,7 +174,7 @@ async def post(self, uri: str, headers: dict, post_data: dict):
                     "method": e.request.method,
                     "url": str(e.request.url),
                     "user_agent": headers["User-Agent"],
-                    "response_status_code": "400",
+                    "status_code": "400",
                 },
             )
             return error_message
@@ -187,7 +187,7 @@ async def post(self, uri: str, headers: dict, post_data: dict):
                     "method": e.request.method,
                     "url": str(e.request.url),
                     "user_agent": headers["User-Agent"],
-                    "response_status_code": "429",
+                    "status_code": "429",
                 },
             )
             return error_message
@@ -202,7 +202,7 @@ async def post(self, uri: str, headers: dict, post_data: dict):
                     "method": e.request.method,
                     "url": str(e.request.url),
                     "user_agent": headers["User-Agent"],
-                    "response_status_code": "500",
+                    "status_code": "500",
                 },
             )
             return error_message
@@ -215,7 +215,7 @@ async def post(self, uri: str, headers: dict, post_data: dict):
                     "method": e.request.method,
                     "url": str(e.request.url),
                     "user_agent": headers["User-Agent"],
-                    "response_status_code": "400",
+                    "status_code": "400",
                 },
             )
             return error_message

src/routers/logger.py

@@ -6,7 +6,8 @@
 
 class ErrorMessage(BaseModel):
     errorMessage: str
-    additionalData: dict | None = None
+    userAgent: str
+    appVersion: str
 
 
 router = APIRouter(prefix="/api")
@@ -29,9 +30,8 @@ async def accept_application_error(
 
     Keyword arguments:
     errorMessage -- the error message to be logged
-
-
     """
+
     background_tasks.add_task(send_error_to_gcp, error)
     return {"status": "OK"}
 
@@ -52,15 +52,15 @@ def send_error_to_gcp(error, http_context=None):
         error_client.report(message=error, http_context=context)
     else:
         # Setup error logging to GCP Error Reporting
-        error_client = error_reporting.Client(version=error["appVersion"])
+        error_client = error_reporting.Client(version=error.appVersion)
 
         # The HTTPContext class is automatically parsed by the GCP Error Reporting service,
         # so using HTTPContext to supply some EVFinder specific information.
         http_context = error_reporting.HTTPContext(
-            user_agent=error.additionalData["userAgent"],
-            referrer=error["appVersion"],
+            user_agent=error.userAgent,
+            referrer=error.appVersion,
         )
         error_client.report(
-            message=f"{error.errorMessage} {error.additionalData}",
+            message=f"{error.errorMessage}",
             http_context=http_context,
         )