refactor: remove sdk from Host::log_resolve, source from state in log_assign

log_resolve: sdk param removed (no impl used it).
log_assign: sdk now sourced from ResolverState instead of per-request.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: nicklasl

confidence-cloudflare-resolver/src/lib.rs

@@ -36,6 +36,7 @@ pub struct SetResolverStateRequest {
 const CDN_STATE_BYTES: &[u8] = include_bytes!("../../data/resolver_state_current.pb");
 const ENCRYPTION_KEY_BASE64: &str = include_str!("../../data/encryption_key");
 
+use confidence::flags::resolver::v1::Sdk;
 use confidence_resolver::proto::confidence::flags::resolver::v1::WriteFlagLogsRequest;
 use confidence_resolver::resolve_logger::ResolveLogger;
 use std::sync::{LazyLock, OnceLock};
@@ -89,8 +90,9 @@ impl Host for H {
         evaluation_context: &Struct,
         assigned_flags: &[FlagToApply],
         client: &Client,
+        sdk: &Option<Sdk>,
     ) {
-        ASSIGN_LOGGER.log_assigns(resolve_id, evaluation_context, assigned_flags, client);
+        ASSIGN_LOGGER.log_assigns(resolve_id, evaluation_context, assigned_flags, client, sdk);
     }
 }
 

confidence-resolver/src/assign_logger.rs

@@ -1,9 +1,6 @@
 use std::collections::VecDeque;
 use std::sync::Mutex;
 
-use arc_swap::ArcSwap;
-use std::sync::Arc;
-
 use crate::proto::confidence::flags::resolver::v1::WriteFlagLogsRequest;
 use crate::FlagToApply;
 use prost::{length_delimiter_len, Message};
@@ -25,30 +22,17 @@ struct State {
     pending_bytes: usize,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct AssignLogger {
     assigned: crossbeam_queue::SegQueue<pb::FlagAssigned>,
     state: Mutex<State>,
-    sdk: ArcSwap<Option<crate::flags_resolver::Sdk>>,
-}
-
-impl Default for AssignLogger {
-    fn default() -> Self {
-        Self {
-            assigned: crossbeam_queue::SegQueue::new(),
-            state: Mutex::default(),
-            sdk: ArcSwap::from_pointee(None),
-        }
-    }
 }
 
 impl AssignLogger {
     pub fn new() -> Self {
-        Self::default()
-    }
-
-    pub fn set_sdk(&self, sdk: Option<crate::flags_resolver::Sdk>) {
-        self.sdk.store(Arc::new(sdk));
+        Self {
+            ..Default::default()
+        }
     }
 
     pub fn log_assigns(
@@ -57,12 +41,12 @@ impl AssignLogger {
         _evaluation_context: &crate::proto::google::Struct,
         assigned_flags: &[FlagToApply],
         client: &crate::Client,
+        sdk: &Option<crate::flags_resolver::Sdk>,
     ) {
-        let sdk = self.sdk.load();
         let client_info = Some(pb::ClientInfo {
             client: client.client_name.to_string(),
             client_credential: client.client_credential_name.to_string(),
-            sdk: (**sdk).clone(),
+            sdk: sdk.clone(),
         });
         let flags = assigned_flags
             .iter()

confidence-resolver/src/lib.rs

@@ -276,6 +276,7 @@ pub trait Host {
         evaluation_context: &Struct,
         assigned_flags: &[FlagToApply],
         client: &Client,
+        sdk: &Option<flags_resolver::Sdk>,
     );
 
     fn encrypt_resolve_token(token_data: &[u8], encryption_key: &[u8]) -> Result<Vec<u8>, String> {
@@ -868,6 +869,7 @@ impl<'a, H: Host> AccountResolver<'a, H> {
                 &self.evaluation_context.context,
                 flags_to_apply.as_slice(),
                 self.client,
+                &self.state.sdk,
             );
         } else {
             let mut resolve_token_v1 = flags_resolver::ResolveTokenV1 {
@@ -971,6 +973,7 @@ impl<'a, H: Host> AccountResolver<'a, H> {
             evaluation_context,
             assigned_flags.as_slice(),
             self.client,
+            &self.state.sdk,
         );
 
         Ok(())
@@ -1676,6 +1679,7 @@ mod tests {
             _evaluation_context: &Struct,
             _assigned_flag: &[FlagToApply],
             _client: &Client,
+            _sdk: &Option<Sdk>,
         ) {
             // In tests, we don't need to print anything
         }
@@ -2075,6 +2079,7 @@ mod tests {
                 _evaluation_context: &Struct,
                 assigned_flag: &[FlagToApply],
                 _client: &Client,
+                _sdk: &Option<Sdk>,
             ) {
                 let mut logs = TestLogger::get_instance()
                     .assign_logs
@@ -2220,6 +2225,7 @@ mod tests {
                 evaluation_context: &Struct,
                 assigned_flag: &[FlagToApply],
                 _client: &Client,
+                _sdk: &Option<Sdk>,
             ) {
                 let mut logs = TestLogger::get_instance()
                     .assign_logs

confidence-resolver/src/materialization_tests.rs

@@ -33,6 +33,7 @@ impl Host for L {
         _evaluation_context: &Struct,
         _assigned_flag: &[FlagToApply],
         _client: &Client,
+        _sdk: &Option<flags_resolver::Sdk>,
     ) {
     }
 }

confidence-resolver/src/resolve_logger.rs

@@ -342,6 +342,7 @@ mod tests {
             _evaluation_context: &Struct,
             _assigned_flags: &[crate::FlagToApply],
             _client: &Client,
+            _sdk: &Option<crate::flags_resolver::Sdk>,
         ) {
         }
 

confidence-resolver/src/resolver_spec_tests.rs

@@ -31,6 +31,7 @@ impl Host for L {
         _evaluation_context: &Struct,
         _assigned_flag: &[FlagToApply],
         _client: &Client,
+        _sdk: &Option<flags_resolver::Sdk>,
     ) {
     }
 }

openfeature-provider/go/confidence/internal/local_resolver/assets/confidence_resolver.wasm

@@ -3,6 +3,7 @@
 use std::sync::LazyLock;
 
 use confidence_resolver::assign_logger::AssignLogger;
+use confidence_resolver::proto::confidence::flags::resolver::v1::Sdk;
 use confidence_resolver::proto::google::Struct;
 use confidence_resolver::resolve_logger::ResolveLogger;
 use confidence_resolver::{Client, FlagToApply, Host, ResolvedValue};
@@ -45,7 +46,8 @@ impl Host for NativeHost {
         evaluation_context: &Struct,
         assigned_flags: &[FlagToApply],
         client: &Client,
+        sdk: &Option<Sdk>,
     ) {
-        ASSIGN_LOGGER.log_assigns(resolve_id, evaluation_context, assigned_flags, client);
+        ASSIGN_LOGGER.log_assigns(resolve_id, evaluation_context, assigned_flags, client, sdk);
     }
 }

openfeature-provider/rust/src/host.rs

@@ -204,8 +204,6 @@ impl ConfidenceProvider {
 
     /// Initialize the provider by fetching initial state and starting background tasks.
     pub async fn init(&mut self) -> Result<()> {
-        ASSIGN_LOGGER.set_sdk(Some(provider_sdk()));
-
         // Fetch initial state
         let result = self.state_fetcher.fetch().await?;
         if let Some((state, account_id)) = result {

openfeature-provider/rust/src/provider.rs

@@ -25,7 +25,7 @@ use crate::proto::SetResolverStateRequest;
 use confidence_resolver::{
     proto::{
         confidence::flags::admin::v1::ResolverState as ResolverStatePb,
-        confidence::flags::resolver::v1::{ApplyFlagsRequest, ResolveProcessResponse},
+        confidence::flags::resolver::v1::{ApplyFlagsRequest, ResolveProcessResponse, Sdk},
         google::{Struct, Timestamp},
     },
     Client, FlagToApply, Host, ResolvedValue, ResolverState,
@@ -96,8 +96,9 @@ impl Host for WasmHost {
         evaluation_context: &Struct,
         assigned_flags: &[FlagToApply],
         client: &Client,
+        sdk: &Option<Sdk>,
     ) {
-        ASSIGN_LOGGER.log_assigns(resolve_id, evaluation_context, assigned_flags, client);
+        ASSIGN_LOGGER.log_assigns(resolve_id, evaluation_context, assigned_flags, client, sdk);
     }
 
     fn encrypt_resolve_token(token_data: &[u8], _encryption_key: &[u8]) -> Result<Vec<u8>, String> {
@@ -131,8 +132,7 @@ wasm_msg_guest! {
     fn set_resolver_state(request: SetResolverStateRequest) -> WasmResult<Void> {
         let state_pb = ResolverStatePb::decode(request.state.as_slice())
             .map_err(|e| format!("Failed to decode resolver state: {}", e))?;
-        let new_state = ResolverState::from_proto(state_pb, request.account_id.as_str(), request.sdk.clone())?;
-        ASSIGN_LOGGER.set_sdk(request.sdk);
+        let new_state = ResolverState::from_proto(state_pb, request.account_id.as_str(), request.sdk)?;
         RESOLVER_STATE.store(Some(Arc::new(new_state)));
         // TODO: track state age once we decide on the right timestamp source
         // let now = WasmHost::current_time();