Remove deprecated modem_downstream_errors and `modem_upstream_timeo…

…uts`
ties · Aug 31, 2024 · 21b1d05 · 21b1d05
1 parent 8b6bb73
commit 21b1d05
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
     downstream and upstream channels with same number would cause messages to be kept
     while channel would be gone for their channel type.
   * Improved tests of channel profile store.
+  * **removed `modem_downstream_errors` and `modem_upstream_timeouts`.
 
 ## 2024-8-29 (v0.6.0)
 

diff --git a/sagemcom_f3896_client/exporter.py b/sagemcom_f3896_client/exporter.py
@@ -230,12 +230,6 @@ async def __update_upstream_channel_metrics(self, registry: CollectorRegistry):
             ["channel", "channel_type", "timeout_type"],
             registry=registry,
         )
-        metric_upstream_timeouts_legacy = Gauge(
-            "modem_upstream_timeouts",
-            "Upstream timeouts by type",
-            ["channel", "channel_type", "timeout_type"],
-            registry=registry,
-        )
 
         metric_upstream_atdma_info = Info(
             "modem_upstream_atdma",
@@ -268,13 +262,6 @@ async def __update_upstream_channel_metrics(self, registry: CollectorRegistry):
             metric_upstream_timeouts.labels(
                 channel=ch.channel_id, channel_type=ch.channel_type, timeout_type="t4"
             ).set(ch.t4_timeouts)
-            # legacy metric (deprecated, removal after 1-5-2024)
-            metric_upstream_timeouts_legacy.labels(
-                channel=ch.channel_id, channel_type=ch.channel_type, timeout_type="t3"
-            ).set(ch.t3_timeouts)
-            metric_upstream_timeouts_legacy.labels(
-                channel=ch.channel_id, channel_type=ch.channel_type, timeout_type="t4"
-            ).set(ch.t4_timeouts)
 
             match ch.channel_type:
                 case "atdma":
@@ -296,17 +283,6 @@ async def __update_upstream_channel_metrics(self, registry: CollectorRegistry):
                         channel_type=ch.channel_type,
                         timeout_type="t2",
                     ).set(ch.t2_timeouts)
-                    # legacy metric (deprecated, removal after 1-5-2024)
-                    metric_upstream_timeouts_legacy.labels(
-                        channel=ch.channel_id,
-                        channel_type=ch.channel_type,
-                        timeout_type="t1",
-                    ).set(ch.t1_timeouts)
-                    metric_upstream_timeouts_legacy.labels(
-                        channel=ch.channel_id,
-                        channel_type=ch.channel_type,
-                        timeout_type="t2",
-                    ).set(ch.t2_timeouts)
                 case "ofdma":
                     metric_upstream_ofdma_info.labels(
                         channel=ch.channel_id, channel_type=ch.channel_type
@@ -358,13 +334,6 @@ async def __update_downstream_channel_metrics(
             ["channel", "channel_type", "error_type"],
             registry=registry,
         )
-        # added on 23-4-2024
-        metric_downstream_errors_legacy = Gauge(
-            "modem_downstream_errors",
-            "Downstream errors",
-            ["channel", "channel_type", "error_type"],
-            registry=registry,
-        )
 
         metric_downstream_qam_snr = Gauge(
             "modem_downstream_qam_snr",
@@ -415,16 +384,6 @@ async def __update_downstream_channel_metrics(
                 channel_type=ch.channel_type,
                 error_type="uncorrected",
             ).set(ch.uncorrected_errors)
-            metric_downstream_errors_legacy.labels(
-                channel=ch.channel_id,
-                channel_type=ch.channel_type,
-                error_type="corrected",
-            ).set(ch.corrected_errors)
-            metric_downstream_errors_legacy.labels(
-                channel=ch.channel_id,
-                channel_type=ch.channel_type,
-                error_type="uncorrected",
-            ).set(ch.uncorrected_errors)
 
             match ch.channel_type:
                 case "sc_qam":