Skip to content

Commit e5afde5

Browse files
imjoehainesimjoehaines
authored
Release v6.25.2
2 parents 41ecc6f + 7454f4b commit e5afde5

File tree

11 files changed

+111
-49
lines changed

11 files changed

+111
-49
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
Changelog
22
=========
33

4+
## v6.25.2 (7 February 2023)
5+
6+
### Enhancements
7+
8+
* Improve performance of `Bugsnag.notify`
9+
| [#774](https://github.com/bugsnag/bugsnag-ruby/pull/774)
10+
| [sambostock](https://github.com/sambostock)
11+
412
## v6.25.1 (5 January 2023)
513

614
### Fixes

‎Gemfile-maze-runner‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
source "https://rubygems.org"
22

3-
gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v7.6.0'
3+
gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v7.10.1'

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.25.1
1+
6.25.2

‎features/fixtures/que/Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ ENV QUE_VERSION $QUE_VERSION
1313
RUN bundle install
1414

1515
COPY app/ /usr/src/app
16+
17+
CMD bundle exec que ./app.rb

‎features/fixtures/rails_integrations/app/lib/tasks/fixture.rake‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
namespace :fixture do
2+
task queue_unhandled_job: [:environment] do
3+
UnhandledJob.perform_later(1, yes: true)
4+
end
5+
6+
task queue_working_job: [:environment] do
7+
WorkingJob.perform_later
8+
end
9+
10+
task queue_resque_job: [:environment] do
11+
Resque.enqueue(ResqueWorker, 123, "abc", [7, 8, 9], x: true, y: false)
12+
end
13+
end

‎features/fixtures/sidekiq/Dockerfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ ENV SIDEKIQ_VERSION $SIDEKIQ_VERSION
1414

1515
RUN bundle install
1616

17-
COPY app/ /app/
17+
COPY app/ /app/
18+
19+
CMD bundle exec sidekiq -r ./app.rb

‎features/que.feature‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Feature: Errors are delivered to Bugsnag from Que
22

33
Scenario: Que will deliver unhandled errors
4-
Given I run the service "que" with the command "bundle exec ruby app.rb unhandled"
5-
And I run the service "que" with the command "timeout 5 bundle exec que ./app.rb"
4+
Given I start the service "que"
5+
When I execute the command "bundle exec ruby app.rb unhandled" in the service "que"
66
And I wait to receive an error
77
Then the error is valid for the error reporting API version "4.0" for the "Ruby Bugsnag Notifier" notifier
88
And the event "unhandled" is true
@@ -14,8 +14,8 @@ Scenario: Que will deliver unhandled errors
1414
And the exception "errorClass" equals "RuntimeError"
1515

1616
Scenario: Que will deliver handled errors
17-
Given I run the service "que" with the command "bundle exec ruby app.rb handled"
18-
And I run the service "que" with the command "timeout 5 bundle exec que ./app.rb"
17+
Given I start the service "que"
18+
When I execute the command "bundle exec ruby app.rb handled" in the service "que"
1919
And I wait to receive an error
2020
Then the error is valid for the error reporting API version "4.0" for the "Ruby Bugsnag Notifier" notifier
2121
And the event "unhandled" is false

‎features/rails_features/integrations.feature‎

Lines changed: 50 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
Feature: App type is set correctly for integrations in a Rails app
22

3-
Background:
4-
Given I start the rails service
5-
And I run the "db:prepare" rake task in the rails app
6-
And I run the "db:migrate" rake task in the rails app
7-
83
@rails_integrations
94
Scenario: Delayed job
5+
Given I start the rails service with the database
6+
And I run the "jobs:work" rake task in the rails app in the background
107
When I run "User.new.delay.raise_the_roof" with the rails runner
11-
And I run the "jobs:workoff" rake task in the rails app
128
And I wait to receive an error
139
Then the error is valid for the error reporting API version "4.0" for the "Ruby Bugsnag Notifier" notifier
1410
And the event "unhandled" is true
@@ -27,6 +23,7 @@ Scenario: Delayed job
2723

2824
@rails_integrations
2925
Scenario: Mailman
26+
Given I start the rails service
3027
When I run "./run_mailman" in the rails app
3128
And I wait to receive an error
3229
Then the error is valid for the error reporting API version "4.0" for the "Ruby Bugsnag Notifier" notifier
@@ -41,8 +38,9 @@ Scenario: Mailman
4138

4239
@rails_integrations
4340
Scenario: Que
41+
Given I start the rails service with the database
42+
And I run "bundle exec que ./config/environment.rb" in the rails app in the background
4443
When I run "QueJob.enqueue" with the rails runner
45-
And I run "timeout 5 bundle exec que ./config/environment.rb" in the rails app
4644
And I wait to receive an error
4745
Then the error is valid for the error reporting API version "4.0" for the "Ruby Bugsnag Notifier" notifier
4846
And the event "unhandled" is true
@@ -56,6 +54,7 @@ Scenario: Que
5654

5755
@rails_integrations
5856
Scenario: Rake
57+
Given I start the rails service
5958
When I run the "rake_task:raise" rake task in the rails app
6059
And I wait to receive an error
6160
Then the error is valid for the error reporting API version "4.0" for the "Ruby Bugsnag Notifier" notifier
@@ -71,8 +70,9 @@ Scenario: Rake
7170

7271
@rails_integrations
7372
Scenario: Resque (no on_exit hooks)
74-
When I run "Resque.enqueue(ResqueWorker, 123, %(abc), x: true, y: false)" with the rails runner
75-
And I run "timeout --signal QUIT 5 bundle exec rake resque:work" in the rails app
73+
Given I start the rails service
74+
And I run the "resque:work" rake task in the rails app in the background
75+
When I run the "fixture:queue_resque_job" rake task in the rails app
7676
And I wait to receive an error
7777
Then the error is valid for the error reporting API version "4.0" for the "Ruby Bugsnag Notifier" notifier
7878
And the event "unhandled" is true
@@ -87,17 +87,21 @@ Scenario: Resque (no on_exit hooks)
8787
And the event "metaData.payload.class" equals "ResqueWorker"
8888
And the event "metaData.payload.args.0" equals 123
8989
And the event "metaData.payload.args.1" equals "abc"
90-
And the event "metaData.payload.args.2.x" is true
91-
And the event "metaData.payload.args.2.y" is false
90+
And the event "metaData.payload.args.2.0" equals 7
91+
And the event "metaData.payload.args.2.1" equals 8
92+
And the event "metaData.payload.args.2.2" equals 9
93+
And the event "metaData.payload.args.3.x" is true
94+
And the event "metaData.payload.args.3.y" is false
9295
And the event "metaData.rake_task.name" equals "resque:work"
9396
And the event "metaData.rake_task.description" equals "Start a Resque worker"
9497
And the event "metaData.rake_task.arguments" is null
9598

9699
@rails_integrations
97100
Scenario: Resque (with on_exit hooks)
98101
Given I set environment variable "RUN_AT_EXIT_HOOKS" to "1"
99-
When I run "Resque.enqueue(ResqueWorker, %(xyz), [7, 8, 9], a: 4, b: 5)" with the rails runner
100-
And I run "timeout --signal QUIT 5 bundle exec rake resque:work" in the rails app
102+
And I start the rails service
103+
And I run the "resque:work" rake task in the rails app in the background
104+
When I run the "fixture:queue_resque_job" rake task in the rails app
101105
And I wait to receive an error
102106
Then the error is valid for the error reporting API version "4.0" for the "Ruby Bugsnag Notifier" notifier
103107
And the event "unhandled" is true
@@ -110,20 +114,22 @@ Scenario: Resque (with on_exit hooks)
110114
And the event "metaData.config.delivery_method" equals "thread_queue"
111115
And the event "metaData.context" equals "ResqueWorker@crash"
112116
And the event "metaData.payload.class" equals "ResqueWorker"
113-
And the event "metaData.payload.args.0" equals "xyz"
114-
And the event "metaData.payload.args.1.0" equals 7
115-
And the event "metaData.payload.args.1.1" equals 8
116-
And the event "metaData.payload.args.1.2" equals 9
117-
And the event "metaData.payload.args.2.a" equals 4
118-
And the event "metaData.payload.args.2.b" equals 5
117+
And the event "metaData.payload.args.0" equals 123
118+
And the event "metaData.payload.args.1" equals "abc"
119+
And the event "metaData.payload.args.2.0" equals 7
120+
And the event "metaData.payload.args.2.1" equals 8
121+
And the event "metaData.payload.args.2.2" equals 9
122+
And the event "metaData.payload.args.3.x" is true
123+
And the event "metaData.payload.args.3.y" is false
119124
And the event "metaData.rake_task.name" equals "resque:work"
120125
And the event "metaData.rake_task.description" equals "Start a Resque worker"
121126
And the event "metaData.rake_task.arguments" is null
122127

123128
@rails_integrations
124129
Scenario: Sidekiq
130+
Given I start the rails service
131+
And I run "bundle exec sidekiq" in the rails app in the background
125132
When I run "SidekiqWorker.perform_async" with the rails runner
126-
And I run "timeout 5 bundle exec sidekiq" in the rails app
127133
And I wait to receive an error
128134
Then the error is valid for the error reporting API version "4.0" for the "Ruby Bugsnag Notifier" notifier
129135
And the event "unhandled" is true
@@ -140,8 +146,9 @@ Scenario: Sidekiq
140146
@rails_integrations
141147
Scenario: Using Sidekiq as the Active Job queue adapter for a job that raises
142148
Given I set environment variable "ACTIVE_JOB_QUEUE_ADAPTER" to "sidekiq"
143-
When I run "UnhandledJob.perform_later(1, yes: true)" with the rails runner
144-
And I run "timeout 5 bundle exec sidekiq" in the rails app
149+
And I start the rails service
150+
And I run "bundle exec sidekiq" in the rails app in the background
151+
When I run the "fixture:queue_unhandled_job" rake task in the rails app
145152
And I wait to receive an error
146153
Then the error is valid for the error reporting API version "4.0" for the "Ruby Bugsnag Notifier" notifier
147154
And the event "unhandled" is true
@@ -162,8 +169,9 @@ Scenario: Using Sidekiq as the Active Job queue adapter for a job that raises
162169
@rails_integrations
163170
Scenario: Using Resque as the Active Job queue adapter for a job that raises
164171
Given I set environment variable "ACTIVE_JOB_QUEUE_ADAPTER" to "resque"
165-
When I run "UnhandledJob.perform_later(1, yes: true)" with the rails runner
166-
And I run "timeout --signal QUIT 5 bundle exec rake resque:work" in the rails app
172+
And I start the rails service
173+
And I run the "resque:work" rake task in the rails app in the background
174+
When I run the "fixture:queue_unhandled_job" rake task in the rails app
167175
And I wait to receive an error
168176
Then the error is valid for the error reporting API version "4.0" for the "Ruby Bugsnag Notifier" notifier
169177
And the event "unhandled" is true
@@ -183,8 +191,9 @@ Scenario: Using Resque as the Active Job queue adapter for a job that raises
183191
@rails_integrations
184192
Scenario: Using Que as the Active Job queue adapter for a job that raises
185193
Given I set environment variable "ACTIVE_JOB_QUEUE_ADAPTER" to "que"
186-
When I run "UnhandledJob.perform_later(1, yes: true)" with the rails runner
187-
And I run "timeout 5 bundle exec que -q default ./config/environment.rb" in the rails app
194+
And I start the rails service with the database
195+
And I run "bundle exec que -q default ./config/environment.rb" in the rails app in the background
196+
When I run the "fixture:queue_unhandled_job" rake task in the rails app
188197
And I wait to receive an error
189198
Then the error is valid for the error reporting API version "4.0" for the "Ruby Bugsnag Notifier" notifier
190199
And the event "unhandled" is true
@@ -204,8 +213,9 @@ Scenario: Using Que as the Active Job queue adapter for a job that raises
204213
@rails_integrations
205214
Scenario: Using Delayed Job as the Active Job queue adapter for a job that raises
206215
Given I set environment variable "ACTIVE_JOB_QUEUE_ADAPTER" to "delayed_job"
207-
And I run "UnhandledJob.perform_later(1, yes: true)" with the rails runner
208-
And I run the "jobs:workoff" rake task in the rails app
216+
And I start the rails service with the database
217+
And I run the "jobs:work" rake task in the rails app in the background
218+
When I run the "fixture:queue_unhandled_job" rake task in the rails app
209219
And I wait to receive an error
210220
Then the error is valid for the error reporting API version "4.0" for the "Ruby Bugsnag Notifier" notifier
211221
And the event "unhandled" is true
@@ -225,27 +235,31 @@ Scenario: Using Delayed Job as the Active Job queue adapter for a job that raise
225235
@rails_integrations
226236
Scenario: Using Sidekiq as the Active Job queue adapter for a job that works
227237
Given I set environment variable "ACTIVE_JOB_QUEUE_ADAPTER" to "sidekiq"
228-
And I run "WorkingJob.perform_later" with the rails runner
229-
And I run "timeout 5 bundle exec sidekiq" in the rails app
238+
And I start the rails service
239+
And I run "bundle exec sidekiq" in the rails app in the background
240+
When I run the "fixture:queue_working_job" rake task in the rails app
230241
Then I should receive no requests
231242

232243
@rails_integrations
233244
Scenario: Using Resque as the Active Job queue adapter for a job that works
234245
Given I set environment variable "ACTIVE_JOB_QUEUE_ADAPTER" to "resque"
235-
And I run "WorkingJob.perform_later" with the rails runner
236-
And I run "timeout --signal QUIT 5 bundle exec rake resque:work" in the rails app
246+
And I start the rails service
247+
And I run "bundle exec rake resque:work" in the rails app in the background
248+
When I run the "fixture:queue_working_job" rake task in the rails app
237249
Then I should receive no requests
238250

239251
@rails_integrations
240252
Scenario: Using Que as the Active Job queue adapter for a job that works
241253
Given I set environment variable "ACTIVE_JOB_QUEUE_ADAPTER" to "que"
242-
And I run "WorkingJob.perform_later" with the rails runner
243-
And I run "timeout 5 bundle exec que -q default ./config/environment.rb" in the rails app
254+
And I start the rails service with the database
255+
And I run "bundle exec que -q default ./config/environment.rb" in the rails app in the background
256+
When I run the "fixture:queue_working_job" rake task in the rails app
244257
Then I should receive no requests
245258

246259
@rails_integrations
247260
Scenario: Using Delayed Job as the Active Job queue adapter for a job that works
248261
Given I set environment variable "ACTIVE_JOB_QUEUE_ADAPTER" to "delayed_job"
249-
And I run "WorkingJob.perform_later" with the rails runner
250-
And I run the "jobs:workoff" rake task in the rails app
262+
And I start the rails service with the database
263+
And I run the "jobs:work" rake task in the rails app in the background
264+
When I run the "fixture:queue_working_job" rake task in the rails app
251265
Then I should receive no requests

‎features/sidekiq.feature‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
Feature: Bugsnag raises errors in Sidekiq workers
22

33
Scenario: An unhandled RuntimeError sends a report
4-
Given I run the service "sidekiq" with the command "timeout 5 bundle exec rake sidekiq_tests:unhandled_error"
4+
Given I start the service "sidekiq"
5+
And I execute the command "bundle exec ruby initializers/UnhandledError.rb" in the service "sidekiq"
56
And I wait to receive an error
67
Then the error is valid for the error reporting API version "4.0" for the "Ruby Bugsnag Notifier" notifier
78
And the event "unhandled" is true
@@ -19,7 +20,8 @@ Scenario: An unhandled RuntimeError sends a report
1920
And the event "metaData.config.delivery_method" equals "thread_queue"
2021

2122
Scenario: A handled RuntimeError can be notified
22-
Given I run the service "sidekiq" with the command "timeout 5 bundle exec rake sidekiq_tests:handled_error"
23+
Given I start the service "sidekiq"
24+
And I execute the command "bundle exec ruby initializers/HandledError.rb" in the service "sidekiq"
2325
And I wait to receive an error
2426
Then the error is valid for the error reporting API version "4.0" for the "Ruby Bugsnag Notifier" notifier
2527
And the event "unhandled" is false
@@ -35,7 +37,8 @@ Scenario: A handled RuntimeError can be notified
3537

3638
Scenario: Synchronous delivery can be used
3739
Given I set environment variable "BUGSNAG_DELIVERY_METHOD" to "synchronous"
38-
And I run the service "sidekiq" with the command "timeout 5 bundle exec rake sidekiq_tests:handled_error"
40+
And I start the service "sidekiq"
41+
And I execute the command "bundle exec ruby initializers/HandledError.rb" in the service "sidekiq"
3942
And I wait to receive an error
4043
Then the error is valid for the error reporting API version "4.0" for the "Ruby Bugsnag Notifier" notifier
4144
And the event "unhandled" is false

‎features/steps/ruby_notifier_steps.rb‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,27 @@
2727
}
2828
end
2929

30+
Given("I start the rails service with the database") do
31+
steps %Q{
32+
Given I start the rails service
33+
And I run the "db:prepare" rake task in the rails app
34+
And I run the "db:migrate" rake task in the rails app
35+
}
36+
end
37+
3038
When("I navigate to the route {string} on the rails app") do |route|
3139
RAILS_FIXTURE.navigate_to(route)
3240
end
3341

3442
When("I run {string} in the rails app") do |command|
3543
steps %Q{
36-
When I run the service "rails#{ENV['RAILS_VERSION']}" with the command "#{command}"
44+
When I execute the command "#{command}" in the service "rails#{ENV['RAILS_VERSION']}"
45+
}
46+
end
47+
48+
When("I run {string} in the rails app in the background") do |command|
49+
steps %Q{
50+
When I execute the command "#{command}" in the service "rails#{ENV['RAILS_VERSION']}" in the background
3751
}
3852
end
3953

@@ -43,9 +57,15 @@
4357
}
4458
end
4559

60+
When("I run the {string} rake task in the rails app in the background") do |task|
61+
steps %Q{
62+
When I run "bundle exec rake #{task}" in the rails app in the background
63+
}
64+
end
65+
4666
When("I run {string} with the rails runner") do |code|
4767
steps %Q{
48-
When I run "bundle exec rails runner '#{code}'" in the rails app
68+
When I execute the command "bundle exec rails runner #{code}" in the service "rails#{ENV['RAILS_VERSION']}"
4969
}
5070
end
5171

0 commit comments

Comments
 (0)