funktor 0.7.2 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 666dbb222916dd61aa30c450c8dba4c0ba72104694c59f73311509c655e7e314
-  data.tar.gz: c14a2b2bfedd970aa8278d7d04e3f17612528317a0ca5ad3ef0747da09147a79
+  metadata.gz: b78b0dfad4344af7ceaeef40b2871f68e1305deaa0218f87737b05b4d2e36578
+  data.tar.gz: 3405468ffbcf7c826ff25dce2a4a991df9c6ebe1076cfbcb357ce1b94174355d
 SHA512:
-  metadata.gz: 9c1d2f538b1e725d94459d79ddbcc68e42654e8188f4072e197e641b0e094a05961c6e49caa3cb273fb5ef19a8f09e8587d13746bc2593b89188d76eac6d811d
-  data.tar.gz: dc8b60572bd5a130274e60c7ceecc3094ff93804c29fd179457129ae3a789dd0d956ea24aaf88e8d70ce9096756280718d40a476620a17fabee71a47fa184cc8
+  metadata.gz: 556517fc7fe7ee77c5cb38b4a97c64333cc929aa7524cd4263ae5f9087e847ba5958def975a4b7401f95aa77bd9b276cc700440e591db769da49e41c22bb9e3f
+  data.tar.gz: 524a7ce3720d0f6d3f368ebc1bec6035568942e2eaaec44c001e3b4acfc7397797b08c6a8c528cd7730ea42007e9b7e1c0b2e55a6c83460a52d75a4a991faf53

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    funktor (0.7.2)
+    funktor (0.7.4)
       activesupport
       aws-sdk-dynamodb (~> 1.62)
       aws-sdk-sqs (~> 1.37)
@@ -21,20 +21,20 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.493.0)
-    aws-sdk-core (3.119.1)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.584.0)
+    aws-sdk-core (3.130.2)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-dynamodb (1.62.0)
-      aws-sdk-core (~> 3, >= 3.119.0)
+    aws-sdk-dynamodb (1.74.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.43.0)
-      aws-sdk-core (~> 3, >= 3.119.0)
+    aws-sdk-sqs (1.51.1)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.4)
+    aws-sigv4 (1.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
     byebug (11.1.3)
     coderay (1.1.3)
@@ -48,7 +48,7 @@ GEM
     hashdiff (1.0.1)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
+    jmespath (1.6.1)
     method_source (1.0.0)
     minitest (5.14.4)
     mustermann (1.1.1)
@@ -90,7 +90,7 @@ GEM
       rack (~> 2.2)
       rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    thor (1.1.0)
+    thor (1.2.1)
     tilt (2.0.10)
     timecop (0.9.4)
     tzinfo (2.0.4)

data/README.md

@@ -40,8 +40,6 @@ cd my-funktor-app
 funktor init
 ```
 
-Then you sh
-
 This will create a `funktor` directory that is ready to deploy to AWS. If you've already configured
 your aws tools via `~/.aws/credentials` you should be ready to deploy.
 

data/funktor-testapp/app/workers/audit_worker.rb

@@ -21,13 +21,17 @@ class AuditWorker
     puts "So long from the #{self.class.name}, and thanks for all the fish!"
   end
 
+  def metric_namespace
+    [ENV['FUNKTOR_APP_NAME'], ENV['SERVERLESS_STAGE']].join('-')
+  end
+
   def metric_hash(time_diff)
     {
       "_aws": {
         "Timestamp": Time.now.strftime('%s%3N').to_i,
         "CloudWatchMetrics": [
           {
-            "Namespace": ENV['FUNKTOR_APP_NAME'],
+            "Namespace": metric_namespace,
             "Dimensions": [["WorkerClassName"]],
             "Metrics": [ # CPU, Memory, Duration, etc...
                          {

data/funktor-testapp/funktor_config/funktor.yml

@@ -103,6 +103,7 @@ IncomingDeadJobQueueName: ${self:service}-${self:custom.stage}-incoming-dead
 IncomingJobHandlerName: ${self:service}-${self:custom.stage}-IncomingJobHandler
 IncomingJobQueueAccessPolicyName: ${self:service}-${self:custom.stage}-incoming-job-queue-access
 DashboardName: ${self:service}-${self:custom.stage}-dashboard
+DashboardNamespace: ${self:service}-${self:custom.stage}
 DefaultQueueName: ${self:service}-${self:custom.stage}-default
 DefaultDeadJobQueueName: ${self:service}-${self:custom.stage}-default-dead
 DefaultQueueHandlerName: ${self:service}-${self:custom.stage}-DefaultQueueHandler

data/funktor-testapp/funktor_config/resources/cloudwatch_dashboard.yml

@@ -29,13 +29,13 @@ Resources:
                     "type": "metric",
                     "properties": {
                         "metrics": [
-                            [ "funktor-testapp", "Duration", "WorkerClassName", "AuditWorker" ],
+                            [ "${self:custom.funktor.DashboardNamespace}", "Duration", "WorkerClassName", "AuditWorker" ],
                             [ "...", { "stat": "p99" } ],
-                            [ "funktor-testapp", "Duration", "WorkerClassName", "GreetingsWorker" ],
+                            [ "${self:custom.funktor.DashboardNamespace}", "Duration", "WorkerClassName", "GreetingsWorker" ],
                             [ "...", { "stat": "p99" } ],
-                            [ "funktor-testapp", "Duration", "WorkerClassName", "HelloWorker" ],
+                            [ "${self:custom.funktor.DashboardNamespace}", "Duration", "WorkerClassName", "HelloWorker" ],
                             [ "...", { "stat": "p99" } ],
-                            [ "funktor-testapp", "Duration", "WorkerClassName", "SingleThreadAuditWorker" ],
+                            [ "${self:custom.funktor.DashboardNamespace}", "Duration", "WorkerClassName", "SingleThreadAuditWorker" ],
                             [ "...", { "stat": "p99" } ]
                         ],
                         "view": "timeSeries",
@@ -55,13 +55,13 @@ Resources:
                     "type": "metric",
                     "properties": {
                         "metrics": [
-                            [ "funktor-testapp", "processed", "WorkerClassName", "AuditWorker" ],
+                            [ "${self:custom.funktor.DashboardNamespace}", "processed", "WorkerClassName", "AuditWorker" ],
                             [ ".", "failed", ".", "." ],
-                            [ "funktor-testapp", "processed", "WorkerClassName", "GreetingsWorker" ],
+                            [ "${self:custom.funktor.DashboardNamespace}", "processed", "WorkerClassName", "GreetingsWorker" ],
                             [ ".", "failed", ".", "." ],
-                            [ "funktor-testapp", "processed", "WorkerClassName", "HelloWorker" ],
+                            [ "${self:custom.funktor.DashboardNamespace}", "processed", "WorkerClassName", "HelloWorker" ],
                             [ ".", "failed", ".", "." ],
-                            [ "funktor-testapp", "processed", "WorkerClassName", "SingleThreadAuditWorker" ],
+                            [ "${self:custom.funktor.DashboardNamespace}", "processed", "WorkerClassName", "SingleThreadAuditWorker" ],
                             [ ".", "failed", ".", "." ]
                         ],
                         "view": "timeSeries",
@@ -81,9 +81,9 @@ Resources:
                     "type": "metric",
                     "properties": {
                         "metrics": [
-                            [ "funktor-testapp", "Duration", "Queue", "default" ],
+                            [ "${self:custom.funktor.DashboardNamespace}", "Duration", "Queue", "default" ],
                             [ "...", { "stat": "p99" } ],
-                            [ "funktor-testapp", "Duration", "Queue", "low_concurrency" ],
+                            [ "${self:custom.funktor.DashboardNamespace}", "Duration", "Queue", "low_concurrency" ],
                             [ "...", { "stat": "p99" } ]
                         ],
                         "view": "timeSeries",
@@ -102,9 +102,9 @@ Resources:
                     "type": "metric",
                     "properties": {
                         "metrics": [
-                            [ "funktor-testapp", "processed", "Queue", "default" ],
+                            [ "${self:custom.funktor.DashboardNamespace}", "processed", "Queue", "default" ],
                             [ ".", "failed", ".", "." ],
-                            [ "funktor-testapp", "processed", "Queue", "low_concurrency" ],
+                            [ "${self:custom.funktor.DashboardNamespace}", "processed", "Queue", "low_concurrency" ],
                             [ ".", "failed", ".", "." ]
                         ],
                         "view": "timeSeries",
@@ -117,17 +117,17 @@ Resources:
                 },
 
 
+                
                 { 
                     "height": 3,
                     "width": 24,
-                    "y": 9,
+                    "y": 12,
                     "x": 0,
                     "type": "text",
                     "properties": {
                         "markdown": "\n# Behind the scenes\n\n The stats below give some insight into the inner workings of the Funktor apparatus."
                     }
                 },
-                
 
 
                 

data/lib/funktor/activity_tracker.rb

@@ -77,13 +77,17 @@ module Funktor
       @dynamodb_client ||= ::Aws::DynamoDB::Client.new
     end
 
+    def metric_namespace
+      [ENV['FUNKTOR_APP_NAME'], ENV['SERVERLESS_STAGE']].join('-')
+    end
+
     def put_metric_to_stdout(key, value)
       data = {
         "_aws": {
           "Timestamp": Time.now.strftime('%s%3N').to_i,
           "CloudWatchMetrics": [
             {
-              "Namespace": "rails-lambda-experiment",
+              "Namespace": metric_namespace,
               "Dimensions": [["functionVersion"]],
               "Metrics": [ # CPU, Memory, Duration, etc...
                            {

data/lib/funktor/cli/init.rb

@@ -40,15 +40,46 @@ module Funktor
       end
 
       def package_json
-        template "package.json", File.join("package.json")
+        if File.exist?("package.json")
+          package_data = File.open("package.json").read
+          if package_data =~ /serverless-ruby-layer/
+            say "serverless-ruby-layer is already installed in package.json"
+          else
+            if File.exist?("package-lock.json")
+              run "npm install serverless-ruby-layer@1.4.0 --save-dev"
+              # TODO - Add handers for yarn and what not
+            elsif File.exist?("yarn.lock")
+              run "yarn add --dev serverless-ruby-layer@1.4.0"
+            else
+              say "You should install serverless-ruby-layer version 1.4.0 using yor package manager of choice."
+            end
+          end
+        else
+          template "package.json", File.join("package.json")
+        end
       end
 
       def gemfile
-        template "Gemfile", File.join("Gemfile")
+        if File.exist?("Gemfile")
+          gem_data = File.open("Gemfile").read
+          if gem_data =~ /funktor/
+            say "funktor is already installed in Gemfile"
+          else
+            run "bundle add funktor"
+          end
+        else
+          template "Gemfile", File.join("Gemfile")
+        end
       end
 
       def gitignore
-        template "gitignore", File.join(".gitignore")
+        # TODO clean this up so that we have a single source of truth for .gitignor stuff
+        if File.exist?(".gitignore")
+          append_to_file ".gitignore", ".serverless"
+          append_to_file ".gitignore", "node_modules"
+        else
+          template "gitignore", File.join(".gitignore")
+        end
       end
 
       def workers

data/lib/funktor/cli/templates/funktor_config/funktor.yml

@@ -81,6 +81,7 @@ IncomingDeadJobQueueName: ${self:service}-${self:custom.stage}-incoming-dead
 IncomingJobHandlerName: ${self:service}-${self:custom.stage}-IncomingJobHandler
 IncomingJobQueueAccessPolicyName: ${self:service}-${self:custom.stage}-incoming-job-queue-access
 DashboardName: ${self:service}-${self:custom.stage}-dashboard
+DashboardNamespace: ${self:service}-${self:custom.stage}
 <%- queue_names.each do |queue_name| -%>
 <%= queue_name.camelize %>QueueName: ${self:service}-${self:custom.stage}-<%= queue_name.underscore.dasherize %>
 <%= queue_name.camelize %>DeadJobQueueName: ${self:service}-${self:custom.stage}-<%= queue_name.underscore.dasherize %>-dead

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

@@ -30,7 +30,7 @@ Resources:
                     "properties": {
                         "metrics": [
                             <%- app_worker_names.each do |worker_name| -%>
-                            [ "<%= app_name %>", "Duration", "WorkerClassName", "<%= worker_name %>" ],
+                            [ "${self:custom.funktor.DashboardNamespace}", "Duration", "WorkerClassName", "<%= worker_name %>" ],
                             [ "...", { "stat": "p99" } ]<%= worker_name == app_worker_names.last ? "" : "," %>
                             <%- end -%>
                         ],
@@ -52,7 +52,7 @@ Resources:
                     "properties": {
                         "metrics": [
                             <%- app_worker_names.each do |worker_name| -%>
-                            [ "<%= app_name %>", "processed", "WorkerClassName", "<%= worker_name %>" ],
+                            [ "${self:custom.funktor.DashboardNamespace}", "processed", "WorkerClassName", "<%= worker_name %>" ],
                             [ ".", "failed", ".", "." ]<%= worker_name == app_worker_names.last ? "" : "," %>
                             <%- end -%>
                         ],
@@ -74,7 +74,7 @@ Resources:
                     "properties": {
                         "metrics": [
                             <%- queue_names.each do |queue_name| -%>
-                            [ "<%= app_name %>", "Duration", "Queue", "<%= queue_name.underscore %>" ],
+                            [ "${self:custom.funktor.DashboardNamespace}", "Duration", "Queue", "<%= queue_name.underscore %>" ],
                             [ "...", { "stat": "p99" } ]<%= queue_name == queue_names.last ? "" : "," %>
                             <%- end -%>
                         ],
@@ -95,7 +95,7 @@ Resources:
                     "properties": {
                         "metrics": [
                             <%- queue_names.each do |queue_name| -%>
-                            [ "<%= app_name %>", "processed", "Queue", "<%= queue_name.underscore %>" ],
+                            [ "${self:custom.funktor.DashboardNamespace}", "processed", "Queue", "<%= queue_name.underscore %>" ],
                             [ ".", "failed", ".", "." ]<%= queue_name == queue_names.last ? "" : "," %>
                             <%- end -%>
                         ],
@@ -109,6 +109,7 @@ Resources:
                 },
 
 
+                <% current_y += 3 %>
                 { <% "Funktor Behind the Scenes Banner" %>
                     "height": 3,
                     "width": 24,
@@ -119,7 +120,6 @@ Resources:
                         "markdown": "\n# Behind the scenes\n\n The stats below give some insight into the inner workings of the Funktor apparatus."
                     }
                 },
-                <% current_y += 3 %>
 
 
                 <% current_y += 6 %>

data/lib/funktor/cli/templates/package.json

@@ -1,8 +1,8 @@
 {
-  "name":"<%= name %>",
-  "description":"",
-  "version":"0.1.0",
-  "devDependencies":{
-    "serverless-ruby-layer":"^1.4.0"
+  "name": "<%= name %>",
+  "description": "",
+  "version": "0.1.0",
+  "devDependencies": {
+    "serverless-ruby-layer": "^1.4.0"
   }
 }

data/lib/funktor/counter.rb

@@ -17,13 +17,17 @@ module Funktor
       Funktor.raw_logger.unknown Funktor.dump_json(metric_hash(job))
     end
 
+    def metric_namespace
+      [ENV['FUNKTOR_APP_NAME'], ENV['SERVERLESS_STAGE']].join('-')
+    end
+
     def metric_hash(job)
       {
         "_aws": {
           "Timestamp": Time.now.strftime('%s%3N').to_i,
           "CloudWatchMetrics": [
             {
-              "Namespace": ENV['FUNKTOR_APP_NAME'],
+              "Namespace": metric_namespace,
               "Dimensions": [["WorkerClassName"], ["Queue"]],
               "Metrics": [ # CPU, Memory, Duration, etc...
                            {

data/lib/funktor/middleware/metrics.rb

@@ -18,13 +18,17 @@ module Funktor
         Funktor.raw_logger.unknown Funktor.dump_json(metric_hash(time_diff, job))
       end
 
+      def metric_namespace
+        [ENV['FUNKTOR_APP_NAME'], ENV['SERVERLESS_STAGE']].join('-')
+      end
+
       def metric_hash(time_diff_in_seconds, job)
         {
           "_aws": {
             "Timestamp": Time.now.strftime('%s%3N').to_i,
             "CloudWatchMetrics": [
               {
-                "Namespace": ENV['FUNKTOR_APP_NAME'],
+                "Namespace": metric_namespace,
                 "Dimensions": [["WorkerClassName"], ["Queue"]],
                 "Metrics": [ # CPU, Memory, Duration, etc...
                              {

data/lib/funktor/version.rb

@@ -1,3 +1,3 @@
 module Funktor
-  VERSION = "0.7.2"
+  VERSION = "0.7.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: funktor
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.5
 platform: ruby
 authors:
 - Jeremy Green
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs