funktor 0.2.9 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dea8b34c6e2cfd3ff2d8d85aaaef9875b7e051e270203f5db2951ee7ec12694
-  data.tar.gz: 68cbf6f504addd239757d34ad30be2d8fda169243191be1be043289b317a8797
+  metadata.gz: 78d588a9932c62a7d4cb3d4e86adacf7f0eb99ac422447e54c5ce336fe77f6f2
+  data.tar.gz: 1a4ef97fdbab5d9d38600e4a247141ffba81fe82ba3fda42de0d024dbcfc180d
 SHA512:
-  metadata.gz: 1a5284c2ee798e99301a9319b72d17c94a8625fa47d0fc8ad6b219add728d252115f8a4af4a3a1144ddfdf09ea8857bfa0034546628bcb14d184729f6c366b33
-  data.tar.gz: 5894ce676884bc96e131dfa827c1e1e74d47f83d0597211254e1d9b59063c96766213e7cf3585e0eff68eed185e200d4c80555a89faf0c2c1f95d1421b5c929c
+  metadata.gz: dda1f909c912b01bd469b4b13398546abc9482ab3d60e6ec275f2002ba5161fa580e123d68732fd19bd148aaf97cfbd42112dc72c416fb745b9bfc14fab555dc
+  data.tar.gz: acccfa11ddd50cde6b372bdeecfc34ce9fe0d0d0294cd5e99d905d6456373979ef9f03c67ed38ce3e54b2acdd6ebf8b6ecaa2d678d40c37ecfe6f153ca36d757

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    funktor (0.2.9)
+    funktor (0.2.14)
       activesupport
       aws-sdk-sqs (~> 1.37)
       thor

data/lib/funktor.rb

@@ -1,6 +1,7 @@
 require "funktor/version"
 require 'funktor/aws/sqs/event'
 require 'funktor/aws/sqs/record'
+require 'funktor/counter'
 require 'funktor/job'
 require 'funktor/worker'
 require 'funktor/middleware_chain'

data/lib/funktor/active_job_handler.rb

@@ -3,6 +3,11 @@ require 'aws-sdk-sqs'
 module Funktor
   class ActiveJobHandler
 
+    def initialize
+      @failed_counter = Funktor::Counter.new('failed')
+      @processed_counter = Funktor::Counter.new('processed')
+    end
+
     def call(event:, context:)
       event = Funktor::Aws::Sqs::Event.new(event)
       puts "event.jobs.count = #{event.jobs.count}"
@@ -20,10 +25,12 @@ module Funktor
         Funktor.active_job_handler_middleware.invoke(job) do
           job.execute
         end
+        @processed_counter.incr(job)
       # rescue Funktor::Job::InvalidJsonError # TODO Make this work
       rescue Exception => e
         puts "Error during processing: #{$!}"
         puts "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
+        @failed_counter.incr(job)
         attempt_retry_or_bail(job)
       end
     end
@@ -43,8 +50,7 @@ module Funktor
       puts job.to_json
       sqs_client.send_message({
         queue_url: job.retry_queue_url,
-        message_body: job.to_json,
-        delay_seconds: job.delay
+        message_body: job.to_json
       })
     end
 

data/lib/funktor/cli/templates/config/resources/cloudwatch_dashboard.yml

@@ -321,6 +321,29 @@ Resources:
                         "title": "Job Duration by Worker"
                     }
                 },
+
+                <% current_y += 6 %>
+                { <% "Processed/Failed Jobs By Worker" %>
+                    "height": 6,
+                    "width": 24,
+                    "y": <%= current_y %>,
+                    "x": 0,
+                    "type": "metric",
+                    "properties": {
+                        "metrics": [
+                            <%- app_worker_names.each do |worker_name| -%>
+                            [ "<%= app_name %>", "processed", "WorkerClassName", "<%= worker_name %>" ],
+                            [ ".", "failed", ".", "." ]<%= worker_name == app_worker_names.last ? "" : "," %>
+                            <%- end -%>
+                        ],
+                        "view": "timeSeries",
+                        "stacked": false,
+                        "region": "us-east-1",
+                        "title": "Process/Failed Jobs By Worker",
+                        "period": 60,
+                        "stat": "Sum"
+                  }
+                },
                 <% current_y += 6 %>
 
                 { <% "Delayed Jobs" %>
@@ -551,5 +574,8 @@ Resources:
                     }
                 }
 
+
+                
+
             ]
         }

data/lib/funktor/cli/templates/lambda_event_handlers/incoming_job_handler.rb

@@ -1,4 +1,7 @@
-require_relative '../config/boot'
+# For this handler we don't need to know about your app, or any of the other gems,
+# so instead of doing `require_relative '../config/boog'` we just manually require
+# the one gem that we do need.
+require 'funktor'
 
 $handler = Funktor::IncomingJobHandler.new
 

data/lib/funktor/counter.rb

@@ -0,0 +1,42 @@
+module Funktor
+  class Counter
+    attr_accessor :dimension
+
+    def initialize(dimension)
+      @dimension = dimension
+    end
+
+    def incr(job)
+      put_metric_to_stdout(job)
+    end
+
+    def put_metric_to_stdout(job)
+      puts Funktor.dump_json(metric_hash(job))
+    end
+
+    def metric_hash(job)
+      {
+        "_aws": {
+          "Timestamp": Time.now.strftime('%s%3N').to_i,
+          "CloudWatchMetrics": [
+            {
+              "Namespace": ENV['FUNKTOR_APP_NAME'],
+              "Dimensions": [["WorkerClassName"]],
+              "Metrics": [ # CPU, Memory, Duration, etc...
+                           {
+                             "Name": dimension,
+                             "Unit": "Count"
+                           }
+              ]
+            }
+          ]
+        },
+        "WorkerClassName": job.worker_class_name,
+        "#{dimension}": 1
+        #"count": value,
+        #"requestId": "989ffbf8-9ace-4817-a57c-e4dd734019ee"
+      }
+      #data[key] = value
+    end
+  end
+end

data/lib/funktor/job.rb

@@ -35,7 +35,11 @@ module Funktor
     end
 
     def delay
-      job_data["delay"]
+      # TODO - In Funktor Pro we need to override this method (or do something else) so that
+      # we can schedule jobs farther in the future than 15 minutes. We do this here in case a
+      # retry sequence goes too long.
+      jdelay = job_data["delay"]
+      return jdelay < 900 ? jdelay : 900
     end
 
     def delay=(delay)
@@ -43,7 +47,7 @@ module Funktor
     end
 
     def execute
-      worker_class.new.perform(worker_params)
+      worker_class.new.perform(*worker_params)
     end
 
     def worker_class

data/lib/funktor/middleware/metrics.rb

@@ -19,7 +19,7 @@ module Funktor
             "Timestamp": Time.now.strftime('%s%3N').to_i,
             "CloudWatchMetrics": [
               {
-                "Namespace": ENV['FUNKTOR_APP_NAME'], # TODO - We should get this from config or someting
+                "Namespace": ENV['FUNKTOR_APP_NAME'],
                 "Dimensions": [["WorkerClassName"]],
                 "Metrics": [ # CPU, Memory, Duration, etc...
                              {

data/lib/funktor/testing.rb

@@ -57,7 +57,7 @@ module Funktor
 
   class InlineJobPusherMiddleware
     def call(worker, payload)
-      worker.new.perform(payload[:worker_params])
+      worker.new.perform(*payload[:worker_params])
     end
   end
 

data/lib/funktor/version.rb

@@ -1,3 +1,3 @@
 module Funktor
-  VERSION = "0.2.9"
+  VERSION = "0.2.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: funktor
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.14
 platform: ruby
 authors:
 - Jeremy Green
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-29 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs
@@ -136,6 +136,7 @@ files:
 - lib/funktor/cli/templates/lambda_event_handlers/work_queue_handler.rb
 - lib/funktor/cli/templates/package.json
 - lib/funktor/cli/templates/serverless.yml
+- lib/funktor/counter.rb
 - lib/funktor/fake_job_queue.rb
 - lib/funktor/incoming_job_handler.rb
 - lib/funktor/job.rb