fixup: incuberating feedback from pr review

Signed-off-by: Simon Schrottner <[email protected]>

Author: aepfli

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

providers/openfeature-provider-flagd/src/openfeature/contrib/provider/flagd/resolvers/grpc.py

@@ -113,37 +113,37 @@ 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",
                 )
-                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)
+                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")