L2SS-1554: Fix missing station state metric

README.md

@@ -139,6 +139,7 @@ Next change the version in the following places:
 
 # Release Notes
 
+* 0.24.1 Let all devices emit basic prometheus metrics
 * 0.24.0 Allow multiple antenna fields to be used in single observation,
   This renames the `Observation` device to `ObservationField`.
 * 0.23.0 Migrate execution environment to nomad

infra/dev/main.hcl

@@ -15,7 +15,7 @@ resource "nomad_job" "tango" {
   paths = ["./jobs/station/tango.nomad"]
 
   health_check {
-    timeout = "300s"
+    timeout = "1000s"
     jobs    = ["tango"]
   }
 }
@@ -26,7 +26,7 @@ resource "nomad_job" "object-storage" {
   paths = ["./jobs/station/object-storage.nomad"]
 
   health_check {
-    timeout = "300s"
+    timeout = "1000s"
     jobs    = ["object-storage"]
   }
 }

infra/jobs/station/jupyter.levant.nomad

@@ -50,7 +50,7 @@ job "jupyter" {
       resources {
         cpu        = 1024
         memory     = 1024
-        memory_max = 8192
+        memory_max = 20480
       }
       template {
         data = <<EOH

tangostationcontrol/VERSION

-0.24.0
+0.24.1

tangostationcontrol/tangostationcontrol/devices/base_device_classes/lofar_device.py

@@ -38,13 +38,14 @@ from tangostationcontrol.common.type_checking import sequence_not_str
 from tangostationcontrol.devices.base_device_classes.control_hierarchy import (
     ControlHierarchyDevice,
 )
-from tangostationcontrol.metrics import DeviceMetricCollector
+from tangostationcontrol.metrics import device_metrics
 
 __all__ = ["LOFARDevice"]
 
 logger = logging.getLogger()
 
 
+@device_metrics()
 class LOFARDevice(Device):
     """
 
@@ -249,7 +250,6 @@ class LOFARDevice(Device):
 
         # record when this device was started
         self.device_start_time = time.time()
-        DeviceMetricCollector.add_device(self)
 
     def _init_device(self):
         logger.debug("[LOFARDevice] init_device")

tangostationcontrol/tangostationcontrol/metrics/_decorators.py

@@ -75,6 +75,9 @@ class DeviceMetricsAttribute:
     @staticmethod
     def init_device_wrapper():
         def new_init_device(instance):
+            from ._collectors import DeviceMetricCollector
+
+            DeviceMetricCollector.add_device(instance)
             metric_values = instance.get_name().split("/")
             metric_values.append(str(instance.get_device_class().get_name()))
             instance.metric_labels = metric_values
@@ -88,6 +91,8 @@ class DeviceMetricsAttribute:
                 self.ds_state.labels(*instance.metric_labels).set(new_state)
             except ValueError as e:
                 logger.warning(e)
+            except AttributeError as e:
+                logger.warning(e)
 
         return new_set_state