improve fixtures to mock tracing

Author: bisgaard-itis

packages/pytest-simcore/src/pytest_simcore/tracing.py

@@ -5,10 +5,34 @@
 
 
 @pytest.fixture
-async def mock_otel_collector_fastapi(mocker: MockerFixture) -> InMemorySpanExporter:
+async def setup_tracing_fastapi(
+    mocker: MockerFixture, monkeypatch: pytest.MonkeyPatch
+) -> InMemorySpanExporter:
     memory_exporter = InMemorySpanExporter()
     span_processor = SimpleSpanProcessor(memory_exporter)
     mocker.patch(
         "servicelib.fastapi.tracing._create_span_processor", return_value=span_processor
     )
+
+    monkeypatch.setenv(
+        "TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT", "http://opentelemetry-collector"
+    )
+    monkeypatch.setenv("TRACING_OPENTELEMETRY_COLLECTOR_PORT", "4318")
+    return memory_exporter
+
+
+@pytest.fixture
+async def setup_tracing_aiohttp(
+    mocker: MockerFixture, monkeypatch: pytest.MonkeyPatch
+) -> InMemorySpanExporter:
+    memory_exporter = InMemorySpanExporter()
+    span_processor = SimpleSpanProcessor(memory_exporter)
+    mocker.patch(
+        "servicelib.aiohttp.tracing._create_span_processor", return_value=span_processor
+    )
+
+    monkeypatch.setenv(
+        "TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT", "http://opentelemetry-collector"
+    )
+    monkeypatch.setenv("TRACING_OPENTELEMETRY_COLLECTOR_PORT", "4318")
     return memory_exporter

services/storage/tests/conftest.py

@@ -194,13 +194,9 @@ def disabled_rabbitmq(app_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPa
 def enable_tracing(
     app_environment: EnvVarsDict,
     monkeypatch: pytest.MonkeyPatch,
-    mock_otel_collector_fastapi: InMemorySpanExporter,
+    setup_tracing_fastapi: InMemorySpanExporter,
 ):
     monkeypatch.setenv("STORAGE_TRACING", "{}")
-    monkeypatch.setenv(
-        "TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT", "http://opentelemetry-collector"
-    )
-    monkeypatch.setenv("TRACING_OPENTELEMETRY_COLLECTOR_PORT", "4318")
 
 
 @pytest.fixture