Skip to content

Merge main into async changes - #1451

Merged
lalitb merged 87 commits into
open-telemetry:async-changesfrom
owent:merge_main_into_async-changes
Jun 15, 2022
Merged

Merge main into async changes#1451
lalitb merged 87 commits into
open-telemetry:async-changesfrom
owent:merge_main_into_async-changes

Conversation

@owent

@owent owent commented Jun 15, 2022

Copy link
Copy Markdown
Member

Changes

Do nothing but merge main into async-changes.
This is used to update #1413 later.

esigo and others added 30 commits March 21, 2022 07:02
* add owent as reviewer

* fix order
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>
hamedprog and others added 25 commits May 16, 2022 19:13
…1396)

Co-authored-by: Lalit Kumar Bhasin <lalit_fin@yahoo.com>
…nc-changes

Signed-off-by: owent <admin@owent.net>

# Conflicts:
#	CHANGELOG.md
#	CMakeLists.txt
#	api/CMakeLists.txt
#	api/include/opentelemetry/common/spin_lock_mutex.h
#	ci/do_ci.ps1
#	ci/do_ci.sh
#	examples/common/metrics_foo_library/foo_library.cc
#	examples/prometheus/prometheus.yml
#	exporters/otlp/test/otlp_http_log_exporter_test.cc
#	ext/src/http/client/curl/CMakeLists.txt
…alues (open-telemetry#1427)

* validate histogram value

* handle Nan

* add changelog

* divide by 0 error on windows

* fix markdown lint
Signed-off-by: WenTao Ou <admin@owent.net>

# Conflicts:
#	CHANGELOG.md
@owent
owent requested a review from a team June 15, 2022 13:18
@codecov

codecov Bot commented Jun 15, 2022

Copy link
Copy Markdown

Codecov Report

❗ No coverage uploaded for pull request base (async-changes@d7b03e8). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff                @@
##             async-changes    #1451   +/-   ##
================================================
  Coverage                 ?   84.35%           
================================================
  Files                    ?      155           
  Lines                    ?     4783           
  Branches                 ?        0           
================================================
  Hits                     ?     4034           
  Misses                   ?      749           
  Partials                 ?        0           

@lalitb
lalitb merged commit f357102 into open-telemetry:async-changes Jun 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.