Merge main into async-changes - #1348
Merged
lalitb merged 37 commits intoApr 25, 2022
Merged
Conversation
* add owent as reviewer * fix order
…elemetry#1301) Signed-off-by: owent <admin@owent.net>
…emetry#1309) Signed-off-by: owent <admin@owent.net>
Signed-off-by: owent <admin@owent.net>
Co-authored-by: Tom Tan <Tom.Tan@microsoft.com> Co-authored-by: Lalit Kumar Bhasin <lalit_fin@yahoo.com>
Co-authored-by: Lalit Kumar Bhasin <lalit_fin@yahoo.com>
…-changes Signed-off-by: owent <admin@owent.net> # Conflicts: # CHANGELOG.md # CMakeLists.txt # api/include/opentelemetry/common/spin_lock_mutex.h # exporters/ostream/test/ostream_metric_test.cc # sdk/CMakeLists.txt # sdk/include/opentelemetry/sdk/metrics/aggregation/histogram_aggregation.h # sdk/src/metrics/aggregation/histogram_aggregation.cc # sdk/test/metrics/sync_metric_storage_test.cc
Signed-off-by: owent <admin@owent.net>
Codecov Report
@@ Coverage Diff @@
## async-changes #1348 +/- ##
================================================
Coverage ? 91.39%
================================================
Files ? 219
Lines ? 8169
Branches ? 0
================================================
Hits ? 7465
Misses ? 704
Partials ? 0 |
… output) Signed-off-by: owent <admin@owent.net>
lalitb
approved these changes
Apr 25, 2022
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes
Do nothing but merge
mainintoasync-changes.Using the
mainversion to resolve all conflicts but the options added byasync-changes.