funktor 0.2.8 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed00bb1e70f943b1b4193e681fdde83c41fd0bd84bae056d4b171689f2dbe5c8
-  data.tar.gz: 57c02b8d42a470f0f52b90d60fff3c4b176523a7c606a7f7c562649dddbdfe4e
+  metadata.gz: ea0e753064ccb434aa89a656425dbe94ce223e8fcce85e7ad3423bc3d082ba31
+  data.tar.gz: 02ff46a0ca5276400dacce0e239bdacc48142624f5bbd36311267bc04964aa78
 SHA512:
-  metadata.gz: 3575e30e6ae1dea0d36f4b31dcc06ec06b2e92ac07342f79cafc5cc99da9f66d22df79091643e4b036a24f22dab01747adb485806e4e3bae42be3441250f1839
-  data.tar.gz: f2a1827d30175051202691e9ab062929cbf73ba6b32b2bf8081259696fcb29d386822e94cfd4706993864581f294ded37918f45d23ab0cf986d5f21ada0c7f2c
+  metadata.gz: 98d58ca33de1fe46d1121ce3498522fc1de8316b71fdd978780ab9ffbd2f97085bf47cef9ff59809648b36e9b4abea96cd89b785df1403c64a587ecec70bcb92
+  data.tar.gz: e6db57253fd756583344d4424fac291cb6126f90838b30761febb0142d32959a5cdec3ee82b92c9ecb5dc9ce2a25c94db9152c4a64ed87a8e0b566024e54c650

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    funktor (0.2.8)
+    funktor (0.2.13)
       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/environment.yml

@@ -1,3 +1,4 @@
+FUNKTOR_APP_NAME: <%= app_name %>
 FUNKTOR_INCOMING_JOB_QUEUE:
   Ref: IncomingJobQueue
 <%- queue_names.each do |queue_name| -%>

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": "rails-lambda-experiment", # 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.8"
+  VERSION = "0.2.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: funktor
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.13
 platform: ruby
 authors:
 - Jeremy Green
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-29 00:00:00.000000000 Z
+date: 2021-06-30 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