Fix timestamp comparison (prometheus#1038)

magmax · web-flow · commit 09a5ae30602a · 2024-05-28T14:11:34.000-06:00
Signed-off-by: Miguel Angel Garcia &lt;miguelangel.garcia@gmail.com&gt;
diff --git a/prometheus_client/samples.py b/prometheus_client/samples.py
@@ -28,10 +28,10 @@ def __ne__(self, other: object) -> bool:
         return not self == other
 
     def __gt__(self, other: "Timestamp") -> bool:
-        return self.sec > other.sec or self.nsec > other.nsec
+        return self.nsec > other.nsec if self.sec == other.sec else self.sec > other.sec
 
     def __lt__(self, other: "Timestamp") -> bool:
-        return self.sec < other.sec or self.nsec < other.nsec
+        return self.nsec < other.nsec if self.sec == other.sec else self.sec < other.sec
 
 
 # Timestamp and exemplar are optional.
diff --git a/tests/test_samples.py b/tests/test_samples.py
@@ -12,6 +12,8 @@ def test_gt(self):
         self.assertEqual(samples.Timestamp(1, 2) > samples.Timestamp(1, 1), True)
         self.assertEqual(samples.Timestamp(2, 1) > samples.Timestamp(1, 1), True)
         self.assertEqual(samples.Timestamp(2, 2) > samples.Timestamp(1, 1), True)
+        self.assertEqual(samples.Timestamp(0, 2) > samples.Timestamp(1, 1), False)
+        self.assertEqual(samples.Timestamp(2, 0) > samples.Timestamp(1, 1), True)
 
     def test_lt(self):
         self.assertEqual(samples.Timestamp(1, 1) < samples.Timestamp(1, 1), False)
@@ -21,6 +23,8 @@ def test_lt(self):
         self.assertEqual(samples.Timestamp(1, 2) < samples.Timestamp(1, 1), False)
         self.assertEqual(samples.Timestamp(2, 1) < samples.Timestamp(1, 1), False)
         self.assertEqual(samples.Timestamp(2, 2) < samples.Timestamp(1, 1), False)
+        self.assertEqual(samples.Timestamp(0, 2) < samples.Timestamp(1, 1), True)
+        self.assertEqual(samples.Timestamp(2, 0) < samples.Timestamp(1, 1), False)
 
 
 if __name__ == '__main__':
