Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deduplicate event attributes #6649

Merged
merged 4 commits into from
Jan 27, 2025
Merged

Deduplicate event attributes #6649

merged 4 commits into from
Jan 27, 2025

Conversation

tninesling
Copy link
Contributor

@tninesling tninesling commented Jan 24, 2025

Addresses a small bug introduced in the OTel upgrade #6493. Specifically, the change at fault was https://github.com/apollographql/router/pull/6493/files#diff-094d0ee09c48d0683b874ada1bbf28afa9423ddf9671a46dab0d35afb33efc95L29.

The OTel crates removed their various map representations of attributes with Vec<KeyValue>, which means we are responsible for deduplicating attributes. This is already checked for metrics, but duplicates could be produced for events. Reinstating the map for storing event attributes removes these duplicates.

Notes:
This is a patch for an unreleased change, so the changeset is omitted to avoid noise in the changelog.
The tests use IndexMap to maintain ordering from snapshots generated with the Vec implementation, but it otherwise uses ahash::HashMap for performance.


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

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.

@tninesling tninesling requested review from a team as code owners January 24, 2025 18:24
@svc-apollo-docs
Copy link
Collaborator

svc-apollo-docs commented Jan 24, 2025

✅ Docs preview has no changes

The preview was not built because there were no changes.

Build ID: 31df6ce61b3604bd3dd94e5b

Copy link
Contributor

@tninesling, please consider creating a changeset entry in /.changesets/. These instructions describe the process and tooling.

@router-perf
Copy link

router-perf bot commented Jan 24, 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

@tninesling tninesling merged commit bfad5b2 into dev Jan 27, 2025
15 of 16 checks passed
@tninesling tninesling deleted the tninesling/dedup-attributes branch January 27, 2025 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants