fixing fixtures for logging

source/databricks/calculation_engine/tests/calculator_job/test_start.py

@@ -28,6 +28,7 @@
 from tests.integration_test_configuration import IntegrationTestConfiguration
 from pydantic_core import ValidationError
 import geh_common.telemetry.logging_configuration as config
+import os
 
 
 class TestWhenInvokedWithInvalidArguments:
@@ -64,7 +65,6 @@ def test_add_info_log_record_to_azure_monitor_with_expected_settings(
         any_calculator_args: CalculatorArgs,
         infrastructure_settings: InfrastructureSettings,
         integration_test_configuration: IntegrationTestConfiguration,
-        configure_logging,
     ) -> None:
         """
         Assert that the calculator job adds log records to Azure Monitor with the expected settings:
@@ -78,7 +78,14 @@ def test_add_info_log_record_to_azure_monitor_with_expected_settings(
 
         Debug level is not tested as it is not intended to be logged by default.
         """
-
+        cleanup_logging()
+        logging_settings = config.LoggingSettings(
+            cloud_role_name="dbr-calculation-engine-tests",
+            subsystem="unit-tests",
+            orchestration_instance_id=uuid.uuid4(),
+            applicationinsights_connection_string=integration_test_configuration.get_applicationinsights_connection_string(),
+        )
+        config.configure_logging(logging_settings=logging_settings)
         # Arrange
         self.prepare_command_line_arguments(any_calculator_args)
 
@@ -166,3 +173,11 @@ def assert_row_count(actual, expected_count):
     value = row["Count"]
     count = cast(int, value)
     assert count == expected_count
+
+
+def cleanup_logging() -> None:
+    config.set_extras({})
+    config.set_is_instrumented(False)
+    config.set_tracer(None)
+    config.set_tracer_name("")
+    os.environ.pop("OTEL_SERVICE_NAME", None)

source/databricks/calculation_engine/tests/conftest.py

@@ -44,14 +44,6 @@
 from unittest.mock import patch
 
 
-def cleanup_logging() -> None:
-    config.set_extras({})
-    config.set_is_instrumented(False)
-    config.set_tracer(None)
-    config.set_tracer_name("")
-    os.environ.pop("OTEL_SERVICE_NAME", None)
-
-
 @pytest.fixture(scope="session")
 def test_files_folder_path(tests_path: str) -> str:
     return f"{tests_path}/test_files"
@@ -449,23 +441,6 @@ def configure_logging_dummy(request):
                 applicationinsights_connection_string="connectionString",
             )
             yield config.configure_logging(logging_settings=logging_settings)
-        cleanup_logging()
-
-
-@pytest.fixture(scope="function")
-def configure_logging(integration_test_configuration):
-    """
-    Configures the logging initially.
-    """
-    # patch to avoid error when trying to configure azure monitor
-    logging_settings = config.LoggingSettings(
-        cloud_role_name="dbr-calculation-engine-tests",
-        subsystem="unit-tests",
-        orchestration_instance_id=uuid.uuid4(),
-        applicationinsights_connection_string=integration_test_configuration.get_applicationinsights_connection_string(),
-    )
-    yield config.configure_logging(logging_settings=logging_settings)
-    cleanup_logging()
 
 
 @pytest.fixture(scope="session")