fix: fix

Author: talboren

keep/api/routes/preset.py

@@ -137,10 +137,10 @@ def pull_data_from_providers(
                         f"Provider {provider.type} ({provider.id}) does not implement pulling incidents",
                         extra=extra,
                     )
-                except Exception as e:
-                    logger.error(
+                except Exception:
+                    logger.exception(
                         f"Unknown error pulling incidents from provider {provider.type} ({provider.id})",
-                        extra={**extra, "error": str(e)},
+                        extra={**extra, "trace_id": trace_id},
                     )
             else:
                 logger.debug(
@@ -165,10 +165,10 @@ def pull_data_from_providers(
                     f"Provider {provider.type} ({provider.id}) does not implement pulling topology data",
                     extra=extra,
                 )
-            except Exception as e:
-                logger.error(
+            except Exception:
+                logger.exception(
                     f"Unknown error pulling topology from provider {provider.type} ({provider.id})",
-                    extra={**extra, "error": str(e)},
+                    extra={**extra},
                 )
 
             for fingerprint, alert in sorted_provider_alerts_by_fingerprint.items():

keep/providers/pagerduty_provider/pagerduty_provider.py

@@ -575,6 +575,7 @@ def _query(self, incident_id: str = None):
             else incidents
         )
 
+    @staticmethod
     def _format_alert(
         event: dict, provider_instance: "BaseProvider" = None
     ) -> AlertDto:
@@ -791,11 +792,15 @@ def _get_incidents(self) -> list[IncidentDto]:
         raw_incidents = self.__get_all_incidents_or_alerts()
         incidents = []
         for incident in raw_incidents:
-            incident_dto = self._format_incident({"event": {"data": incident}})
+            incident_dto = PagerdutyProvider._format_incident(
+                {"event": {"data": incident}}
+            )
             incident_alerts = self.__get_all_incidents_or_alerts(
                 incident_id=incident_dto.fingerprint
             )
-            incident_alerts = [self._format_alert(alert) for alert in incident_alerts]
+            incident_alerts = [
+                PagerdutyProvider._format_alert(alert) for alert in incident_alerts
+            ]
             incident_dto._alerts = incident_alerts
             incidents.append(incident_dto)
         return incidents