fix: address CodeRabbit review feedback

- Add 'Z' suffix to timestamp isoformat in get_count() and get_timeline()

- Move shutil import to module level in tests

- Use assertEqual instead of assertLessEqual for exact count verification

Author: cabana8471-arch

structured_logging.py

@@ -419,7 +419,8 @@ def count(
             params.append(feature_id)
         if since:
             conditions.append("timestamp >= ?")
-            params.append(since.isoformat())
+            ts = since.isoformat().replace("+00:00", "Z")
+            params.append(ts if ts.endswith("Z") else since.isoformat())
 
         where_clause = " AND ".join(conditions) if conditions else "1=1"
         cursor.execute(f"SELECT COUNT(*) FROM logs WHERE {where_clause}", params)
@@ -460,7 +461,12 @@ def get_timeline(
             GROUP BY bucket, agent_id
             ORDER BY bucket
             """,
-            (bucket_minutes, bucket_minutes, since.isoformat(), until.isoformat()),
+            (
+                bucket_minutes,
+                bucket_minutes,
+                since.isoformat().replace("+00:00", "Z"),
+                until.isoformat().replace("+00:00", "Z"),
+            ),
         )
 
         rows = cursor.fetchall()

test_structured_logging.py

@@ -6,6 +6,7 @@
 """
 
 import json
+import shutil
 import sqlite3
 import tempfile
 import threading
@@ -81,7 +82,6 @@ def setUp(self):
 
     def tearDown(self):
         """Clean up temporary files."""
-        import shutil
         shutil.rmtree(self.temp_dir, ignore_errors=True)
 
     def test_creates_database(self):
@@ -120,7 +120,6 @@ def setUp(self):
 
     def tearDown(self):
         """Clean up temporary files."""
-        import shutil
         shutil.rmtree(self.temp_dir, ignore_errors=True)
 
     def test_creates_logs_directory(self):
@@ -212,7 +211,6 @@ def setUp(self):
 
     def tearDown(self):
         """Clean up temporary files."""
-        import shutil
         shutil.rmtree(self.temp_dir, ignore_errors=True)
 
     def test_query_by_level(self):
@@ -302,7 +300,6 @@ def setUp(self):
 
     def tearDown(self):
         """Clean up temporary files."""
-        import shutil
         shutil.rmtree(self.temp_dir, ignore_errors=True)
 
     def test_export_json(self):
@@ -360,7 +357,6 @@ def setUp(self):
 
     def tearDown(self):
         """Clean up temporary files."""
-        import shutil
         shutil.rmtree(self.temp_dir, ignore_errors=True)
 
     def test_concurrent_writes(self):
@@ -434,7 +430,6 @@ def setUp(self):
 
     def tearDown(self):
         """Clean up temporary files."""
-        import shutil
         shutil.rmtree(self.temp_dir, ignore_errors=True)
 
     def test_cleanup_old_entries(self):
@@ -462,8 +457,8 @@ def test_cleanup_old_entries(self):
         count = cursor.fetchone()[0]
         conn.close()
 
-        # Should have at most max_entries
-        self.assertLessEqual(count, 10)
+        # Should have exactly max_entries after cleanup
+        self.assertEqual(count, 10)
 
 
 if __name__ == "__main__":