[release-v0.13.x] Fix Logs ordered from the Loki response

pkg/api/server/v1alpha2/plugin/plugin_logs.go

@@ -11,6 +11,7 @@ import (
 	"net/url"
 	"path"
 	"path/filepath"
+	"sort"
 	"strconv"
 	"strings"
 
@@ -237,6 +238,7 @@ func getLokiLogs(s *LogServer, writer io.Writer, parent string, rec *db.Record)
 				Stream struct {
 					Message string `json:"message"`
 				} `json:"stream"`
+				Values [][]string `json:"values"`
 			} `json:"result"`
 			Stats map[string]interface{} `json:"stats"`
 		} `json:"data"`
@@ -255,20 +257,37 @@ func getLokiLogs(s *LogServer, writer io.Writer, parent string, rec *db.Record)
 		return status.Error(codes.Internal, "Error fetching log data from Loki")
 	}
 
-	var logMessages []string
+	var logMessages [][]string
 	for _, result := range lokiResponse.Data.Result {
-		logMessages = append(logMessages, result.Stream.Message)
+		logMessages = append(logMessages, result.Values...)
 	}
 
-	formattedLogs := strings.Join(logMessages, "\n")
+	sort.Slice(logMessages, func(i, j int) bool {
+		if len(logMessages[i]) == 0 {
+			return true
+		}
+		if len(logMessages[j]) == 0 {
+			return false
+		}
+		return logMessages[i][0] < logMessages[j][0]
+	})
+
+	var orderMessages []string
+	for _, val := range logMessages {
+		if len(val) <= 1 {
+			continue
+		}
+		orderMessages = append(orderMessages, val[1:]...)
+	}
+
+	formattedLogs := strings.Join(orderMessages, "\n")
 
 	if _, err = writer.Write([]byte(formattedLogs)); err != nil {
 		s.logger.Errorf("failed to write log data, err: %s", err.Error())
 		return status.Error(codes.Internal, "Error streaming log")
 	}
 
 	return nil
-
 }
 
 func getBlobLogs(s *LogServer, writer io.Writer, parent string, rec *db.Record) error {

pkg/api/server/v1alpha2/plugin/plugin_logs_test.go

@@ -58,9 +58,21 @@ func TestLogPluginServer_GetLog(t *testing.T) {
 			"data": map[string]interface{}{
 				"result": []map[string]interface{}{
 					{
-						"stream": map[string]string{"message": "Foo Bar!"},
+						"stream": map[string]string{},
 						"values": [][]string{
-							{"1625081600000000000", "Hello World!"},
+							{"1625081600000000001", "Log Message 1"},
+						},
+					},
+					{
+						"stream": map[string]string{},
+						"values": [][]string{
+							{"1625081600000000003", "Log Message 3"},
+						},
+					},
+					{
+						"stream": map[string]string{},
+						"values": [][]string{
+							{"1625081600000000000", "Log Message 0"},
 						},
 					},
 				},
@@ -139,7 +151,7 @@ func TestLogPluginServer_GetLog(t *testing.T) {
 		Name: log.FormatName(res.GetName(), "baz"),
 	}
 
-	expectedData := "Foo Bar!"
+	expectedData := "Log Message 0\nLog Message 1\nLog Message 3"
 	// Call GetLog
 	err = srv.LogPluginServer.GetLog(req, mockServer)
 	if err != nil {