Skip to content

merge main into metrics_new #2176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 13, 2021
Merged

merge main into metrics_new #2176

merged 10 commits into from
Oct 13, 2021

Conversation

codeboten
Copy link
Contributor

No description provided.

alrex and others added 3 commits September 30, 2021 00:00
@codeboten codeboten closed this Oct 4, 2021
chalin and others added 7 commits October 4, 2021 12:51
* update OTLP/HTTP port to 4318

* map 4318->55681 in the collector for now

* update development status

Co-authored-by: Diego Hurtado <[email protected]>
* Fix race in set_tracer_provider

* refactor _reset_globals to a test util

* get rid of "Mixin" name and simplify code a bit

* add some comments to concurrency_test.py

* actually respect log option

Co-authored-by: Diego Hurtado <[email protected]>
Co-authored-by: Leighton Chen <[email protected]>
Co-authored-by: Owais Lone <[email protected]>
@codeboten codeboten reopened this Oct 13, 2021
@ocelotl ocelotl merged commit 589ba99 into metrics_new Oct 13, 2021
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.

8 participants