Skip to content

Commit 5584bc6

Browse files
committed
Merge branch 'zappool' of https://github.com/khushijain21/opentelemetry-go-contrib into zappool
2 parents d0c73eb + 8db2a5e commit 5584bc6

File tree

1 file changed

+26
-0
lines changed

1 file changed

+26
-0
lines changed

bridges/otelzap/encoder_test.go

+26
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package otelzap
77

88
import (
99
"errors"
10+
"fmt"
1011
"testing"
1112
"time"
1213

@@ -55,6 +56,7 @@ func TestObjectEncoder(t *testing.T) {
5556
arr.AppendBool(true)
5657
return nil
5758
})), "Expected AddArray to succeed.")
59+
5860
},
5961
expected: []interface{}{true, false, true},
6062
},
@@ -65,6 +67,13 @@ func TestObjectEncoder(t *testing.T) {
6567
},
6668
expected: []interface{}{wantTurducken, wantTurducken},
6769
},
70+
{
71+
desc: "AddArray-with AppendArray",
72+
f: func(e zapcore.ObjectEncoder) {
73+
assert.NoError(t, e.AddArray("k", number(2)), "Expected AddArray to succeed.")
74+
},
75+
expected: []interface{}{[]interface{}{"1"}, []interface{}{"2"}},
76+
},
6877
{
6978
desc: "AddReflected",
7079
f: func(e zapcore.ObjectEncoder) {
@@ -361,6 +370,23 @@ func (t turduckens) MarshalLogArray(enc zapcore.ArrayEncoder) error {
361370
return err
362371
}
363372

373+
type number int
374+
375+
func (t number) MarshalLogArray(enc zapcore.ArrayEncoder) error {
376+
var err error
377+
for i := 0; i < int(t); i++ {
378+
err = errors.Join(err, enc.AppendArray(numberString(fmt.Sprint(i+1))))
379+
}
380+
return err
381+
}
382+
383+
type numberString string
384+
385+
func (t numberString) MarshalLogArray(enc zapcore.ArrayEncoder) error {
386+
enc.AppendString(string(t))
387+
return nil
388+
}
389+
364390
type loggable struct{ bool }
365391

366392
func (l loggable) MarshalLogObject(enc zapcore.ObjectEncoder) error {

0 commit comments

Comments
 (0)