Skip to content

[7.17](backport #33568) handle EOF on single line content#34991

Merged
tdancheva merged 13 commits into7.17from
mergify/bp/7.17/pr-33568
Jun 5, 2023
Merged

[7.17](backport #33568) handle EOF on single line content#34991
tdancheva merged 13 commits into7.17from
mergify/bp/7.17/pr-33568

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Apr 1, 2023 •
edited by zube bot
Loading

This is an automatic backport of pull request #33568 done by Mergify.
Cherry-pick of 7b45320 has failed:

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

You are currently cherry-picking commit 7b45320917.
  (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
	modified:   libbeat/reader/readfile/bench_test.go
	modified:   libbeat/reader/readfile/encode.go
	modified:   x-pack/filebeat/input/awss3/s3_objects_test.go
	new file:   x-pack/filebeat/input/awss3/testdata/no-eol-twolines.txt
	new file:   x-pack/filebeat/input/awss3/testdata/no-eol.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/reader/readfile/line.go
	both modified:   libbeat/reader/readfile/line_test.go
	both modified:   x-pack/filebeat/input/awss3/s3_objects.go

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

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify
handle EOF on single line content (#33568)
8ad19c9 
* handle EOF on single line content

* changelog

* fallback to encode_eof if no events in aws-s3 input

* lint

* lint

* collect on EOF in line reader

* remove encode eof

* remove iterN

* fix test

* increase test coverage

* linting

* more linting

* increase coverage

(cherry picked from commit 7b45320)

# Conflicts:
#	libbeat/reader/readfile/line.go
#	libbeat/reader/readfile/line_test.go
#	x-pack/filebeat/input/awss3/s3_objects.go
@mergify mergify bot requested review from a team as code owners April 1, 2023 06:39
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 1, 2023
@mergify mergify bot requested review from belimawr and faec and removed request for a team April 1, 2023 06:39
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 1, 2023
@botelastic
Copy link
Copy Markdown

botelastic bot commented Apr 1, 2023

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Apr 1, 2023 •
edited by jenkins-beats-ci bot
Loading

💚 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: 2023-05-29T16:12:14.802+0000

  • Duration: 147 min 49 sec

Test stats 🧪

Test Results
Failed 0
Passed 25388
Skipped 1731
Total 27119

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the 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!)

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Apr 3, 2023

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

1 similar comment
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Apr 10, 2023

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

@zmoog zmoog assigned zmoog and unassigned francescayeye Apr 11, 2023
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Apr 17, 2023

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

5 similar comments
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Apr 24, 2023

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

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented May 1, 2023

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

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented May 8, 2023

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

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented May 15, 2023

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

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented May 22, 2023

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

zmoog
zmoog requested changes May 25, 2023
View reviewed changes
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented May 29, 2023

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

@tdancheva tdancheva marked this pull request as draft May 29, 2023 12:03
zmoog
zmoog reviewed May 29, 2023
View reviewed changes
zmoog
zmoog approved these changes May 31, 2023
View reviewed changes
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jun 5, 2023

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

@tommyers-elastic tommyers-elastic marked this pull request as ready for review June 5, 2023 10:10
@tdancheva tdancheva merged commit 047ef66 into 7.17 Jun 5, 2023
@tdancheva tdancheva deleted the mergify/bp/7.17/pr-33568 branch June 5, 2023 10:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zmoog zmoog zmoog approved these changes

@belimawr belimawr Awaiting requested review from belimawr belimawr is a code owner automatically assigned from elastic/elastic-agent-data-plane

@faec faec Awaiting requested review from faec faec is a code owner automatically assigned from elastic/elastic-agent-data-plane

+1 more reviewer

@tdancheva tdancheva tdancheva left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@zmoog zmoog

Labels

backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@elasticmachine @zmoog @tdancheva @francescayeye