[Backport 8.x] Reimplement LogStash::String setting in Java (#16576)#16959
Merged
andsel merged 3 commits intoelastic:8.xfrom Jan 27, 2025
Merged
[Backport 8.x] Reimplement LogStash::String setting in Java (#16576)#16959andsel merged 3 commits intoelastic:8.xfrom
andsel merged 3 commits intoelastic:8.xfrom
Conversation
Reimplements `LogStash::Setting::String` Ruby setting class into the `org.logstash.settings.SettingString` and exposes it through `java_import` as `LogStash::Setting::SettingString`. Updates the rspec tests in two ways: - logging mock is now converted to real Log4J appender that spy log line that are later verified - verifies `java.lang.IllegalArgumentException` instead of `ArgumentError` is thrown because the kind of exception thrown by Java code, during verification.
…f mock test double
|
💚 Build Succeeded
|
7 tasks
kaisecheng
reviewed
Jan 27, 2025
| end | ||
| end | ||
|
|
||
| java_import org.logstash.settings.NullableSetting |
Contributor
There was a problem hiding this comment.
Is it not in use and can be removed?
Member
Author
There was a problem hiding this comment.
If we remove this then we fail the test https://github.com/elastic/logstash/blob/8.x/logstash-core/spec/logstash/settings/nullable_spec.rb and it's reason why we changed the test a little bit
Member
Author
|
@logstashmachine backport 8.17 |
github-actions bot
pushed a commit
that referenced
this pull request
Jan 27, 2025
…16959) Non clean backport of #16576 ---- Reimplements `LogStash::Setting::String` Ruby setting class into the `org.logstash.settings.SettingString` and exposes it through `java_import` as `LogStash::Setting::SettingString`. Updates the rspec tests in two ways: - logging mock is now converted to real Log4J appender that spy log line that are later verified - verifies `java.lang.IllegalArgumentException` instead of `ArgumentError` is thrown because the kind of exception thrown by Java code, during verification. * Fixed the rename of NullableString to SettingNullableString * Fixed runner test to use real spy logger from Java Settings instead of mock test double (cherry picked from commit a0378c0)
Member
Author
|
@logstashmachine backport 8.16 |
andsel
added a commit
to andsel/logstash
that referenced
this pull request
Jan 27, 2025
…16576) (elastic#16959) Non clean backport of elastic#16576 ---- Reimplements `LogStash::Setting::String` Ruby setting class into the `org.logstash.settings.SettingString` and exposes it through `java_import` as `LogStash::Setting::SettingString`. Updates the rspec tests in two ways: - logging mock is now converted to real Log4J appender that spy log line that are later verified - verifies `java.lang.IllegalArgumentException` instead of `ArgumentError` is thrown because the kind of exception thrown by Java code, during verification. * Fixed the rename of NullableString to SettingNullableString * Fixed runner test to use real spy logger from Java Settings instead of mock test double
5 tasks
andsel
added a commit
that referenced
this pull request
Jan 27, 2025
…16959) (#16960) Clean backport of #16959 from 8.x to 8.17 ---- Reimplements `LogStash::Setting::String` Ruby setting class into the `org.logstash.settings.SettingString` and exposes it through `java_import` as `LogStash::Setting::SettingString`. Updates the rspec tests in two ways: - logging mock is now converted to real Log4J appender that spy log line that are later verified - verifies `java.lang.IllegalArgumentException` instead of `ArgumentError` is thrown because the kind of exception thrown by Java code, during verification. * Fixed the rename of NullableString to SettingNullableString * Fixed runner test to use real spy logger from Java Settings instead of mock test double (cherry picked from commit a0378c0) Co-authored-by: Andrea Selva <selva.andre@gmail.com>
andsel
added a commit
that referenced
this pull request
Jan 27, 2025
…16959) (#16961) Non clean backport of #16959 from 8.x to 8.16 (which is a non clean backport of #16576 to 8.x) Changes respect to 8.x: - in 8.x the `with_deprecated_alias` receives also a parameter specifying the version where the setting is removed. In this case we removed the extra parameter to the method https://github.com/elastic/logstash/blob/a0378c05cbcc8eda3ec0b2de286fb9ebde97df96/logstash-core/lib/logstash/environment.rb#L79 - fixed the test removing the check for the remove version https://github.com/elastic/logstash/blob/a0378c05cbcc8eda3ec0b2de286fb9ebde97df96/logstash-core/spec/logstash/settings/setting_with_deprecated_alias_spec.rb#L157 ---- Reimplements `LogStash::Setting::String` Ruby setting class into the `org.logstash.settings.SettingString` and exposes it through `java_import` as `LogStash::Setting::SettingString`. Updates the rspec tests in two ways: - logging mock is now converted to real Log4J appender that spy log line that are later verified - verifies `java.lang.IllegalArgumentException` instead of `ArgumentError` is thrown because the kind of exception thrown by Java code, during verification. * Fixed the rename of NullableString to SettingNullableString * Fixed runner test to use real spy logger from Java Settings instead of mock test double
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-picked from commit 03b11e9
Non clean backport of #16576
The main differences with
mainare:main179e2ef