Skip to content

Commit 17e5d0f

Browse files
authored
Do not wrap error if multierror does not have one. (#3772)
1 parent 01bbea3 commit 17e5d0f

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
4949
- Remove use of deprecated `"math/rand".Seed` in `go.opentelemetry.io/otel/example/prometheus`. (#3733)
5050
- Do not silently drop unknown schema data with `Parse` in `go.opentelemetry.io/otel/schema/v1.1`. (#3743)
5151
- Data race issue in OTLP exporter retry mechanism. (#3756)
52+
- Fixes wrapping a nil error in some cases (#????)
5253

5354
## [1.13.0/0.36.0] 2023-02-07
5455

sdk/metric/pipeline.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,9 @@ func (m *multierror) errorOrNil() error {
551551
if len(m.errors) == 0 {
552552
return nil
553553
}
554+
if m.wrapped == nil {
555+
return errors.New(strings.Join(m.errors, "; "))
556+
}
554557
return fmt.Errorf("%w: %s", m.wrapped, strings.Join(m.errors, "; "))
555558
}
556559

0 commit comments

Comments
 (0)