otelzap: Implement methods on arrayEncoder (#5652)

Part of #5191 Pre-work #5279 --------- Co-authored-by: Tyler Yahn <[email protected]>
open-telemetry · May 29, 2024 · 73e8301 · 73e8301
1 parent 257ec3a
commit 73e8301
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 14 deletions.
diff --git a/bridges/otelzap/encoder.go b/bridges/otelzap/encoder.go
@@ -201,17 +201,24 @@ func (a *arrayEncoder) AppendString(v string) {
 	a.elems = append(a.elems, log.StringValue(v))
 }
 
-// TODO.
-func (a *arrayEncoder) AppendComplex128(v complex128)  {}
-func (a *arrayEncoder) AppendUint64(v uint64)          {}
-func (a *arrayEncoder) AppendComplex64(v complex64)    {}
-func (a *arrayEncoder) AppendDuration(v time.Duration) {}
-func (a *arrayEncoder) AppendInt32(v int32)            {}
-func (a *arrayEncoder) AppendInt16(v int16)            {}
-func (a *arrayEncoder) AppendInt8(v int8)              {}
-func (a *arrayEncoder) AppendTime(v time.Time)         {}
-func (a *arrayEncoder) AppendUint(v uint)              {}
-func (a *arrayEncoder) AppendUint32(v uint32)          {}
-func (a *arrayEncoder) AppendUint16(v uint16)          {}
-func (a *arrayEncoder) AppendUint8(v uint8)            {}
-func (a *arrayEncoder) AppendUintptr(v uintptr)        {}
+func (a *arrayEncoder) AppendComplex128(v complex128) {
+	r := log.Float64("r", real(v))
+	i := log.Float64("i", imag(v))
+	a.elems = append(a.elems, log.MapValue(r, i))
+}
+
+func (a *arrayEncoder) AppendUint64(v uint64) {
+	a.elems = append(a.elems, assignUintValue(v))
+}
+
+func (a *arrayEncoder) AppendComplex64(v complex64)    { a.AppendComplex128(complex128(v)) }
+func (a *arrayEncoder) AppendDuration(v time.Duration) { a.AppendInt64(v.Nanoseconds()) }
+func (a *arrayEncoder) AppendInt32(v int32)            { a.AppendInt64(int64(v)) }
+func (a *arrayEncoder) AppendInt16(v int16)            { a.AppendInt64(int64(v)) }
+func (a *arrayEncoder) AppendInt8(v int8)              { a.AppendInt64(int64(v)) }
+func (a *arrayEncoder) AppendTime(v time.Time)         { a.AppendInt64(int64(v.UnixNano())) }
+func (a *arrayEncoder) AppendUint(v uint)              { a.AppendUint64(uint64(v)) }
+func (a *arrayEncoder) AppendUint32(v uint32)          { a.AppendInt64(int64(v)) }
+func (a *arrayEncoder) AppendUint16(v uint16)          { a.AppendInt64(int64(v)) }
+func (a *arrayEncoder) AppendUint8(v uint8)            { a.AppendInt64(int64(v)) }
+func (a *arrayEncoder) AppendUintptr(v uintptr)        { a.AppendUint64(uint64(v)) }
diff --git a/bridges/otelzap/encoder_test.go b/bridges/otelzap/encoder_test.go
@@ -169,8 +169,22 @@ func TestArrayEncoder(t *testing.T) {
 		{"AppendFloat64", func(e zapcore.ArrayEncoder) { e.AppendFloat64(3.14) }, 3.14},
 		{"AppendFloat32", func(e zapcore.ArrayEncoder) { e.AppendFloat32(3.14) }, float64(float32(3.14))},
 		{"AppendInt64", func(e zapcore.ArrayEncoder) { e.AppendInt64(42) }, int64(42)},
+		{"AppendInt32", func(e zapcore.ArrayEncoder) { e.AppendInt32(42) }, int64(42)},
+		{"AppendInt16", func(e zapcore.ArrayEncoder) { e.AppendInt16(42) }, int64(42)},
+		{"AppendInt8", func(e zapcore.ArrayEncoder) { e.AppendInt8(42) }, int64(42)},
 		{"AppendInt", func(e zapcore.ArrayEncoder) { e.AppendInt(42) }, int64(42)},
 		{"AppendString", func(e zapcore.ArrayEncoder) { e.AppendString("foo") }, "foo"},
+		{"AppendComplex128", func(e zapcore.ArrayEncoder) { e.AppendComplex128(1 + 2i) }, map[string]interface{}{"i": float64(2), "r": float64(1)}},
+		{"AppendComplex64", func(e zapcore.ArrayEncoder) { e.AppendComplex64(1 + 2i) }, map[string]interface{}{"i": float64(2), "r": float64(1)}},
+		{"AppendDuration", func(e zapcore.ArrayEncoder) { e.AppendDuration(time.Second) }, int64(1000000000)},
+		{"AppendTime", func(e zapcore.ArrayEncoder) { e.AppendTime(time.Unix(0, 100)) }, time.Unix(0, 100).UnixNano()},
+		{"AppendUint", func(e zapcore.ArrayEncoder) { e.AppendUint(42) }, int64(42)},
+		{"AppendUint64", func(e zapcore.ArrayEncoder) { e.AppendUint64(42) }, int64(42)},
+		{"AppendUint64 - overflow", func(e zapcore.ArrayEncoder) { e.AppendUint64(^uint64(0)) }, float64(^uint64(0))},
+		{"AppendUint32", func(e zapcore.ArrayEncoder) { e.AppendUint32(42) }, int64(42)},
+		{"AppendUint16", func(e zapcore.ArrayEncoder) { e.AppendUint16(42) }, int64(42)},
+		{"AppendUint8", func(e zapcore.ArrayEncoder) { e.AppendUint8(42) }, int64(42)},
+		{"AppendUintptr", func(e zapcore.ArrayEncoder) { e.AppendUintptr(42) }, int64(42)},
 	}
 
 	for _, tt := range tests {