From 7e7040fe91f96900287af308d595091cf3b4f646 Mon Sep 17 00:00:00 2001
From: Thomas Spalinger <spali@spali.ch>
Date: Thu, 3 Oct 2024 15:17:45 +0200
Subject: [PATCH 1/2] bypass-lock for "list" and "info" to prevent errors from
 metrics temporary workaround for
 https://github.com/borgbackup/borg/issues/7255 as cache is still locked

---
 src/metrics.py | 44 +++++++++++++++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/metrics.py b/src/metrics.py
index 7cf1b7a..d38981b 100644
--- a/src/metrics.py
+++ b/src/metrics.py
@@ -1,6 +1,9 @@
 # pylint: disable=protected-access
 import json
+import os
 import subprocess
+from io import StringIO
+from functools import partial
 from typing import Any
 
 import arrow
@@ -69,11 +72,22 @@ def set_metric(
 
 
 def collect(borgmatic_configs: list, registry):
+    # temporary workaround for https://github.com/borgbackup/borg/issues/7255 to be used together with `--bypass-lock`
+    tmp_env = os.environ.copy()
+    tmp_env["HOME"] = "/tmp/borgmatic-exporter-cache"
+    tmp_env["BORG_UNKNOWN_UNENCRYPTED_REPO_ACCESS_IS_OK"] = "yes"
+
     borgmatic_configs = " -c ".join(borgmatic_configs)
     # Overall repo info and last archive only
-    repos = run_command(f"borgmatic info -c {borgmatic_configs} --json --last 1")
+    repos = run_command(
+        f"borgmatic -c {borgmatic_configs} --verbosity -1 borg info --bypass-lock --json --last 1",
+        tmp_env,
+    )
     # All archives
-    archives = run_command(f"borgmatic list -c {borgmatic_configs} --json")
+    archives = run_command(
+        f"borgmatic -c {borgmatic_configs} --verbosity -1 borg list --bypass-lock --json",
+        tmp_env,
+    )
 
     for r, a in zip(repos, archives):
         labels = {"repository": r["repository"]["location"]}
@@ -139,15 +153,31 @@ def collect(borgmatic_configs: list, registry):
             )
 
 
-def run_command(command: str) -> dict:
+def json_multi_parse(fileobj, decoder=json.JSONDecoder(), buffersize=2048):
+    """
+    Parses the content of the file object to json and yields every found valid json.
+    Can read valid json which is concatenated together (in combination not valid json).
+    """
+    buffer = ""
+    for chunk in iter(partial(fileobj.read, buffersize), ""):
+        buffer += chunk
+        while buffer:
+            try:
+                result, index = decoder.raw_decode(buffer)
+                yield result
+                buffer = buffer[index:].lstrip()
+            except ValueError:
+                # Not enough data to decode, read more
+                break
+
+
+def run_command(command: str, command_env=os.environ.copy()) -> dict:
     """
     Execute command via the command line and load the output into dictionary.
     """
     with timy.Timer(command):
         result = subprocess.run(
-            command.split(" "),
-            check=True,
-            stdout=subprocess.PIPE,
+            command.split(" "), check=True, stdout=subprocess.PIPE, env=command_env
         )
     output = result.stdout.decode("utf-8").strip()
-    return json.loads(output)
+    return list(json_multi_parse(StringIO(output)))

From 0775999bf54159280c58393326af2cbdeadef0d2 Mon Sep 17 00:00:00 2001
From: Thomas Spalinger <spali@spali.ch>
Date: Mon, 7 Oct 2024 07:57:27 +0000
Subject: [PATCH 2/2] fix test and add test for invalid json parsing

---
 tests/test_metrics.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/test_metrics.py b/tests/test_metrics.py
index 6396d4e..5371f3f 100644
--- a/tests/test_metrics.py
+++ b/tests/test_metrics.py
@@ -34,8 +34,12 @@ def collect(self, mocker, registry):
         yield registry
 
     def test_run_command(self):
-        result = metrics.run_command(command='echo {"foo": "bar"}')
-        assert result == {"foo": "bar"}
+        result = metrics.run_command(command='echo {"foo": "bar"}{"foo2": "bar2"}')
+        assert result == [{"foo": "bar"}, {"foo2": "bar2"}]
+
+    def test_run_command_ignore_invalid_json(self):
+        result = metrics.run_command(command='echo {"foo": "bar"}{"foo2": ')
+        assert result == [{"foo": "bar"}]
 
     def test_registry(self, registry):
         result = metrics.create_metrics(registry=registry)._names_to_collectors