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.

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

Request timeout and rate limited error responses are structured errors #5578

Merged
merged 16 commits into from
Jul 5, 2024

Conversation

IvanGoncharov
Copy link
Member

@IvanGoncharov IvanGoncharov commented Jul 2, 2024

Request timeout (408 Request Timeout) and request rate limited (429 Too Many Requests)errors will now result in a structured GraphQL error (i.e., {"errors": [...]}) being returned to the client rather than a plain-text error as was the case previously.

Also both errors are now properly tracked in telemetry, including apollo_router_graphql_error_total metric.


Checklist

Complete the checklist (and note appropriate exceptions) before the PR is marked ready-for-review.

  • Changes are compatible1
  • Documentation2 completed
  • Performance impact assessed and acceptable
  • Tests added and passing3
    • Unit Tests
    • Integration Tests
    • Manual Tests

Exceptions

Note any exceptions here

Notes

Fixes: #4891

Footnotes

  1. It may be appropriate to bring upcoming changes to the attention of other (impacted) groups. Please endeavour to do this before seeking PR approval. The mechanism for doing this will vary considerably, so use your judgement as to how and when to do this.

  2. Configuration is an important part of many changes. Where applicable please try to document configuration examples.

  3. Tick whichever testing boxes are applicable. If you are adding Manual Tests, please document the manual testing (extensively) in the Exceptions.

This comment has been minimized.

@router-perf
Copy link

router-perf bot commented Jul 2, 2024

CI performance tests

  • const - Basic stress test that runs with a constant number of users
  • demand-control-instrumented - A copy of the step test, but with demand control monitoring and metrics enabled
  • demand-control-uninstrumented - A copy of the step test, but with demand control monitoring enabled
  • enhanced-signature - Enhanced signature enabled
  • events - Stress test for events with a lot of users and deduplication ENABLED
  • events_big_cap_high_rate - Stress test for events with a lot of users, deduplication enabled and high rate event with a big queue capacity
  • events_big_cap_high_rate_callback - Stress test for events with a lot of users, deduplication enabled and high rate event with a big queue capacity using callback mode
  • events_callback - Stress test for events with a lot of users and deduplication ENABLED in callback mode
  • events_without_dedup - Stress test for events with a lot of users and deduplication DISABLED
  • events_without_dedup_callback - Stress test for events with a lot of users and deduplication DISABLED using callback mode
  • extended-reference-mode - Extended reference mode enabled
  • large-request - Stress test with a 1 MB request payload
  • no-tracing - Basic stress test, no tracing
  • reload - Reload test over a long period of time at a constant rate of users
  • step-jemalloc-tuning - Clone of the basic stress test for jemalloc tuning
  • step-local-metrics - Field stats that are generated from the router rather than FTV1
  • step-with-prometheus - A copy of the step test with the Prometheus metrics exporter enabled
  • step - Basic stress test that steps up the number of users over time
  • xlarge-request - Stress test with 10 MB request payload
  • xxlarge-request - Stress test with 100 MB request payload

Copy link
Contributor

@bnjjj bnjjj left a comment

Choose a reason for hiding this comment

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

I think it might also be interesting to add more tests for metrics, like is it properly accounted with the right status code and so one

@IvanGoncharov IvanGoncharov requested a review from bnjjj July 4, 2024 06:32
@IvanGoncharov
Copy link
Member Author

I think it might also be interesting to add more tests for metrics, like is it properly accounted with the right status code and so one

@bnjjj I added metrics into integration tests, please take a look

@IvanGoncharov IvanGoncharov marked this pull request as ready for review July 4, 2024 06:34
@IvanGoncharov IvanGoncharov requested review from a team as code owners July 4, 2024 06:34
@IvanGoncharov IvanGoncharov requested a review from bnjjj July 4, 2024 07:32
Copy link
Contributor

Choose a reason for hiding this comment

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

Not a blocker, but if you have time could you add a test including configuration with custom telemetry and adding the status_code attributes on http.server.request.duration ?

Something like:

telemetry:
  instrumentation:
    instruments:
      router:
        http.server.request.duration:
          attributes:
            # Standard attributes
            http.response.status_code: true
            graphql.error:
              on_graphql_error: true

Make sure to guard it like here and test it with the right env variables set to enable graphos in tests (TEST_APOLLO_KEY, TEST_APOLLO_GRAPH_REF).

@IvanGoncharov IvanGoncharov requested a review from bnjjj July 4, 2024 15:11
@IvanGoncharov IvanGoncharov changed the title traffic_shaping: report timeout as graphql error Request timeout and rate limited error responses are structured errors Jul 4, 2024
@IvanGoncharov IvanGoncharov changed the title Request timeout and rate limited error responses are structured errors <!-- [ROUTER-413] -->Request timeout and rate limited error responses are structured errors Jul 5, 2024
@IvanGoncharov IvanGoncharov changed the title <!-- [ROUTER-413] -->Request timeout and rate limited error responses are structured errors Request timeout and rate limited error responses are structured errors Jul 5, 2024
@IvanGoncharov IvanGoncharov merged commit 9b19146 into dev Jul 5, 2024
13 of 14 checks passed
@IvanGoncharov IvanGoncharov deleted the i1g/timeout branch July 5, 2024 09:15
@abernix abernix mentioned this pull request Jul 16, 2024
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.

Timed out subgraph requests do not trigger SubgraphResponse coprocessor requests
5 participants