fix: AWS S3 improve unexpected EOF detection by Kavindu-Dodan · Pull Request #44813 · elastic/beats

Kavindu-Dodan · 2025-06-13T17:12:21Z

Proposed commit message

This PR revisits the implementation introduced in #42420 and improves the detection of io.ErrUnexpectedEOF.

The io.ErrUnexpectedEOF error can occur while streaming the S3 object body. The previous approach relied on reading the entire body into memory using io.Copy which unfortunately led to increased memory usage in Beats deployments.

This change introduces a wrapper around io.Reader to catch and handle io.ErrUnexpectedEOF. This allows us to handle stream errors (retriable) and content parsing errors (non-retriable) separately.

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.

Related issues

Fixes #44735

github-actions · 2025-06-13T17:12:31Z

🤖 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!)

elasticmachine · 2025-06-13T17:12:41Z

Pinging @elastic/obs-ds-hosted-services (Team:obs-ds-hosted-services)

x-pack/filebeat/input/awss3/s3_objects.go

gizas

LGTM, you mainly removed the io.copy Thanks for that

Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co>

kaiyan-sheng

LGTM!

Kavindu-Dodan · 2025-06-16T18:44:57Z

Merging by EOD 16.05.20205

github-actions · 2025-06-16T21:05:23Z

@Mergifyio backport 8.17 8.18 8.19 9.0

mergify · 2025-06-16T21:05:45Z

backport 8.17 8.18 8.19 9.0

✅ Backports have been created

Details

#44847 [8.17](backport #44813) fix: AWS S3 improve unexpected EOF detection has been created for branch 8.17
#44848 [8.18](backport #44813) fix: AWS S3 improve unexpected EOF detection has been created for branch 8.18
#44849 [8.19](backport #44813) fix: AWS S3 improve unexpected EOF detection has been created for branch 8.19
#44850 [9.0](backport #44813) fix: AWS S3 improve unexpected EOF detection has been created for branch 9.0

* improve unexpected EOF detection Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> * add changelog entry Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> * fix lint issues Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> * review: receiver name Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> --------- Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> (cherry picked from commit a75b4e7)

…44847) * fix: AWS S3 improve unexpected EOF detection (#44813) * improve unexpected EOF detection Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> * add changelog entry Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> * fix lint issues Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> * review: receiver name Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> --------- Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> (cherry picked from commit a75b4e7) * Update CHANGELOG.next.asciidoc * fix import Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> --------- Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> Co-authored-by: Kavindu Dodanduwa <Kavindu-Dodan@users.noreply.github.com> Co-authored-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co>

…44848) * fix: AWS S3 improve unexpected EOF detection (#44813) * improve unexpected EOF detection Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> * add changelog entry Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> * fix lint issues Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> * review: receiver name Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> --------- Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> (cherry picked from commit a75b4e7) * Update CHANGELOG.next.asciidoc * fix import Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> --------- Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> Co-authored-by: Kavindu Dodanduwa <Kavindu-Dodan@users.noreply.github.com> Co-authored-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co>

…44850) * fix: AWS S3 improve unexpected EOF detection (#44813) * improve unexpected EOF detection Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> * add changelog entry Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> * fix lint issues Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> * review: receiver name Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> --------- Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> (cherry picked from commit a75b4e7) * Update CHANGELOG.next.asciidoc * fix import Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> --------- Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> Co-authored-by: Kavindu Dodanduwa <Kavindu-Dodan@users.noreply.github.com> Co-authored-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co>

…44849) * fix: AWS S3 improve unexpected EOF detection (#44813) * improve unexpected EOF detection Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> * add changelog entry Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> * fix lint issues Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> * review: receiver name Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> --------- Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> (cherry picked from commit a75b4e7) * Update CHANGELOG.next.asciidoc * fix import Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> --------- Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co> Co-authored-by: Kavindu Dodanduwa <Kavindu-Dodan@users.noreply.github.com> Co-authored-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co>

Kavindu-Dodan requested a review from a team as a code owner June 13, 2025 17:12

botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 13, 2025

Kavindu-Dodan changed the title ~~improve unexpected EOF detection~~ Jun 13, 2025

Kavindu-Dodan added the Team:obs-ds-hosted-services Label for the Observability Hosted Services team label Jun 13, 2025

botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 13, 2025

elastic deleted a comment from botelastic bot Jun 13, 2025

Kavindu-Dodan added the backport-active-all Automated backport with mergify to all the active branches label Jun 13, 2025

mergify bot assigned Kavindu-Dodan Jun 13, 2025

Kavindu-Dodan changed the title ~~fix: improve unexpected EOF detection~~ Jun 13, 2025

Kavindu-Dodan mentioned this pull request Jun 13, 2025

[AWS S3] high memory usage from growSlice due to io.Copy usage in S3 object processing #44735

Closed

Kavindu-Dodan force-pushed the fix/aws-s3-io-copy-usage branch 3 times, most recently from effda78 to 0c78399 Compare June 13, 2025 18:22

gizas reviewed Jun 16, 2025

View reviewed changes

x-pack/filebeat/input/awss3/s3_objects.go Outdated Show resolved Hide resolved

gizas reviewed Jun 16, 2025

View reviewed changes

gizas approved these changes Jun 16, 2025

View reviewed changes

Kavindu-Dodan added 3 commits June 16, 2025 06:39

improve unexpected EOF detection

d85c9a8

Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co>

add changelog entry

3cb9a71

Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co>

fix lint issues

7f07023

Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co>

Kavindu-Dodan force-pushed the fix/aws-s3-io-copy-usage branch from 0c78399 to 7f07023 Compare June 16, 2025 13:39

review: receiver name

e7ae0c5

Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co>

elastic deleted a comment from mergify bot Jun 16, 2025

MichaelKatsoulis self-requested a review June 16, 2025 14:31

kaiyan-sheng approved these changes Jun 16, 2025

View reviewed changes

Kavindu-Dodan merged commit a75b4e7 into elastic:main Jun 16, 2025
34 checks passed

mergify bot mentioned this pull request Jun 16, 2025

[8.17](backport #44813) fix: AWS S3 improve unexpected EOF detection #44847

Merged

6 tasks

mergify bot mentioned this pull request Jun 16, 2025

[8.18](backport #44813) fix: AWS S3 improve unexpected EOF detection #44848

Merged

6 tasks

mergify bot mentioned this pull request Jun 16, 2025

[8.19](backport #44813) fix: AWS S3 improve unexpected EOF detection #44849

Merged

6 tasks

mergify bot mentioned this pull request Jun 16, 2025

[9.0](backport #44813) fix: AWS S3 improve unexpected EOF detection #44850

Merged

6 tasks

khushijain21 mentioned this pull request Jun 17, 2025

Add otelbeat binary for test #44855

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: AWS S3 improve unexpected EOF detection#44813

fix: AWS S3 improve unexpected EOF detection#44813
Kavindu-Dodan merged 4 commits intoelastic:mainfrom
Kavindu-Dodan:fix/aws-s3-io-copy-usage

Kavindu-Dodan commented Jun 13, 2025 •

edited

Loading

github-actions bot commented Jun 13, 2025

elasticmachine commented Jun 13, 2025

Uh oh!

gizas left a comment •

edited

Loading

kaiyan-sheng left a comment

Kavindu-Dodan commented Jun 16, 2025

Uh oh!

github-actions bot commented Jun 16, 2025

mergify bot commented Jun 16, 2025 •

edited

Loading

Labels

4 participants

Conversation

Kavindu-Dodan commented Jun 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed commit message

Checklist

Related issues

github-actions bot commented Jun 13, 2025

🤖 GitHub comments

elasticmachine commented Jun 13, 2025

Uh oh!

gizas left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

kaiyan-sheng left a comment

Choose a reason for hiding this comment

Kavindu-Dodan commented Jun 16, 2025

Uh oh!

github-actions bot commented Jun 16, 2025

mergify bot commented Jun 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Backports have been created

Labels

4 participants

Kavindu-Dodan commented Jun 13, 2025 •

edited

Loading

gizas left a comment •

edited

Loading

mergify bot commented Jun 16, 2025 •

edited

Loading