Skip to content

Fix metric apollo.router.operations.batching.size (backport #7306)#7362

Merged
bnjjj merged 2 commits into1.xfrom
mergify/bp/1.x/pr-7306
Apr 29, 2025
Merged

Fix metric apollo.router.operations.batching.size (backport #7306)#7362
bnjjj merged 2 commits into1.xfrom
mergify/bp/1.x/pr-7306

Conversation

@bnjjj
Copy link
Contributor

@bnjjj bnjjj commented Apr 29, 2025

Fix the metric apollo.router.operations.batching.size, it will now contain the right batch size.


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

[ROUTER-1256]: https://apollographql.atlassian.net/browse/ROUTER-1256?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ


This is an automatic backport of pull request #7306 done by Mergify.

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.

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>
Co-authored-by: Jesse Rosenberger <git@jro.cc>
(cherry picked from commit 517ec16)

# Conflicts:
#	apollo-router/src/services/router/tests.rs
@mergify mergify bot added the conflicts label Apr 29, 2025
@bnjjj bnjjj requested a review from a team April 29, 2025 07:51
@bnjjj bnjjj requested review from a team as code owners April 29, 2025 07:51
@mergify mergify bot assigned bnjjj Apr 29, 2025
@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2025

Cherry-pick of 517ec16 has failed:

On branch mergify/bp/1.x/pr-7306
Your branch is up to date with 'origin/1.x'.

You are currently cherry-picking commit 517ec16f.
  (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:
	new file:   .changesets/fix_bnjjj_rh_845.md
	modified:   apollo-router/src/graphql/request.rs

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

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 29, 2025

✅ Docs preview has no changes

The preview was not built because there were no changes.

Build ID: 4d9e47e623824382d623e7fc

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>
@bnjjj bnjjj enabled auto-merge (squash) April 29, 2025 08:02
@bnjjj bnjjj merged commit 2f66c12 into 1.x Apr 29, 2025
14 checks passed
@bnjjj bnjjj deleted the mergify/bp/1.x/pr-7306 branch April 29, 2025 08:21
abernix added a commit that referenced this pull request Jun 19, 2025
This applies a reversion of the fix, but not the tests.  This supports the
reversion of other bits for the coprocessor payload.
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