lamby 5.0.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bed40f788bb3ef9eecb63040924c583bee423ac369179f76aa5fe43fe797e3ec
-  data.tar.gz: 7fd33a98bb6cd19b202a16ef58f5a03f7f7e1e21f75e6342330b318ebb260bed
+  metadata.gz: 98dcd67fb4bd1f352c4afde4809295882f00f98136aecf0fb59d41b926a753cb
+  data.tar.gz: bb842eac6ef100d94925ec34934b0f75055255f48148416763810ebe74d66481
 SHA512:
-  metadata.gz: 8dca95a577c3afbcb3fbcb9715e54987b04cd830abeda28ac9c4df82f088a50ea866ce8a6f19212e003d80cb3d88c37370393e79c69f9f023c34ae81f967f8d5
-  data.tar.gz: d795ac32b599d239ad6ccfde9da12e88b79bfcff854766c77c0630ca69acbaac9f2cbd5e5c56ee9eb48c46b70bd4d683b67fc7dbf1c2cef61c6dbf0f42a81728
+  metadata.gz: 715a673a6c996aea87b9639d5d130e851d9ed0c5ca005705f21edcb35a163696911f1f876ef2aced5450780a4387b2bc6270c3d5b95a811a828fa3343f49bbb6
+  data.tar.gz: 18e6581b89d754cf7d4360d522c31a88e6c26a8ca7731e8f644e61e7ca88fc039c53a7bd3a403f14ebb974c4e8663d99659e24329e3f2b0528917e8995d69fb2

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 See this http://keepachangelog.com link for information on how we want this documented formatted.
 
+## v5.2.0
+
+### Fixed
+
+- Safely Pass Percent Symbols in Paths Fixes #170
+
+## v5.1.0
+
+### Added
+
+- New CloudWatch cold start metrics. Defaults to off. Enable with `config.cold_start_metrics = true`.
+
 ## v5.0.0
 
 ### Changed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lamby (5.0.0)
+    lamby (5.2.0)
       lambda-console-ruby
       rack
 
@@ -133,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)
@@ -169,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)
@@ -180,6 +183,7 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  arm64-darwin-22
 
 DEPENDENCIES
   aws-sdk-ssm
@@ -192,6 +196,7 @@ DEPENDENCIES
   pry
   rails
   rake
+  timecop
   webrick
 
 BUNDLED WITH

data/lamby.gemspec

@@ -27,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
 
@@ -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
 

data/lib/lamby/rack_http.rb

@@ -78,6 +78,7 @@ module Lamby
     def path_info
       stage = event.dig('requestContext', 'stage')
       spath = event.dig('requestContext', 'http', 'path') || event.dig('requestContext', 'path')
+      spath = event['rawPath'] if spath != event['rawPath'] && !payload_version_one?
       spath.sub /\A\/#{stage}/, ''
     end
 

data/lib/lamby/version.rb

@@ -1,3 +1,3 @@
 module Lamby
-  VERSION = '5.0.0'
+  VERSION = '5.2.0'
 end

data/lib/lamby.rb

@@ -9,6 +9,7 @@ require 'lamby/rack_alb'
 require 'lamby/rack_rest'
 require 'lamby/rack_http'
 require 'lamby/debug'
+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: 5.0.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Ken Collins
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-16 00:00:00.000000000 Z
+date: 2023-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -136,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
@@ -177,6 +191,7 @@ files:
 - images/social2.png
 - lamby.gemspec
 - lib/lamby.rb
+- lib/lamby/cold_start_metrics.rb
 - lib/lamby/config.rb
 - lib/lamby/debug.rb
 - lib/lamby/handler.rb