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.

Sign up for GitHub

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

perf(export): do not allocate arrays if resource has no pending async attributes #4550

Merged
merged 4 commits into from
Mar 25, 2024
Merged

perf(export): do not allocate arrays if resource has no pending async attributes #4550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5b52e2
perf(eport): do not allocate arrays if resource has no pending async …
Samuron Mar 17, 2024
a4f45c7
perf(export): do not use splice if fit in one batch
Samuron Mar 17, 2024
fee30fd
Update CHANGELOG.md
Samuron Mar 22, 2024
670bfbb
Merge branch 'main' into batch_span_allocations
pichlermarc Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/

### :rocket: (Enhancement)

* perf(sdk-trace-base): do not allocate arrays if resource has no pending async attributes

### :bug: (Bug Fix)

* fix(sdk-metrics): increase the depth of the output to the console such that objects in the metric are printed fully to the console [#4522](https://github.com/open-telemetry/opentelemetry-js/pull/4522) @JacksonWeber
Expand Down
31 changes: 21 additions & 10 deletions packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,13 @@ export abstract class BatchSpanProcessorBase<T extends BufferConfig>
// Reset the finished spans buffer here because the next invocations of the _flush method
// could pass the same finished spans to the exporter if the buffer is cleared
// outside the execution of this callback.
const spans = this._finishedSpans.splice(0, this._maxExportBatchSize);
let spans: ReadableSpan[];
if (this._finishedSpans.length <= this._maxExportBatchSize) {
spans = this._finishedSpans;
this._finishedSpans = [];
} else {
spans = this._finishedSpans.splice(0, this._maxExportBatchSize);
}
pichlermarc marked this conversation as resolved.
Show resolved Hide resolved

const doExport = () =>
this._exporter.export(spans, result => {
Expand All @@ -195,19 +201,24 @@ export abstract class BatchSpanProcessorBase<T extends BufferConfig>
);
}
});
const pendingResources = spans
.map(span => span.resource)
.filter(resource => resource.asyncAttributesPending);

let pendingResources: Array<Promise<void>> | null = null;
for (let i = 0, len = spans.length; i < len; i++) {
const span = spans[i];
if (
span.resource.asyncAttributesPending &&
span.resource.waitForAsyncAttributes
) {
pendingResources ??= [];
pendingResources.push(span.resource.waitForAsyncAttributes());
}
}

// Avoid scheduling a promise to make the behavior more predictable and easier to test
if (pendingResources.length === 0) {
if (pendingResources === null) {
doExport();
} else {
Promise.all(
pendingResources.map(
resource => resource.waitForAsyncAttributes?.()
)
).then(doExport, err => {
Promise.all(pendingResources).then(doExport, err => {
globalErrorHandler(err);
reject(err);
});
Expand Down