Skip to content

Give spans their proper parent in the plugin stack#4877

Merged
Geal merged 3 commits intodevfrom
geal/reparent-spans
Mar 28, 2024
Merged

Give spans their proper parent in the plugin stack#4877
Geal merged 3 commits intodevfrom
geal/reparent-spans

Conversation

@Geal
Copy link
Copy Markdown
Contributor

@Geal Geal commented Mar 28, 2024

Fix #4827


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.

@Geal Geal requested a review from BrynCooke March 28, 2024 10:12
@github-actions

This comment has been minimized.

@router-perf
Copy link
Copy Markdown

router-perf Bot commented Mar 28, 2024

CI performance tests

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

Geal added 2 commits March 28, 2024 11:15
Some plugins may create their own span using the
`serviceBuilder::instrument()` method. That method was only applying the
span on the future returned by the inner service, but this meant that if
plugin A created a span, then when pugin B created a span, its parent
would not be span A but the parent of span A.
By entiering the span before creating the future, we make sure that the
span hierarchy is respected
@Geal Geal force-pushed the geal/reparent-spans branch from 2fb0040 to 82b1f71 Compare March 28, 2024 10:15
@Geal Geal merged commit 9c32f65 into dev Mar 28, 2024
@Geal Geal deleted the geal/reparent-spans branch March 28, 2024 10:50
BrynCooke pushed a commit that referenced this pull request Mar 29, 2024
Fix #4827

Some plugins may create their own span using the
`serviceBuilder::instrument()` method. That method was only applying the
span on the future returned by the inner service, but this meant that if
plugin A created a span, then when pugin B created a span, its parent
would not be span A but the parent of span A.
By entiering the span before creating the future, we make sure that the
span hierarchy is respected
@BrynCooke BrynCooke mentioned this pull request Mar 29, 2024
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.

More accurately nest spans in tracing

3 participants