Merge pull request #94 from trubrics/fix-error-handling

Author: jeffkayne

CHANGELOG.md

@@ -6,10 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-### Added
-- ...
 
-## [1.7.13] - 2025-02-06
+
+## [1.8.1] - 2025-02-07
+### Fixed
+- Fixed error logging when flushing events
+
+## [1.8.0] - 2025-02-06
 ### Added
 - Update logging, removing `is_verbose` parameter
 - Removed CONTRIBUTING.md, as info is now in README.md

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "trubrics"
-version = "1.8.0"
+version = "1.8.1"
 requires-python = ">=3.10"
 license = { text = "Apache 2.0" }
 authors = [

trubrics/main.py

@@ -1,3 +1,4 @@
+import json
 import logging
 import threading
 import time
@@ -127,8 +128,8 @@ def flush(self):
             self.last_flush_time = datetime.now(timezone.utc)
 
             if not success:
-                time.sleep(5)
                 self.logger.info(f"Retrying flush of {queue_len} events.")
+                time.sleep(5)
 
                 self._post(events)
 
@@ -156,8 +157,22 @@ def _post(self, events: list[dict]):
                 response.raise_for_status()
                 self.logger.info(f"{len(events)} events sent to Trubrics.")
                 return True
+            except requests.exceptions.HTTPError as e:
+                error_message = response.text if response.status_code != 200 else str(e)
+                try:
+                    error_message = json.loads(error_message).get(
+                        "detail", error_message
+                    )
+                except json.JSONDecodeError:
+                    pass
+                self.logger.error(
+                    f"Error flushing {len(events)} events: {error_message}"
+                )
+                return False
             except Exception as e:
-                self.logger.error(f"Error flushing {len(events)} events: {e}")
+                self.logger.error(
+                    f"Unexpected error flushing {len(events)} events: {e}"
+                )
                 return False
 
     def _periodic_flush(self):