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.

Sign up for GitHub

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

Jump to bottom

Reintroduce bundler 2.4 #14995

Merged
merged 3 commits into from
Apr 12, 2023
Merged

Reintroduce bundler 2.4 #14995

merged 3 commits into from
Apr 12, 2023

Commits on Apr 11, 2023

  1. Revert "Revert "Unpin bundler to allow 2.4 (elastic#14894)" (elastic#… 

    …14942)"

This reverts commit 5e3038a.
    @jsvd
    jsvd committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    296a185 View commit details
    Browse the repository at this point in the history

  2. prevent bundler 2.4 from blowing up memory during ./gradlew generateP… 

    …luginsVersion

for some reason, instances of Bundler::Dsl are retained in
org.jruby.MetaClass. Each Bundler::Dsl will retain Bundler::SourceList
which is > 150MB. This commit sets the internal state of each Dsl's
source list so the large objects can be collected.

The proper fix would be to either reuse a single Dsl object or fix the
code upstream to avoid having Dsl objects retained by org.jruby.MetaClass.
    @jsvd
    jsvd committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    5b3491e View commit details
    Browse the repository at this point in the history

  3. skip input cloudwatch during generatePluginsVersion 

    the new bundler 2.4's resolution algorithm seems to struggle in certain
situations, like resolving combination of "logstash-input-cloudwatch" and
"logstash-integration-aws".

Until the issue is solved let's skip it.
    @jsvd
    jsvd committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    86a75d0 View commit details
    Browse the repository at this point in the history