From cfb2455da200d3a7da6a8d405c36dedd7ce747b7 Mon Sep 17 00:00:00 2001
From: Maximilien Cuony <maximilien.cuony@orbitalize.com>
Date: Thu, 15 Jan 2026 11:02:03 +0100
Subject: [PATCH] [monitoringlib] Set ConnectionResetError as retryable

---
 monitoring/monitorlib/fetch/__init__.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/monitoring/monitorlib/fetch/__init__.py b/monitoring/monitorlib/fetch/__init__.py
index 1b1cf380e8..137b936a08 100644
--- a/monitoring/monitorlib/fetch/__init__.py
+++ b/monitoring/monitorlib/fetch/__init__.py
@@ -6,6 +6,7 @@
 import uuid
 from dataclasses import dataclass
 from enum import Enum
+from http.client import RemoteDisconnected
 from typing import Self, TypeVar
 from urllib.parse import urlparse
 
@@ -714,10 +715,21 @@ def build_failing_query(t0) -> Query:
                 logger.warning(failure_message)
             failures.append(failure_message)
         except requests.ConnectionError as e:
-            if "RemoteDisconnected" in str(e):
-                # This error manifests as:
-                #   ('Connection aborted.', RemoteDisconnected('Remote end closed connection without response'))
-                # ...and this may be retryable
+
+            def context_contains(exception, types) -> bool:
+                if (
+                    exception.__class__ in types
+                ):  # We don't use isinstance, we want exact type
+                    return True
+
+                parent = getattr(exception, "__context__", None)
+
+                if parent:
+                    return context_contains(parent, types)
+                else:
+                    return False
+
+            if context_contains(e, (RemoteDisconnected, ConnectionResetError)):
                 retryable = True
             else:
                 retryable = False