From 0cb9a40b49d51168216794aa78ed47ac8603bcb3 Mon Sep 17 00:00:00 2001 From: Mateusz Kulewicz Date: Fri, 6 Dec 2024 12:21:06 +0100 Subject: [PATCH 1/2] Remove log pollution from charm tracing in scenario tests --- tests/scenario/test_machine_charm/conftest.py | 8 +++++++- .../test_machine_charm/test_tracing_configuration.py | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/scenario/test_machine_charm/conftest.py b/tests/scenario/test_machine_charm/conftest.py index 78169f36..dcfa290f 100644 --- a/tests/scenario/test_machine_charm/conftest.py +++ b/tests/scenario/test_machine_charm/conftest.py @@ -3,7 +3,7 @@ from unittest.mock import PropertyMock, patch import pytest - +from charms.tempo_coordinator_k8s.v0.charm_tracing import charm_tracing_disabled @pytest.fixture def placeholder_cfg_path(tmp_path): @@ -39,3 +39,9 @@ def mock_refresh(): @pytest.fixture(params=CONFIG_MATRIX) def charm_config(request): return request.param + + +@pytest.fixture(autouse=True) +def mock_charm_tracing(): + with charm_tracing_disabled(): + yield diff --git a/tests/scenario/test_machine_charm/test_tracing_configuration.py b/tests/scenario/test_machine_charm/test_tracing_configuration.py index 3ef2738f..5eb6b85f 100644 --- a/tests/scenario/test_machine_charm/test_tracing_configuration.py +++ b/tests/scenario/test_machine_charm/test_tracing_configuration.py @@ -5,6 +5,7 @@ import yaml from charms.grafana_agent.v0.cos_agent import ReceiverProtocol from charms.tempo_coordinator_k8s.v0.tracing import ReceiverProtocol as TracingReceiverProtocol +from charms.tempo_coordinator_k8s.v0.charm_tracing import charm_tracing_disabled from scenario import Context, Relation, State, SubordinateRelation from charm import GrafanaAgentMachineCharm @@ -75,7 +76,8 @@ def test_tracing_sampling_config_is_present( "tracing", remote_app_data=TracingProviderAppData( receivers=[ - Receiver(protocol={"name": "otlp_grpc", "type": "grpc"}, url="http:foo.com:1111") + Receiver(protocol={"name": "otlp_grpc", "type": "grpc"}, url="http:foo.com:1111"), + Receiver(protocol={"name": "otlp_http", "type": "http"}, url="http://localhost:1112"), ] ).dump(), ) From 40ca17bff93faa5b95a11c97c8fe1bbb208fae08 Mon Sep 17 00:00:00 2001 From: Mateusz Kulewicz Date: Fri, 6 Dec 2024 12:29:05 +0100 Subject: [PATCH 2/2] fmt --- tests/scenario/test_machine_charm/conftest.py | 1 + .../test_machine_charm/test_tracing_configuration.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/scenario/test_machine_charm/conftest.py b/tests/scenario/test_machine_charm/conftest.py index dcfa290f..b5831f8d 100644 --- a/tests/scenario/test_machine_charm/conftest.py +++ b/tests/scenario/test_machine_charm/conftest.py @@ -5,6 +5,7 @@ import pytest from charms.tempo_coordinator_k8s.v0.charm_tracing import charm_tracing_disabled + @pytest.fixture def placeholder_cfg_path(tmp_path): return tmp_path / "foo.yaml" diff --git a/tests/scenario/test_machine_charm/test_tracing_configuration.py b/tests/scenario/test_machine_charm/test_tracing_configuration.py index 5eb6b85f..a6f05a55 100644 --- a/tests/scenario/test_machine_charm/test_tracing_configuration.py +++ b/tests/scenario/test_machine_charm/test_tracing_configuration.py @@ -5,7 +5,6 @@ import yaml from charms.grafana_agent.v0.cos_agent import ReceiverProtocol from charms.tempo_coordinator_k8s.v0.tracing import ReceiverProtocol as TracingReceiverProtocol -from charms.tempo_coordinator_k8s.v0.charm_tracing import charm_tracing_disabled from scenario import Context, Relation, State, SubordinateRelation from charm import GrafanaAgentMachineCharm @@ -77,7 +76,9 @@ def test_tracing_sampling_config_is_present( remote_app_data=TracingProviderAppData( receivers=[ Receiver(protocol={"name": "otlp_grpc", "type": "grpc"}, url="http:foo.com:1111"), - Receiver(protocol={"name": "otlp_http", "type": "http"}, url="http://localhost:1112"), + Receiver( + protocol={"name": "otlp_http", "type": "http"}, url="http://localhost:1112" + ), ] ).dump(), )