Merge 1.1 into master (redux) #262

chadlwilson · 2024-07-18T17:51:04Z

Alternative to Merge 1.1 into master #253 after getting tests to pass on master
Fixes NoMethodError undefined method get_header re-emerged with JRuby Rack 1.2.2 #259

Todo

Get tests to pass, there are some logger things to figure out, probably screwed up in the merge

…e when needed

…owstatus.detail'

…be nil

…' env value (jruby#195)

…e exec instead

... (this is relevant since Bundler >= 1.10.1)

…can be set)

…9K and --2.0

…lStateException (jruby#216)

* '1.1-stable' of github.com:jruby/jruby-rack: [fix] Don't let getSession cause an infinite loop if it throws IllegalStateException (jruby#216)

Old version still uses the removed rubygems.org v1 dependencies API, which breaks the build.

Update to latest mavengem

This fixes jruby#247 without introducing a dependency on the new catWithCodeRange in JRuby 9.4. It does depend on a now-deprecated method cat19 that will go away in the next year or so.

Coderange cat for 9.3

…merge-1.1.x-changes # Conflicts: # .travis.yml # Appraisals # Gemfile # Gemfile.lock # gemfiles/rails30.gemfile.lock # gemfiles/rails31.gemfile.lock # gemfiles/rails32.gemfile # gemfiles/rails32.gemfile.lock # gemfiles/rails40.gemfile # gemfiles/rails40.gemfile.lock # gemfiles/rails41.gemfile # gemfiles/rails41.gemfile.lock # gemfiles/rails42.gemfile # gemfiles/rails42.gemfile.lock # gemfiles/railsNG.gemfile.lock # pom.xml # src/main/java/org/jruby/rack/RackInput.java # src/main/ruby/jruby/rack/booter.rb # src/main/ruby/jruby/rack/error_app.rb # src/main/ruby/jruby/rack/error_app/show_status.rb # src/main/ruby/jruby/rack/response.rb # src/main/ruby/jruby/rack/version.rb # src/spec/ruby/jruby/rack/booter_spec.rb # src/spec/ruby/jruby/rack/rails_booter_spec.rb # src/spec/ruby/rack/application_spec.rb

Not really sure these are correct, but they at least seem to match the intend logger changes and cant see how they were passing earlier given the changes.

kares · 2024-08-28T09:44:06Z

💯 Chad, this is looking great 💚
indeed, it's been a while since 1.1 was merged to master (mostly due always being in a rush when working on yet another 1.1.x minor release). I was hoping to do some merging and cleanup work on master before 1.2.0 but than the week only has 7 days 😓. think we degraded the "production" quality expectations with the 1.2.x releases, at least for now.

anyways, I am very glad to see the work you did here. maybe some of it is redundant but there are a lot of important fixes that are otherwise missing from master, thus 👍 from me...

chadlwilson · 2024-08-28T10:55:10Z

Thanks @kares, nice to see you!

I think the main thing I could use some input on was the intent of the earlier changes to the way the loggers work across the branches, and whether they are still relevant these days. I wasn't really sure what the main philosophy was for 1.2 so was really just trying to "infer", which is probably a bit tough for me, as not a Rack expert.

For example, in 6abde22 I made the tests pass, but I'm not sure if I am merging something which should only apply to 1.1 and has no role in 1.2 and why I needed to do this. 😅

Given the divergence of the branches, there is a risk of (accidentally) reinstating some historical complexity from 1.1 that was intended to be removed/ignored on 1.2.

Other than that, my intention before un-drafting the PR was

to actually sanity test it with at least my "real" application
to play around with the examples and appraisals stuff (which I suspect do not work/pass anymore) to understand what confidence they give us and whether it's important to extend that to newer rails versions etc.

I note that the old travis setup seemed to run the appraisals, so at some point they passed, but right now they are not included in the GHA CI which makes me a little nervous. Even if many of those rails versions do not now need to be supported/appraised, it'd probably be good to run at least Rails 6.1 I imagine, while noting that at least in some use cases (#244) Rails 7.0 doesn't currently work right.

But ya, I also got a bit busy in personal life. Will have some more time/space back soon.

kares · 2024-08-28T17:52:53Z

That looks okay, in terms of the intent of the Logger implementation defaults changing in 1.2.0.

Unfortunately, I am not fully up to speed and do not have an app to test it, but seems the default is not setup to be 100% usable (at least with recent Rails), these days: #260 (comment)

Not sure what is really missing but indeed the idea was that since we JRuby-Rack supports redirecting logging to a Java backend to fully support that, with plain old Ruby Logger that is a bit of a stretch thus the custom impl class...

enebo · 2024-09-01T15:26:35Z

@kares @headius so now that we got approval for this what is needed now? Land and release? Should we have some smoketest set up? I feel like this project has languished due to lack of knowing if it is safe to release.

A question I would like answered is how do we QA this? At this point even if we don't answer this I feel like we should release just to get feedback on what else is still broken (forward progress even if wrong probably is right for now). That said, I feel like the lack of confidence is paralyzing our ability to move forward.

chadlwilson · 2024-09-02T01:50:13Z

Interested in your questions also, but give me a week or so to sanity check this? I'm not blocked here, just been very busy moving house so haven't had time to make progress 🙏

I'll have a go at the appraisals but since they are not running on master right now either this doesn't make things "worse" for 1.2 so probably can be decoupled 😅

kares · 2024-09-02T12:02:10Z

Should we have some smoketest set up? I feel like this project has languished due to lack of knowing if it is safe to release.

I usually had a dummy sample Rails (as well as Sinatra) app that I would deploy to Tomcat as a .war and see how it's doing. Unless of course there were fixes which targeted other servers than I would deploy to multiple ones (e.g. if there was a Jetty related bug report) as needed...

enebo · 2024-09-03T17:30:25Z

I usually had a dummy sample Rails (as well as Sinatra) app that I would deploy to Tomcat as a .war and see how it's doing. Unless of course there were fixes which targeted other servers than I would deploy to multiple ones (e.g. if there was a Jetty related bug report) as needed...

@kares I don't doubt there could be a lot of deploys to test all the things supported but even a golden path deploy I think would help improve confidence. At one point I think @mkristian had a bunch of CI tests on jruby/jruby doing some tests with web containers.

kares · 2024-09-04T12:28:27Z

👍 definitely, I recall those test from the main jruby repo.
although they were a little opaque to debug, the benefits are clear for a project such as jruby-rack.
believe it might be easier these days with something like test-containers (Docker), time is the only enemy 🎐

mkristian · 2024-09-10T15:48:54Z

guees they disappeared because they were hard to debug but quite helpful to get JRuby work and ensure to work in different servlet contexts - classloader it was if I remember right

kares and others added 30 commits April 27, 2015 21:13

appraise latest rails versions

954e795

let us see how we're doing with the travis-ci test matrix

342d4f8

make sure i18n < 0.7 for Rails 3.x still test run with 1.8 mode

564f5f6

more travis-ci magic to get specs rolling again

0c67f6c

just to be sure about travis-ci ... update rake everywhere to 10.4.2

ce31f75

allow for more JRuby::Rack::ErrorApp customizations + retrieve caus…

22bb8b2

…e when needed

tune ErrorApp + ShowStatus (use-d by default) to respect set 'rack.sh…

e369146

…owstatus.detail'

avoid failures with rack < 1.5 since it's Rack::Request#scheme would …

e5ca043

…be nil

servlet attributes with null/false values should not end up with an '…

8da7440

…' env value (jruby#195)

[travis-ci] jruby -G does not work with 1.6.8 ... kind of use ~ bundl…

caf7a38

…e exec instead

[travis-ci] back to rake spec for now (only due 1.6.8)

1a01517

update (bundled) rack to 1.5.5

29f46b4

use spec.base_dir (instead of installation_path)

ee6f164

work-around respond_to_missing? bug in JRuby 1.7.20

2693ff3

... (this is relevant since Bundler >= 1.10.1)

bundle update jruby-openssl

d0323ed

update appraised rails versions

1aae207

update jruby-maven-plugins' version

dcecc35

update bundler used during mvn build

7eda40a

prepare for 1.1.19

ff85d14

release actually happened on 1.7

3f93d44

update for next development SNAPSHOT

fa0f042

[travis-ci] re-invent - simplify setup + test on 9K

8da098e

seems its easy to avoid the confusing spec failure on 1.6.8 (due BUG)

9468cb8

[travis-ci] expect rails 4.2 to pass fine

9851506

update appraisals to their latest

f547986

servlet env should behave on fetch and [] like a Hash (nil value …

864d68e

…can be set)

bundle update jruby-openssl

859a90c

(c) 2016!

9391d2a

adjust jruby home dir fallback (for default $LOAD_PATH) correctly on …

33fd974

…9K and --2.0

Add a ActionController::Base method to return the servlet_response

fb7a4c3

smellsblue and others added 16 commits December 3, 2020 10:30

[fix] Don't let getSession cause an infinite loop if it throws Illega…

b2c7cab

…lStateException (jruby#216)

avoid Fixnum warning - assume recent JRuby

a9dac39

avoid NativeException - not used on recent JRuby

ba0abaf

[release] late next dev snapshot update

ec34317

update (bundled) rack to 1.6.13

0a3eb45

[build] update bundler + hook-up mavengem

a24d58a

compile using Java 6 source compat

c5e2b1b

[release] prepare for 1.1.22

bae8b2c

[build] update maven deploy plugin

63cf7d0

[build] try release with nexus plugin

754e7af

[build] disable javadoc lint on Java 8

c993abc

Merge branch '1.1-stable' of github.com:jruby/jruby-rack into 1.1-stable

cbee8b5

* '1.1-stable' of github.com:jruby/jruby-rack: [fix] Don't let getSession cause an infinite loop if it throws IllegalStateException (jruby#216)

Update to latest mavengem

ff5bad9

Old version still uses the removed rubygems.org v1 dependencies API, which breaks the build.

Merge pull request jruby#254 from headius/1.1-stable-build-updates

45d6a94

Update to latest mavengem

Use cat19 for 1.1 branch that will fade away soon

5d81b71

This fixes jruby#247 without introducing a dependency on the new catWithCodeRange in JRuby 9.4. It does depend on a now-deprecated method cat19 that will go away in the next year or so.

Merge pull request jruby#255 from headius/coderange_cat_for_9.3

610d87f

Coderange cat for 9.3

chadlwilson force-pushed the merge-1.1.x-changes branch from cb383b3 to ebeafd2 Compare July 19, 2024 04:53

chadlwilson added 2 commits July 19, 2024 12:57

Fix logger tests by changing expectations

6abde22

Not really sure these are correct, but they at least seem to match the intend logger changes and cant see how they were passing earlier given the changes.

chadlwilson force-pushed the merge-1.1.x-changes branch from ebeafd2 to 6abde22 Compare July 19, 2024 04:59

kares approved these changes Aug 28, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 1.1 into master (redux) #262

Merge 1.1 into master (redux) #262

chadlwilson commented Jul 18, 2024 •

edited

Loading

kares commented Aug 28, 2024

chadlwilson commented Aug 28, 2024

kares commented Aug 28, 2024

enebo commented Sep 1, 2024

chadlwilson commented Sep 2, 2024 •

edited

Loading

kares commented Sep 2, 2024

enebo commented Sep 3, 2024

kares commented Sep 4, 2024

mkristian commented Sep 10, 2024

Merge 1.1 into master (redux) #262

Are you sure you want to change the base?

Merge 1.1 into master (redux) #262

Conversation

chadlwilson commented Jul 18, 2024 • edited Loading

kares commented Aug 28, 2024

chadlwilson commented Aug 28, 2024

kares commented Aug 28, 2024

enebo commented Sep 1, 2024

chadlwilson commented Sep 2, 2024 • edited Loading

kares commented Sep 2, 2024

enebo commented Sep 3, 2024

kares commented Sep 4, 2024

mkristian commented Sep 10, 2024

chadlwilson commented Jul 18, 2024 •

edited

Loading

chadlwilson commented Sep 2, 2024 •

edited

Loading