Merge pull request #63 from matburt/extra_prom_info

Adding some info stats

Author: matburt

receptor/receptor.py

@@ -1,3 +1,4 @@
+import pkg_resources
 import asyncio
 import copy
 import json
@@ -9,7 +10,7 @@
 from . import exceptions
 from .messages import directive, envelope
 from .router import MeshRouter
-from .stats import messages_received_counter
+from .stats import messages_received_counter, receptor_info
 from .work import WorkManager
 
 RECEPTOR_DIRECTIVE_NAMESPACE = 'receptor'
@@ -31,6 +32,7 @@ def __init__(self, config, node_id=None, router_cls=None,
         self.connection_manifest_path = os.path.join(self.base_path, "connection_manifest")
         self.buffer_mgr = self.config.components_buffer_manager
         self.stop = False
+        receptor_info.info(dict(node_id=self.node_id, receptor_version=pkg_resources.get_distribution("receptor").version))
 
     def _find_node_id(self):
         if 'RECEPTOR_NODE_ID' in os.environ:

receptor/router.py

@@ -7,7 +7,7 @@
 
 from .exceptions import ReceptorBufferError, UnrouteableError
 from .messages import envelope
-from .stats import route_counter
+from .stats import route_counter, route_info
 
 logger = logging.getLogger(__name__)
 
@@ -20,16 +20,7 @@ class MeshRouter:
     def __init__(self, receptor):
         self.receptor = receptor
         self.node_id = receptor.node_id
-
-    def debug_router(self):
-        logger.debug("Receptor Edges: {}".format(self._edges))
-        if self.receptor.config.default_debug:
-            fd = open("graph_{}.dot".format(self.receptor.node_id), "w")
-            fd.write("graph {")
-            for left, right, weight in self._edges:
-                fd.write("{} -- {};".format(left, right))
-            fd.write("}")
-            fd.close()
+        route_info.info(dict(edges="()"))
 
     def node_is_known(self, node_id):
         return node_id in self._nodes or node_id == self.node_id
@@ -57,7 +48,7 @@ def register_edge(self, left, right, cost):
         edge = self.update_node(left, right, cost)
         if not edge:
             self._edges.add((*sorted([left, right]), cost))
-        self.debug_router()
+        route_info.info(dict(edges=str(self._edges)))
 
     def update_node(self, left, right, cost):
         edge = self.find_edge(left, right)

receptor/stats.py

@@ -1,7 +1,10 @@
-from prometheus_client import Counter, Gauge
+from prometheus_client import Counter, Gauge, Info
 
 messages_received_counter = Counter("incoming_messages", "Messages received from Receptor Peers")
 connected_peers_gauge = Gauge("connected_peers", "Number of active peer connections")
 work_counter = Counter("work_events", "A count of the number of work events that have been received")
 active_work_gauge = Gauge("active_work", "Amount of work currently being performed")
 route_counter = Counter("route_events", "A count of the number of messages that have been routed elsewhere in the mesh")
+route_info = Info("routing_table", "This nodes view of the mesh routing table")
+receptor_info = Info("receptor_info", "Version and Node information of the current node")
+work_info = Info("worker_info", "Plugin information and versions")

receptor/work.py

@@ -5,14 +5,15 @@
 
 from . import exceptions
 from .messages import envelope
-from .stats import active_work_gauge, work_counter
+from .stats import active_work_gauge, work_counter, work_info
 
 logger = logging.getLogger(__name__)
 
 
 class WorkManager:
     def __init__(self, receptor):
         self.receptor = receptor
+        work_info.info(dict(plugins=str(self.get_capabilities())))
         self.active_work = []
 
     def load_receptor_worker(self, name):