Fixed uniffi problems

Signed-off-by: Benedikt Zinn <[email protected]>
amosproj · Jan 20, 2025 · e66e49f · e66e49f
1 parent 3bb755f
commit e66e49f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/rust/backend/daemon/src/collector/aggregator.rs b/rust/backend/daemon/src/collector/aggregator.rs
@@ -9,7 +9,7 @@ use ractor::{cast, Actor, ActorProcessingErr, ActorRef};
 use shared::ziofa::event::EventType;
 use shared::ziofa::log_event::EventData;
 use shared::ziofa::time_series_event::EventTypeEnum;
-use shared::ziofa::time_series_event::TimeSeries as ZioTimeSeries;
+use shared::ziofa::time_series_event::TimeSeriesType;
 use shared::ziofa::{Event, TimeSeriesEvent as ZioTimeSeriesEvent};
 use std::collections::HashMap;
 use tokio::time;
@@ -18,8 +18,8 @@ pub struct Aggregator;
 impl Aggregator {
     fn convert_map_to_prototype(
         time_series_map: HashMap<u32, TimeSeries>,
-    ) -> HashMap<u32, ZioTimeSeries> {
-        let mut map = HashMap::<u32, ZioTimeSeries>::with_capacity(time_series_map.len());
+    ) -> HashMap<u32, TimeSeriesType> {
+        let mut map = HashMap::<u32, TimeSeriesType>::with_capacity(time_series_map.len());
         for (id, time_series) in time_series_map {
             map.insert(id, time_series.into());
         }

diff --git a/rust/backend/daemon/src/collector/time_series.rs b/rust/backend/daemon/src/collector/time_series.rs
@@ -40,9 +40,9 @@ impl TimeSeries {
     }
 }
 
-impl From<TimeSeries> for shared::ziofa::time_series_event::TimeSeries {
+impl From<TimeSeries> for shared::ziofa::time_series_event::TimeSeriesType {
     fn from(series: TimeSeries) -> Self {
-        shared::ziofa::time_series_event::TimeSeries {
+        shared::ziofa::time_series_event::TimeSeriesType{
             list: series.as_array(),
         }
     }

diff --git a/rust/shared/build.rs b/rust/shared/build.rs
@@ -34,6 +34,7 @@ static UNIFFI_RECORDS: LazyLock<Vec<&str>> = LazyLock::new(|| {
             "SysSigquitConfig",
             "GcConfig",
             "GcEvent",
+            "TimeSeriesType"
         ]
     } else {
         vec![]

diff --git a/rust/shared/proto/ziofa.proto b/rust/shared/proto/ziofa.proto
@@ -153,11 +153,11 @@ message TimeSeriesEvent {
   EventTypeEnum event_type_enum = 1;
   uint32 timeframe_ms = 2;
 
-  message time_series{
+  message TimeSeriesType{
       repeated uint64 list = 1;
   }
 
-  map<uint32, time_series>time_series_map = 3;
+  map<uint32, TimeSeriesType>time_series_map = 3;
 }