add slice to logging

Author: aldogonzalez8

airbyte_cdk/sources/declarative/requesters/http_requester.py

@@ -473,6 +473,7 @@ def send_request(
             dedupe_query_params=True,
             log_formatter=log_formatter,
             exit_on_rate_limit=self._exit_on_rate_limit,
+            stream_slice=stream_slice,
         )
 
         return response

airbyte_cdk/sources/streams/http/http.py

@@ -546,6 +546,7 @@ def _fetch_next_page(
             dedupe_query_params=True,
             log_formatter=self.get_log_formatter(),
             exit_on_rate_limit=self.exit_on_rate_limit,
+            stream_slice=stream_slice
         )
 
         return request, response

airbyte_cdk/sources/streams/http/http_client.py

@@ -243,6 +243,7 @@ def _send_with_retry(
         request_kwargs: Mapping[str, Any],
         log_formatter: Optional[Callable[[requests.Response], Any]] = None,
         exit_on_rate_limit: Optional[bool] = False,
+        stream_slice: Optional[Mapping[str, Any]] = None,
     ) -> requests.Response:
         """
         Sends a request with retry logic.
@@ -259,9 +260,9 @@ def _send_with_retry(
         max_tries = max(0, max_retries) + 1
         max_time = self._max_time
 
-        user_backoff_handler = user_defined_backoff_handler(max_tries=max_tries, max_time=max_time)(
-            self._send
-        )
+        user_backoff_handler = user_defined_backoff_handler(
+            max_tries=max_tries, max_time=max_time, stream_slice=stream_slice
+        )(self._send)
         rate_limit_backoff_handler = rate_limit_default_backoff_handler(max_tries=max_tries)
         backoff_handler = http_client_default_backoff_handler(
             max_tries=max_tries, max_time=max_time
@@ -506,6 +507,7 @@ def send_request(
         dedupe_query_params: bool = False,
         log_formatter: Optional[Callable[[requests.Response], Any]] = None,
         exit_on_rate_limit: Optional[bool] = False,
+        stream_slice: Optional[Mapping[str, Any]] = None,
     ) -> Tuple[requests.PreparedRequest, requests.Response]:
         """
         Prepares and sends request and return request and response objects.
@@ -526,6 +528,7 @@ def send_request(
             request_kwargs=request_kwargs,
             log_formatter=log_formatter,
             exit_on_rate_limit=exit_on_rate_limit,
+            stream_slice=stream_slice
         )
 
         return request, response

airbyte_cdk/sources/streams/http/rate_limiting.py

@@ -103,6 +103,7 @@ def should_give_up(exc: Exception) -> bool:
 def user_defined_backoff_handler(
     max_tries: Optional[int],
     max_time: Optional[int] = None,
+    stream_slice: Optional[Mapping[str, Any]] = None,
     **kwargs: Any,
 ) -> Callable[[SendRequestCallableType], SendRequestCallableType]:
     def sleep_on_ratelimit(details: Mapping[str, Any]) -> None:
@@ -114,8 +115,11 @@ def sleep_on_ratelimit(details: Mapping[str, Any]) -> None:
                 )
             retry_after = exc.backoff
             # include logging og the current time to help with debugging
+            logging_message = f"Retrying. Sleeping for {retry_after} seconds at {time.strftime('%Y-%m-%d %H:%M:%S')}"
+            if stream_slice:
+                logging_message += f" for slice: {stream_slice}"
             logger.info(
-                f"Retrying. Sleeping for {retry_after} seconds at {time.strftime('%Y-%m-%d %H:%M:%S')}"
+                logging_message
             )
             time.sleep(retry_after + 1)  # extra second to cover any fractions of second