Skip to content

merge main into metrics_new#2176

Merged
ocelotl merged 10 commits intometrics_newfrom
main
Oct 13, 2021
Merged

merge main into metrics_new#2176
ocelotl merged 10 commits intometrics_newfrom
main

Conversation

@codeboten
Copy link
Copy Markdown
Contributor

No description provided.

alrex and others added 3 commits September 30, 2021 00:00
* add assertTraceResponseHeaderMatchesSpan method

* fix lint

Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com>
Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com>
@codeboten codeboten closed this Oct 4, 2021
chalin and others added 7 commits October 4, 2021 12:51
Co-authored-by: Owais Lone <owais@users.noreply.github.com>
Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com>
* update OTLP/HTTP port to 4318

* map 4318->55681 in the collector for now

* update development status

Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com>
* 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 <ocelotl@users.noreply.github.com>
Co-authored-by: Leighton Chen <lechen@microsoft.com>
Co-authored-by: Owais Lone <owais@users.noreply.github.com>
@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