feat: add timestamps to log lines

api/protobuf/engine/engine_service.proto

@@ -227,9 +227,10 @@ message GetServiceLogsResponse {
   map<string, bool> not_found_service_uuid_set = 2;
 }
 
-// TODO add timestamp as well, for when we do timestamp-handling on the client side
 message LogLine {
   repeated string line = 1;
+
+  google.protobuf.Timestamp timestamp = 2;
 }
 
 message LogLineFilter {

api/rust/src/engine_api.rs

@@ -216,12 +216,13 @@ pub struct GetServiceLogsResponse {
         bool,
     >,
 }
-/// TODO add timestamp as well, for when we do timestamp-handling on the client side
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct LogLine {
     #[prost(string, repeated, tag = "1")]
     pub line: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    #[prost(message, optional, tag = "2")]
+    pub timestamp: ::core::option::Option<::prost_types::Timestamp>,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]

api/typescript/src/engine/kurtosis_engine_rpc_api_bindings/connect/engine_service_pb.d.ts

@@ -719,8 +719,6 @@ export declare class GetServiceLogsResponse extends Message<GetServiceLogsRespon
 }
 
 /**
- * TODO add timestamp as well, for when we do timestamp-handling on the client side
- *
  * @generated from message engine_api.LogLine
  */
 export declare class LogLine extends Message<LogLine> {
@@ -729,6 +727,11 @@ export declare class LogLine extends Message<LogLine> {
    */
   line: string[];
 
+  /**
+   * @generated from field: google.protobuf.Timestamp timestamp = 2;
+   */
+  timestamp?: Timestamp;
+
   constructor(data?: PartialMessage<LogLine>);
 
   static readonly runtime: typeof proto3;

api/typescript/src/engine/kurtosis_engine_rpc_api_bindings/connect/engine_service_pb.js

@@ -279,14 +279,13 @@ export const GetServiceLogsResponse = proto3.makeMessageType(
 );
 
 /**
- * TODO add timestamp as well, for when we do timestamp-handling on the client side
- *
  * @generated from message engine_api.LogLine
  */
 export const LogLine = proto3.makeMessageType(
   "engine_api.LogLine",
   () => [
     { no: 1, name: "line", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true },
+    { no: 2, name: "timestamp", kind: "message", T: Timestamp },
   ],
 );
 

api/typescript/src/engine/kurtosis_engine_rpc_api_bindings/engine_service_pb.d.ts

@@ -464,6 +464,11 @@ export class LogLine extends jspb.Message {
   clearLineList(): LogLine;
   addLine(value: string, index?: number): LogLine;
 
+  getTimestamp(): google_protobuf_timestamp_pb.Timestamp | undefined;
+  setTimestamp(value?: google_protobuf_timestamp_pb.Timestamp): LogLine;
+  hasTimestamp(): boolean;
+  clearTimestamp(): LogLine;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): LogLine.AsObject;
   static toObject(includeInstance: boolean, msg: LogLine): LogLine.AsObject;
@@ -475,6 +480,7 @@ export class LogLine extends jspb.Message {
 export namespace LogLine {
   export type AsObject = {
     lineList: Array<string>,
+    timestamp?: google_protobuf_timestamp_pb.Timestamp.AsObject,
   }
 }
 

api/typescript/src/engine/kurtosis_engine_rpc_api_bindings/engine_service_pb.js

@@ -3594,7 +3594,8 @@ proto.engine_api.LogLine.prototype.toObject = function(opt_includeInstance) {
  */
 proto.engine_api.LogLine.toObject = function(includeInstance, msg) {
   var f, obj = {
-    lineList: (f = jspb.Message.getRepeatedField(msg, 1)) == null ? undefined : f
+    lineList: (f = jspb.Message.getRepeatedField(msg, 1)) == null ? undefined : f,
+    timestamp: (f = msg.getTimestamp()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -3635,6 +3636,11 @@ proto.engine_api.LogLine.deserializeBinaryFromReader = function(msg, reader) {
       var value = /** @type {string} */ (reader.readString());
       msg.addLine(value);
       break;
+    case 2:
+      var value = new google_protobuf_timestamp_pb.Timestamp;
+      reader.readMessage(value,google_protobuf_timestamp_pb.Timestamp.deserializeBinaryFromReader);
+      msg.setTimestamp(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -3671,6 +3677,14 @@ proto.engine_api.LogLine.serializeBinaryToWriter = function(message, writer) {
       f
     );
   }
+  f = message.getTimestamp();
+  if (f != null) {
+    writer.writeMessage(
+      2,
+      f,
+      google_protobuf_timestamp_pb.Timestamp.serializeBinaryToWriter
+    );
+  }
 };
 
 
@@ -3711,6 +3725,43 @@ proto.engine_api.LogLine.prototype.clearLineList = function() {
 };
 
 
+/**
+ * optional google.protobuf.Timestamp timestamp = 2;
+ * @return {?proto.google.protobuf.Timestamp}
+ */
+proto.engine_api.LogLine.prototype.getTimestamp = function() {
+  return /** @type{?proto.google.protobuf.Timestamp} */ (
+    jspb.Message.getWrapperField(this, google_protobuf_timestamp_pb.Timestamp, 2));
+};
+
+
+/**
+ * @param {?proto.google.protobuf.Timestamp|undefined} value
+ * @return {!proto.engine_api.LogLine} returns this
+*/
+proto.engine_api.LogLine.prototype.setTimestamp = function(value) {
+  return jspb.Message.setWrapperField(this, 2, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.engine_api.LogLine} returns this
+ */
+proto.engine_api.LogLine.prototype.clearTimestamp = function() {
+  return this.setTimestamp(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.engine_api.LogLine.prototype.hasTimestamp = function() {
+  return jspb.Message.getField(this, 2) != null;
+};
+
+
 
 
 

engine/server/engine/centralized_logs/client_implementations/kurtosis_backend/kurtosis_backend_logs_database_client.go

@@ -14,6 +14,7 @@ import (
 	"io"
 	"strings"
 	"sync"
+	"time"
 )
 
 const (
@@ -192,7 +193,8 @@ func streamServiceLogLines(
 				return
 			}
 
-			logLine := logline.NewLogLine(logLineStr)
+			// TODO: Parse out the timestamp from docker container logs string instead of time.Now
+			logLine := logline.NewLogLine(logLineStr, time.Now())
 
 			//filtering it
 			shouldReturnLogLine, err := logLine.IsValidLogLineBaseOnFilters(conjunctiveLogLinesFiltersWithRegex)