Merge pull request #82 from digital-asset/python-metrics-1.0

python: Remove the block offset metric, as it is no longer numeric in DAML SDK 1.0

Author: da-tanabe

VERSION

@@ -1 +1 @@
-6.7.3
+6.7.4

python/dazl/metrics/prometheus.py

@@ -36,15 +36,9 @@ def __init__(self, registry: 'Optional[CollectorRegistry]' = None):
             'dazl_network_loop_responsiveness_seconds',
             'Number of seconds to immediately schedule and execute a no-op on the event loop',
             registry=registry)
-        self._offset = Gauge(
-            'dazl_party_offset',
-            'current read offset',
-            ['party'],
-            registry=registry)
 
     def loop_responsiveness(self, responsiveness: 'timedelta') -> None:
         self._loop_responsiveness_seconds.set(responsiveness.total_seconds())
 
     def party_offset(self, party: 'Party', offset: str) -> None:
-        if offset is not None:
-            self._offset.labels(party).set(offset)
+        pass

python/dazl/model/reading.py

@@ -317,14 +317,14 @@ def max_offset(offsets: 'Collection[str]') -> 'Optional[str]':
     return max(offsets, key=sortable_offset_height) if offsets else None
 
 
-def sortable_offset_height(value: str) -> 'Union[int, str]':
+def sortable_offset_height(value: str) -> 'str':
     if value:
         try:
             components = value.split('-', 3)
             if len(components) == 1:
-                return int(value)
+                return f'{int(value):016d}'
             elif len(components) >= 1:
-                return int(components[1])
+                return f'{int(components[1]):016d}'
         except ValueError:
             # newer versions of the DAML SDK no longer return offsets in a parseable format, but
             # the strings themselves are naturally comparable

python/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dazl"
-version = "6.7.3"
+version = "6.7.4"
 description = "high-level Ledger API client for DAML ledgers"
 license = "Apache-2.0"
 authors = ["Davin K. Tanabe <davin.tanabe@digitalasset.com>"]