diff --git a/Pipfile b/Pipfile index 03db77ce193603f18f2f24653321904026fb9c41..6c9d4f27bcd05bc3c4780461a87fa7cf2d04edb4 100644 --- a/Pipfile +++ b/Pipfile @@ -25,6 +25,7 @@ sphinx_rtd_theme = "*" sphinx-autobuild = "*" sphinxcontrib-websupport = "*" recommonmark = "*" +skuid = {editable = true, ref = "SAR-147_add_txn_id_endpoint", git = "https://gitlab.com/ska-telescope/skuid.git"} [dev-packages] diff --git a/src/ska/logging/transactions.py b/src/ska/logging/transactions.py index 693171f7f925f597d0d098216532282945666c50..234d5be227c0a563d3bf81bc7ca489c7d46887ba 100644 --- a/src/ska/logging/transactions.py +++ b/src/ska/logging/transactions.py @@ -7,7 +7,7 @@ import os from typing import Mapping, Text -from skuid.client import SkuidClient, get_local_transaction_id +from ska.skuid.client import SkuidClient, get_local_transaction_id class transaction: """Transaction context handler. @@ -48,7 +48,8 @@ class transaction: def __exit__(self, exc_type, exc_val, exc_tb): # TODO: more to be done with func arguments - + transaction_id = self._get_new_or_existing_transaction_id() + params_json = json.dumps(self._params) self.logger.info(f"Exit transaction {self._name}, {transaction_id}, {params_json}") def _get_new_or_existing_transaction_id(self): diff --git a/tests/test_transactions.py b/tests/test_transactions.py index a4032ef8b08adbcd25893974170b4f8aaa0b8c56..4205484faa9d5fc9f73afed514fadb0c71663e58 100644 --- a/tests/test_transactions.py +++ b/tests/test_transactions.py @@ -95,7 +95,7 @@ class TestTransactionIdGenerator: def test_remote_id_generator_increments_on_next(self, monkeypatch): monkeypatch.setenv("SKUID_URL", "endpoint/to/skuid-client") - with patch("skuid.client.requests.get") as mocked_req: + with patch("ska.skuid.client.requests.get") as mocked_req: response = MagicMock() response.json.side_effect = [ json.dumps({"transaction_id": 1}),