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

Adds Aggregation and instruments as part of Metrics SDK #2234

Merged
merged 49 commits into from
Nov 18, 2021
Merged

Adds Aggregation and instruments as part of Metrics SDK #2234

merged 49 commits into from
Nov 18, 2021

Commits on Nov 15, 2021

  1. Adds metrics API (open-telemetry#1887) 

    * 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 <aaronabbott@google.com>
    @ocelotl @aabmass
    ocelotl and aabmass committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    082d553 View commit details
    Browse the repository at this point in the history

  2. Make measurement a concrete class (open-telemetry#2153) 

    * Make Measurement a concrete class

* comments

* update changelog
    @aabmass @ocelotl
    aabmass authored and ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    162acb9 View commit details
    Browse the repository at this point in the history

  3. Return proxy instruments from ProxyMeter (open-telemetry#2169)

    @aabmass @ocelotl
    aabmass authored and ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    22b561d View commit details
    Browse the repository at this point in the history

  4. Merge main 4 (open-telemetry#2236)

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    6e8b1a7 View commit details
    Browse the repository at this point in the history

  5. Add MeterProvider and Meter to the SDK 

    Fixes open-telemetry#2200
    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    4b448d8 View commit details
    Browse the repository at this point in the history

  6. Add FIXMEs

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    aa2b1f0 View commit details
    Browse the repository at this point in the history

  7. Fix docstring

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    881b04a View commit details
    Browse the repository at this point in the history

  8. Add FIXME

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    e3816eb View commit details
    Browse the repository at this point in the history

  9. Fix meter return

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    611ef1f View commit details
    Browse the repository at this point in the history

  10. Log an error if a force flush fails

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    c7f0dae View commit details
    Browse the repository at this point in the history

  11. Add FIXME

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    0ab82ba View commit details
    Browse the repository at this point in the history

  12. Fix lint

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    a01198f View commit details
    Browse the repository at this point in the history

  13. Remove SDK API module

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    558c9ac View commit details
    Browse the repository at this point in the history

  14. Unregister

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    3c119a2 View commit details
    Browse the repository at this point in the history

  15. Fix API names

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    899c064 View commit details
    Browse the repository at this point in the history

  16. Return _DefaultMeter

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    bdce736 View commit details
    Browse the repository at this point in the history

  17. Remove properties

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    8cff4ca View commit details
    Browse the repository at this point in the history

  18. Pass MeterProvider as a parameter to __init__

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    f019207 View commit details
    Browse the repository at this point in the history

  19. Add FIXMEs

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    07fdeac View commit details
    Browse the repository at this point in the history

  20. Add FIXMEs

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    32b67e8 View commit details
    Browse the repository at this point in the history

  21. Fix lint

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    cb3ed60 View commit details
    Browse the repository at this point in the history

  22. Add Aggregation to the metrics SDK 

    Fixes open-telemetry#2229
    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    325e904 View commit details
    Browse the repository at this point in the history

  23. lint fix wip

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    ab5d753 View commit details
    Browse the repository at this point in the history

  24. Fix lint

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    26e103d View commit details
    Browse the repository at this point in the history

  25. Add proto to setup.cfg

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    49e82b6 View commit details
    Browse the repository at this point in the history

  26. Add timestamp for last value

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    a58e1f9 View commit details
    Browse the repository at this point in the history

  27. Rename modules to be private

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    deb696f View commit details
    Browse the repository at this point in the history

  28. Fix paths

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    904c7d9 View commit details
    Browse the repository at this point in the history

  29. Set value in concrete classes init

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    50e708a View commit details
    Browse the repository at this point in the history

  30. Fix test

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    b157bb7 View commit details
    Browse the repository at this point in the history

  31. Fix lint

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    3d5a779 View commit details
    Browse the repository at this point in the history

  32. Remove temporalities

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    f1b9529 View commit details
    Browse the repository at this point in the history

  33. Use frozenset as key

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    46dad80 View commit details
    Browse the repository at this point in the history

  34. Test instruments

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    2c8e893 View commit details
    Browse the repository at this point in the history

  35. Handle min, max and sum in explicit bucket histogram aggregator

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    2d9e0c3 View commit details
    Browse the repository at this point in the history

  36. Add test for negative values

    @ocelotl
    ocelotl committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    2f084f1 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2021

  1. Remove collect method from aggregations

    @ocelotl
    ocelotl committed Nov 16, 2021
    Configuration menu
    Copy the full SHA
    641823c View commit details
    Browse the repository at this point in the history

  2. Add make_point_and_reset

    @ocelotl
    ocelotl committed Nov 16, 2021
    Configuration menu
    Copy the full SHA
    ed502c5 View commit details
    Browse the repository at this point in the history

  3. Remove add implementation

    @ocelotl
    ocelotl committed Nov 16, 2021
    Configuration menu
    Copy the full SHA
    5f50e74 View commit details
    Browse the repository at this point in the history

  4. Remove _Synchronous

    @ocelotl
    ocelotl committed Nov 16, 2021
    Configuration menu
    Copy the full SHA
    f51cb8e View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2021

  1. Update opentelemetry-sdk/src/opentelemetry/sdk/_metrics/aggregation.py 

    Co-authored-by: Aaron Abbott <aaronabbott@google.com>
    @ocelotl @aabmass
    ocelotl and aabmass authored Nov 17, 2021
    Configuration menu
    Copy the full SHA
    c4196f7 View commit details
    Browse the repository at this point in the history

  2. Requested fixes

    @ocelotl
    ocelotl committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    4c8454c View commit details
    Browse the repository at this point in the history

  3. Remove NoneAggregation

    @ocelotl
    ocelotl committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    d8797bc View commit details
    Browse the repository at this point in the history

  4. Add changelog entry

    @ocelotl
    ocelotl committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    90f0ef8 View commit details
    Browse the repository at this point in the history

  5. Fix tests

    @ocelotl
    ocelotl committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    dd685f5 View commit details
    Browse the repository at this point in the history

  6. Fix boundaries

    @ocelotl
    ocelotl committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    b7f05b3 View commit details
    Browse the repository at this point in the history

  7. More fixes

    @ocelotl
    ocelotl committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    8c1a8aa View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into issue_2229

    @ocelotl
    ocelotl authored Nov 17, 2021
    Configuration menu
    Copy the full SHA
    7136925 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2021

  1. Update CHANGELOG.md 

    Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com>
    @ocelotl @srikanthccv
    ocelotl and srikanthccv authored Nov 18, 2021
    Configuration menu
    Copy the full SHA
    ec591ed View commit details
    Browse the repository at this point in the history