forked from jaegertracing/jaeger
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "[chore]: Replace pkg/multierror with standard errors.Join (ja…
…egertracing#4293)" This reverts commit 18843de. Signed-off-by: Pablo Baeyens <[email protected]>
- Loading branch information
Showing
14 changed files
with
156 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| // Copyright (c) 2019 The Jaeger Authors. | ||
| // Copyright (c) 2017 Uber Technologies, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package multierror | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "strings" | ||
| ) | ||
|
|
||
| // Wrap takes a slice of errors and returns a single error that encapsulates | ||
| // those underlying errors. If the slice is nil or empty it returns nil. | ||
| // If the slice only contains a single element, that error is returned directly. | ||
| // When more than one error is wrapped, the Error() string is a concatenation | ||
| // of the Error() values of all underlying errors. | ||
| func Wrap(errs []error) error { | ||
| return multiError(errs).flatten() | ||
| } | ||
|
|
||
| // multiError bundles several errors together into a single error. | ||
| type multiError []error | ||
|
|
||
| // flatten returns either: nil, the only error, or the multiError instance itself | ||
| // if there are 0, 1, or more errors in the slice respectively. | ||
| func (errors multiError) flatten() error { | ||
| switch len(errors) { | ||
| case 0: | ||
| return nil | ||
| case 1: | ||
| return errors[0] | ||
| default: | ||
| return errors | ||
| } | ||
| } | ||
|
|
||
| // Error returns a string like "[e1, e2, ...]" where each eN is the Error() of | ||
| // each error in the slice. | ||
| func (errors multiError) Error() string { | ||
| parts := make([]string, len(errors)) | ||
| for i, err := range errors { | ||
| parts[i] = err.Error() | ||
| } | ||
| return fmt.Sprintf("[%s]", strings.Join(parts, ", ")) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| // Copyright (c) 2019 The Jaeger Authors. | ||
| // Copyright (c) 2017 Uber Technologies, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package multierror | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func ExampleWrap() { | ||
| someFunc := func() error { | ||
| return errors.New("doh") | ||
| } | ||
|
|
||
| var errs []error | ||
| for i := 0; i < 2; i++ { | ||
| if err := someFunc(); err != nil { | ||
| errs = append(errs, err) | ||
| } | ||
| fmt.Println(Wrap(errs).Error()) | ||
| } | ||
| // Output: doh | ||
| // [doh, doh] | ||
| } | ||
|
|
||
| func TestWrapEmptySlice(t *testing.T) { | ||
| var errors []error | ||
| e1 := Wrap(errors) | ||
| assert.Nil(t, e1) | ||
| e2 := Wrap([]error{}) | ||
| assert.Nil(t, e2) | ||
| } | ||
|
|
||
| func TestWrapSingleError(t *testing.T) { | ||
| err := errors.New("doh") | ||
| e1 := Wrap([]error{err}) | ||
| assert.Error(t, e1) | ||
| assert.Equal(t, err, e1) | ||
| assert.Equal(t, "doh", e1.Error()) | ||
| } | ||
|
|
||
| func TestWrapManyErrors(t *testing.T) { | ||
| err1 := errors.New("ay") | ||
| err2 := errors.New("caramba") | ||
| e1 := Wrap([]error{err1, err2}) | ||
| assert.Error(t, e1) | ||
| assert.Equal(t, "[ay, caramba]", e1.Error()) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters