Skip to content

Comments

Fix JWT metrics discrepancy (backport #7258)#7291

Merged
goto-bus-stop merged 2 commits into1.xfrom
mergify/bp/1.x/pr-7258
Apr 17, 2025
Merged

Fix JWT metrics discrepancy (backport #7258)#7291
goto-bus-stop merged 2 commits into1.xfrom
mergify/bp/1.x/pr-7258

Conversation

@SimonSapin
Copy link
Contributor

@SimonSapin SimonSapin commented Apr 16, 2025

This fixes the apollo.router.operations.authentication.jwt counter metric to behave as documented: emitted for every request that uses JWT, with the authentication.jwt.failed attribute set to true or false for failed or successful authentication.

Previously, it was only used for failed authentication.

The attribute-less and accidentally-differently-named apollo.router.operations.jwt counter was and is only emitted for successful authentication, but is deprecated now.


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 #7258 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 f57b207)

# Conflicts:
#	apollo-router/src/plugins/authentication/mod.rs
@SimonSapin SimonSapin requested a review from a team April 16, 2025 14:04
@mergify mergify bot added the conflicts label Apr 16, 2025
@SimonSapin SimonSapin requested review from a team as code owners April 16, 2025 14:04
@mergify
Copy link
Contributor

mergify bot commented Apr 16, 2025

Cherry-pick of f57b207 has failed:

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

You are currently cherry-picking commit f57b2079.
  (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_simon_jwt_metrics.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   apollo-router/src/plugins/authentication/mod.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 16, 2025

✅ Docs preview has no changes

The preview was not built because there were no changes.

Build ID: b5e0666286022ae497f728c5

@goto-bus-stop
Copy link
Member

Ah! This metric doesnt even exist in 1.x. No backport necessary.

@goto-bus-stop
Copy link
Member

....nevermind, i misunderstood. I'll patch up the conflicts.

@goto-bus-stop goto-bus-stop reopened this Apr 16, 2025
@goto-bus-stop goto-bus-stop merged commit 82f617a into 1.x Apr 17, 2025
14 checks passed
@goto-bus-stop goto-bus-stop deleted the mergify/bp/1.x/pr-7258 branch April 17, 2025 14:04
@router-perf
Copy link

router-perf bot commented Apr 20, 2025

CI performance tests

  • connectors-const - Connectors stress test that runs with a constant number of users
  • 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

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.

4 participants