Skip to content

Conversation

@mauri870
Copy link
Member

Proposed commit message

The call to ConsumeLogs can fail in various ways. If the error is of type "Permanent", retrying will have no effect. For any other error, we need to retry the batch. Additionally, only acknowledge a batch when the collector confirms receipt of the data to avoid losing events.

  • 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.

Author's Checklist

  • I'm unsure about the batch.Drop() in the permanent error case, should I handle it in a different way?

Related issues

@mauri870 mauri870 requested a review from a team October 25, 2024 15:27
@mauri870 mauri870 self-assigned this Oct 25, 2024
@mauri870 mauri870 requested review from AndersonQ and VihasMakwana and removed request for a team October 25, 2024 15:27
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 25, 2024
@mauri870 mauri870 added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Oct 25, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 25, 2024
@mauri870 mauri870 marked this pull request as ready for review October 25, 2024 15:28
@mauri870 mauri870 requested a review from a team as a code owner October 25, 2024 15:28
@elasticmachine
Copy link
Contributor

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

@mergify
Copy link
Contributor

mergify bot commented Oct 25, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @mauri870? 🙏.
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

@mergify
Copy link
Contributor

mergify bot commented Oct 25, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Oct 25, 2024
@mauri870 mauri870 requested a review from leehinman October 25, 2024 15:28
@mauri870 mauri870 force-pushed the otel-tests branch 2 times, most recently from d4521f9 to 43d6220 Compare October 25, 2024 15:41
@mauri870 mauri870 requested a review from a team as a code owner October 25, 2024 15:41
The call to `ConsumeLogs` can fail in various ways. If the error is of
type "Permanent", retrying will have no effect. For any other error,
we need to retry the batch. Additionally, only acknowledge a batch
when the collector confirms receipt of the data to avoid losing events.
@mauri870
Copy link
Member Author

/test

Copy link
Contributor

@leehinman leehinman left a comment

Choose a reason for hiding this comment

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

LGTM

@mauri870 mauri870 merged commit e20e486 into elastic:main Oct 29, 2024
mergify bot pushed a commit that referenced this pull request Oct 29, 2024
…#41457)

The call to `ConsumeLogs` can fail in various ways. If the error is of
type "Permanent", retrying will have no effect. For any other error,
we need to retry the batch. Additionally, only acknowledge a batch
when the collector confirms receipt of the data to avoid losing events.

(cherry picked from commit e20e486)
pierrehilbert pushed a commit that referenced this pull request Oct 29, 2024
…#41457) (#41476)

The call to `ConsumeLogs` can fail in various ways. If the error is of
type "Permanent", retrying will have no effect. For any other error,
we need to retry the batch. Additionally, only acknowledge a batch
when the collector confirms receipt of the data to avoid losing events.

(cherry picked from commit e20e486)

Co-authored-by: Mauri de Souza Meneguzzo <[email protected]>
@khushijain21 khushijain21 mentioned this pull request Jun 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.x Automated backport to the 8.x branch with mergify enhancement Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants