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

Handle non-unicode payload in Logstash. (#16072) #16168

Merged

Conversation

mashhurs
Copy link
Contributor

Cherry picking #16072 to 8.14

Automatic backport didn't work due to conflict (attaching following logs) in versions.yml file. Manually cherry picking #16072

INFO: Checkout of 8.14 to backport to...

INFO: Creating backport branch backport_16072_8.14...

INFO: Merge commit detected from PR: 979d30d7016db6f0df8150f794a74d[37](https://github.com/elastic/logstash/actions/runs/9116832148/job/25066303742#step:12:38)85199fb2

INFO: Cherry-picking 979d30d7016db6f0df8150f794a74d3785199fb2

INFO: Looks like you have cherry-pick errors.

INFO: Fix them, then run: 

INFO:     git cherry-pick --continue

INFO:     devtools/backport 8.14 16072 --remote=origin --yes --continue

Release notes

What does this PR do?

Why is it important/What is the impact to the user?

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 (and/or docker env variables)
  • I have added tests that prove my fix is effective or that my feature works

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

* A logic to handle non-unicode payload in Logstash.

* Well tested and code organized version of the logic.

Co-authored-by: Ry Biesemeyer <yaauie@users.noreply.github.com>

* Upgrade jrjackson to 0.4.20

* Code review: simplify the logic with a standard String#encode interface with replace option.

Co-authored-by: Ry Biesemeyer <ry.biesemeyer@elastic.co>

---------

Co-authored-by: Ry Biesemeyer <yaauie@users.noreply.github.com>
Co-authored-by: Ry Biesemeyer <ry.biesemeyer@elastic.co>
(cherry picked from commit 979d30d)
@mashhurs mashhurs requested a review from yaauie May 16, 2024 18:09
@mashhurs mashhurs self-assigned this May 16, 2024
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

cc @mashhurs

Copy link
Member

@yaauie yaauie left a comment

Choose a reason for hiding this comment

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

LGTM.

I don't think that the source object needs to be duped and frozen since our normalisation makes copies when necessary, but we can address that in a follow-up.

@mashhurs mashhurs merged commit 7277a36 into elastic:8.14 May 21, 2024
6 checks passed
@yaauie yaauie added the v8.14.1 label May 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants