015 add tracing

2026-03-14 00:28:51 +03:00
parent 7c5be003c1
commit 66beab4682
19 changed files with 507 additions and 9 deletions
@@ -14,3 +14,9 @@ repository:
 adapter:
  cdek_client_id: "yaml-id"
  cdek_client_secret: "yaml-secret"
+
+observability:
+  enabled: false
+  service_name: "default-config-service"
+  otlp_endpoint: "http://default-collector:4317"
+  otlp_insecure: true
@@ -22,3 +22,9 @@ adapter:
  cdek_retry_backoff_seconds: 0.2
  cdek_timeout_seconds: 10.0
  cdek_cache_ttl_seconds: 900
+
+observability:
+  enabled: false
+  service_name: "invalid-price-multiplier-service"
+  otlp_endpoint: "http://collector:4317"
+  otlp_insecure: true
@@ -11,3 +11,9 @@ business_logic:
 repository:
  redis_dsn: "redis://localhost:6379/0"
  price_cache_ttl_seconds: 900
+
+observability:
+  enabled: false
+  service_name: "missing-adapter-service"
+  otlp_endpoint: "http://collector:4317"
+  otlp_insecure: true
@@ -0,0 +1,24 @@
+controller:
+  api_prefix: "/api/v1"
+  request_id_header: "X-Request-ID"
+
+service:
+  provider_timeout_seconds: 10.0
+  max_parallel_providers: 8
+
+business_logic:
+  weight_round_scale: 2
+  provider_price_multiplier: 1.0
+
+repository:
+  redis_dsn: "redis://localhost:6379/0"
+  price_cache_ttl_seconds: 900
+
+adapter:
+  cdek_base_url: "https://api.cdek.ru/v2"
+  cdek_client_id: "test-client-id"
+  cdek_client_secret: "test-client-secret"
+  cdek_retry_attempts: 2
+  cdek_retry_backoff_seconds: 0.2
+  cdek_timeout_seconds: 10.0
+  cdek_cache_ttl_seconds: 900
@@ -0,0 +1,29 @@
+controller:
+  api_prefix: "/api/v1"
+  request_id_header: "X-Request-ID"
+
+service:
+  provider_timeout_seconds: 10.0
+  max_parallel_providers: 8
+
+business_logic:
+  weight_round_scale: 2
+  provider_price_multiplier: 1.0
+
+repository:
+  redis_dsn: "redis://localhost:6379/0"
+  price_cache_ttl_seconds: 900
+
+adapter:
+  cdek_base_url: "https://api.cdek.ru/v2"
+  cdek_client_id: "test-client-id"
+  cdek_client_secret: "test-client-secret"
+  cdek_retry_attempts: 2
+  cdek_retry_backoff_seconds: 0.2
+  cdek_timeout_seconds: 10.0
+  cdek_cache_ttl_seconds: 900
+
+observability:
+  enabled: true
+  service_name: "g2s-aggregator"
+  otlp_insecure: true
@@ -21,3 +21,9 @@ adapter:
  cdek_retry_backoff_seconds: 0.2
  cdek_timeout_seconds: 10.0
  cdek_cache_ttl_seconds: 900
+
+observability:
+  enabled: false
+  service_name: "missing-price-multiplier-service"
+  otlp_endpoint: "http://collector:4317"
+  otlp_insecure: true
@@ -14,3 +14,9 @@ repository:
 adapter:
  cdek_client_id: "test-id"
  cdek_client_secret: "test-secret"
+
+observability:
+  enabled: true
+  service_name: "override-config-service"
+  otlp_endpoint: "http://override-collector:4317"
+  otlp_insecure: false
@@ -24,6 +24,16 @@ INVALID_PRICE_MULTIPLIER_CONFIG_FILE = (
 MISSING_PRICE_MULTIPLIER_CONFIG_FILE = (
    PROJECT_ROOT / "tests" / "config" / "fixtures" / "config.missing_price_multiplier.yaml"
 )
+MISSING_OBSERVABILITY_CONFIG_FILE = (
+    PROJECT_ROOT / "tests" / "config" / "fixtures" / "config.missing_observability.yaml"
+)
+MISSING_OBSERVABILITY_ENDPOINT_CONFIG_FILE = (
+    PROJECT_ROOT
+    / "tests"
+    / "config"
+    / "fixtures"
+    / "config.missing_observability_endpoint.yaml"
+)


 def _use_runtime_config_files(
@@ -64,6 +74,10 @@ def test_configuration_sections_are_loaded_from_yaml_file(
    assert settings.adapter.cdek_retry_backoff_seconds == 0.2
    assert settings.adapter.cdek_timeout_seconds == 10.0
    assert settings.adapter.cdek_cache_ttl_seconds == 900
+    assert settings.observability.enabled is False
+    assert settings.observability.service_name == "g2s-aggregator-test"
+    assert settings.observability.otlp_endpoint == "http://localhost:4317"
+    assert settings.observability.otlp_insecure is True


 def test_get_settings_fails_when_required_yaml_section_is_missing(
@@ -91,6 +105,7 @@ def test_get_settings_returns_cached_instance(monkeypatch: pytest.MonkeyPatch) -
    assert first is second
    assert first.service.provider_timeout_seconds == 10.0
    assert first.business_logic.provider_price_multiplier == Decimal("1.0")
+    assert first.observability.service_name == "g2s-aggregator-test"
    get_settings.cache_clear()


@@ -109,6 +124,10 @@ def test_get_settings_uses_config_test_yaml_in_pytest_environment(
    assert settings.controller.api_prefix == "/from-config-test-yaml"
    assert settings.business_logic.provider_price_multiplier == Decimal("1.25")
    assert settings.adapter.cdek_client_id == "test-id"
+    assert settings.observability.enabled is True
+    assert settings.observability.service_name == "override-config-service"
+    assert settings.observability.otlp_endpoint == "http://override-collector:4317"
+    assert settings.observability.otlp_insecure is False
    get_settings.cache_clear()


@@ -142,3 +161,35 @@ def test_get_settings_fails_when_provider_price_multiplier_is_missing(
    locations = {tuple(item["loc"]) for item in error.value.errors()}
    assert ("business_logic", "provider_price_multiplier") in locations
    get_settings.cache_clear()
+
+
+def test_get_settings_fails_when_observability_section_is_missing(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    _use_runtime_config_files(
+        monkeypatch,
+        test_config_file=MISSING_OBSERVABILITY_CONFIG_FILE,
+    )
+
+    with pytest.raises(ValidationError) as error:
+        get_settings()
+
+    locations = {tuple(item["loc"]) for item in error.value.errors()}
+    assert ("observability",) in locations
+    get_settings.cache_clear()
+
+
+def test_get_settings_fails_when_observability_endpoint_is_missing(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    _use_runtime_config_files(
+        monkeypatch,
+        test_config_file=MISSING_OBSERVABILITY_ENDPOINT_CONFIG_FILE,
+    )
+
+    with pytest.raises(ValidationError) as error:
+        get_settings()
+
+    locations = {tuple(item["loc"]) for item in error.value.errors()}
+    assert ("observability", "otlp_endpoint") in locations
+    get_settings.cache_clear()