Skip to content

Comments

feat(subscription): add operation_name label to apollo.router.opened.subscriptions counter (backport #7606)#7656

Merged
bnjjj merged 2 commits into1.xfrom
mergify/bp/1.x/pr-7606
Jun 10, 2025
Merged

feat(subscription): add operation_name label to apollo.router.opened.subscriptions counter (backport #7606)#7656
bnjjj merged 2 commits into1.xfrom
mergify/bp/1.x/pr-7606

Conversation

@bnjjj
Copy link
Contributor

@bnjjj bnjjj commented Jun 10, 2025

This PR adds a new label on apollo.router.opened.subscriptions metric to know exactly which subscription is still opened.


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
  • Metrics and logs are added3 and documented
  • Tests added and passing4
    • Unit Tests
    • Integration Tests
    • Manual Tests

Exceptions

Note any exceptions here

Notes


This is an automatic backport of pull request #7606 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. A lot of (if not most) features benefit from built-in observability and debug-level logs. Please read this guidance on metrics best-practices.

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

…subscriptions counter (#7606)

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>
Co-authored-by: carodewig <16093297+carodewig@users.noreply.github.com>
Co-authored-by: bryn <bryn@apollographql.com>
(cherry picked from commit e7b7e40)

# Conflicts:
#	apollo-router/src/metrics/mod.rs
#	docs/source/routing/observability/telemetry/instrumentation/standard-instruments.mdx
@mergify mergify bot added the conflicts label Jun 10, 2025
@bnjjj bnjjj requested a review from a team June 10, 2025 12:40
@bnjjj bnjjj requested review from a team as code owners June 10, 2025 12:40
@mergify
Copy link
Contributor

mergify bot commented Jun 10, 2025

Cherry-pick of e7b7e40 has failed:

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

You are currently cherry-picking commit e7b7e401.
  (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_add_operation_name_subscription_metric.md
	modified:   apollo-router/src/notification.rs
	modified:   apollo-router/src/plugins/subscription.rs
	modified:   apollo-router/src/services/subgraph_service.rs
	modified:   apollo-router/src/services/supergraph/tests.rs
	modified:   apollo-router/tests/integration/mod.rs
	renamed:    apollo-router/tests/integration/subscription.rs -> apollo-router/tests/integration/subscription_load_test.rs
	modified:   dev-docs/metrics.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   apollo-router/src/metrics/mod.rs
	both modified:   docs/source/routing/observability/telemetry/instrumentation/standard-instruments.mdx

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

@mergify mergify bot assigned bnjjj Jun 10, 2025
Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>
@apollo-librarian
Copy link

apollo-librarian bot commented Jun 10, 2025

✅ Docs preview ready

The preview is ready to be viewed. View the preview

File Changes

0 new, 5 changed, 0 removed
* (developer-tools)/apollo-mcp-server/(latest)/command-reference.mdx
* (developer-tools)/rover/commands/dev.mdx
* graphos/routing/(latest)/observability/telemetry/instrumentation/standard-instruments.mdx
* graphos/routing/v1/observability/telemetry/instrumentation/standard-instruments.mdx
* graphos/schema-design/federated-schemas/reference/moving-to-federation-2.mdx

Build ID: 7b1f90c6fc01df10a68d7495

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

@apollo-librarian
Copy link

🛠️ Docs preview building...

The preview is currently being built.

Build ID: 7b1f90c6fc01df10a68d7495

@bnjjj bnjjj enabled auto-merge (squash) June 10, 2025 13:04
@bnjjj bnjjj merged commit ae2b133 into 1.x Jun 10, 2025
13 checks passed
@bnjjj bnjjj deleted the mergify/bp/1.x/pr-7606 branch June 10, 2025 13:15
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.

2 participants