Skip to content

Commit 7b1fd2a

Browse files
committed
Update Tests With Test Data
Signed-off-by: Mahad Zaryab <[email protected]>
1 parent 133b21e commit 7b1fd2a

File tree

3 files changed

+325
-151
lines changed

3 files changed

+325
-151
lines changed

internal/storage/v2/clickhouse/tracestore/assert_test.go

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"github.com/stretchr/testify/require"
1313
"go.opentelemetry.io/collector/pdata/pcommon"
1414
"go.opentelemetry.io/collector/pdata/ptrace"
15+
"go.opentelemetry.io/collector/pdata/xpdata"
1516

1617
"github.com/jaegertracing/jaeger/internal/jptrace"
1718
"github.com/jaegertracing/jaeger/internal/storage/v2/clickhouse/tracestore/dbmodel"
@@ -126,6 +127,29 @@ func requireComplexAttrs(t *testing.T, expectedKeys []string, expectedVals []str
126127
decoded, err := base64.StdEncoding.DecodeString(expectedVals[i])
127128
require.NoError(t, err)
128129
require.Equal(t, decoded, val.Bytes().AsRaw())
130+
case strings.HasPrefix(k, "@map@"):
131+
key := strings.TrimPrefix(expectedKeys[i], "@map@")
132+
val, ok := attrs.Get(key)
133+
require.True(t, ok)
134+
decoded, err := base64.StdEncoding.DecodeString(expectedVals[i])
135+
require.NoError(t, err)
136+
137+
m := &xpdata.JSONUnmarshaler{}
138+
expectedVal, err := m.UnmarshalValue(decoded)
139+
require.NoError(t, err)
140+
require.True(t, expectedVal.Map().Equal(val.Map()))
141+
case strings.HasPrefix(k, "@slice@"):
142+
key := strings.TrimPrefix(expectedKeys[i], "@slice@")
143+
val, ok := attrs.Get(key)
144+
145+
require.True(t, ok)
146+
decoded, err := base64.StdEncoding.DecodeString(expectedVals[i])
147+
require.NoError(t, err)
148+
149+
m := &xpdata.JSONUnmarshaler{}
150+
expectedVal, err := m.UnmarshalValue(decoded)
151+
require.NoError(t, err)
152+
require.True(t, expectedVal.Slice().Equal(val.Slice()))
129153
default:
130154
t.Fatalf("unsupported complex attribute key: %s", k)
131155
}

internal/storage/v2/clickhouse/tracestore/dbmodel/to.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func extractAttributes(attrs pcommon.Map) *Attributes {
125125
out.ComplexKeys = append(out.ComplexKeys, key)
126126
out.ComplexValues = append(out.ComplexValues, encoded)
127127
case pcommon.ValueTypeMap:
128-
key := "@array@" + k
128+
key := "@map@" + k
129129
m := &xpdata.JSONMarshaler{}
130130
b, err := m.MarshalValue(v)
131131
if err != nil {

0 commit comments

Comments
 (0)