Fix _entities Apollo Error Metrics Missing Service Attribute (backport #8153)

[rregitsky]

---

Error counting #7712 introduced a bug where _entities errors from a subgraph fetch no longer reported a service (subgraph or connector) attribute. This erroneously categorized these errors as from the Router rather than their originating service in the Studio UI.

The attribute has been re-added, fixing this issue.

Checklist

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

• PR description explains the motivation for the change and relevant context for reviewing
• PR description links appropriate GitHub/Jira tickets (creating when necessary)
• Changeset is included for user-facing changes
• Changes are compatible¹
• Documentation² completed
• Performance impact assessed and acceptable
• Metrics and logs are added³ and documented
• Tests added and passing⁴
  • Unit tests
  • Integration tests
  • Manual tests, as necessary

Exceptions

Note any exceptions here

Notes

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

---

This is an automatic backport of pull request #8153 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. 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. ↩

[mergify]

Cherry-pick of 78d22ee has failed:

On branch mergify/bp/2.6.1/pr-8153
Your branch is up to date with 'origin/2.6.1'.

You are currently cherry-picking commit 78d22ee7.
  (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/services/subgraph_service.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

[apollo-librarian]

✅ Docs preview ready

The preview is ready to be viewed. View the preview

File Changes

0 new, 7 changed, 0 removed

* graphos/routing/(latest)/cloud/migrate-to-dedicated.mdx
* graphos/routing/(latest)/configuration/envvars.mdx
* graphos/routing/(latest)/configuration/cli.mdx
* graphos/routing/(latest)/customization/custom-binary.mdx
* graphos/routing/(latest)/observability/telemetry/instrumentation/selectors.mdx
* graphos/routing/(latest)/security/persisted-queries.mdx
* graphos/routing/(latest)/graphos-features.mdx

Build ID: 31ad78888bcdbd944c1ed8c6
Build Logs: View logs

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

[abernix]

@mergify rebase

[mergify]

rebase

✅ Branch has been successfully rebased

[abernix]

going to try a fresh PR because i backported this wrong.

[abernix]

@rregitsky This is my cherrypicking of your #8153 onto our upcoming 2.6.1. I know you can't approve your own PRs, but if you could make sure this still looks right and give your written LGTM, I'm happy to green-light it and land it myself.

[rregitsky]

@rregitsky This is my cherrypicking of your #8153 onto our upcoming 2.6.1. I know you can't approve your own PRs, but if you could make sure this still looks right and give your written LGTM, I'm happy to green-light it and land it myself.

@abernix LGTM. I successfully tested the branch out locally as well.