funktor 0.7.25 → 0.7.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4efb77bf5008c8b7045610883ea0f0229a8ebaa89d1b5f3dd4846c3e0bc7ddd4
-  data.tar.gz: ad9b24108efdc8747d863bc9afbf0b47fe9508c6804f48ca80eba314e681a474
+  metadata.gz: 2dec96dc948fcba2229478780e99336bc02441367d4e983c260bc64a91a8994a
+  data.tar.gz: 93da2f42dc12e42c2d589675839cc18b3c38fa9eddc479993a2d89a1064aec18
 SHA512:
-  metadata.gz: a1d9c1547d1195bab096469043bef6bd63d4183b005a1ee6e08d60ad5f894fe79d0bdeaa33a446966566904a99a088045c66348f0eb9ca5aca1543b75adf9595
-  data.tar.gz: ead715f1b9673487067fea8206e0bb9a0fb74bcc2a79e43bf3e07703df9a5d3f0fc3361bcde55357ef223078ed7dc1e215d325354614f379138142cc33e07bc3
+  metadata.gz: 93f042ad21b600a43112255347afab9ba9349f70da15961121b2281ba4f93ef5d840ea4383d38b9dd0e1f9e36fed373771182770eb6cfd27ffbff7186ea24890
+  data.tar.gz: 3595243efb050367bcff3a471901641fde331169ebee669049aa9543d61e1d75a0b3b495c4832ed2dc8a867732e88a378d3bbe8056fe27f8073cd4c9d8a3cf69

data/Gemfile

@@ -5,3 +5,5 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
+
+gem 'newrelic_rpm'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    funktor (0.7.25)
+    funktor (0.7.28)
       activesupport
       aws-sdk-dynamodb (~> 1.62)
       aws-sdk-sqs (~> 1.37)
@@ -22,7 +22,7 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.2.0)
-    aws-partitions (1.596.0)
+    aws-partitions (1.597.0)
     aws-sdk-core (3.131.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
@@ -53,6 +53,7 @@ GEM
     minitest (5.14.4)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
+    newrelic_rpm (8.8.0)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -107,6 +108,7 @@ PLATFORMS
 DEPENDENCIES
   activejob (>= 5.1.5)
   funktor!
+  newrelic_rpm
   pry-byebug
   rake (~> 12.0)
   rspec (~> 3.0)

data/lib/funktor/job.rb

@@ -114,8 +114,16 @@ module Funktor
       self.delay = seconds_to_delay(retries)
     end
 
-    # delayed_job and sidekiq use the same basic formula
     def seconds_to_delay(count)
+      if worker_class&.funktor_retry_in_block
+        worker_class.funktor_retry_in_block.call(count)
+      else
+        default_seconds_to_delay(count)
+      end
+    end
+
+    # delayed_job and sidekiq use the same basic formula
+    def default_seconds_to_delay(count)
       (count**4) + 15 + (rand(30) * (count + 1))
     end
 
@@ -124,7 +132,7 @@ module Funktor
     end
 
     def retry_limit
-      25
+      worker_class&.custom_retry_limit || 25
     end
 
     def can_retry

data/lib/funktor/middleware/new_relic.rb

@@ -0,0 +1,34 @@
+require 'newrelic_rpm'
+module Funktor
+  module Middleware
+    class NewRelic
+      include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
+
+      def call(job)
+        trace_args = {
+          :name => 'perform',
+          :class_name => job.worker_class_name_for_metrics,
+          :category => 'OtherTransaction/Funktor'
+        }
+        perform_action_with_newrelic_trace(trace_args) do
+          ::NewRelic::Agent::Transaction.merge_untrusted_agent_attributes(job.worker_params,
+                                                                        :'worker.funktor.params',
+                                                                        ::NewRelic::Agent::AttributeFilter::DST_NONE)
+          yield
+        end
+      end
+    end
+  end
+
+  def self.new_relic!
+    Funktor.configure_work_queue_handler do |config|
+      config.work_queue_handler_middleware do |chain|
+        chain.add Funktor::Middleware::NewRelic
+      end
+    end
+  end
+end
+
+
+
+

data/lib/funktor/version.rb

@@ -1,3 +1,3 @@
 module Funktor
-  VERSION = "0.7.25"
+  VERSION = "0.7.28"
 end

data/lib/funktor/worker/funktor_options.rb

@@ -7,6 +7,7 @@ module Funktor
         base.extend ClassMethods
         base.class_eval do
           class_attribute :funktor_options_hash
+          class_attribute :funktor_retry_in_block
         end
       end
       module ClassMethods
@@ -18,6 +19,10 @@ module Funktor
           self.funktor_options_hash || {}
         end
 
+        def funktor_retry_in(&block)
+          self.funktor_retry_in_block = block
+        end
+
         def custom_queue_url
           get_funktor_options[:queue_url]
         end
@@ -26,6 +31,16 @@ module Funktor
           get_funktor_options[:queue]
         end
 
+        def custom_retry_limit
+          retry_limit = get_funktor_options[:retry]
+          if retry_limit.nil?
+            retry_limit = 25
+          elsif !retry_limit # if someone did "retry: false"
+            retry_limit = 0
+          end
+          return retry_limit
+        end
+
         def queue_url
           custom_queue_url
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: funktor
 version: !ruby/object:Gem::Version
-  version: 0.7.25
+  version: 0.7.28
 platform: ruby
 authors:
 - Jeremy Green
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs
@@ -261,6 +261,7 @@ files:
 - lib/funktor/job_pusher.rb
 - lib/funktor/logger.rb
 - lib/funktor/middleware/metrics.rb
+- lib/funktor/middleware/new_relic.rb
 - lib/funktor/middleware_chain.rb
 - lib/funktor/rails.rb
 - lib/funktor/shard_utils.rb