funktor 0.2.11 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99102148cae3682c1c870882cd44b9651869e3d1ec3adb7e3b4145ef7a6becf5
-  data.tar.gz: c6adb462dbe095673a72e81570d293a59a7f75d18376178684cabe5c81342f3c
+  metadata.gz: fa01638d668cf37cb97173784714a5339a13d37b4dbbc1c55edf5d4633f034de
+  data.tar.gz: a245b13673f1eabd8721468638205e9da36f75a6892389cc8156ecee4d6d1bf3
 SHA512:
-  metadata.gz: 501e7dd2f92ff36d492da512861bf4dd6ab56f07a4fcbc6c362fa5249a52f0e2694b835d6eda1b454304046be2315c8a9a253c92a25e8548605a7dc4829008ac
-  data.tar.gz: fa98731784d2b0007b9bf831b2536f9ec93bbb5a8870e7f5b9e8810b414002d1f760000d18fa581b7e6f8016f48e9dbca1d905bf1d2821dbfaf85cdec80158dc
+  metadata.gz: 5f4ea8b57070bb603e33edb9dbad4a088b1c7deb3b8e5e34c1c2667a063c421a4cf843eae7a495a9762a00fd2bbce8316c7c38f287ad0e7c7e02003941fd5885
+  data.tar.gz: f550064ade4cb5dabf889f4cccdff22b065806e79043086aa86b95592dd7f665da7de2afe63402a15470f491002f90153cb70d8bacd17fe9f7b260cced77170f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    funktor (0.2.11)
+    funktor (0.2.16)
       activesupport
       aws-sdk-sqs (~> 1.37)
       thor
@@ -18,13 +18,13 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.1.1)
-    aws-partitions (1.472.0)
+    aws-partitions (1.473.0)
     aws-sdk-core (3.115.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-sqs (1.39.0)
+    aws-sdk-sqs (1.40.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.3)

data/lib/funktor/active_job_handler.rb

@@ -50,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/counter.rb

@@ -21,7 +21,7 @@ module Funktor
           "CloudWatchMetrics": [
             {
               "Namespace": ENV['FUNKTOR_APP_NAME'],
-              "Dimensions": [["WorkerClassName"]],
+              "Dimensions": [["WorkerClassName"], ["Queue"]],
               "Metrics": [ # CPU, Memory, Duration, etc...
                            {
                              "Name": dimension,
@@ -32,6 +32,7 @@ module Funktor
           ]
         },
         "WorkerClassName": job.worker_class_name,
+        "Queue": job.queue,
         "#{dimension}": 1
         #"count": value,
         #"requestId": "989ffbf8-9ace-4817-a57c-e4dd734019ee"

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)

data/lib/funktor/middleware/metrics.rb

@@ -20,7 +20,7 @@ module Funktor
             "CloudWatchMetrics": [
               {
                 "Namespace": ENV['FUNKTOR_APP_NAME'],
-                "Dimensions": [["WorkerClassName"]],
+                "Dimensions": [["WorkerClassName"], ["Queue"]],
                 "Metrics": [ # CPU, Memory, Duration, etc...
                              {
                                "Name": "Duration",
@@ -31,6 +31,7 @@ module Funktor
             ]
           },
           "WorkerClassName": job.worker_class_name,
+          "Queue": job.queue,
           "Duration": time_diff_in_seconds * 1_000
           #"count": value,
           #"requestId": "989ffbf8-9ace-4817-a57c-e4dd734019ee"

data/lib/funktor/version.rb

@@ -1,3 +1,3 @@
 module Funktor
-  VERSION = "0.2.11"
+  VERSION = "0.2.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: funktor
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.16
 platform: ruby
 authors:
 - Jeremy Green
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-30 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs