refactor: rust std refactor (#29)

* refactor: bring back std

* refactor: proto module

* refactor: json feature

* feat: non blocking aggregating resolve logger

* feat: added log_assign to resolve_logger

* fixup! feat: added log_assign to resolve_logger

Author: andreas-karlsson

Cargo.lock

@@ -1,5 +1,7 @@
-use confidence_resolver::confidence::flags::resolver::v1::events::FlagAssigned;
-use confidence_resolver::{confidence, FlagToApply, Host, ResolvedValue, ResolverState, Struct};
+use confidence_resolver::{
+    proto::{confidence, google::Struct},
+    FlagToApply, Host, ResolvedValue, ResolverState,
+};
 use worker::*;
 
 use base64::engine::general_purpose::STANDARD;
@@ -8,7 +10,9 @@ use bytes::Bytes;
 use serde_json::from_slice;
 use serde_json::json;
 
-use confidence::flags::resolver::v1::{ApplyFlagsRequest, ApplyFlagsResponse, ResolveFlagsRequest};
+use confidence::flags::resolver::v1::{
+    events::FlagAssigned, ApplyFlagsRequest, ApplyFlagsResponse, ResolveFlagsRequest,
+};
 
 use confidence_resolver::Client;
 use once_cell::sync::Lazy;
@@ -19,8 +23,8 @@ const ACCOUNT_ID: &str = include_str!("../../data/account_id");
 const STATE_JSON: &[u8] = include_bytes!("../../data/resolver_state_current.pb");
 const ENCRYPTION_KEY_BASE64: &str = include_str!("../../data/encryption_key");
 
-use confidence_resolver::confidence::flags::admin::v1::{ClientResolveInfo, FlagResolveInfo};
-use confidence_resolver::confidence::flags::resolver::v1::Sdk;
+use confidence::flags::admin::v1::{ClientResolveInfo, FlagResolveInfo};
+use confidence::flags::resolver::v1::Sdk;
 use serde::{Deserialize, Serialize};
 use std::sync::OnceLock;
 

confidence-cloudflare-resolver/src/lib.rs

@@ -10,8 +10,9 @@ publish = false
 crate-type = ['rlib']
 
 [features]
-default = ["std"]
-std = ["chrono/clock", "rand/thread_rng", "rust-crypto-wasm", "serde", "serde_json", "pbjson", "pbjson-types"]
+default = ["std", "json"]
+std = ["chrono/clock", "rand/thread_rng", "rust-crypto-wasm"]
+json = ["serde", "serde_json", "pbjson", "pbjson-types"]
 
 [dependencies]
 spin = "0.10.0"
@@ -20,12 +21,14 @@ bitvec = { version = "1.0.1", default-features = false, features = ["alloc"] }
 miniz_oxide = { version = "0.8.9", default-features = false, features = ["with-alloc"] }
 chrono = { version = "0.4", default-features = false, features = ["alloc"] }
 semver = { version = "1.0.20", default-features = false }
-hashbrown = { version = "0.15.4" }
 crc32fast = { version = "1.4.2", default-features = false }
+crossbeam-queue = { version = "0.3.12", default-features = false, features = ["alloc"] }
 
 prost = { version = "0.12", default-features = false, features = ["derive" ] }
 prost-types = { version = "0.12", default-features = false }
 bytes = { version = "1.4.0", default-features = false }
+papaya = "0.2.3"
+arc-swap = "1.7.1"
 
 # Optional dependency for std
 rust-crypto-wasm = { version = "0.3.1", optional = true }

confidence-resolver/Cargo.toml

@@ -35,14 +35,14 @@ fn main() -> Result<()> {
     ]
     .iter()
     .for_each(|&p| {
-        config.type_attribute(p, "#[derive(Eq, PartialOrd, Ord)]");
+        config.type_attribute(p, "#[derive(Eq, Hash)]");
     });
 
     config
         .file_descriptor_set_path(&descriptor_path)
         .btree_map(["."]);
 
-    #[cfg(feature = "std")]
+    #[cfg(feature = "json")]
     {
         // Override prost-types with pbjson-types when std feature is enabled
         config
@@ -53,7 +53,7 @@ fn main() -> Result<()> {
     // Generate prost structs
     config.compile_protos(&proto_files, &[root])?;
 
-    #[cfg(feature = "std")]
+    #[cfg(feature = "json")]
     {
         // Generate pbjson serde implementations
         let descriptor_set = std::fs::read(&descriptor_path)?;

confidence-resolver/build.rs

@@ -7,19 +7,18 @@ import "google/protobuf/struct.proto";
 import "google/api/annotations.proto";
 import "google/api/field_behavior.proto";
 import "google/api/visibility.proto";
+import "confidence/flags/admin/v1/types.proto";
 
 import "confidence/flags/resolver/v1/types.proto";
 import "confidence/flags/resolver/v1/events/events.proto";
 import "confidence/auth/v1/auth.proto";
 import "confidence/api/annotations.proto";
+import "confidence/flags/admin/v1/events/events.proto";
 
 option java_package = "com.spotify.confidence.flags.resolver.v1";
 option java_multiple_files = true;
 option java_outer_classname = "InternalApiProto";
 
-// The service that allows to report flag assigned and other client-side flag
-// operations, useful when the resolve engine runs on the customer's premises
-// (e.g. side-car)
 service InternalFlagLoggerService {
   option (google.api.api_visibility).restriction = "INTERNAL";
 
@@ -46,8 +45,48 @@ service InternalFlagLoggerService {
       object_field: "account"
     };
   }
+
+  // Writes flag assignment events and resolve logs together.
+  // (-- api-linter: core::0136::http-uri-suffix=disabled
+  //     aip.dev/not-precedent: Disabled because the additional binding. --)
+  rpc WriteFlagLogs(WriteFlagLogsRequest) returns (WriteFlagLogsResponse){
+    option (google.api.http) = {
+      post: "/v1/flagLogs:write"
+      body: "*"
+    };
+    option (confidence.auth.v1.auth) = {
+      required_permission: CREATE_FLAG_ASSIGNED
+      allow_basic_auth: true
+      // we use the same permission for writing both logs
+      required_relation: "can_write_flag_assigned"
+      object_field: "account"
+    };
+  }
+
 }
 
+// The service that allows to report flag assigned and other client-side flag
+// operations, useful when the resolve engine runs on the customer's premises
+// (e.g. side-car)
+message WriteFlagLogsRequest {
+  repeated confidence.flags.resolver.v1.events.FlagAssigned flag_assigned = 1 [
+    (google.api.field_behavior) = OPTIONAL
+  ];
+
+  TelemetryData telemetry_data = 2 [
+    (google.api.field_behavior) = OPTIONAL
+  ];
+
+  repeated confidence.flags.admin.v1.ClientResolveInfo client_resolve_info = 3 [
+    (google.api.field_behavior) = OPTIONAL
+  ];
+  repeated confidence.flags.admin.v1.FlagResolveInfo flag_resolve_info = 4 [
+    (google.api.field_behavior) = OPTIONAL
+  ];
+}
+
+message WriteFlagLogsResponse {}
+
 // A request to write flag assignments
 message WriteFlagAssignedRequest {
   // List of flag assigned events to write

confidence-resolver/protos/confidence/flags/resolver/v1/internal_api.proto

@@ -1,4 +1,3 @@
-use alloc::string::{String, ToString};
 use core::panic::Location;
 
 /// A minimal error type suitable as a replacement for runtime panics.