Skip to content

Reset trace headers for bulk items when returning to pool#5317

Merged
michel-laterman merged 2 commits intoelastic:mainfrom
michel-laterman:fix/bulker-reset-trace-headers
Aug 26, 2025
Merged

Reset trace headers for bulk items when returning to pool#5317
michel-laterman merged 2 commits intoelastic:mainfrom
michel-laterman:fix/bulker-reset-trace-headers

Conversation

@michel-laterman
Copy link
Contributor

What is the problem this PR solves?

Bulker items can have a previous item's trace links.

How does this PR solve the problem?

Clear the reference to the trace link in the block's reset method. This method is called before a block is put back in the sync.Pool.

Note that this fix would only apply to functions using the bulker without a transaction tied to their context.

@michel-laterman michel-laterman requested a review from a team as a code owner August 21, 2025 21:09
@michel-laterman michel-laterman added the bug Something isn't working label Aug 21, 2025
@michel-laterman michel-laterman requested a review from pchila August 21, 2025 21:09
@michel-laterman michel-laterman added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team backport-active-all Automated backport with mergify to all the active branches labels Aug 21, 2025
@prodsecmachine
Copy link

prodsecmachine commented Aug 21, 2025

🎉 Snyk checks have passed. No issues have been found so far.

security/snyk check is complete. No issues have been found. (View Details)

license/snyk check is complete. No issues have been found. (View Details)

@michel-laterman michel-laterman merged commit 138a4e0 into elastic:main Aug 26, 2025
9 checks passed
@michel-laterman michel-laterman deleted the fix/bulker-reset-trace-headers branch August 26, 2025 22:18
@github-actions
Copy link
Contributor

@Mergifyio backport 8.17 8.18 8.19 9.0 9.1

@mergify
Copy link
Contributor

mergify bot commented Aug 26, 2025

mergify bot pushed a commit that referenced this pull request Aug 26, 2025
* Reset trace headers

* Add pr ref to changelog

(cherry picked from commit 138a4e0)
mergify bot pushed a commit that referenced this pull request Aug 26, 2025
* Reset trace headers

* Add pr ref to changelog

(cherry picked from commit 138a4e0)
mergify bot pushed a commit that referenced this pull request Aug 26, 2025
* Reset trace headers

* Add pr ref to changelog

(cherry picked from commit 138a4e0)
mergify bot pushed a commit that referenced this pull request Aug 26, 2025
* Reset trace headers

* Add pr ref to changelog

(cherry picked from commit 138a4e0)
mergify bot pushed a commit that referenced this pull request Aug 26, 2025
* Reset trace headers

* Add pr ref to changelog

(cherry picked from commit 138a4e0)
michel-laterman added a commit that referenced this pull request Aug 26, 2025
)

* Reset trace headers

* Add pr ref to changelog

(cherry picked from commit 138a4e0)

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>
michel-laterman added a commit that referenced this pull request Aug 26, 2025
)

* Reset trace headers

* Add pr ref to changelog

(cherry picked from commit 138a4e0)

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>
michel-laterman added a commit that referenced this pull request Aug 26, 2025
)

* Reset trace headers

* Add pr ref to changelog

(cherry picked from commit 138a4e0)

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>
michel-laterman added a commit that referenced this pull request Aug 26, 2025
)

* Reset trace headers

* Add pr ref to changelog

(cherry picked from commit 138a4e0)

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>
michel-laterman added a commit that referenced this pull request Aug 26, 2025
)

* Reset trace headers

* Add pr ref to changelog

(cherry picked from commit 138a4e0)

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-active-all Automated backport with mergify to all the active branches bug Something isn't working Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

3 participants