Skip to content

[Kafka] Update sarama to include error handling fix #44622

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
Merged
faec merged 2 commits into from
Jun 4, 2025
Merged

[Kafka] Update sarama to include error handling fix #44622

faec merged 2 commits into from
Jun 4, 2025

Conversation

@faec
Copy link
Contributor

@faec faec commented Jun 3, 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.

@faec faec self-assigned this Jun 3, 2025
@faec faec added bug Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team labels Jun 3, 2025
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jun 3, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Jun 3, 2025

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@faec faec marked this pull request as ready for review June 3, 2025 18:00
@faec faec requested a review from a team as a code owner June 3, 2025 18:00
@elasticmachine
Copy link
Contributor

elasticmachine commented Jun 3, 2025

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

@mergify
Copy link
Contributor

mergify bot commented Jun 3, 2025

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @faec? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@faec faec added the backport-active-all Automated backport with mergify to all the active branches label Jun 3, 2025
cmacknz
cmacknz approved these changes Jun 3, 2025
View reviewed changes
Copy link
Member

@cmacknz cmacknz left a comment

Choose a reason for hiding this comment

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

LGTM, should have a changelog for this fix though.

@faec faec merged commit 4195119 into elastic:main Jun 4, 2025
203 checks passed
@github-actions
Copy link
Contributor

github-actions bot commented Jun 4, 2025

@Mergifyio backport 8.17 8.18 8.19 9.0

@mergify
Copy link
Contributor

mergify bot commented Jun 4, 2025 •
edited
Loading

backport 8.17 8.18 8.19 9.0

✅ Backports have been created

Details

mergify bot pushed a commit that referenced this pull request Jun 4, 2025
@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 bot pushed a commit that referenced this pull request Jun 4, 2025
@faec @mergify
[Kafka] Update sarama to include error handling fix (#44622)
34ba7ad 
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
This was referenced Jun 4, 2025
Closed
Merged
mergify bot pushed a commit that referenced this pull request Jun 4, 2025
@faec @mergify
[Kafka] Update sarama to include error handling fix (#44622)
0111996 
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)
@mergify mergify bot mentioned this pull request Jun 4, 2025
Merged
mergify bot pushed a commit that referenced this pull request Jun 4, 2025
@faec @mergify
[Kafka] Update sarama to include error handling fix (#44622)
1801812 
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 mentioned this pull request Jun 4, 2025
Merged
faec added a commit that referenced this pull request Jun 17, 2025
@mergify @faec
[8.18](backport #44622) [Kafka] Update sarama to include error handli…
9534961 
…ng fix (#44645)

* [Kafka] Update sarama to include error handling fix (#44622)

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

* fix broken merge

* make notice

---------

Co-authored-by: Fae Charlton <[email protected]>
faec added a commit that referenced this pull request Jun 17, 2025
@mergify @faec
[9.0](backport #44622) [Kafka] Update sarama to include error handlin…
eea7f9d 
…g fix (#44647)

* [Kafka] Update sarama to include error handling fix (#44622)

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

* fix broken merge

* make notice

---------

Co-authored-by: Fae Charlton <[email protected]>
faec added a commit that referenced this pull request Jun 17, 2025
@mergify @faec
[Kafka] Update sarama to include error handling fix (#44622) (#44646)
89b2561 
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)

Co-authored-by: Fae Charlton <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pierrehilbert pierrehilbert pierrehilbert approved these changes

@cmacknz cmacknz cmacknz approved these changes

Assignees

@faec faec

Labels

backport-active-all Automated backport with mergify to all the active branches bug 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

@faec @elasticmachine @pierrehilbert @cmacknz