Merge v2.10 into v3.0

2023-11-29 12:20:57 +01:00 · 2023-11-29 12:20:57 +01:00 · e29a142f6a
commit e29a142f6a
parent 35c704ace3 dae0491b61
118 changed files with 1324 additions and 1290 deletions
--- a/pkg/tracing/operation_name_test.go
+++ b/pkg/tracing/operation_name_test.go
@ -129,7 +129,7 @@ func TestTruncateString(t *testing.T) {
 			actual := truncateString(test.text, test.limit)

 			assert.Equal(t, test.expected, actual)
-			assert.True(t, len(actual) <= test.limit)
+			assert.LessOrEqual(t, len(actual), test.limit)
 		})
 	}
 }