fix: Remove obsolete timeseries (#45)

* proof stats only by active cc

* proof stats only by active cc

* proof stats only by active cc

* remove obsolete cc_ids

Author: lowzzz

graph_node_metrics.py

@@ -321,66 +321,86 @@ def collect_active_capacity_commitments_stats(client, provider_id, provider_name
         logger.error(f"Error collecting active capacity commitments: {e}")
         raise
 
+
 def collect_current_epoch_proof_stats(client, providers):
     """Collect proof stats for the current epoch."""
     try:
         current_epoch = get_current_epoch(client)
         network_info = get_network_info(client)
-        if current_epoch and network_info:
-            epoch_id = current_epoch['id']
-            max_proofs = int(network_info['graphNetworks'][0]['maxProofsPerEpoch'])
-            min_proofs = int(network_info['graphNetworks'][0]['minRequiredProofsPerEpoch'])
-            epoch_duration = int(network_info['graphNetworks'][0]['coreEpochDuration'])
-            time_from_epoch_start = int(time.time()) - int(current_epoch['startTimestamp'])
-
-            query = gql(f'''
-            query  {{
-              capacityCommitmentStatsPerEpoches(
-                where: {{epoch: "{epoch_id}", capacityCommitment_: {{status: Active}}}}
-              ) {{
-                submittedProofsCount
-                totalFailCount
+        if not current_epoch or not network_info:
+            logger.warning("Failed to get current epoch or network info")
+            return
+
+        epoch_id = current_epoch['id']
+        max_proofs = int(network_info['graphNetworks'][0]['maxProofsPerEpoch'])
+        min_proofs = int(network_info['graphNetworks'][0]['minRequiredProofsPerEpoch'])
+        epoch_duration = int(network_info['graphNetworks'][0]['coreEpochDuration'])
+
+        if epoch_duration == 0:
+            logger.error("Epoch duration is zero, cannot calculate projected proofs")
+            return
+
+        time_from_epoch_start = int(time.time()) - int(current_epoch['startTimestamp'])
+
+        query = gql(f'''
+        query {{
+          capacityCommitmentStatsPerEpoches(
+            where: {{epoch: "{epoch_id}", capacityCommitment_: {{status: Active}}}}
+          ) {{
+            submittedProofsCount
+            totalFailCount
+            id
+            activeUnitCount
+            capacityCommitment {{
+              id
+              provider {{
                 id
-                activeUnitCount
-                capacityCommitment {{
-                  id
-                  provider {{
-                    id
-                    name
-                  }}
-                }}
+                name
               }}
-            }}   
-            ''')
-            response = client.execute(query)
-            stats = response['capacityCommitmentStatsPerEpoches']
-            provider_ids = set([provider['id'] for provider in providers])
-
-            for stat in stats:
-                provider_id = stat['capacityCommitment']['provider']['id']
-                provider_name = stat['capacityCommitment']['provider']['name']
-                cc_id = stat['capacityCommitment']['id']
-                activeUnitCount = int(stat['activeUnitCount'])
-
-                if provider_id in provider_ids:
-                    submitted_proofs = stat['submittedProofsCount']
-                    max_projected_proofs = (activeUnitCount * max_proofs ) * (time_from_epoch_start / epoch_duration)
-                    min_projected_proofs = (activeUnitCount * min_proofs ) * (time_from_epoch_start / epoch_duration)
-
-                    COMMITMENT_CURRENT_EPOCH_SUBMITTED_PROOFS.labels(
-                        cc_id = cc_id,
-                        provider_id=provider_id,
-                        provider_name=provider_name).set(submitted_proofs)
-
-                    COMMITMENT_CURRENT_EPOCH_MAX_PROJECTED_PROOFS.labels(
-                        cc_id = cc_id,
-                        provider_id=provider_id,
-                        provider_name=provider_name).set(max_projected_proofs)
-
-                    COMMITMENT_CURRENT_EPOCH_MIN_PROJECTED_PROOFS.labels(
-                        cc_id = cc_id,
-                        provider_id=provider_id,
-                        provider_name=provider_name).set(min_projected_proofs)
+            }}
+          }}
+        }}
+        ''')
+        response = client.execute(query)
+        stats = response.get('capacityCommitmentStatsPerEpoches', [])
+        if not stats:
+            logger.warning("No stats returned from GraphQL query")
+            return
+
+        provider_ids = {provider['id'] for provider in providers}
+        current_cc_ids = {stat['capacityCommitment']['id'] for stat in stats}
+
+        for metric in [COMMITMENT_CURRENT_EPOCH_SUBMITTED_PROOFS,
+                       COMMITMENT_CURRENT_EPOCH_MIN_PROJECTED_PROOFS,
+                       COMMITMENT_CURRENT_EPOCH_MAX_PROJECTED_PROOFS]:
+            for labels in list(metric._metrics.keys()):
+                cc_id = labels[0]
+                if cc_id not in current_cc_ids:
+                    metric.remove(*labels)
+
+        for stat in stats:
+            provider_id = stat['capacityCommitment']['provider']['id']
+            provider_name = stat['capacityCommitment']['provider']['name']
+            cc_id = stat['capacityCommitment']['id']
+            active_unit_count = int(stat['activeUnitCount'])
+
+            if provider_id not in provider_ids:
+                continue
+
+            submitted_proofs = int(stat['submittedProofsCount'])
+            max_projected_proofs = (active_unit_count * max_proofs) * (time_from_epoch_start / epoch_duration)
+            min_projected_proofs = (active_unit_count * min_proofs) * (time_from_epoch_start / epoch_duration)
+
+            COMMITMENT_CURRENT_EPOCH_SUBMITTED_PROOFS.labels(
+                cc_id=cc_id, provider_id=provider_id, provider_name=provider_name
+            ).set(submitted_proofs)
+            COMMITMENT_CURRENT_EPOCH_MAX_PROJECTED_PROOFS.labels(
+                cc_id=cc_id, provider_id=provider_id, provider_name=provider_name
+            ).set(max_projected_proofs)
+            COMMITMENT_CURRENT_EPOCH_MIN_PROJECTED_PROOFS.labels(
+                cc_id=cc_id, provider_id=provider_id, provider_name=provider_name
+            ).set(min_projected_proofs)
+
     except Exception as e:
         logger.error(f"Error collecting proof stats: {e}")
         raise