-
Notifications
You must be signed in to change notification settings - Fork 329
Avoid ArrayList copying from TraceInterceptors #10828
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
Draft
dougqh
wants to merge
6
commits into
master
Choose a base branch
from
dougqh/trace-intercept-optimization
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+54
−14
Draft
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
8a33be4
Skip copying to another array if interceptedTrace == trace
dougqh e092c44
Reducing allocation in interceptCompleteTrace
dougqh c2e108a
Merge branch 'master' into dougqh/trace-intercept-optimization
dougqh 139625f
spotless
dougqh e7e438c
Merge branch 'dougqh/trace-intercept-optimization' of github.com:Data…
dougqh 9894ce5
Merge branch 'master' into dougqh/trace-intercept-optimization
dougqh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,6 @@ | |
| import datadog.trace.api.time.TimeSource; | ||
| import datadog.trace.bootstrap.instrumentation.api.AgentScope; | ||
| import datadog.trace.core.monitor.HealthMetrics; | ||
| import java.util.Collections; | ||
| import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; | ||
| import javax.annotation.Nonnull; | ||
|
|
||
|
|
@@ -72,7 +71,7 @@ PublishState onPublish(DDSpan span) { | |
| tracer.onRootSpanPublished(rootSpan); | ||
| } | ||
| healthMetrics.onFinishSpan(); | ||
| tracer.write(Collections.singletonList(span)); | ||
| tracer.write(TraceList.of(span)); | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This part is slightly questionable, since TraceList (being an ArrayList) does incur an extra Object[] allocation that isn't needed for singletonList. I think this is offset by the efficiency gains elsewhere, but I should verify more carefully. |
||
| return PublishState.WRITTEN; | ||
| } | ||
|
|
||
|
|
||
22 changes: 22 additions & 0 deletions
22
dd-trace-core/src/main/java/datadog/trace/core/TraceList.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package datadog.trace.core; | ||
|
|
||
| import java.util.ArrayList; | ||
|
|
||
| /** ArrayList that exposes modCount to allow for an optimization in TraceInterceptor handling */ | ||
| final class TraceList extends ArrayList<DDSpan> { | ||
| static final TraceList EMPTY = new TraceList(0); | ||
|
|
||
| static final TraceList of(DDSpan span) { | ||
| TraceList list = new TraceList(1); | ||
| list.add(span); | ||
| return list; | ||
| } | ||
|
|
||
| TraceList(int capacity) { | ||
| super(capacity); | ||
| } | ||
|
|
||
| int modCount() { | ||
| return this.modCount; | ||
| } | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Previously, there was a defensive copy of the incoming trace; however, I couldn't see a reason why. The incoming List was already copied from the span buffer. And creating a new ArrayList didn't prevent mutation by the TraceInterceptor, since the TraceInterceptor could simply change the incoming list and return it anyway.