appsignal 2.11.0.alpha.2 → 2.11.0.beta.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +3 -0
- data/.semaphore/semaphore.yml +37 -9
- data/CHANGELOG.md +10 -1
- data/build_matrix.yml +5 -1
- data/gemfiles/rails-4.2.gemfile +9 -2
- data/gemfiles/rails-5.0.gemfile +1 -0
- data/gemfiles/rails-5.1.gemfile +1 -0
- data/gemfiles/rails-5.2.gemfile +1 -0
- data/gemfiles/rails-6.0.gemfile +1 -0
- data/gemfiles/resque-1.gemfile +7 -0
- data/gemfiles/{resque.gemfile → resque-2.gemfile} +1 -1
- data/lib/appsignal/hooks.rb +2 -0
- data/lib/appsignal/hooks/active_job.rb +89 -0
- data/lib/appsignal/hooks/resque.rb +60 -0
- data/lib/appsignal/hooks/sidekiq.rb +16 -92
- data/lib/appsignal/integrations/que.rb +1 -1
- data/lib/appsignal/integrations/resque.rb +9 -12
- data/lib/appsignal/integrations/resque_active_job.rb +9 -32
- data/lib/appsignal/transaction.rb +10 -0
- data/lib/appsignal/utils/deprecation_message.rb +5 -1
- data/lib/appsignal/version.rb +1 -1
- data/spec/lib/appsignal/hooks/activejob_spec.rb +458 -0
- data/spec/lib/appsignal/hooks/resque_spec.rb +185 -0
- data/spec/lib/appsignal/hooks/sidekiq_spec.rb +215 -263
- data/spec/lib/appsignal/integrations/que_spec.rb +25 -6
- data/spec/lib/appsignal/integrations/resque_active_job_spec.rb +20 -179
- data/spec/lib/appsignal/integrations/resque_spec.rb +20 -85
- data/spec/lib/appsignal/probes/sidekiq_spec.rb +10 -7
- data/spec/lib/appsignal/transaction_spec.rb +5 -7
- data/spec/support/helpers/action_mailer_helpers.rb +25 -0
- data/spec/support/helpers/dependency_helper.rb +9 -2
- data/spec/support/helpers/transaction_helpers.rb +6 -0
- data/spec/support/stubs/sidekiq/api.rb +1 -1
- metadata +12 -3
@@ -0,0 +1,25 @@
|
|
1
|
+
module ActionMailerHelpers
|
2
|
+
def perform_action_mailer(mailer, method, args = nil)
|
3
|
+
if DependencyHelper.rails_version >= Gem::Version.new("5.2.0")
|
4
|
+
case args
|
5
|
+
when Array
|
6
|
+
mailer.send(method, *args).deliver_later
|
7
|
+
when Hash
|
8
|
+
mailer.with(args).send(method).deliver_later
|
9
|
+
when NilClass
|
10
|
+
mailer.send(method).deliver_later
|
11
|
+
else
|
12
|
+
raise "Unknown scenario for arguments: #{args}"
|
13
|
+
end
|
14
|
+
else
|
15
|
+
# Rails 5.1 and lower
|
16
|
+
mailer_object =
|
17
|
+
if args
|
18
|
+
mailer.send(method, *args)
|
19
|
+
else
|
20
|
+
mailer.send(method)
|
21
|
+
end
|
22
|
+
mailer_object.deliver_later
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
@@ -1,6 +1,10 @@
|
|
1
1
|
module DependencyHelper
|
2
2
|
module_function
|
3
3
|
|
4
|
+
def ruby_version
|
5
|
+
Gem::Version.new(RUBY_VERSION)
|
6
|
+
end
|
7
|
+
|
4
8
|
def running_jruby?
|
5
9
|
defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
|
6
10
|
end
|
@@ -10,8 +14,11 @@ module DependencyHelper
|
|
10
14
|
end
|
11
15
|
|
12
16
|
def rails6_present?
|
13
|
-
rails_present? &&
|
14
|
-
|
17
|
+
rails_present? && rails_version >= Gem::Version.new("6.0.0")
|
18
|
+
end
|
19
|
+
|
20
|
+
def rails_version
|
21
|
+
Gem.loaded_specs["rails"].version
|
15
22
|
end
|
16
23
|
|
17
24
|
def sequel_present?
|
@@ -44,6 +44,12 @@ module TransactionHelpers
|
|
44
44
|
created_transactions.last
|
45
45
|
end
|
46
46
|
|
47
|
+
# Set current transaction manually.
|
48
|
+
# Cleared by {clear_current_transaction!}
|
49
|
+
def set_current_transaction(transaction) # rubocop:disable Style/AccessorMethodName
|
50
|
+
Thread.current[:appsignal_transaction] = transaction
|
51
|
+
end
|
52
|
+
|
47
53
|
# Use when {Appsignal::Transaction.clear_current_transaction!} is stubbed to
|
48
54
|
# clear the current transaction on the current thread.
|
49
55
|
def clear_current_transaction!
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: appsignal
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.11.0.
|
4
|
+
version: 2.11.0.beta.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Robert Beekman
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2020-07-
|
13
|
+
date: 2020-07-06 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: rack
|
@@ -172,7 +172,8 @@ files:
|
|
172
172
|
- gemfiles/rails-5.1.gemfile
|
173
173
|
- gemfiles/rails-5.2.gemfile
|
174
174
|
- gemfiles/rails-6.0.gemfile
|
175
|
-
- gemfiles/resque.gemfile
|
175
|
+
- gemfiles/resque-1.gemfile
|
176
|
+
- gemfiles/resque-2.gemfile
|
176
177
|
- gemfiles/sequel-435.gemfile
|
177
178
|
- gemfiles/sequel.gemfile
|
178
179
|
- gemfiles/sinatra.gemfile
|
@@ -206,6 +207,7 @@ files:
|
|
206
207
|
- lib/appsignal/helpers/metrics.rb
|
207
208
|
- lib/appsignal/hooks.rb
|
208
209
|
- lib/appsignal/hooks/action_cable.rb
|
210
|
+
- lib/appsignal/hooks/active_job.rb
|
209
211
|
- lib/appsignal/hooks/active_support_notifications.rb
|
210
212
|
- lib/appsignal/hooks/celluloid.rb
|
211
213
|
- lib/appsignal/hooks/data_mapper.rb
|
@@ -217,6 +219,7 @@ files:
|
|
217
219
|
- lib/appsignal/hooks/que.rb
|
218
220
|
- lib/appsignal/hooks/rake.rb
|
219
221
|
- lib/appsignal/hooks/redis.rb
|
222
|
+
- lib/appsignal/hooks/resque.rb
|
220
223
|
- lib/appsignal/hooks/sequel.rb
|
221
224
|
- lib/appsignal/hooks/shoryuken.rb
|
222
225
|
- lib/appsignal/hooks/sidekiq.rb
|
@@ -291,6 +294,7 @@ files:
|
|
291
294
|
- spec/lib/appsignal/garbage_collection_profiler_spec.rb
|
292
295
|
- spec/lib/appsignal/hooks/action_cable_spec.rb
|
293
296
|
- spec/lib/appsignal/hooks/active_support_notifications_spec.rb
|
297
|
+
- spec/lib/appsignal/hooks/activejob_spec.rb
|
294
298
|
- spec/lib/appsignal/hooks/celluloid_spec.rb
|
295
299
|
- spec/lib/appsignal/hooks/data_mapper_spec.rb
|
296
300
|
- spec/lib/appsignal/hooks/delayed_job_spec.rb
|
@@ -301,6 +305,7 @@ files:
|
|
301
305
|
- spec/lib/appsignal/hooks/que_spec.rb
|
302
306
|
- spec/lib/appsignal/hooks/rake_spec.rb
|
303
307
|
- spec/lib/appsignal/hooks/redis_spec.rb
|
308
|
+
- spec/lib/appsignal/hooks/resque_spec.rb
|
304
309
|
- spec/lib/appsignal/hooks/sequel_spec.rb
|
305
310
|
- spec/lib/appsignal/hooks/shoryuken_spec.rb
|
306
311
|
- spec/lib/appsignal/hooks/sidekiq_spec.rb
|
@@ -348,6 +353,7 @@ files:
|
|
348
353
|
- spec/support/fixtures/projects/valid/config/environments/test.rb
|
349
354
|
- spec/support/fixtures/projects/valid/log/.gitkeep
|
350
355
|
- spec/support/fixtures/uploaded_file.txt
|
356
|
+
- spec/support/helpers/action_mailer_helpers.rb
|
351
357
|
- spec/support/helpers/api_request_helper.rb
|
352
358
|
- spec/support/helpers/cli_helpers.rb
|
353
359
|
- spec/support/helpers/config_helpers.rb
|
@@ -435,6 +441,7 @@ test_files:
|
|
435
441
|
- spec/lib/appsignal/garbage_collection_profiler_spec.rb
|
436
442
|
- spec/lib/appsignal/hooks/action_cable_spec.rb
|
437
443
|
- spec/lib/appsignal/hooks/active_support_notifications_spec.rb
|
444
|
+
- spec/lib/appsignal/hooks/activejob_spec.rb
|
438
445
|
- spec/lib/appsignal/hooks/celluloid_spec.rb
|
439
446
|
- spec/lib/appsignal/hooks/data_mapper_spec.rb
|
440
447
|
- spec/lib/appsignal/hooks/delayed_job_spec.rb
|
@@ -445,6 +452,7 @@ test_files:
|
|
445
452
|
- spec/lib/appsignal/hooks/que_spec.rb
|
446
453
|
- spec/lib/appsignal/hooks/rake_spec.rb
|
447
454
|
- spec/lib/appsignal/hooks/redis_spec.rb
|
455
|
+
- spec/lib/appsignal/hooks/resque_spec.rb
|
448
456
|
- spec/lib/appsignal/hooks/sequel_spec.rb
|
449
457
|
- spec/lib/appsignal/hooks/shoryuken_spec.rb
|
450
458
|
- spec/lib/appsignal/hooks/sidekiq_spec.rb
|
@@ -492,6 +500,7 @@ test_files:
|
|
492
500
|
- spec/support/fixtures/projects/valid/config/environments/test.rb
|
493
501
|
- spec/support/fixtures/projects/valid/log/.gitkeep
|
494
502
|
- spec/support/fixtures/uploaded_file.txt
|
503
|
+
- spec/support/helpers/action_mailer_helpers.rb
|
495
504
|
- spec/support/helpers/api_request_helper.rb
|
496
505
|
- spec/support/helpers/cli_helpers.rb
|
497
506
|
- spec/support/helpers/config_helpers.rb
|