sovereign 0.29.0__tar.gz → 0.29.0a3__tar.gz

{sovereign-0.29.0 → sovereign-0.29.0a3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sovereign
-Version: 0.29.0
+Version: 0.29.0a3
 Summary: Envoy Proxy control-plane written in Python
 Home-page: https://pypi.org/project/sovereign/
 License: Apache-2.0
@@ -18,7 +18,6 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
@@ -38,7 +37,7 @@ Requires-Dist: cachelib (>=0.10.2,<0.11.0)
 Requires-Dist: cachetools (>=5.3.2,<6.0.0)
 Requires-Dist: cashews[redis] (>=6.3.0,<7.0.0) ; extra == "caching"
 Requires-Dist: croniter (>=1.4.1,<2.0.0)
-Requires-Dist: cryptography (>=43.0.1,<44.0.0)
+Requires-Dist: cryptography (>=42.0.5,<43.0.0)
 Requires-Dist: datadog (>=0.47.0,<0.48.0) ; extra == "statsd"
 Requires-Dist: fastapi (>=0.110.0,<0.111.0)
 Requires-Dist: glom (>=23.3.0,<24.0.0)

{sovereign-0.29.0 → sovereign-0.29.0a3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sovereign"
-version = "0.29.0"
+version = "0.29.0a3"
 description = "Envoy Proxy control-plane written in Python"
 license = "Apache-2.0"
 packages = [
@@ -73,7 +73,7 @@ Jinja2 = "^3.1.2"
 structlog = "^23.1.0"
 cachelib = "^0.10.2"
 glom = "^23.3.0"
-cryptography = "^43.0.1"
+cryptography = "^42.0.5"
 fastapi = "^0.110.0"
 uvloop = "^0.19.0"
 sentry-sdk = "^1.23.1"

{sovereign-0.29.0 → sovereign-0.29.0a3}/src/sovereign/discovery.py

@@ -23,6 +23,7 @@ except ImportError:
 from sovereign import XDS_TEMPLATES, config, logs, template_context
 from sovereign.utils.version_info import compute_hash
 from sovereign.schemas import XdsTemplate, DiscoveryRequest, ProcessedTemplate
+from sovereign.tracing import Tracer
 
 
 try:
@@ -105,7 +106,8 @@ def response(request: DiscoveryRequest, xds_type: str) -> ProcessedTemplate:
         resource_names=request.resources,
         **template_context.get_context(request, template),
     )
-    content = template(**context)
+    with Tracer("template rendering"):
+        content = template(**context)
 
     # Deserialize YAML output from Jinja2
     if not template.is_python_source:
@@ -116,13 +118,19 @@ def response(request: DiscoveryRequest, xds_type: str) -> ProcessedTemplate:
         content = deserialize_config(content)
 
     # Early return if the template is identical
-    config_version = compute_hash(content)
-    if config_version == request.version_info and not config.discovery_cache.enabled:
-        return ProcessedTemplate(version_info=config_version, resources=[])
-
-    if not isinstance(content, dict):
-        raise RuntimeError(f"Attempting to filter unstructured data: {content}")
-    resources = filter_resources(content["resources"], request.resources)
+    with Tracer("nested test"):
+        with Tracer("hashing"):
+            config_version = compute_hash(content)
+        if (
+            config_version == request.version_info
+            and not config.discovery_cache.enabled
+        ):
+            return ProcessedTemplate(version_info=config_version, resources=[])
+
+        if not isinstance(content, dict):
+            raise RuntimeError(f"Attempting to filter unstructured data: {content}")
+        with Tracer("filtering"):
+            resources = filter_resources(content["resources"], request.resources)
     return ProcessedTemplate(resources=resources, version_info=config_version)
 
 

{sovereign-0.29.0 → sovereign-0.29.0a3}/src/sovereign/dynamic_config/__init__.py

@@ -1,4 +1,3 @@
-import inspect
 from typing import Any, Dict, Optional
 
 from pydantic import BaseModel
@@ -14,20 +13,20 @@ class Loadable(BaseModel):
     serialization: Optional[str] = None
 
     def load(self, default: Any = None) -> Any:
-        if self.protocol not in LOADERS:
+        if self.protocol not in custom_loaders:
             raise KeyError(
-                f"Could not find CustomLoader {self.protocol}. Available: {LOADERS}"
+                f"Could not find CustomLoader {self.protocol}. Available: {custom_loaders}"
             )
-        loader_ = LOADERS[self.protocol]
+        loader_ = custom_loaders[self.protocol]
 
         ser = self.serialization
         if ser is None:
             ser = loader_.default_deser
-        if ser not in DESERIALIZERS:
+        if ser not in deserializers:
             raise KeyError(
-                f"Could not find Deserializer {ser}. Available: {DESERIALIZERS}"
+                f"Could not find Deserializer {ser}. Available: {deserializers}"
             )
-        deserializer = DESERIALIZERS[ser]
+        deserializer = deserializers[ser]
 
         try:
             data = loader_.load(self.path)
@@ -64,25 +63,23 @@ class Loadable(BaseModel):
         )
 
 
-LOADERS: Dict[str, CustomLoader] = {}
-for entry_point in EntryPointLoader("loaders").groups["loaders"]:
+custom_loaders: Dict[str, CustomLoader] = {}
+loader_entry_point = EntryPointLoader("loaders")
+for entry_point in loader_entry_point.groups["loaders"]:
     custom_loader = entry_point.load()
-    func = custom_loader()
-    method = getattr(func, "load")
-    if not inspect.ismethod(method):
-        raise AttributeError(
-            f"CustomLoader {entry_point.name} does not implement .load()"
-        )
-    LOADERS[entry_point.name] = func
+    try:
+        func = custom_loader()
+    except AttributeError:
+        raise AttributeError("CustomLoader does not implement .load()")
+    custom_loaders[entry_point.name] = func
 
 
-DESERIALIZERS: Dict[str, ConfigDeserializer] = {}
-for entry_point in EntryPointLoader("deserializers").groups["deserializers"]:
+deserializers: Dict[str, ConfigDeserializer] = {}
+deser_entry_point = EntryPointLoader("deserializers")
+for entry_point in deser_entry_point.groups["deserializers"]:
     deserializer = entry_point.load()
-    func = deserializer()
-    method = getattr(func, "deserialize")
-    if not inspect.ismethod(method):
-        raise AttributeError(
-            f"Deserializer {entry_point.name} does not implement .deserialize()"
-        )
-    DESERIALIZERS[entry_point.name] = func
+    try:
+        func = deserializer()
+    except AttributeError:
+        raise AttributeError("Deserializer does not implement .deserialize()")
+    deserializers[entry_point.name] = func

{sovereign-0.29.0 → sovereign-0.29.0a3}/src/sovereign/schemas.py

@@ -112,7 +112,6 @@ class DiscoveryCacheConfig(BaseModel):
     suppress: bool = False  # False = Don't suppress connection errors. True = suppress connection errors
     socket_keepalive: bool = True  # Try to keep connections to redis around.
     ttl: int = 60
-    extra_keys: Dict[str, Any] = {}
 
     @model_validator(mode="after")
     def set_default_protocol(self) -> Self:

{sovereign-0.29.0 → sovereign-0.29.0a3}/src/sovereign/views/discovery.py

@@ -117,24 +117,21 @@ async def perform_discovery(
         authenticate(req)
     if discovery_cache.enabled:
         logs.access_logger.queue_log_fields(CACHE_XDS_HIT=False)
-        metadata_keys = discovery_cache.extra_keys.get("metadata", [])
-        extra_metadata = [req.node.metadata.get(key, None) for key in metadata_keys]
-        hash_keys = [
-            api_version,
-            resource_type,
-            req.envoy_version,
-            req.resource_names,
-            req.desired_controlplane,
-            req.hide_private_keys,
-            req.type_url,
-            req.node.cluster,
-            req.node.locality,
-            req.node.metadata.get("auth", None),
-            req.node.metadata.get("num_cpus", None),
-        ] + extra_metadata
-
-        cache_key = compute_hash(hash_keys)
-
+        cache_key = compute_hash(
+            [
+                api_version,
+                resource_type,
+                req.envoy_version,
+                req.resource_names,
+                req.desired_controlplane,
+                req.hide_private_keys,
+                req.type_url,
+                req.node.cluster,
+                req.node.locality,
+                req.node.metadata.get("auth", None),
+                req.node.metadata.get("num_cpus", None),
+            ]
+        )
         if template := await cache.get(key=cache_key, default=None):
             logs.access_logger.queue_log_fields(CACHE_XDS_HIT=True)
             return template  # type: ignore[no-any-return]