sovereign 1.0.0b108__tar.gz → 1.0.0b109__tar.gz

{sovereign-1.0.0b108 → sovereign-1.0.0b109}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sovereign
-Version: 1.0.0b108
+Version: 1.0.0b109
 Summary: Envoy Proxy control-plane written in Python
 Home-page: https://pypi.org/project/sovereign/
 License: Apache-2.0

{sovereign-1.0.0b108 → sovereign-1.0.0b109}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sovereign"
-version = "1.0.0b108"
+version = "1.0.0b109"
 description = "Envoy Proxy control-plane written in Python"
 license = "Apache-2.0"
 packages = [

{sovereign-1.0.0b108 → sovereign-1.0.0b109}/src/sovereign/statistics.py

@@ -3,15 +3,12 @@ from typing import Optional, Any, Callable, Dict
 from functools import wraps
 from sovereign.schemas import config as sovereign_config
 
-emitted: Dict[str, Any] = dict()
-
 STATSD: Dict[str, Optional["StatsDProxy"]] = {"instance": None}
 
 
 class StatsDProxy:
     def __init__(self, statsd_instance: Optional[Any] = None) -> None:
         self.statsd = statsd_instance
-        self.emitted = emitted
 
     def __getattr__(self, item: str) -> Any:
         if self.statsd is not None:
@@ -23,14 +20,9 @@ class StatsDProxy:
 
     def do_nothing(self, *args: Any, **kwargs: Any) -> None:
         k = args[0]
-        emitted[k] = emitted.setdefault(k, 0) + 1
 
 
 class StatsdNoop:
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        k = args[0]
-        emitted[k] = emitted.setdefault(k, 0) + 1
-
     def __enter__(self):  # type: ignore
         return self
 
@@ -41,7 +33,6 @@ class StatsdNoop:
         @wraps(func)
         def wrapped(*args: Any, **kwargs: Any):  # type: ignore
             return func(*args, **kwargs)
-
         return wrapped
 
 
@@ -51,18 +42,9 @@ def configure_statsd() -> StatsDProxy:
     config = sovereign_config.statsd
     try:
         from datadog import DogStatsd
-
-        class CustomStatsd(DogStatsd):  # type: ignore
-            def _report(self, *args, **kwargs) -> None:  # type: ignore
-                super()._report(*args, **kwargs)
-                # Capture the metric name and increment its count for debugging
-                if metric := kwargs.get("metric"):
-                    self.emitted: Dict[str, Any] = dict()
-                    self.emitted[metric] = self.emitted.setdefault(metric, 0) + 1
-
-        module: Optional[CustomStatsd]
-        module = CustomStatsd()
-        if config.enabled:
+        module: Optional[DogStatsd]
+        module = DogStatsd()
+        if config.enabled and module:
             module.host = config.host
             module.port = config.port
             module.namespace = config.namespace

{sovereign-1.0.0b108 → sovereign-1.0.0b109}/src/sovereign/views/discovery.py

@@ -10,8 +10,17 @@ from sovereign.schemas import (
 )
 
 
-def not_modified() -> Response:
-    return Response(status_code=304)
+def response_headers(
+    discovery_request: DiscoveryRequest, response: cache.Entry, xds: str
+) -> dict[str, str]:
+    return {
+        "X-Sovereign-Client-Build": discovery_request.envoy_version,
+        "X-Sovereign-Client-Version": discovery_request.version_info,
+        "X-Sovereign-Requested-Resources": ",".join(discovery_request.resource_names)
+        or "all",
+        "X-Sovereign-Requested-Type": xds,
+        "X-Sovereign-Response-Version": response.version,
+    }
 
 
 router = APIRouter()
@@ -51,11 +60,12 @@ async def discovery_response(
             XDS_CLIENT_VERSION=xds_req.version_info,
             XDS_SERVER_VERSION=entry.version,
         )
+        headers = response_headers(xds_req, entry, xds_type)
         if entry.len == 0:
-            return Response(status_code=404)
+            return Response(status_code=404, headers=headers)
         if entry.version == xds_req.version_info:
-            return not_modified()
-        return Response(entry.text, media_type="application/json")
+            return Response(status_code=304, headers=headers)
+        return Response(entry.text, media_type="application/json", headers=headers)
 
     if entry := await cache.blocking_read(xds_req):
         return handle_response(entry)