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

GraphQL Blocking #3819

Merged
merged 73 commits into from
Dec 20, 2023
Merged

GraphQL Blocking #3819

merged 73 commits into from
Dec 20, 2023

Commits on Nov 23, 2023

  1. Upload module skeleton.

    @hoolioh
    hoolioh committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    ca016be View commit details
    Browse the repository at this point in the history

  2. Blocking in apollo, very very first version

    @uurien
    uurien committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    7233810 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. Move graphql implementation to another module.

    @hoolioh
    hoolioh committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    007204a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'julio/graphql-resolver-handler' into julio/graphql-bloc… 

    …king
    @hoolioh
    hoolioh committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    1bee1ae View commit details
    Browse the repository at this point in the history

  3. Blocking for apollo-server-core, ugly but it works, lets find a bette… 

    …r way
    @uurien
    uurien committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    6113ee1 View commit details
    Browse the repository at this point in the history

  4. Use real blocking data

    @uurien
    uurien committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    f8c52e9 View commit details
    Browse the repository at this point in the history

  5. Set blocking to true.

    @hoolioh
    hoolioh committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    7f05909 View commit details
    Browse the repository at this point in the history

  6. Throw before resolver execution in order to stop the operation's exec… 

    …ution flow.
    @hoolioh
    hoolioh committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    ece953f View commit details
    Browse the repository at this point in the history

  7. Use HttpQueryError in apollo-server-core

    @uurien
    uurien committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    2aa7488 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'julio/graphql-blocking' of github.com:DataDog/dd-trace-… 

    …js into julio/graphql-blocking
    @hoolioh
    hoolioh committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    3c7d6a7 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'julio/graphql-blocking' of github.com:DataDog/dd-trace-… 

    …js into julio/graphql-blocking
    @hoolioh
    hoolioh committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    d74cf95 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Blocking test in apollo-server-fastify

    @uurien
    uurien committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    51640f2 View commit details
    Browse the repository at this point in the history

  2. Refactor graphql blocking. 

    * Remove previous implementation which only supported monitoring.
* Add new waf address in order to check the payload of every resolver.
* Use apm start resolver address instead of a new one.
* Remove mock and perform an actual call to the waf.
    @hoolioh
    hoolioh committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    a2ed730 View commit details
    Browse the repository at this point in the history

  3. Add non blocking graphql test

    @uurien
    uurien committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    a8f2186 View commit details
    Browse the repository at this point in the history

  4. Move abortController constructor to context creation. 

    This reduces the performance overhead due to just one instance is shared across the whole query exectution.
    @hoolioh
    hoolioh committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    464ad05 View commit details
    Browse the repository at this point in the history

  5. Add pollo-server-express block tests

    @uurien
    uurien committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    b2fb5d6 View commit details
    Browse the repository at this point in the history

  6. Add unit tests.

    @hoolioh
    hoolioh committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    f45d1ed View commit details
    Browse the repository at this point in the history

  7. Merge branch 'julio/graphql-blocking' of github.com:DataDog/dd-trace-… 

    …js into julio/graphql-blocking
    @hoolioh
    hoolioh committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    d195082 View commit details
    Browse the repository at this point in the history

  8. Add @apollo/server tests

    @uurien
    uurien committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    4ad350c View commit details
    Browse the repository at this point in the history

  9. Update test rules for blocking by graphql.server.resolver

    @uurien
    uurien committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    a059bfd View commit details
    Browse the repository at this point in the history

  10. Block with graphql templates data

    @uurien
    uurien committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    76483a0 View commit details
    Browse the repository at this point in the history

  11. Add tests.

    @hoolioh
    hoolioh committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    e982e80 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'julio/graphql-blocking' of github.com:DataDog/dd-trace-… 

    …js into julio/graphql-blocking
    @hoolioh
    hoolioh committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    6498d9f View commit details
    Browse the repository at this point in the history

  13. Block with graphql data in graphql endpoint

    @uurien
    uurien committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    3f5653b View commit details
    Browse the repository at this point in the history

  14. Fix tests.

    @hoolioh
    hoolioh committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    5dd121b View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. Execute @apollo/server and apollo-server-express tests

    @uurien
    uurien committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    7cc8bba View commit details
    Browse the repository at this point in the history

  2. Unify code in @apollo/server and apollo-server-core

    @uurien
    uurien committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    7542f8a View commit details
    Browse the repository at this point in the history

  3. update comments

    @uurien
    uurien committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    bbcebcf View commit details
    Browse the repository at this point in the history

  4. Add appsec.blocked tag in blocked requests

    @uurien
    uurien committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    71a3524 View commit details
    Browse the repository at this point in the history

  5. fix test

    @uurien
    uurien committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    d9d8050 View commit details
    Browse the repository at this point in the history

  6. Fix lint

    @uurien
    uurien committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    e417adb View commit details
    Browse the repository at this point in the history

  7. Add test with non graphql block response

    @uurien
    uurien committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    fe6edbb View commit details
    Browse the repository at this point in the history

  8. small fix

    @uurien
    uurien committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    2410db5 View commit details
    Browse the repository at this point in the history

  9. Tests for block with redirect

    @uurien
    uurien committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    df4d73d View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. Fix integration test

    @uurien
    uurien committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    61b18ac View commit details
    Browse the repository at this point in the history

  2. Fix graphql plugin tests

    @uurien
    uurien committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    c944acc View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. Prevent creation of resolve span when it is blocked before the execut… 

    …ion of the resolve code
    @uurien
    uurien committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    9ce8d98 View commit details
    Browse the repository at this point in the history

  2. Refactor addResolver in order to get directives information.

    @hoolioh
    hoolioh committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    cf7baa8 View commit details
    Browse the repository at this point in the history

  3. Add tests to block on directives.

    @hoolioh
    hoolioh committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    9cba641 View commit details
    Browse the repository at this point in the history

  4. Add test for directives.

    @hoolioh
    hoolioh committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    12427b3 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. Undo prevent creating resolve span

    @uurien
    uurien committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    82db1d4 View commit details
    Browse the repository at this point in the history

  2. Configurable graphql blocking json

    @uurien
    uurien committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    1a238bf View commit details
    Browse the repository at this point in the history

  3. Refactor graphql 

    * Using resolver instead of resolvers.
* Change graphql channel name to be consistent with the others.
* Fix tests.
* Remove comments.
    @hoolioh
    hoolioh committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    a685a01 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'julio/graphql-blocking' of github.com:DataDog/dd-trace-… 

    …js into julio/graphql-blocking
    @hoolioh
    hoolioh committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    1d4524f View commit details
    Browse the repository at this point in the history

  5. Fix integration tests.

    @hoolioh
    hoolioh committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    46039a7 View commit details
    Browse the repository at this point in the history

  6. fix channel name

    @uurien
    uurien committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    727456e View commit details
    Browse the repository at this point in the history

  7. Small fixes

    @uurien
    uurien committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    35d4aeb View commit details
    Browse the repository at this point in the history

  8. Small changes in blocking

    @uurien
    uurien committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    5c293ee View commit details
    Browse the repository at this point in the history

  9. Small changes

    @uurien
    uurien committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    d9e6ce3 View commit details
    Browse the repository at this point in the history

  10. Move resover information resolution to plugin.

    @hoolioh
    hoolioh committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    7cc8561 View commit details
    Browse the repository at this point in the history

  11. Revert "Move resover information resolution to plugin." 

    This reverts commit 7cc8561.
    @hoolioh
    hoolioh committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    62dc02a View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Remove resolver information from context, pass it in a different fiel… 

    …d instead.
    @hoolioh
    hoolioh committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    a941309 View commit details
    Browse the repository at this point in the history

  2. Throw custom exception rather than send an empty array.

    @hoolioh
    hoolioh committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    d94df58 View commit details
    Browse the repository at this point in the history

  3. Change exception name

    @hoolioh
    hoolioh committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    80a4e01 View commit details
    Browse the repository at this point in the history

  4. Update packages/datadog-instrumentations/src/graphql.js 

    Co-authored-by: Ugaitz Urien <[email protected]>
    @hoolioh @uurien
    hoolioh and uurien authored Dec 4, 2023
    Configuration menu
    Copy the full SHA
    08b3b2b View commit details
    Browse the repository at this point in the history

  5. Change a bit apollo-server-core instrumentation

    @uurien
    uurien committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    e310e5c View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Small code changes

    @uurien
    uurien committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    5fbb4c5 View commit details
    Browse the repository at this point in the history

  2. Small changes

    @uurien
    uurien committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    8be2238 View commit details
    Browse the repository at this point in the history

  3. Protect Header map, if in future version it is moved/removed, prevent… 

    … breaks
    @uurien
    uurien committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    204b405 View commit details
    Browse the repository at this point in the history

  4. Remove some duplicated code

    @uurien
    uurien committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    3416b3f View commit details
    Browse the repository at this point in the history

  5. Fix blocking tests

    @uurien
    uurien committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    0347483 View commit details
    Browse the repository at this point in the history

  6. Fix blocking tests

    @uurien
    uurien committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    1b1d481 View commit details
    Browse the repository at this point in the history

  7. Small fixes

    @uurien
    uurien committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    4c5578b View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Update packages/datadog-instrumentations/src/apollo-server.js 

    Co-authored-by: Carles Capell <[email protected]>
    @uurien @CarlesDD
    uurien and CarlesDD authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    44187c6 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. Fix comments in the PR

    @uurien
    uurien committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    c820226 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. Fix PR comments.

    @hoolioh
    hoolioh committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    a293f51 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. Fix some comments in the PR

    @uurien
    uurien committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    c45af94 View commit details
    Browse the repository at this point in the history

  2. Fix test

    @uurien
    uurien committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    26f64d0 View commit details
    Browse the repository at this point in the history

  3. Fix lint

    @uurien
    uurien committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    b4a23e6 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2023

  1. Move resolver information formatting to the plugin.

    @hoolioh
    hoolioh committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    80b3c21 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. Fix PR comments.

    @hoolioh
    hoolioh committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    026aaaa View commit details
    Browse the repository at this point in the history

  2. Fix tests.

    @hoolioh
    hoolioh committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    0b83ea1 View commit details
    Browse the repository at this point in the history

  3. Fix proper use of Promise.race.

    @hoolioh
    hoolioh committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    8f427dc View commit details
    Browse the repository at this point in the history