NEOS-1724: updates runs logs query to use close time if workflow has …

…ended (#3174)
nucleuscloud · Jan 22, 2025 · d2315fc · d2315fc
1 parent 814b63f
commit d2315fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/backend/services/mgmt/v1alpha1/job-service/runs.go b/backend/services/mgmt/v1alpha1/job-service/runs.go
@@ -608,12 +608,15 @@ func (s *Service) streamLokiWorkerLogs(
 	}
 	workflowExecution, err := s.temporalmgr.GetWorkflowExecutionById(ctx, req.GetAccountId(), req.GetJobRunId(), logger)
 	if err != nil {
-		return err
+		return fmt.Errorf("unable to retrieve workflow execution: %w", err)
 	}
 
 	lokiclient := loki.New(s.cfg.RunLogConfig.LokiRunLogConfig.BaseUrl, http.DefaultClient)
 	direction := loki.BACKWARD
 	end := time.Now()
+	if workflowExecution.CloseTime != nil {
+		end = workflowExecution.CloseTime.AsTime()
+	}
 	start := getLogFilterTime(req.GetWindow(), end)
 	query := buildLokiQuery(
 		s.cfg.RunLogConfig.LokiRunLogConfig.LabelsQuery,

diff --git a/internal/javascript/vm/vm_test.go b/internal/javascript/vm/vm_test.go
@@ -53,7 +53,7 @@ func TestRunner(t *testing.T) {
 			wg.Add(1)
 			go func() {
 				defer wg.Done()
-				_, err = runner.Run(context.Background(), program)
+				_, err := runner.Run(context.Background(), program)
 				require.NoError(t, err)
 			}()
 		}