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

Update to the latest branch of the sarama fork #30776

Merged
merged 2 commits into from
Mar 14, 2022
Merged

Conversation

faec
Copy link
Contributor

@faec faec commented Mar 10, 2022

What does this PR do?

Updates the linked sarama version to include the recent logging fixes for #26294, targeting the commit:

commit ebc2b0d8eef3fb865395ad7f2bee57debcf1aaaa (HEAD -> beats-fork, upstream/beats-fork)
Merge: 11c3ef8 a0af98a
Author: Fae Charlton <[email protected]>
Date:   Thu Mar 10 14:33:31 2022 -0500

    Merge pull request #15 from faec/logging

    Report common unrecoverable connection / authentication errors

Generated with:

go mod edit -replace github.com/Shopify/sarama=github.com/elastic/sarama@ebc2b0d8eef3fb865395ad7f2bee57debcf1aaaa

make notice

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

For details on the change and its testing see the sarama fork PR

@faec faec added the bug label Mar 10, 2022
@faec faec self-assigned this Mar 10, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 10, 2022
@faec faec added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Mar 10, 2022
@elasticmachine
Copy link
Collaborator

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Mar 10, 2022
@mergify
Copy link
Contributor

mergify bot commented Mar 10, 2022

This pull request does not have a backport label. Could you fix it @faec? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Mar 10, 2022
@faec faec added backport-v8.1.0 Automated backport with mergify v8.2.0 and removed backport-skip Skip notification from the automated backport with mergify labels Mar 10, 2022
@faec faec requested review from kvch and rdner March 10, 2022 20:08
@elasticmachine
Copy link
Collaborator

elasticmachine commented Mar 10, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-03-10T20:10:54.959+0000

  • Duration: 207 min 7 sec

Test stats 🧪

Test Results
Failed 0
Passed 43024
Skipped 3846
Total 46870

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

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

@faec faec merged commit f408ba0 into elastic:main Mar 14, 2022
@faec faec deleted the sarama-logging branch March 14, 2022 16:12
mergify bot pushed a commit that referenced this pull request Mar 14, 2022
* Update to the latest branch of the sarama fork

* update changelog

(cherry picked from commit f408ba0)
faec added a commit that referenced this pull request Mar 24, 2022
* Update to the latest branch of the sarama fork

* update changelog

(cherry picked from commit f408ba0)

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
Labels
backport-v8.1.0 Automated backport with mergify bug Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team v8.2.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants