Merge remote-tracking branch 'upstream/main' into feat/gherkinmigration

aepfli · aepfli · commit 67a6850c2d97 · 2024-12-27T13:59:35.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -60,7 +60,7 @@ jobs:
 
       - if: matrix.python-version == '3.11'
         name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4.5.0
+        uses: codecov/codecov-action@v5.1.2
         with:
           name: Code Coverage for ${{ matrix.package }} on Python ${{ matrix.python-version }}
           directory: ${{ matrix.package }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -46,7 +46,7 @@ jobs:
       # IMPORTANT: this permission is mandatory for trusted publishing to pypi
       id-token: write
     container:
-      image: "python:3.12"
+      image: "python:3.13"
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.gitmodules b/.gitmodules
@@ -4,6 +4,7 @@
 [submodule "providers/openfeature-provider-flagd/test-harness"]
 	path = providers/openfeature-provider-flagd/openfeature/test-harness
 	url = git@github.com:open-feature/flagd-testbed.git
+	branch = v0.5.18
 [submodule "providers/openfeature-provider-flagd/spec"]
 	path = providers/openfeature-provider-flagd/openfeature/spec
 	url = https://github.com/open-feature/spec
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,14 +1,14 @@
 default_stages: [commit]
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.3
+    rev: v0.8.4
     hooks:
       - id: ruff
         args: [--fix]
       - id: ruff-format
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-toml
       - id: check-yaml
diff --git a/providers/openfeature-provider-flagd/openfeature/test-harness b/providers/openfeature-provider-flagd/openfeature/test-harness
@@ -1 +1 @@
-Subproject commit 796c0e81e0165c821ed325254eb07d1cd9f47bb2
+Subproject commit 706a7e951bb72a145523b38fe83060becc34c4d7
diff --git a/providers/openfeature-provider-flagd/pyproject.toml b/providers/openfeature-provider-flagd/pyproject.toml
@@ -40,7 +40,7 @@ dependencies = [
   "pytest-bdd",
   "testcontainers",
   "asserts",
-  "grpcio-health-checking==1.60.0",
+  "grpcio-health-checking==1.68.1",
 ]
 pre-install-commands = [
   "hatch build",
diff --git a/providers/openfeature-provider-flagd/src/openfeature/contrib/provider/flagd/config.py b/providers/openfeature-provider-flagd/src/openfeature/contrib/provider/flagd/config.py
@@ -26,7 +26,7 @@ class CacheType(Enum):
 DEFAULT_RESOLVER_TYPE = ResolverType.RPC
 DEFAULT_RETRY_BACKOFF = 1000
 DEFAULT_RETRY_BACKOFF_MAX = 120000
-DEFAULT_RETRY_GRACE_PERIOD = 5
+DEFAULT_RETRY_GRACE_PERIOD_SECONDS = 5
 DEFAULT_STREAM_DEADLINE = 600000
 DEFAULT_TLS = False
 
@@ -41,7 +41,7 @@ class CacheType(Enum):
 ENV_VAR_RESOLVER_TYPE = "FLAGD_RESOLVER"
 ENV_VAR_RETRY_BACKOFF_MS = "FLAGD_RETRY_BACKOFF_MS"
 ENV_VAR_RETRY_BACKOFF_MAX_MS = "FLAGD_RETRY_BACKOFF_MAX_MS"
-ENV_VAR_RETRY_GRACE_PERIOD = "FLAGD_RETRY_GRACE_PERIOD"
+ENV_VAR_RETRY_GRACE_PERIOD_SECONDS = "FLAGD_RETRY_GRACE_PERIOD"
 ENV_VAR_STREAM_DEADLINE_MS = "FLAGD_STREAM_DEADLINE_MS"
 ENV_VAR_TLS = "FLAGD_TLS"
 
@@ -118,7 +118,9 @@ def __init__(  # noqa: PLR0913
         self.retry_grace_period: int = (
             int(
                 env_or_default(
-                    ENV_VAR_RETRY_GRACE_PERIOD, DEFAULT_RETRY_GRACE_PERIOD, cast=int
+                    ENV_VAR_RETRY_GRACE_PERIOD_SECONDS,
+                    DEFAULT_RETRY_GRACE_PERIOD_SECONDS,
+                    cast=int,
                 )
             )
             if retry_grace_period is None
diff --git a/providers/openfeature-provider-flagd/src/openfeature/contrib/provider/flagd/resolvers/grpc.py b/providers/openfeature-provider-flagd/src/openfeature/contrib/provider/flagd/resolvers/grpc.py
@@ -54,7 +54,11 @@ def __init__(
         self.emit_provider_error = emit_provider_error
         self.emit_provider_stale = emit_provider_stale
         self.emit_provider_configuration_changed = emit_provider_configuration_changed
-        self.cache: typing.Optional[BaseCacheImpl] = self._create_cache()
+        self.cache: typing.Optional[BaseCacheImpl] = (
+            LRUCache(maxsize=self.config.max_cache_size)
+            if self.config.cache == CacheType.LRU
+            else None
+        )
 
         self.retry_grace_period = config.retry_grace_period
         self.streamline_deadline_seconds = config.stream_deadline_ms * 0.001
@@ -80,12 +84,10 @@ def __init__(
         self.timer: typing.Optional[threading.Timer] = None
         self.active = False
 
-    def _create_cache(self):
-        return (
-            LRUCache(maxsize=self.config.max_cache_size)
-            if self.config.cache == CacheType.LRU
-            else None
-        )
+        self.thread: typing.Optional[threading.Thread] = None
+        self.timer: typing.Optional[threading.Timer] = None
+
+        self.start_time = time.time()
 
     def initialize(self, evaluation_context: EvaluationContext) -> None:
         self.connect()
@@ -114,40 +116,41 @@ def connect(self) -> None:
             )
 
     def monitor(self) -> None:
-        def state_change_callback(new_state: ChannelConnectivity) -> None:
-            logger.debug(f"gRPC state change: {new_state}")
-            if new_state == ChannelConnectivity.READY:
-                if not self.thread or not self.thread.is_alive():
-                    self.thread = threading.Thread(
-                        target=self.listen,
-                        daemon=True,
-                        name="FlagdGrpcServiceWorkerThread",
-                    )
-                    self.thread.start()
-
-                if self.timer and self.timer.is_alive():
-                    logger.debug("gRPC error timer expired")
-                    self.timer.cancel()
-
-            elif new_state == ChannelConnectivity.TRANSIENT_FAILURE:
-                # this is the failed reonnect attempt so we are going into stale
-                self.emit_provider_stale(
-                    ProviderEventDetails(
-                        message="gRPC sync disconnected, reconnecting",
-                    )
+        self.channel.subscribe(self._state_change_callback, try_to_connect=True)
+
+    def _state_change_callback(self, new_state: ChannelConnectivity) -> None:
+        logger.debug(f"gRPC state change: {new_state}")
+        if new_state == ChannelConnectivity.READY:
+            if not self.thread or not self.thread.is_alive():
+                self.thread = threading.Thread(
+                    target=self.listen,
+                    daemon=True,
+                    name="FlagdGrpcServiceWorkerThread",
                 )
-                # adding a timer, so we can emit the error event after time
-                self.timer = threading.Timer(self.retry_grace_period, self.emit_error)
+                self.thread.start()
 
-                logger.debug("gRPC error timer started")
-                self.timer.start()
-                self.connected = False
+            if self.timer and self.timer.is_alive():
+                logger.debug("gRPC error timer expired")
+                self.timer.cancel()
 
-        self.channel.subscribe(state_change_callback, try_to_connect=True)
+        elif new_state == ChannelConnectivity.TRANSIENT_FAILURE:
+            # this is the failed reconnect attempt so we are going into stale
+            self.emit_provider_stale(
+                ProviderEventDetails(
+                    message="gRPC sync disconnected, reconnecting",
+                )
+            )
+            self.start_time = time.time()
+            # adding a timer, so we can emit the error event after time
+            self.timer = threading.Timer(self.retry_grace_period, self.emit_error)
+
+            logger.debug("gRPC error timer started")
+            self.timer.start()
+            self.connected = False
 
     def emit_error(self) -> None:
         logger.debug("gRPC error emitted")
-        if self.cache is not None:
+        if self.cache:
             self.cache.clear()
         self.emit_provider_error(
             ProviderEventDetails(
@@ -157,12 +160,13 @@ def emit_error(self) -> None:
         )
 
     def listen(self) -> None:
-        logger.info("gRPC starting listener thread")
+        logger.debug("gRPC starting listener thread")
         call_args = (
             {"timeout": self.streamline_deadline_seconds}
             if self.streamline_deadline_seconds > 0
             else {}
         )
+        call_args["wait_for_ready"] = True
         request = evaluation_pb2.EventStreamRequest()
 
         # defining a never ending loop to recreate the stream
diff --git a/providers/openfeature-provider-flagd/tests/e2e/flagd_container.py b/providers/openfeature-provider-flagd/tests/e2e/flagd_container.py
@@ -1,4 +1,5 @@
 import time
+from pathlib import Path
 
 import grpc
 from grpc_health.v1 import health_pb2, health_pb2_grpc
@@ -15,8 +16,10 @@ def __init__(
         self,
         **kwargs,
     ) -> None:
-        image: str = "ghcr.io/open-feature/flagd-testbed:v0.5.15"
-        super().__init__(image, **kwargs)
+        image: str = "ghcr.io/open-feature/flagd-testbed"
+        path = Path(__file__).parents[2] / "openfeature/test-harness/version.txt"
+        data = path.read_text().rstrip()
+        super().__init__(f"{image}:v{data}", **kwargs)
         self.rpc = 8013
         self.ipr = 8015
         self.with_exposed_ports(self.rpc, self.ipr, HEALTH_CHECK)
diff --git a/providers/openfeature-provider-flagd/tests/e2e/step/config_steps.py b/providers/openfeature-provider-flagd/tests/e2e/step/config_steps.py
@@ -35,8 +35,13 @@ def convert_resolver_type(val: typing.Union[str, ResolverType]) -> ResolverType:
 }
 
 
-@pytest.fixture(autouse=True, scope="module")
-def setup(request):
+@pytest.fixture(autouse=True)
+def container():
+    pass
+
+
+@pytest.fixture(autouse=True)
+def setup_provider(request):
     pass
 
 
diff --git a/renovate.json b/renovate.json
@@ -0,0 +1,30 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ],
+  "semanticCommits": "enabled",
+  "pep621": {
+    "enabled": true
+  },
+  "pre-commit": {
+    "enabled": true
+  },
+  "packageRules": [
+    {
+      "description": "Automerge non-major updates",
+      "matchUpdateTypes": [
+        "minor",
+        "patch"
+      ],
+      "matchCurrentVersion": "!/^0/",
+      "automerge": true
+    },
+    {
+      "matchManagers": [
+        "github-actions"
+      ],
+      "automerge": true
+    }
+  ]
+}

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ dependencies = [`
`40`	`40`	`"pytest-bdd",`
`41`	`41`	`"testcontainers",`
`42`	`42`	`"asserts",`
`43`		`- "grpcio-health-checking==1.60.0",`
	`43`	`+ "grpcio-health-checking==1.68.1",`
`44`	`44`	`]`
`45`	`45`	`pre-install-commands = [`
`46`	`46`	`"hatch build",`