diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3edd1c1..45d63bb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,6 +8,7 @@ on: jobs: release: + if: github.event.pull_request.merged == true uses: Aignosi/github_workflow_templates/.github/workflows/dataops-module-release.yml@main permissions: write-all with: diff --git a/ingestor/managers/data_manager.py b/ingestor/managers/data_manager.py index 3f6d998..44d248e 100644 --- a/ingestor/managers/data_manager.py +++ b/ingestor/managers/data_manager.py @@ -261,10 +261,7 @@ class DataManager(SientiaMonitoring): try: await self.mongo_repository.insert( collection_name=topic, - document={ - **data, - 'inserted_at': now() - }, + document={**data, 'inserted_at': now()}, metadata=self.metadata, ) self.logger.debug(f'Message inserted into MongoDB collection {topic}: {data}') diff --git a/ingestor/managers/opc_manager.py b/ingestor/managers/opc_manager.py index 049b6f8..7b446c9 100644 --- a/ingestor/managers/opc_manager.py +++ b/ingestor/managers/opc_manager.py @@ -202,7 +202,7 @@ class OpcManager(SientiaMonitoring): tags={ 'pod_id': self.pod_id, 'server_name': self.name, - } + }, ) try: self.client = Client(self.url, timeout=10, watchdog_intervall=3600000) @@ -574,8 +574,6 @@ class OpcManager(SientiaMonitoring): if self.non_receive_count >= 15: await self.emit_metric( metric_object=metrics.OPC_RECONNECTIONS_TOTAL, - method='inc', - value=1, tags={ 'pod_id': self.pod_id, 'server_name': self.name, diff --git a/tests/unit/managers/test_ingestor_manager.py b/tests/unit/managers/test_ingestor_manager.py index 3c40e3e..32ac827 100644 --- a/tests/unit/managers/test_ingestor_manager.py +++ b/tests/unit/managers/test_ingestor_manager.py @@ -286,13 +286,13 @@ async def test_update_opc_servers(metrics, opc_manager, ingestor_manager): async def test_check_opc_servers_integrity_all_healthy(metrics, ingestor_manager): # Setup mock OPC managers opc_manager1 = MagicMock() - opc_manager1.check_cycles.return_value = None - opc_manager1.check_opc_listenning.return_value = False + opc_manager1.check_cycles = AsyncMock(return_value=None) + opc_manager1.check_opc_listenning = AsyncMock(return_value=False) opc_manager1.config = {'config': 'config1'} opc_manager2 = MagicMock() - opc_manager2.check_cycles.return_value = None - opc_manager2.check_opc_listenning.return_value = False + opc_manager2.check_cycles = AsyncMock(return_value=None) + opc_manager2.check_opc_listenning = AsyncMock(return_value=False) opc_manager2.config = {'config': 'config2'} ingestor_manager.opc_managers = {'server1': opc_manager1, 'server2': opc_manager2} diff --git a/tests/unit/managers/test_opc_manager.py b/tests/unit/managers/test_opc_manager.py index 85a1448..407c166 100644 --- a/tests/unit/managers/test_opc_manager.py +++ b/tests/unit/managers/test_opc_manager.py @@ -155,8 +155,6 @@ async def test_connect_no_security(client, mock_metrics, raw_opc_manager): [ call( metric_object=mock_metrics.OPC_CONNECTIONS_TOTAL, - method='inc', - value=1, tags={ 'pod_id': raw_opc_manager.pod_id, 'server_name': raw_opc_manager.name, @@ -620,8 +618,6 @@ async def test_check_opc_listenning_error_notification_and_retry(metrics, opc_ma [ call( metric_object=metrics.OPC_RECONNECTIONS_TOTAL, - method='inc', - value=1, tags={ 'pod_id': opc_manager.pod_id, 'server_name': opc_manager.name,