Remove last second error classification for postgres serialization er…

…rors (#32030)

GitOrigin-RevId: c5b8572190819e668a740f042aa4db3e569825d7

crates/common/src/http/mod.rs

@@ -553,8 +553,10 @@ impl From<anyhow::Error> for HttpResponseError {
             error_code: err.short_msg().to_string().into(),
             msg: err.msg().to_string().into(),
         };
-        let trace = err.last_second_classification();
-        Self { trace, http_error }
+        Self {
+            trace: err,
+            http_error,
+        }
     }
 }
 

crates/errors/src/lib.rs

@@ -576,7 +576,6 @@ pub trait ErrorMetadataAnyhowExt {
     fn wrap_error_message<F>(self, f: F) -> Self
     where
         F: FnOnce(String) -> String;
-    fn last_second_classification(self) -> Self;
 }
 
 impl ErrorMetadataAnyhowExt for anyhow::Error {
@@ -795,39 +794,6 @@ impl ErrorMetadataAnyhowExt for anyhow::Error {
         let new_msg = f(self.to_string());
         self.context(new_msg)
     }
-
-    /// Escape hatch classification function.
-    /// Call this near the edge of the system to do a last-second classification
-    /// on the way out. This is not an ideal place to do error
-    /// classification. It is much better to do it at the point it is being
-    /// thrown.
-    ///
-    /// Reality is that in some cases it's not ergonomic or possible to classify
-    /// during throw, so leaving ourselves an escape hatch
-    fn last_second_classification(self) -> Self {
-        // Each classification here should have a comment explaining why we're doing
-        // it last second. We'd much rather prefer doing it at the time of throw.
-
-        let as_string = self.to_string();
-        // Just doing this as a quick hack because sqlx::query has 100 throw sites.
-        // Ideally, we would wrap sqlx and do handling there, but punting to save time.
-        let postgres_occs = [
-            "could not serialize access due to read/write dependencies among transactions",
-            "could not serialize access due to concurrent update",
-        ];
-        if let Some(occ) = postgres_occs
-            .into_iter()
-            .find(|occ| as_string.contains(occ))
-        {
-            // Classify postgres occ as overloaded. ErrorMetadata::OCC is specific to the
-            // application level inside convex backend.
-            return self
-                .context(ErrorMetadata::overloaded("PostgresOcc", occ))
-                .context(as_string);
-        }
-
-        self
-    }
 }
 
 pub const INTERNAL_SERVER_ERROR_MSG: &str = "Your request couldn't be completed. Try again later.";

crates/local_backend/src/subs/mod.rs

@@ -250,8 +250,7 @@ async fn run_sync_socket(
 
     let close_msg = match result {
         Ok(..) => None,
-        Err(err) => {
-            let mut err = err.last_second_classification();
+        Err(mut err) => {
             // Send a message on the WebSocket before closing it if the sync
             // worker failed with a "4xx" type error. In this case the client will
             // assume the error is its fault and not retry.