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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc538
+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.1rc538.dist-info → qontract_reconcile-0.10.1rc540.dist-info}/RECORD

@@ -158,7 +158,7 @@ reconcile/cna/assets/asset.py,sha256=1v51uYSaD1NOc9cI_YxG7h0NOcR1ng-mkmD2UzQ8PXE
 reconcile/cna/assets/asset_factory.py,sha256=7T7X_J6xIsoGETqBRI45_EyIKEdQcnRPt_GAuVuLQcc,785
 reconcile/cna/assets/null.py,sha256=Fby1Fbn7oNRIGNasdyhRDvXJ0ktpxv-pUAPN0lZWSzk,1684
 reconcile/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/glitchtip/integration.py,sha256=FB1dmwrDs8z6MHfO5Za83fcPkxsVvcaw6sFymIx4C_Q,8116
+reconcile/glitchtip/integration.py,sha256=te0xjFnovY199nRQeokxQjoOmDKgx-E98mBQykgMVCU,8192
 reconcile/glitchtip/reconciler.py,sha256=XybVNqXFnrPbNEX_B1B7esqExWdWNsUPXaORMPRUbfk,12333
 reconcile/glitchtip_project_alerts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip_project_alerts/integration.py,sha256=Bb4X-oEeBxLQtVJM4TZSerQKgDTknAWO_f-7LZRVGnI,11778
@@ -241,7 +241,7 @@ reconcile/gql_definitions/gitlab_members/gitlab_instances.py,sha256=8yOrIN4o0ofZ
 reconcile/gql_definitions/gitlab_members/permissions.py,sha256=Qzj3Fpv7xj8v9eygeP312nHRNg8er8XMRBveynPIyQM,3302
 reconcile/gql_definitions/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/glitchtip/glitchtip_instance.py,sha256=VLtAz0MQOdioh3K0viBOvDS-irrEFNnvqD6qxwG8n3M,2710
-reconcile/gql_definitions/glitchtip/glitchtip_project.py,sha256=bjNhs7mevIf19tyHpp823o_0Sm7sm0YQ8XnS-_mKkpY,5907
+reconcile/gql_definitions/glitchtip/glitchtip_project.py,sha256=oFijq1LIQysUM-IOyNUjxVZgRD93NK12lNvJuBq4vjE,6008
 reconcile/gql_definitions/glitchtip_project_alerts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/glitchtip_project_alerts/glitchtip_project.py,sha256=9gtwIyJOuhM6u-aIIsU2KEobG_aoAEhSsIGM-gkFrqM,4201
 reconcile/gql_definitions/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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
@@ -597,7 +597,7 @@ reconcile/utils/cloud_resource_best_practice/__init__.py,sha256=47DEQpj8HBSa-_TI
 reconcile/utils/cloud_resource_best_practice/aws_rds.py,sha256=EvE6XKLsrZ531MJptKqPht2lOETrOjySTHXk6CzMgo0,2279
 reconcile/utils/glitchtip/__init__.py,sha256=FT6iBhGqoe7KExFdbgL8AYUb64iW_4snF5__Dcl7yt0,258
 reconcile/utils/glitchtip/client.py,sha256=qLqw-AMrWkdP1c9pguSBjE20W6ux6JCeXCM260uET-s,10396
-reconcile/utils/glitchtip/models.py,sha256=Ic-RimRgMFskdbyYL6fQuOLwC2dGrt4y70-p-OqbQ-c,6197
+reconcile/utils/glitchtip/models.py,sha256=fwIo1u3IpLGb353Oy0WW7PY-ROAdYR87TV0hhM2d9Qs,6434
 reconcile/utils/internal_groups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/internal_groups/client.py,sha256=abREA8RwXKybXFjCK8CAcCr-iUp2r0tAbIEJ-c-PXws,4538
 reconcile/utils/internal_groups/models.py,sha256=jlkH_hyyyuwS0J1IpuS7W1AyQSKQ2QpHelXoH36edbE,2316
@@ -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.1rc538.dist-info/METADATA,sha256=TkmlNiYqcISDkpP1_R0KR4m709lpVpeeJUAkfjVEFVc,2349
-qontract_reconcile-0.10.1rc538.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc538.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc538.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc538.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/glitchtip/integration.py

@@ -100,6 +100,7 @@ def fetch_desired_state(
             name=glitchtip_project.name,
             platform=glitchtip_project.platform,
             slug=glitchtip_project.project_id if glitchtip_project.project_id else "",
+            event_throttle_rate=glitchtip_project.event_throttle_rate or 0,
         )
         # Check project is unique within an organization
         if project.name in [p.name for p in organization.projects]:

reconcile/gql_definitions/glitchtip/glitchtip_project.py

@@ -45,6 +45,7 @@ query Projects {
     name
     platform
     projectId
+    eventThrottleRate
     teams {
       name
       roles {
@@ -183,6 +184,7 @@ class GlitchtipProjectsV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     platform: str = Field(..., alias="platform")
     project_id: Optional[str] = Field(..., alias="projectId")
+    event_throttle_rate: Optional[int] = Field(..., alias="eventThrottleRate")
     teams: list[GlitchtipTeamV1] = Field(..., alias="teams")
     organization: GlitchtipProjectsV1_GlitchtipOrganizationV1 = Field(..., alias="organization")
     namespaces: list[NamespaceV1] = Field(..., alias="namespaces")

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:

reconcile/utils/glitchtip/models.py

@@ -154,6 +154,10 @@ class Project(BaseModel):
     platform: Optional[str]
     teams: list[Team] = []
     alerts: list[ProjectAlert] = []
+    event_throttle_rate: int = Field(0, alias="eventThrottleRate")
+
+    class Config:
+        allow_population_by_field_name = True
 
     @root_validator
     def slugify(  # pylint: disable=no-self-argument
@@ -174,7 +178,11 @@ class Project(BaseModel):
         return self.slug == other.slug
 
     def diff(self, other: Project) -> bool:
-        return self.name != other.name or self.platform != other.platform
+        return (
+            self.name != other.name
+            or self.platform != other.platform
+            or self.event_throttle_rate != other.event_throttle_rate
+        )
 
     def __hash__(self) -> int:
         return hash(self.slug)