Skip to content

Add configurable server header read timeout (backport #7262)#7353

Merged
gwardwell merged 10 commits into1.xfrom
mergify/bp/1.x/pr-7262
Apr 29, 2025
Merged

Add configurable server header read timeout (backport #7262)#7353
gwardwell merged 10 commits into1.xfrom
mergify/bp/1.x/pr-7262

Conversation

@gwardwell
Copy link
Contributor

@gwardwell gwardwell commented Apr 28, 2025

This change exposes the server's header read timeout as the server.http.header_read_timeout configuration option.

By default, the server.http.header_read_timeout is set to previously hard-coded 10 seconds. A longer timeout can be configured using the server.http.header_read_timeout option.

server:
  http:
    header_read_timeout: 30s

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


This is an automatic backport of pull request #7262 done by [Mergify](https://mergify.com).

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.

(cherry picked from commit f008bf3)
(cherry picked from commit 8683f3a)

# Conflicts:
#	apollo-router/src/configuration/mod.rs
(cherry picked from commit bca998b)

# Conflicts:
#	apollo-router/src/axum_factory/axum_http_server_factory.rs
#	apollo-router/src/axum_factory/listeners.rs
(cherry picked from commit de2127f)

# Conflicts:
#	apollo-router/src/axum_factory/axum_http_server_factory.rs
#	apollo-router/src/axum_factory/listeners.rs
(cherry picked from commit 1b19574)

# Conflicts:
#	apollo-router/src/configuration/snapshots/apollo_router__configuration__tests__schema_generation.snap
(cherry picked from commit f0aa17d)

# Conflicts:
#	apollo-router/src/axum_factory/listeners.rs
@mergify mergify bot added the conflicts label Apr 28, 2025
@gwardwell gwardwell requested a review from a team April 28, 2025 16:06
@gwardwell gwardwell requested review from a team as code owners April 28, 2025 16:06
@mergify
Copy link
Contributor

mergify bot commented Apr 28, 2025

Cherry-pick of 8683f3a has failed:

On branch mergify/bp/1.x/pr-7262
Your branch is ahead of 'origin/1.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 8683f3a6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   apollo-router/src/configuration/tests.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   apollo-router/src/configuration/mod.rs

Cherry-pick of bca998b has failed:

On branch mergify/bp/1.x/pr-7262
Your branch is ahead of 'origin/1.x' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit bca998b2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   apollo-router/src/axum_factory/axum_http_server_factory.rs
	both modified:   apollo-router/src/axum_factory/listeners.rs

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of de2127f has failed:

On branch mergify/bp/1.x/pr-7262
Your branch is ahead of 'origin/1.x' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit de2127f5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   apollo-router/src/configuration/server.rs
	modified:   apollo-router/src/configuration/tests.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   apollo-router/src/axum_factory/axum_http_server_factory.rs
	both modified:   apollo-router/src/axum_factory/listeners.rs

Cherry-pick of 1b19574 has failed:

On branch mergify/bp/1.x/pr-7262
Your branch is ahead of 'origin/1.x' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 1b195743.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   apollo-router/src/configuration/snapshots/apollo_router__configuration__tests__schema_generation.snap

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of f0aa17d has failed:

On branch mergify/bp/1.x/pr-7262
Your branch is ahead of 'origin/1.x' by 7 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit f0aa17d8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   apollo-router/src/axum_factory/listeners.rs

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@svc-apollo-docs
Copy link
Collaborator

svc-apollo-docs commented Apr 28, 2025

✅ Docs preview ready

The preview is ready to be viewed. View the preview

File Changes

0 new, 1 changed, 0 removed
* graphos/routing/v1/configuration.mdx

Build ID: be689022ee507e54beb06001

URL: https://www.apollographql.com/docs/deploy-preview/be689022ee507e54beb06001

@gwardwell gwardwell force-pushed the mergify/bp/1.x/pr-7262 branch 4 times, most recently from eca0f74 to a9ca055 Compare April 28, 2025 16:41
@gwardwell gwardwell force-pushed the mergify/bp/1.x/pr-7262 branch from a9ca055 to c4eae7b Compare April 28, 2025 16:49
@gwardwell gwardwell merged commit 3b428b2 into 1.x Apr 29, 2025
14 checks passed
@gwardwell gwardwell deleted the mergify/bp/1.x/pr-7262 branch April 29, 2025 11:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Comments