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

Add support for custom attributes for spans and logs #4102

Merged
merged 109 commits into from
Nov 21, 2023

Conversation

bnjjj
Copy link
Contributor

@bnjjj bnjjj commented Oct 26, 2023

Fixes #4096
Fixes #4086
Fixes #3543
Fixes #3537

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.

bnjjj added 3 commits October 25, 2023 17:41
Signed-off-by: Benjamin Coenen <[email protected]>
Signed-off-by: Benjamin Coenen <[email protected]>
@github-actions
Copy link
Contributor

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

@router-perf
Copy link

router-perf bot commented Oct 26, 2023

CI performance tests

  • 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_without_dedup - Stress test for events with a lot of users and deduplication DISABLED
  • events - Stress test for events with a lot of users and deduplication ENABLED
  • large-request - Stress test with a 1 MB request payload
  • step - Basic stress test that steps up the number of users over time
  • xlarge-request - Stress test with 10 MB request payload
  • reload - Reload test over a long period of time at a constant rate of users
  • no-graphos - Basic stress test, no GraphOS.
  • xxlarge-request - Stress test with 100 MB request payload
  • step-jemalloc-tuning - Clone of the basic stress test for jemalloc tuning
  • const - Basic stress test that runs with a constant number of users

bnjjj and others added 14 commits October 26, 2023 17:31
Signed-off-by: Benjamin Coenen <[email protected]>
Signed-off-by: Benjamin Coenen <[email protected]>
Signed-off-by: Benjamin Coenen <[email protected]>
Signed-off-by: Benjamin Coenen <[email protected]>
Signed-off-by: Benjamin Coenen <[email protected]>
Signed-off-by: Benjamin Coenen <[email protected]>
Signed-off-by: Benjamin Coenen <[email protected]>
Signed-off-by: Benjamin Coenen <[email protected]>
@bnjjj bnjjj marked this pull request as ready for review November 2, 2023 16:32
@bnjjj bnjjj requested a review from a team as a code owner November 2, 2023 16:32
bnjjj and others added 24 commits November 10, 2023 14:56
Signed-off-by: Benjamin Coenen <[email protected]>
…graphql/router into bnjjj/custom_attributes_telemetry
Signed-off-by: Benjamin Coenen <[email protected]>
…graphql/router into bnjjj/custom_attributes_telemetry
… one (#4202)

Some perf improvements to lazy parse the attribute for logs

---------

Signed-off-by: Benjamin Coenen <[email protected]>
Fix compile errors.
Move some attribute stuff to the correct files in prep for testing.
add tests for the formatting layer

---------

Signed-off-by: Benjamin Coenen <[email protected]>
Add tests for `RouterSpans`, `SupergraphSpans` and `SubgraphSpans`.
…graphql/router into bnjjj/custom_attributes_telemetry
@bnjjj bnjjj merged commit 3fa7c11 into dev Nov 21, 2023
11 of 12 checks passed
@bnjjj bnjjj deleted the bnjjj/custom_attributes_telemetry branch November 21, 2023 09:55
Geal pushed a commit that referenced this pull request Nov 29, 2023
#4102 Introduced some changes to tests that would result in failures if
the developer did not have an enterprise account. This is now gated on
the appropriate env variables being present.

Changes:
Revert configuration of existing jaeger tests for not use custom span
attributes.
Add a new test specifically for this.

<!-- start metadata -->
---

**Checklist**

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

- [ ] Changes are compatible[^1]
- [ ] Documentation[^2] completed
- [ ] Performance impact assessed and acceptable
- Tests added and passing[^3]
    - [ ] Unit Tests
    - [ ] Integration Tests
    - [ ] Manual Tests

**Exceptions**

*Note any exceptions here*

**Notes**

[^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.

Co-authored-by: bryn <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants