stop returning unused duplicit logs, also, limit the log entries count

Author: dobrac

packages/orchestrator/internal/template/server/template_status.go

@@ -2,14 +2,14 @@ package server
 
 import (
 	"context"
-	"fmt"
-	"time"
 
 	"github.com/pkg/errors"
 
 	template_manager "github.com/e2b-dev/infra/packages/shared/pkg/grpc/template-manager"
 )
 
+const maxLogEntriesPerRequest = int32(100)
+
 func (s *ServerStore) TemplateBuildStatus(ctx context.Context, in *template_manager.TemplateStatusRequest) (*template_manager.TemplateBuildStatusResponse, error) {
 	_, ctxSpan := tracer.Start(ctx, "template-build-status-request")
 	defer ctxSpan.End()
@@ -19,7 +19,11 @@ func (s *ServerStore) TemplateBuildStatus(ctx context.Context, in *template_mana
 		return nil, errors.Wrap(err, "error while getting build info, maybe already expired")
 	}
 
-	logs := make([]string, 0)
+	limit := maxLogEntriesPerRequest
+	if in.Limit != nil && in.GetLimit() < int32(maxLogEntriesPerRequest) {
+		limit = in.GetLimit()
+	}
+
 	logEntries := make([]*template_manager.TemplateBuildLogEntry, 0)
 	logsCrawled := int32(0)
 	for _, entry := range buildInfo.GetLogs() {
@@ -33,8 +37,11 @@ func (s *ServerStore) TemplateBuildStatus(ctx context.Context, in *template_mana
 			continue
 		}
 
+		if int32(len(logEntries)) >= limit {
+			break
+		}
+
 		logEntries = append(logEntries, entry)
-		logs = append(logs, fmt.Sprintf("[%s] %s", entry.GetTimestamp().AsTime().Format(time.RFC3339), entry.GetMessage()))
 	}
 
 	result := buildInfo.GetResult()
@@ -43,7 +50,6 @@ func (s *ServerStore) TemplateBuildStatus(ctx context.Context, in *template_mana
 			Status:     template_manager.TemplateBuildState_Building,
 			Reason:     nil,
 			Metadata:   nil,
-			Logs:       logs,
 			LogEntries: logEntries,
 		}, nil
 	}
@@ -52,7 +58,6 @@ func (s *ServerStore) TemplateBuildStatus(ctx context.Context, in *template_mana
 		Status:     result.Status,
 		Reason:     result.Reason,
 		Metadata:   result.Metadata,
-		Logs:       logs,
 		LogEntries: logEntries,
 	}, nil
 }

packages/orchestrator/template-manager.proto

@@ -104,6 +104,7 @@ message TemplateStatusRequest {
   string buildID = 2;
   optional int32 offset = 3;
   optional LogLevel level = 4;
+  optional int32 limit = 5;
 }
 
 // Data required for deleting a template.
@@ -137,11 +138,10 @@ message TemplateBuildStatusReason {
 
 // Logs from template build
 message TemplateBuildStatusResponse {
-  reserved 3;
+  reserved 3, 4;
 
   TemplateBuildState status = 1;
   TemplateBuildMetadata metadata = 2;
-  repeated string logs = 4;
   repeated TemplateBuildLogEntry logEntries = 5;
 
   optional TemplateBuildStatusReason reason = 6;