qontract-reconcile 0.10.1rc539__py3-none-any.whl → 0.10.1rc540__py3-none-any.whl

{qontract_reconcile-0.10.1rc539.dist-info → qontract_reconcile-0.10.1rc540.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc539
+Version: 0.10.1rc540
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc539.dist-info → qontract_reconcile-0.10.1rc540.dist-info}/RECORD

@@ -350,8 +350,8 @@ reconcile/saas_auto_promotions_manager/publisher.py,sha256=4_M9Oykhj-kEZPUn05E2D
 reconcile/saas_auto_promotions_manager/subscriber.py,sha256=cLhPlkT71J2LIice3SLmH1WpsqzV46gd0peMxrnqyRw,7452
 reconcile/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request.py,sha256=BeAJWLow7b4HQyZ9zz398sQkPeIz8chpMkCts2NU27c,1282
-reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py,sha256=mU6csC1-2WjEHhYNCeEDDmN63QQIprp0zkqQ5UH5xNM,6817
-reconcile/saas_auto_promotions_manager/merge_request_manager/metrics.py,sha256=mI9yYwCiNePmtox16yKH1mU5ijsMeQYjQBgRiZq101A,878
+reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py,sha256=awjaelk-1YbuxA-SsamzinDmM820I8TynGkelJe3Uq4,6991
+reconcile/saas_auto_promotions_manager/merge_request_manager/metrics.py,sha256=sdHp71Wl87tFM-Z_QvqvdHhyrppFLGi4ekksCi_e_bs,977
 reconcile/saas_auto_promotions_manager/merge_request_manager/mr_parser.py,sha256=x8Gg-YjEFWEeDPJH3Y8SrfcJbwhLuAqCz4kIhfEyaaA,7060
 reconcile/saas_auto_promotions_manager/merge_request_manager/reconciler.py,sha256=nst5ZynEQs9Hy9Z2DAjN8_ALIS_5XnrbJh7KG4YVRrE,7789
 reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=huslpgeXNf_VmEVmWHIYYSwEcT67zsbuubYMk2P9ezc,6959
@@ -669,8 +669,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=se-YG_YVCWRFrnCPvBVHDBT_59CkbIoEni-4SJa8_MU,2755
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc539.dist-info/METADATA,sha256=G5OnXKqXyOiLpF5fCCYMXfTGjJhCuyfYLi-9EiP-jLE,2349
-qontract_reconcile-0.10.1rc539.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc539.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc539.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc539.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc540.dist-info/METADATA,sha256=WNI0hxRRLGZlqygoB1eyLlAcy8BikBAxDbX2dcyKcHM,2349
+qontract_reconcile-0.10.1rc540.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc540.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc540.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc540.dist-info/RECORD,,

reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py

@@ -148,8 +148,6 @@ class MergeRequestManagerV2:
 
     def reconcile(self, subscribers: Iterable[Subscriber]) -> None:
         current_state = self._mr_parser.retrieve_open_mrs(label=SAPM_LABEL)
-        metrics.set_gauge(ParallelOpenMRGauge(), len(current_state))
-
         desired_state = self._aggregate_desired_state(subscribers=subscribers)
 
         diff = self._reconciler.reconcile(
@@ -157,6 +155,10 @@ class MergeRequestManagerV2:
             desired_promotions=desired_state,
             open_mrs=current_state,
         )
+        parallel_open_mrs = (
+            len(current_state) - len(diff.deletions) + len(diff.additions)
+        )
+        metrics.set_gauge(ParallelOpenMRGauge(), parallel_open_mrs)
         for deletion in diff.deletions:
             metrics.inc_counter(
                 MRClosedCounter(
@@ -172,6 +174,7 @@ class MergeRequestManagerV2:
             metrics.inc_counter(
                 MROpenedCounter(
                     is_batchable=addition.batchable,
+                    batch_size=len(addition.content_hashes),
                 ),
             )
             self._render_mr(addition=addition)

reconcile/saas_auto_promotions_manager/merge_request_manager/metrics.py

@@ -16,6 +16,8 @@ class SAPMOpenedMRsCounter(SAPMBaseMetric, CounterMetric):
     "Counter for the number of opened auto-promotion MRs"
 
     is_batchable: bool
+    # We do not expect batches >10, i.e., cardinality will stay in check here.
+    batch_size: int
 
     @classmethod
     def name(cls) -> str: