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

[pkg/stanza] Fix recombine operator's 'overwrite_with' #30786

Merged

Conversation

djaglowski
Copy link
Member

Fixes #30783

@djaglowski djaglowski marked this pull request as ready for review January 25, 2024 21:18
@djaglowski djaglowski requested review from a team and jpkrohling January 25, 2024 21:18
Co-authored-by: Yang Song <songy23@users.noreply.github.com>
@djaglowski djaglowski merged commit 7a7ecce into open-telemetry:main Jan 25, 2024
78 checks passed
@djaglowski djaglowski deleted the pkg-stanza-recombine-overwrite-with branch January 25, 2024 21:47
@github-actions github-actions bot added this to the next release milestone Jan 25, 2024
djaglowski added a commit that referenced this pull request Jan 26, 2024
This updates the documentation according to changes in #30786
djaglowski added a commit that referenced this pull request Jan 26, 2024
This updates the documentation according to changes in #30786
cparkins pushed a commit to AmadeusITGroup/opentelemetry-collector-contrib that referenced this pull request Feb 1, 2024
…y#30786)

Fixes open-telemetry#30783

---------

Co-authored-by: Yang Song <songy23@users.noreply.github.com>
cparkins pushed a commit to AmadeusITGroup/opentelemetry-collector-contrib that referenced this pull request Feb 1, 2024
Comment on lines 346 to 350
if r.overwriteWithOldest {
base = entries[0]
} else {
base = entries[len(entries)-1]
} else {
base = entries[0]
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@djaglowski Sorry, I don't quite understand this change. When overwrite_with = 'oldest', doesn't it mean that the attributes of the earliest entry are used? The change will use the latest entry as the base entry when overwrite_with = 'oldest'.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, I got it backwards. I've opened #32146 to correct it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[pkg/stanza] Recombine operator inverts 'overwrite_with' setting
3 participants