Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Merge main into metrics_new #2165

Closed
wants to merge 13 commits into from
Closed

Merge main into metrics_new #2165

wants to merge 13 commits into from
+2,232 −164

Conversation

ocelotl
Copy link
Contributor

@ocelotl ocelotl commented Sep 30, 2021

No description provided.

@ocelotl ocelotl self-assigned this Sep 30, 2021
@ocelotl ocelotl requested a review from a team September 30, 2021 09:30
aabmass
aabmass approved these changes Oct 2, 2021
View reviewed changes
Copy link
Member

@aabmass aabmass left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ocelotl shouldn't the branch be main and not ocelotl:merge_main_0? I am guessing this might end up a little behind before merging otherwise.

codeboten
codeboten approved these changes Oct 4, 2021
View reviewed changes
Copy link
Contributor

@codeboten codeboten left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just confirming here, the branch that isn't main is this way because of branch protection?

chalin and others added 7 commits October 4, 2021 12:51
@chalin
Delete docs-update.yml (open-telemetry#2171)
9554bbc
@oxeye-nikolay @owais @ocelotl
Updated bootstrap_gen.py for pika instrumentation in the contrib (ope…
c9b18c6 
…n-telemetry#2160)

Co-authored-by: Owais Lone <[email protected]>
Co-authored-by: Diego Hurtado <[email protected]>
@andrew-matteson
Update bootstrap_gen.py for jinja2 versions (open-telemetry#2183)
a0d1267
@ocelotl
update OTLP/HTTP example & test port to 4318 (open-telemetry#2016)
65528f7 
* update OTLP/HTTP port to 4318

* map 4318->55681 in the collector for now

* update development status

Co-authored-by: Diego Hurtado <[email protected]>
@lzchen
Update RELEASING.md (open-telemetry#2177)
2a94c3d
@owais
Update contrib SHA for Github Actions workflow (open-telemetry#2191)
0770fcd
@aabmass @ocelotl
@lzchen @owais
Fix race in set_tracer_provider() (open-telemetry#2182)
7867202 
* 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]>
aabmass
aabmass requested changes Oct 12, 2021
View reviewed changes
Copy link
Member

@aabmass aabmass left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ocelotl can you update this branch to current main?

ocelotl and others added 3 commits October 13, 2021 16:06
@ocelotl @aabmass
Adds metrics API (open-telemetry#1887)
bba4a04 
* Adds metric prototype

Fixes open-telemetry#1835

* Fix docs

* Add API metrics doc

* Add missing docs

* Add files

* Adding docs

* Refactor to _initialize

* Refactor initialize

* Add more documentation

* Add exporter test

* Add process

* Fix tests

* Try to add aggregator_class argument

Tests are failing here

* Fix instrument parent classes

* Test default aggregator

* WIP

* Add prototype test

* Tests passing again

* Use right counters

* All tests passing

* Rearrange instrument storage

* Fix tests

* Add HTTP server test

* WIP

* WIP

* Add prototype

* WIP

* Fail the test

* WIP

* WIP

* WIP

* WIP

* Add views

* Discard instruments via views

* Fix tests

* WIP

* WIP

* Fix lint

* WIP

* Fix test

* Fix lint

* Fix method

* Fix lint

* Mypy workaround

* Skip if 3.6

* Fix lint

* Add reason

* Fix 3.6

* Fix run

* Fix lint

* Remove SDK metrics

* Remove SDK docs

* Remove metrics

* Remove assertnotraises mixin

* Revert sdk docs conf

* Remove SDK env var changes

* Fix unit checking

* Define positional-only arguments

* Add Metrics plans

* Add API tests

* WIP

* WIP test

* WIP

* WIP

* WIP

* Set provider test passing

* Use a fixture

* Add test for get_provider

* Rename tests

* WIP

* WIP

* WIP

* WIP

* Remove non specific requirement

* Add meter requirements

* Put all meter provider tests in one file

* Add meter tests

* Make attributes be passed as a dictionary

* Make some interfaces private

* Log an error instead

* Remove ASCII flag

* Add CHANGELOG entry

* Add instrument tests

* All tests passing

* Add test

* Add name tests

* Add unit tests

* Add description tests

* Add counter tests

* Add more tests

* Add Histogram tests

* Add observable gauge tests

* Add updowncounter tests

* Add observableupdowncounter tests

* Fix lint

* Fix docs

* Fix lint

* Ignore mypy

* Remove useless pylint skip

* Remove useless pylint skip

* Remove useless pylint skip

* Remove useless pylint skip

* Remove useless pylint skip

* Add locks to meter and meterprovider

* Add lock to instruments

* Fix fixmes

* Fix lint

* Add documentation placeholder

* Remove blank line as requested.

* Do not override Rlock

* Remove unecessary super calls

* Add missing super calls

* Remove plan files

* Add missing parameters

* Rename observe to callback

* Fix lint

* Rename to secure_instrument_name

* Remove locks

* Fix lint

* Remove args and kwargs

* Remove implementation that gives meters access to meter provider

* Allow creating async instruments with either a callback function or generator

* add additional test with callback form of observable counter

* add a test/example that reads measurements from proc stat

* implement cpu time integration test with generator too

Co-authored-by: Aaron Abbott <[email protected]>
@aabmass @ocelotl
Make measurement a concrete class (open-telemetry#2153)
84a3111 
* Make Measurement a concrete class

* comments

* update changelog
@ocelotl
Remove checks and callbacks from API (open-telemetry#2164)
450a86c 
* Remove checks and callbacks from API

Fixes open-telemetry#2151

* Fix tests
@ocelotl
Copy link
Contributor Author

ocelotl commented Oct 13, 2021

Just confirming here, the branch that isn't main is this way because of branch protection?

Hmno, I was just trying to follow the same that seems to have been done in #2107. I see that you merged main into metrics new directly in #2176. Is #2176 a PR that used main as the branch that was holding the changes to introduce into metrics_new?

@aabmass
Copy link
Member

aabmass commented Oct 13, 2021 •
edited
Loading

I'm confused, why is 84a3111 (from #2153) and 450a86c (#2164) in this branch? Those are in the metrics_new branch already

Ahh I think it's to resolve merge conflicts right?

@ocelotl
Copy link
Contributor Author

ocelotl commented Oct 13, 2021

I accidentally pushed a rebased branch to this other branch and ended up updating metrics_new to main.

Happy accident, but I have removed permissions to directly push to metrics_new. Closing this PR.

@ocelotl ocelotl closed this Oct 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aabmass aabmass aabmass requested changes

@lzchen lzchen lzchen approved these changes

@codeboten codeboten codeboten approved these changes

Assignees

@ocelotl ocelotl

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@ocelotl @aabmass @codeboten @lzchen @chalin @oxeye-nikolay @andrew-matteson @owais