lamby 4.3.3 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dce401866a14fbce98621f6c677ab0f17df796c1c9c0792d4a1030adc69eadbd
-  data.tar.gz: 593c2f449b053f4bdc6ae2dbe74602f0debd93d57a57a1811d7f791bc1b40fc9
+  metadata.gz: 940f2329a4503c79e8c2c48908b3f1c2d22445c16ebb0dc71ee0802e54e7c560
+  data.tar.gz: 708b36a037b00b3f66dfa3239a8060ae6b00177628a1e1cd38ba0a8ed8988a94
 SHA512:
-  metadata.gz: 4f119c574a97288c37eb7c5c97643650d2d730fe16ab7b7e6b06a777088e069b6050c4ab023856e32c10c7da0029d74067eb8db37492b0dc0c1a0ed3948f7ee9
-  data.tar.gz: 1bf90e93726e78a75f408801976f65c7dafe369cc14d567fb4ddb337832a0b3dfb10fb1d8e2f91b9b7cf20d42c176f914f0b33c3641accbbc8fd757ec3d56ba6
+  metadata.gz: e2d135f4d5cab367171030c98c2126f57e9a9542b2b802535677450e47f8be6dc4c99d8865871978d73c184269c7a806d61c0b48f1fd54642ceda76289b96474
+  data.tar.gz: 472144850f8dd607c2709d74d6a240ea6949ce640a6e2ddc748e49a31db8f94b04cfa1b3aae842bb9fc465c798e47bc13020571dd8d611b01523e9f8378852cc

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 See this http://keepachangelog.com link for information on how we want this documented formatted.
 
+## v5.1.0
+
+### Added
+
+- New CloudWatch cold start metrics. Defaults to off. Enable with `config.cold_start_metrics = true`.
+
+## v5.0.0
+
+### Changed
+
+- ⚠️ Breaking Changes ⚠️
+- Remove Lamby::Runner & Lamby::Command in favor of LambdaConsole Ruby gem.
+- New runner pattern exceptions from above. Now: LambdaConsole::Run::UnknownCommandPattern
+- Switch your own runner events to new https://github.com/rails-lambda/lambda-console spec.
+
 ## v4.3.1, v4.3.2
 
 ### Changed

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    lamby (4.3.3)
+    lamby (5.1.0)
+      lambda-console-ruby
       rack
 
 GEM
@@ -98,6 +99,7 @@ GEM
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
+    lambda-console-ruby (1.0.0)
     lambdakiq (2.2.0)
       activejob
       aws-sdk-sqs
@@ -131,6 +133,8 @@ GEM
     nio4r (2.5.9)
     nokogiri (1.14.3-aarch64-linux)
       racc (~> 1.4)
+    nokogiri (1.14.3-arm64-darwin)
+      racc (~> 1.4)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -167,6 +171,7 @@ GEM
     rake (13.0.6)
     ruby2_keywords (0.0.5)
     thor (1.2.1)
+    timecop (0.9.6)
     timeout (0.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -178,6 +183,7 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  arm64-darwin-22
 
 DEPENDENCIES
   aws-sdk-ssm
@@ -190,6 +196,7 @@ DEPENDENCIES
   pry
   rails
   rake
+  timecop
   webrick
 
 BUNDLED WITH

data/lamby.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.add_dependency 'rack'
+  spec.add_dependency 'lambda-console-ruby'
   spec.add_development_dependency 'aws-sdk-ssm'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
@@ -26,5 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest-focus'
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'webrick'
 end

data/lib/lamby/cold_start_metrics.rb

@@ -0,0 +1,83 @@
+module Lamby
+  class ColdStartMetrics
+    NAMESPACE = 'Lamby'
+
+    @cold_start = true
+    @cold_start_time = (Time.now.to_f * 1000).to_i
+
+    class << self
+
+      def instrument!
+        return unless @cold_start
+        @cold_start = false
+        now = (Time.now.to_f * 1000).to_i
+        proactive_init = (now - @cold_start_time) > 10_000
+        new(proactive_init).instrument!
+      end
+
+      def clear!
+        @cold_start = true
+        @cold_start_time = (Time.now.to_f * 1000).to_i
+      end
+
+    end
+
+    def initialize(proactive_init)
+      @proactive_init = proactive_init
+      @metrics = []
+      @properties = {}
+    end
+
+    def instrument!
+      name = @proactive_init ? 'ProactiveInit' : 'ColdStart'
+      put_metric name, 1, 'Count'
+      puts JSON.dump(message)
+    end
+
+    private
+
+    def dimensions
+      [{ AppName: rails_app_name }]
+    end
+
+    def put_metric(name, value, unit = nil)
+      @metrics << { 'Name': name }.tap do |m|
+        m['Unit'] = unit if unit
+      end
+      set_property name, value
+    end
+
+    def set_property(name, value)
+      @properties[name] = value
+      self
+    end
+
+    def message
+      {
+        '_aws': {
+          'Timestamp': timestamp,
+          'CloudWatchMetrics': [
+            {
+              'Namespace': NAMESPACE,
+              'Dimensions': [dimensions.map(&:keys).flatten],
+              'Metrics': @metrics
+            }
+          ]
+        }
+      }.tap do |m|
+        dimensions.each { |d| m.merge!(d) }
+        m.merge!(@properties)
+      end
+    end
+
+    def timestamp
+      Time.current.strftime('%s%3N').to_i
+    end
+
+    def rails_app_name
+      Lamby.config.metrics_app_name ||
+        Rails.application.class.name.split('::').first
+    end
+
+  end
+end

data/lib/lamby/config.rb

@@ -41,6 +41,8 @@ module Lamby
 
     def initialize_defaults
       @rack_app = nil
+      @cold_start_metrics = false
+      @metrics_app_name = nil
       @event_bridge_handler = lambda { |event, context| puts(event) }
     end
 
@@ -53,7 +55,7 @@ module Lamby
     end
 
     def runner_patterns
-      Runner::PATTERNS
+      LambdaConsole::Run::PATTERNS
     end
 
     def handled_proc
@@ -64,5 +66,21 @@ module Lamby
       @handled_proc = proc
     end
 
+    def cold_start_metrics?
+      @cold_start_metrics
+    end
+
+    def cold_start_metrics=(bool)
+      @cold_start_metrics = bool
+    end
+
+    def metrics_app_name
+      @metrics_app_name
+    end
+
+    def metrics_app_name=(name)
+      @metrics_app_name = name
+    end
+
   end
 end

data/lib/lamby/handler.rb

@@ -4,6 +4,7 @@ module Lamby
     class << self
 
       def call(app, event, context, options = {})
+        Lamby::ColdStartMetrics.instrument! if Lamby.config.cold_start_metrics?
         new(app, event, context, options).call.response
       end
 
@@ -92,10 +93,8 @@ module Lamby
         Lambdakiq.cmd event: @event, context: @context
       elsif lambda_cable?
         LambdaCable.cmd event: @event, context: @context
-      elsif command?
-        Lamby::Command.cmd event: @event, context: @context
-      elsif runner?
-        Lamby::Runner.cmd event: @event, context: @context
+      elsif LambdaConsole.handle?(@event)
+        LambdaConsole.handle(@event)
       elsif event_bridge?
         Lamby.config.event_bridge_handler.call @event, @context
       else
@@ -121,14 +120,6 @@ module Lamby
       defined?(::Lambdakiq) && ::Lambdakiq.jobs?(@event)
     end
 
-    def runner?
-      Lamby::Runner.handle?(@event)
-    end
-
-    def command?
-      Lamby::Command.handle?(@event)
-    end
-
     def lambda_cable?
       defined?(::LambdaCable) && ::LambdaCable.handle?(@event, @context)
     end

data/lib/lamby/version.rb

@@ -1,3 +1,3 @@
 module Lamby
-  VERSION = '4.3.3'
+  VERSION = '5.1.0'
 end

data/lib/lamby.rb

@@ -1,6 +1,7 @@
 require 'lamby/logger'
 require 'rack'
 require 'base64'
+require 'lambda-console-ruby'
 require 'lamby/version'
 require 'lamby/config'
 require 'lamby/rack'
@@ -8,8 +9,7 @@ require 'lamby/rack_alb'
 require 'lamby/rack_rest'
 require 'lamby/rack_http'
 require 'lamby/debug'
-require 'lamby/runner'
-require 'lamby/command'
+require 'lamby/cold_start_metrics'
 require 'lamby/handler'
 
 if defined?(Rails)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lamby
 version: !ruby/object:Gem::Version
-  version: 4.3.3
+  version: 5.1.0
 platform: ruby
 authors:
 - Ken Collins
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-15 00:00:00.000000000 Z
+date: 2023-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: lambda-console-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ssm
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +191,7 @@ files:
 - images/social2.png
 - lamby.gemspec
 - lib/lamby.rb
-- lib/lamby/command.rb
+- lib/lamby/cold_start_metrics.rb
 - lib/lamby/config.rb
 - lib/lamby/debug.rb
 - lib/lamby/handler.rb
@@ -175,7 +203,6 @@ files:
 - lib/lamby/rack_http.rb
 - lib/lamby/rack_rest.rb
 - lib/lamby/railtie.rb
-- lib/lamby/runner.rb
 - lib/lamby/ssm_parameter_store.rb
 - lib/lamby/tasks.rake
 - lib/lamby/version.rb

data/lib/lamby/command.rb

@@ -1,43 +0,0 @@
-module Lamby
-  class Command
-
-    class << self
-
-      def handle?(event)
-        event.dig('x-lambda-console', 'command') ||
-          event.dig('lamby', 'command')
-      end
-
-      def cmd(event:, context:)
-        new(event).call
-      end
-
-    end
-
-    def initialize(event)
-      @event = event
-      @body = ''
-    end
-
-    def call
-      begin
-        body = eval(command, TOPLEVEL_BINDING).inspect
-        { statusCode: 200, headers: {}, body: body }
-      rescue Exception => e
-        body = "#<#{e.class}:#{e.message}>".tap do |b|
-          if e.backtrace
-            b << "\n"
-            b << e.backtrace.join("\n")
-          end
-        end
-        { statusCode: 422, headers: {}, body: body }
-      end
-    end
-
-    def command
-      @event.dig('x-lambda-console', 'command') ||
-        @event.dig('lamby', 'command')
-    end
-
-  end
-end

data/lib/lamby/runner.rb

@@ -1,64 +0,0 @@
-require 'open3'
-
-module Lamby
-  class Runner
-    class Error < StandardError ; end
-    class UnknownCommandPattern < Error ; end
-
-    PATTERNS = [%r{.*}]
-
-    class << self
-
-      def handle?(event)
-        event.dig('x-lambda-console', 'runner') ||
-          event.dig('lamby', 'runner')
-      end
-
-      def cmd(event:, context:)
-        new(event).call
-      end
-
-    end
-
-    def initialize(event)
-      @event = event
-      @body = ''
-    end
-
-    def call
-      validate!
-      status = Open3.popen3(env, command, chdir: chdir) do |_stdin, stdout, stderr, thread|
-        @body << stdout.read
-        @body << stderr.read
-        puts @body
-        thread.value.exitstatus
-      end
-      { statusCode: status, headers: {}, body: @body }
-    end
-
-    def command
-      @event.dig('x-lambda-console', 'runner') ||
-        @event.dig('lamby', 'runner')
-    end
-
-    private
-
-    def chdir
-      defined?(::Rails) ? ::Rails.root : Dir.pwd
-    end
-
-    def validate!
-      return if pattern?
-      raise UnknownCommandPattern.new(command)
-    end
-
-    def pattern?
-      PATTERNS.any? { |p| p === command }
-    end
-
-    def env
-      Hash[ENV.to_hash.map { |k,v| [k, ENV[k]] }]
-    end
-
-  end
-end