improve error handling, label usage, bump versions

Signed-off-by: Zen <[email protected]>

Author: desultory

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "json_exporter"
-version = "0.11.0"
+version = "0.11.2"
 authors = [
   { name="Desultory", email="[email protected]" },
 ]
@@ -17,9 +17,9 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "prometheus_exporter >= 0.11.2",
+    "prometheus_exporter >= 0.11.3",
     "aiohttp >= 3.9.1",
-    "zenlib >= 1.6.2"
+    "zenlib >= 1.6.4"
 ]
 
 [project.scripts]

src/json_exporter/json_endpoint.py

@@ -12,9 +12,10 @@ def __init__(self, name, *args, **kwargs):
 
     def get_labels(self):
         """ Returns the labels for the JSON endpoint """
-        return self.labels.copy() | self.json_labels
+        return self.labels | self._json_labels
 
     def read_config(self):
+        """ Reads the config file using the parent method, adds json specific config """
         super().read_config()
         if self.name not in self.config['json']:
             raise ValueError("Endpoint not defined in config: %s" % self.name)
@@ -98,12 +99,12 @@ async def get_metrics(self, label_filter={}, *args, **kwargs):
     def update_json_labels(self):
         """ Updates the JSON labels """
         from .json_labels import JSONLabels
-        self.logger.debug("[%s] Updating JSON labels", self.name)
+        self.logger.debug("[%s] Updating JSON labels for: %s" % (self.name, self.json_labels))
 
         kwargs = {'json_paths': self.json_labels, 'json_data': self.data,
                   'logger': self.logger, '_log_init': False}
 
-        self.json_labels = JSONLabels(**kwargs)
+        self._json_labels = JSONLabels(**kwargs)
 
     def __str__(self):
         """

src/json_exporter/json_exporter.py

@@ -42,5 +42,5 @@ async def get_metrics(self, *args, **kwargs):
             if endpoint.metrics:
                 metric_list += endpoint.metrics
 
-        self.logger.debug("Got metrics: %s", metric_list)
+        self.logger.debug("Got %d metrics", len(metric_list))
         self.metrics = metric_list

src/json_exporter/json_labels.py

@@ -32,7 +32,11 @@ def __getitem__(self, name):
 
         value = self.data.copy()
         for key in self.json_paths[name].split('.'):
-            value = value[key]
+            try:
+                value = value[key]
+            except KeyError:
+                self.logger.warning("Unable to resolve JSON path: %s" % self.json_paths[name])
+                self.logger.debug("JSON data: %a" % self.data)
         self.logger.debug("[%s]Resolved JSON data from path: %s -> %a" % (name, self.json_paths[name], value))
         return value