Merge branch 'main' into rm-unit-pkg

open-telemetry · Feb 27, 2023 · a934378 · a934378
2 parents 1a2cf87 + 17e5d0f
commit a934378
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -50,6 +50,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Remove use of deprecated `"math/rand".Seed` in `go.opentelemetry.io/otel/example/prometheus`. (#3733)
 - Do not silently drop unknown schema data with `Parse` in  `go.opentelemetry.io/otel/schema/v1.1`. (#3743)
 - Data race issue in OTLP exporter retry mechanism. (#3756)
+- Fixes wrapping a nil error in some cases (#????)
 
 ### Deprecated
 

diff --git a/sdk/metric/pipeline.go b/sdk/metric/pipeline.go
@@ -550,6 +550,9 @@ func (m *multierror) errorOrNil() error {
 	if len(m.errors) == 0 {
 		return nil
 	}
+	if m.wrapped == nil {
+		return errors.New(strings.Join(m.errors, "; "))
+	}
 	return fmt.Errorf("%w: %s", m.wrapped, strings.Join(m.errors, "; "))
 }