diff --git a/bridges/otelzap/encoder_test.go b/bridges/otelzap/encoder_test.go index 358e9bda632..f9b57b6c480 100644 --- a/bridges/otelzap/encoder_test.go +++ b/bridges/otelzap/encoder_test.go @@ -12,7 +12,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uber.org/multierr" "go.uber.org/zap/zapcore" "go.opentelemetry.io/otel/log" @@ -243,7 +242,7 @@ func (t turduckens) MarshalLogArray(enc zapcore.ArrayEncoder) error { var err error tur := turducken{} for i := 0; i < int(t); i++ { - err = multierr.Append(err, enc.AppendObject(tur)) + err = errors.Join(err, enc.AppendObject(tur)) } return err } diff --git a/bridges/otelzap/go.mod b/bridges/otelzap/go.mod index a8014330deb..4daadc84d72 100644 --- a/bridges/otelzap/go.mod +++ b/bridges/otelzap/go.mod @@ -5,7 +5,6 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 go.opentelemetry.io/otel/log v0.3.0 - go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 ) @@ -17,5 +16,6 @@ require ( go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.uber.org/multierr v1.11.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect )