refactor

Author: leoromanovsky

Cargo.lock

@@ -15,7 +15,7 @@ libdd-telemetry-ffi = { path = "../libdatadog/libdd-telemetry-ffi", default-feat
 datadog-live-debugger = { path = "../libdatadog/datadog-live-debugger" }
 datadog-live-debugger-ffi = { path = "../libdatadog/datadog-live-debugger-ffi", default-features = false }
 datadog-ipc = { path = "../libdatadog/datadog-ipc" }
-datadog-remote-config = { path = "../libdatadog/datadog-remote-config" }
+datadog-remote-config = { path = "../libdatadog/datadog-remote-config", features = ["ffe"] }
 datadog-sidecar = { path = "../libdatadog/datadog-sidecar" }
 datadog-sidecar-ffi = { path = "../libdatadog/datadog-sidecar-ffi" }
 libdd-tinybytes = { path = "../libdatadog/libdd-tinybytes" }

components-rs/Cargo.toml

@@ -66,43 +66,34 @@ const char *ddog_remote_config_get_path(const struct ddog_RemoteConfigState *rem
 
 bool ddog_process_remote_configs(struct ddog_RemoteConfigState *remote_config);
 
-uint8_t *ddog_get_ffe_config(size_t *out_len);
-
-void ddog_free_ffe_config(uint8_t *ptr, size_t len);
+bool ddog_ffe_has_config(void);
 
 bool ddog_ffe_config_changed(void);
 
-bool ddog_ffe_load_config(const uint8_t *data, size_t len);
-
-void ddog_ffe_clear_config(void);
-
-bool ddog_ffe_has_config(void);
+struct FfeResult;
 
-struct ddog_FfeResolutionDetails;
+struct FfeAttribute {
+    const char *key;
+    int32_t value_type;       /* 0=string, 1=number, 2=bool */
+    const char *string_value;
+    double number_value;
+    bool bool_value;
+};
 
-struct ddog_FfeResolutionDetails *ddog_ffe_evaluate(
+struct FfeResult *ddog_ffe_evaluate(
     const char *flag_key,
     int32_t expected_type,
-    const uint8_t *context_json,
-    size_t context_json_len);
-
-const char *ddog_ffe_result_value(const struct ddog_FfeResolutionDetails *details);
-
-const char *ddog_ffe_result_variant(const struct ddog_FfeResolutionDetails *details);
-
-const char *ddog_ffe_result_allocation_key(const struct ddog_FfeResolutionDetails *details);
-
-int32_t ddog_ffe_result_reason(const struct ddog_FfeResolutionDetails *details);
-
-int32_t ddog_ffe_result_error_code(const struct ddog_FfeResolutionDetails *details);
-
-const char *ddog_ffe_result_error_message(const struct ddog_FfeResolutionDetails *details);
-
-bool ddog_ffe_result_do_log(const struct ddog_FfeResolutionDetails *details);
-
-void ddog_ffe_free_result(struct ddog_FfeResolutionDetails *details);
-
-bool ddog_ffe_config_changed(void);
+    const char *targeting_key,
+    const struct FfeAttribute *attributes,
+    size_t attributes_count);
+
+const char *ddog_ffe_result_value(const struct FfeResult *r);
+const char *ddog_ffe_result_variant(const struct FfeResult *r);
+const char *ddog_ffe_result_allocation_key(const struct FfeResult *r);
+int32_t ddog_ffe_result_reason(const struct FfeResult *r);
+int32_t ddog_ffe_result_error_code(const struct FfeResult *r);
+bool ddog_ffe_result_do_log(const struct FfeResult *r);
+void ddog_ffe_free_result(struct FfeResult *r);
 
 bool ddog_type_can_be_instrumented(const struct ddog_RemoteConfigState *remote_config,
                                    ddog_CharSlice typename_);