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

Initial cost metrics #4990

Merged
merged 55 commits into from
Apr 29, 2024
Merged

Initial cost metrics #4990

merged 55 commits into from
Apr 29, 2024

Commits on Apr 3, 2024

  1. wip 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    fb2d0b6 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. add support of events 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    ae546b8 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. add tests for events 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    62d400d View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. fix test 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    28d93cd View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. fix test and ordering of attributes and headers 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    5bc0287 View commit details
    Browse the repository at this point in the history

  2. fix lint 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    2e56947 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of github.com:apollographql/router into bnjjj/feat… 

    …_4320
    @bnjjj
    bnjjj committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    4ac8833 View commit details
    Browse the repository at this point in the history

  4. delete useless commment 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    8ef1a15 View commit details
    Browse the repository at this point in the history

  5. update metrics 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    9bba758 View commit details
    Browse the repository at this point in the history

  6. wip 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    3235c57 View commit details
    Browse the repository at this point in the history

  7. wip 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    c3151bf View commit details
    Browse the repository at this point in the history

  8. refactor event attributes 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    3f73f8b View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. tests wip 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    91402d7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of github.com:apollographql/router into bnjjj/feat… 

    …_4320
    @bnjjj
    bnjjj committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    d3d7740 View commit details
    Browse the repository at this point in the history

  3. fix custom event detection in otel 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    81f7e87 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. add tests 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    6a82c3e View commit details
    Browse the repository at this point in the history

  2. improve handling of object as an otel attribute 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    c83c6d9 View commit details
    Browse the repository at this point in the history

  3. fix snapshot 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    b513b51 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Merge branch 'bnjjj/feat_4320' of github.com:apollographql/router int… 

    …o bnjjj/feat_4320
    @bnjjj
    bnjjj committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    84d3655 View commit details
    Browse the repository at this point in the history

  2. add more tests for events 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    7c41055 View commit details
    Browse the repository at this point in the history

  3. fix otel value test 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    6d0c232 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' of github.com:apollographql/router into bnjjj/feat… 

    …_4320
    @bnjjj
    bnjjj committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    60ca42e View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. fixes 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    080ef4c View commit details
    Browse the repository at this point in the history

  2. fix lint 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    c9ce9bd View commit details
    Browse the repository at this point in the history

  3. add conditions on custom attributes for spans + a new selector for gr… 

    …aphql error

Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    514092f View commit details
    Browse the repository at this point in the history

  4. add static field selector 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    566cd51 View commit details
    Browse the repository at this point in the history

  5. update docs 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    f27bbf1 View commit details
    Browse the repository at this point in the history

  6. fix lint 

    Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
    @bnjjj
    bnjjj committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    0f5d6bd View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. Merge dev

    bryn committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    1ef4b2e View commit details
    Browse the repository at this point in the history

  2. Condition attribute schema

    bryn committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    a7b3a56 View commit details
    Browse the repository at this point in the history

  3. Move condition attribute to separate module

    bryn committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    af2ad47 View commit details
    Browse the repository at this point in the history

  4. Rename ConditionAttribute to Conditional to match Extendable

    bryn committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    5f43729 View commit details
    Browse the repository at this point in the history

  5. Add tests, add deserializer. 

    There's a failing test still.
    bryn committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    340d779 View commit details
    Browse the repository at this point in the history

  6. Fix test. The issue is that you may have a selector on request that h… 

    …as a condition on response. This means stashing the value until you know it can be used.
    bryn committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    5978025 View commit details
    Browse the repository at this point in the history

  7. Improve condition logic to avoid computation unless absolutely necess… 

    …ary. Needs more tests.
    bryn committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    fb8bc4c View commit details
    Browse the repository at this point in the history

  8. Add tests

    bryn committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    875036b View commit details
    Browse the repository at this point in the history

  9. Schema update

    bryn committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    da40912 View commit details
    Browse the repository at this point in the history

  10. Add more tests

    bryn committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    8e99b39 View commit details
    Browse the repository at this point in the history

  11. Allow non-object selectors

    bryn committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    58f9b17 View commit details
    Browse the repository at this point in the history

  12. Remove commented out code and add comment

    bryn committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    4895316 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. Add failing test: test_extendable_serde_conditional 

    Also improve error output from serde a little.
    bryn committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    5c87015 View commit details
    Browse the repository at this point in the history

  2. Fix deserialization, modify test to exercise multiple fields on attri… 

    …bute.
    bryn committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    1bcfcc2 View commit details
    Browse the repository at this point in the history

  3. Improve errors

    bryn committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    ac1e733 View commit details
    Browse the repository at this point in the history

  4. Feed metrics through to selectors.

    bryn committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    2808f8a View commit details
    Browse the repository at this point in the history

  5. Rename CostAttributes to CostInstruments.

    bryn committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    e9fff4a View commit details
    Browse the repository at this point in the history

  6. Metrics now hooked up, but needs tests

    bryn committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    03e5b39 View commit details
    Browse the repository at this point in the history

  7. Add missing events

    bryn committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    5527727 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Update metric names

    bryn committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    9517515 View commit details
    Browse the repository at this point in the history

  2. Take in conditional fix

    bryn committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    751b231 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. Merge dev

    bryn committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    f5ac2c3 View commit details
    Browse the repository at this point in the history

  2. Add tests. Lint fixes

    bryn committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    c9cb6a4 View commit details
    Browse the repository at this point in the history

  3. Snapshot updates

    bryn committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    43326a1 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. Merge branch 'dev' into bryn/demand-control-metrics

    @BrynCooke
    BrynCooke committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    e78fb5b View commit details
    Browse the repository at this point in the history

  2. Rename CostResult to CostContext

    bryn committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    a28b9ce View commit details
    Browse the repository at this point in the history

  3. Lock only once for context

    bryn committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    c9ca854 View commit details
    Browse the repository at this point in the history