proto/logger: differentiate between a fetched/stored log items

shuttle-hq · iulianbarbu · Aug 24, 2023 · Aug 22, 2023 · Aug 22, 2023 · Aug 22, 2023
commit a9c0bd5630a9c831f44185f0c73049dc2547f6eb
diff --git a/proto/logger.proto b/proto/logger.proto
@@ -11,11 +11,11 @@ service Logger {
   rpc GetLogs(LogsRequest) returns (LogsResponse);
 
   // Get fresh logs as they are incoming
-  rpc GetLogsStream(LogsRequest) returns (stream LogItem);
+  rpc GetLogsStream(LogsRequest) returns (stream FetchedLogItem);
 }
 
 message StoreLogsRequest {
-  repeated LogItem logs = 1;
+  repeated StoredLogItem logs = 1;
 }
 
 message StoreLogsResponse {
@@ -27,12 +27,18 @@ message LogsRequest {
 }
 
 message LogsResponse {
-  repeated LogItem log_items = 1;
+  repeated FetchedLogItem log_items = 1;
 }
 
-message LogItem {
+message StoredLogItem {
   string service_name = 1;
   string deployment_id = 2;
   google.protobuf.Timestamp tx_timestamp = 3;
   bytes data = 4;
 }
+
+message FetchedLogItem {
+  string service_name = 1;
+  google.protobuf.Timestamp tx_timestamp = 2;
+  bytes data = 3;
+}
diff --git a/proto/src/generated/logger.rs b/proto/src/generated/logger.rs
@@ -2,7 +2,7 @@
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct StoreLogsRequest {
     #[prost(message, repeated, tag = "1")]
-    pub logs: ::prost::alloc::vec::Vec<LogItem>,
+    pub logs: ::prost::alloc::vec::Vec<StoredLogItem>,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -20,11 +20,11 @@ pub struct LogsRequest {
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct LogsResponse {
     #[prost(message, repeated, tag = "1")]
-    pub log_items: ::prost::alloc::vec::Vec<LogItem>,
+    pub log_items: ::prost::alloc::vec::Vec<FetchedLogItem>,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct LogItem {
+pub struct StoredLogItem {
     #[prost(string, tag = "1")]
     pub service_name: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
@@ -34,6 +34,16 @@ pub struct LogItem {
     #[prost(bytes = "vec", tag = "4")]
     pub data: ::prost::alloc::vec::Vec<u8>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct FetchedLogItem {
+    #[prost(string, tag = "1")]
+    pub service_name: ::prost::alloc::string::String,
+    #[prost(message, optional, tag = "2")]
+    pub tx_timestamp: ::core::option::Option<::prost_types::Timestamp>,
+    #[prost(bytes = "vec", tag = "3")]
+    pub data: ::prost::alloc::vec::Vec<u8>,
+}
 /// Generated client implementations.
 pub mod logger_client {
     #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
@@ -144,7 +154,7 @@ pub mod logger_client {
             &mut self,
             request: impl tonic::IntoRequest<super::LogsRequest>,
         ) -> Result<
-            tonic::Response<tonic::codec::Streaming<super::LogItem>>,
+            tonic::Response<tonic::codec::Streaming<super::FetchedLogItem>>,
             tonic::Status,
         > {
             self.inner
@@ -183,7 +193,7 @@ pub mod logger_server {
         ) -> Result<tonic::Response<super::LogsResponse>, tonic::Status>;
         /// Server streaming response type for the GetLogsStream method.
         type GetLogsStreamStream: futures_core::Stream<
-                Item = Result<super::LogItem, tonic::Status>,
+                Item = Result<super::FetchedLogItem, tonic::Status>,
             >
             + Send
             + 'static;
@@ -331,7 +341,7 @@ pub mod logger_server {
                         T: Logger,
                     > tonic::server::ServerStreamingService<super::LogsRequest>
                     for GetLogsStreamSvc<T> {
-                        type Response = super::LogItem;
+                        type Response = super::FetchedLogItem;
                         type ResponseStream = T::GetLogsStreamStream;
                         type Future = BoxFuture<
                             tonic::Response<Self::ResponseStream>,

diff --git a/proto/src/lib.rs b/proto/src/lib.rs
@@ -232,4 +232,14 @@ pub mod resource_recorder {
 
 pub mod logger {
     include!("generated/logger.rs");
+
+    impl From<StoredLogItem> for FetchedLogItem {
+        fn from(value: StoredLogItem) -> Self {
+            FetchedLogItem {
+                service_name: value.service_name,
+                tx_timestamp: value.tx_timestamp,
+                data: value.data,
+            }
+        }
+    }
 }