Skip to content

[8.17](backport #44622) [Kafka] Update sarama to include error handling fix #44644

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

Jump to bottom
Closed
mergify wants to merge 1 commit into from
Closed

[8.17](backport #44622) [Kafka] Update sarama to include error handling fix #44644

mergify wants to merge 1 commit into from

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 4, 2025

This PR updates Sarama to the current Elastic fork, targeting the commit:

commit 7672917f26b6112627457d6bd1736a8636449c5b (HEAD, upstream/beats-fork)
Merge: e414b10 a10b157
Author: Fae Charlton <[email protected]>
Date:   Tue Jun 3 13:51:45 2025 -0400

    Merge pull request #28 from faec/broker-rst-fix

    Clean up broker connections when returning a short-circuit error during metadata fetch

This includes the fix for #44606.

This is an automatic backport of pull request #44622 done by Mergify.

@faec @mergify
[Kafka] Update sarama to include error handling fix (#44622)
105eaf4 
This PR updates Sarama to the current Elastic fork, targeting the commit:

```
commit 7672917f26b6112627457d6bd1736a8636449c5b (HEAD, upstream/beats-fork)
Merge: e414b10 a10b157
Author: Fae Charlton <[email protected]>
Date:   Tue Jun 3 13:51:45 2025 -0400

    Merge pull request #28 from faec/broker-rst-fix

    Clean up broker connections when returning a short-circuit error during metadata fetch
```

This includes the fix for #44606.

(cherry picked from commit 4195119)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 4, 2025
@mergify mergify bot assigned faec Jun 4, 2025
@mergify mergify bot requested a review from a team as a code owner June 4, 2025 12:58
@mergify mergify bot added the backport label Jun 4, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jun 4, 2025

Cherry-pick of 4195119 has failed:

On branch mergify/bp/8.17/pr-44622
Your branch is up to date with 'origin/8.17'.

You are currently cherry-picking commit 4195119f0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 4, 2025
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 4, 2025
@mergify mergify bot mentioned this pull request Jun 4, 2025
Merged
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Jun 4, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 4, 2025
@elasticmachine
Copy link
Contributor

elasticmachine commented Jun 4, 2025

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@mergify
Copy link
Contributor Author

mergify bot commented Jun 9, 2025

This pull request has not been merged yet. Could you please review and merge it @faec? 🙏

1 similar comment
@mergify
Copy link
Contributor Author

mergify bot commented Jun 16, 2025

This pull request has not been merged yet. Could you please review and merge it @faec? 🙏

@faec faec closed this Jun 17, 2025
@mergify mergify bot deleted the mergify/bp/8.17/pr-44622 branch June 17, 2025 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@faec faec

Labels

backport conflicts There is a conflict in the backported pull request Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@elasticmachine @pierrehilbert @faec