-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Optimize Logs SDK BatchProcessor #6569
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
Merged
+44
−11
Merged
Changes from 6 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
8e9863a
why
wmdanor 93b55ea
update comment
wmdanor ec81485
Merge branch 'main' into logs-perf-actual
wmdanor 15b3f0e
Update exporter.go
pellared 2d259b1
Merge branch 'main' into logs-perf-actual
pellared 996346b
Update CHANGELOG.md
pellared 2c7d8a6
Update CHANGELOG.md
pellared 087f302
Merge branch 'main' into logs-perf-actual
pellared 0f8bc54
Update batch.go
pellared be4cc3d
fix typo
wmdanor 3a8fb6b
change skip behaviour
wmdanor bdec7f0
Merge branch 'main' into logs-perf-actual
wmdanor 12038f5
revert skip behaviour
wmdanor 668e54f
replace isqueuefull with ready
wmdanor 49572b3
Merge branch 'main' into logs-perf-actual
pellared 94db019
Merge branch 'main' into logs-perf-actual
pellared 61cb20d
Merge branch 'main' into logs-perf-actual
dmathieu 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
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -156,13 +156,17 @@ func (b *BatchProcessor) poll(interval time.Duration) (done chan struct{}) { | |||||||||
| global.Warn("dropped log records", "dropped", d) | ||||||||||
| } | ||||||||||
|
|
||||||||||
| qLen := b.q.TryDequeue(buf, func(r []Record) bool { | ||||||||||
| ok := b.exporter.EnqueueExport(r) | ||||||||||
| if ok { | ||||||||||
| buf = slices.Clone(buf) | ||||||||||
| } | ||||||||||
| return ok | ||||||||||
| }) | ||||||||||
| qLen := b.q.Len() | ||||||||||
| // don't copy data from queue unless exporter can accept more, it is very expensive | ||||||||||
| if !b.exporter.IsQueueFull() { | ||||||||||
| qLen = b.q.TryDequeue(buf, func(r []Record) bool { | ||||||||||
| ok := b.exporter.EnqueueExport(r) | ||||||||||
dmathieu marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||||||
| if ok { | ||||||||||
| buf = slices.Clone(buf) | ||||||||||
| } | ||||||||||
| return ok | ||||||||||
| }) | ||||||||||
| } | ||||||||||
|
Contributor
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.
Suggested change
|
||||||||||
| if qLen >= b.batchSize { | ||||||||||
| // There is another full batch ready. Immediately trigger | ||||||||||
| // another export attempt. | ||||||||||
|
|
@@ -272,6 +276,13 @@ func newQueue(size int) *queue { | |||||||||
| } | ||||||||||
| } | ||||||||||
|
|
||||||||||
| func (q *queue) Len() int { | ||||||||||
| q.Lock() | ||||||||||
| defer q.Unlock() | ||||||||||
|
|
||||||||||
| return q.len | ||||||||||
| } | ||||||||||
|
|
||||||||||
| // Dropped returns the number of Records dropped during enqueueing since the | ||||||||||
| // last time Dropped was called. | ||||||||||
| func (q *queue) Dropped() uint64 { | ||||||||||
|
|
||||||||||
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
Oops, something went wrong.
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.