Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 theVec
implementation, but it otherwise usesahash::HashMap
for performance.Checklist
Complete the checklist (and note appropriate exceptions) before the PR is marked ready-for-review.
Exceptions
Note any exceptions here
Notes
Footnotes
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. ↩
Configuration is an important part of many changes. Where applicable please try to document configuration examples. ↩
Tick whichever testing boxes are applicable. If you are adding Manual Tests, please document the manual testing (extensively) in the Exceptions. ↩