From 661559c4e31e423590df2373dd0e883af4f9f082 Mon Sep 17 00:00:00 2001
From: slasher <shenjie1@oppo.com>
Date: Tue, 4 Jul 2023 09:50:08 +0800
Subject: [PATCH] fix(test): fixup test case of sort of map keys

Signed-off-by: slasher <shenjie1@oppo.com>
---
 blobstore/common/trace/span_context.go | 7 +------
 blobstore/common/trace/span_test.go    | 8 ++++++++
 blobstore/common/trace/tracer_test.go  | 5 ++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/blobstore/common/trace/span_context.go b/blobstore/common/trace/span_context.go
index 80df000888..97bd3f18d6 100644
--- a/blobstore/common/trace/span_context.go
+++ b/blobstore/common/trace/span_context.go
@@ -102,12 +102,7 @@ func (s *SpanContext) append(value string) {
 		s.baggage = map[string][]string{internalTrackLogKey: {value}}
 		return
 	}
-
-	if _, ok := s.baggage[internalTrackLogKey]; ok {
-		s.baggage[internalTrackLogKey] = append(s.baggage[internalTrackLogKey], value)
-		return
-	}
-	s.baggage[internalTrackLogKey] = []string{value}
+	s.baggage[internalTrackLogKey] = append(s.baggage[internalTrackLogKey], value)
 }
 
 func (s *SpanContext) baggageItem(key string) []string {
diff --git a/blobstore/common/trace/span_test.go b/blobstore/common/trace/span_test.go
index 09f62e9488..af77160303 100644
--- a/blobstore/common/trace/span_test.go
+++ b/blobstore/common/trace/span_test.go
@@ -130,6 +130,14 @@ func TestSpan_TrackLog(t *testing.T) {
 
 	spanChild.AppendTrackLog("sleep3", time.Now(), nil)
 	require.Equal(t, []string{"sleep", "sleep2/sleep2 err", "blobnode:4", "scheduler:5", "sleep3"}, span.TrackLog())
+
+	msg := make([]byte, maxErrorLen+10)
+	for idx := range msg {
+		msg[idx] = 97
+	}
+	spanChild.AppendTrackLog("longError", time.Now(), errors.New(string(msg)))
+	except := "longError/" + string(msg[:maxErrorLen])
+	require.Equal(t, except, span.TrackLog()[len(span.TrackLog())-1])
 }
 
 func TestSpan_TrackLogWithDuration(t *testing.T) {
diff --git a/blobstore/common/trace/tracer_test.go b/blobstore/common/trace/tracer_test.go
index e5835ecd83..e39a21a802 100644
--- a/blobstore/common/trace/tracer_test.go
+++ b/blobstore/common/trace/tracer_test.go
@@ -17,6 +17,7 @@ package trace
 import (
 	"context"
 	"net/http"
+	"sort"
 	"strings"
 	"testing"
 	"time"
@@ -46,7 +47,9 @@ func TestExplicitTags(t *testing.T) {
 		"tag2K": "tag2V",
 	}
 
-	require.Equal(t, []string{"tag1K:tag1V", "tag2K:tag2V"}, tags.ToSlice())
+	slice := tags.ToSlice()
+	sort.Strings(slice)
+	require.Equal(t, []string{"tag1K:tag1V", "tag2K:tag2V"}, slice)
 	_, err := tags.Marshal()
 	require.NoError(t, err)