salestation 3.3.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b02a58d20a83f0b3cf88032b0d36b101f2e37fbae8b92393b2d087dc52f004d
-  data.tar.gz: 851f1eb6a3edfe57edecf51a41d2ee7dd4762577ef3e42c6a3b9343a163c3418
+  metadata.gz: 7c1c39aa648194b22cc8f4e75bccddaa3d51992c5fcd6c85facadb6960f52db0
+  data.tar.gz: 9d2132d9c51921bec0146a5a22c7cc7f6c5dbbf3ef5a044cd1f405d4e4953e78
 SHA512:
-  metadata.gz: e5d3870a03be8ad6f4f6861c5c5879f8e16267be6086da08a1de7253881b0ed7e88484db5ce1167700b71769b4b76124f83d9eabf0275e5d62015b101ff28dfa
-  data.tar.gz: 295578db7f08c01ac68aa84484a5fc7de7984c74a1517677f4a63d7f69cd93cf1ec2e94d2dfff0e1908325c401c642dfd7c72204089761c9ec2a8870a14a9739
+  metadata.gz: 3f6ba6c35d4e30f10ee547b484457948602d19fcc91da64912bda45ed8043378bea84ceb29d2a5a6912be5c85eb4dc3bf4520b4c96b93e50e4a4e1bebeaf1c57
+  data.tar.gz: c116c954f2a544fb5d100718f27c1a599aa1b83b7efa0d0216f365e1137af64d8811a5da362f0652497eb949816bb50e0e1276be0acef67b9caac4b55fefad6f

data/.travis.yml

@@ -1,6 +1,4 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4
-  - 2.5
-before_install: gem install bundler -v 1.17.3
+  - 2.7

data/README.md

@@ -142,17 +142,26 @@ end
 
 Salestation provides a StatsD middleware which can be used record request
 execution time. A `timing` call with elapsed seconds is made to the provided
-StatsD instance with `path`, `method`, `status` tags.
+StatsD instance with `path`, `method`, `status` and `status_class` tags.
 
 ```ruby
 class Webapp < Sinatra::Base
   # ...
   use Salestation::Web::StatsdMiddleware,
     Statsd.new(host, port),
-    metric: 'my-metric'
+    metric: 'my_service.response.time'
 end
 ```
 
+You can configure per-request tags by defining `salestation.statsd.tags` in sinatra `env`:
+
+```ruby
+  def my_handler(env)
+    env['salestation.statsd.tags'] = ['foo:bar']
+    # ...
+  end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/salestation/app.rb

@@ -7,7 +7,7 @@ require 'dry-types'
 module Salestation
   class App
     module Types
-      include Dry::Types.module
+      include Dry::Types()
     end
 
     def initialize(env:, hooks: {})

data/lib/salestation/app/errors.rb

@@ -5,7 +5,7 @@ module Salestation
     module Errors
       class InvalidInput < Dry::Struct
         attribute :errors, Types::Strict::Hash
-        attribute :hints, Types::Coercible::Hash.default({})
+        attribute :hints, Types::Coercible::Hash.default({}.freeze)
         attribute? :debug_message, Types::Strict::String
       end
 

data/lib/salestation/web.rb

@@ -8,7 +8,7 @@ require 'json'
 module Salestation
   class Web < Module
     module Types
-      include Dry::Types.module
+      include Dry::Types()
     end
 
     def initialize(errors: {})

data/lib/salestation/web/extractors.rb

@@ -82,6 +82,10 @@ module Salestation
           end
           Deterministic::Result::Success(input)
         end
+
+        def merge(other)
+          CombinedInputExtractor.new([self, other])
+        end
       end
 
       class HeadersExtractor

data/lib/salestation/web/responses.rb

@@ -32,9 +32,9 @@ module Salestation
       class Error < Response
         attribute :status, Types::Strict::Integer
         attribute :message, Types::Strict::String
-        attribute :debug_message, Types::String.default('')
-        attribute :context, Types::Hash.default({})
-        attribute :headers, Types::Hash.default({})
+        attribute :debug_message, Types::Coercible::String.default('')
+        attribute :context, Types::Hash.default({}.freeze)
+        attribute :headers, Types::Hash.default({}.freeze)
 
         def body
           {message: message, debug_message: debug_message}
@@ -44,7 +44,7 @@ module Salestation
       class Success < Response
         attribute :status, Types::Strict::Integer
         attribute :body, Types::Strict::Hash | Types::Strict::Array
-        attribute :headers, Types::Hash.default({})
+        attribute :headers, Types::Hash.default({}.freeze)
       end
 
       class UnprocessableEntityFromSchemaErrors

data/lib/salestation/web/statsd_middleware.rb

@@ -3,6 +3,9 @@
 module Salestation
   class Web < Module
     class StatsdMiddleware
+      EXTRA_TAGS_ENV_KEY = 'salestation.statsd.tags'
+
+      DURATION_MILLISECOND_PRECISION = 3
 
       def initialize(app, statsd, metric:)
         @app = app
@@ -11,7 +14,7 @@ module Salestation
       end
 
       def call(env)
-        start = Time.now
+        start = system_monotonic_time
 
         status, header, body = @app.call env
 
@@ -23,14 +26,27 @@ module Salestation
             'unknown-route'
           end
 
-        @statsd.timing(@metric, (Time.now - start) * 1000, tags: [
-          "path:#{ path }",
-          "method:#{ method }",
-          "status:#{ status }"
-        ])
+        tags = [
+          "path:#{path}",
+          "method:#{method}",
+          "status:#{status}",
+          "status_class:#{status / 100}xx"
+        ] + env.fetch(EXTRA_TAGS_ENV_KEY, [])
+
+        @statsd.timing(@metric, duration_ms(from: start), tags: tags)
 
         [status, header, body]
       end
+
+      private
+
+      def duration_ms(from:)
+        ((system_monotonic_time - from) * 1000).round(DURATION_MILLISECOND_PRECISION)
+      end
+
+      def system_monotonic_time
+        Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      end
     end
   end
 end

data/salestation.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "salestation"
-  spec.version       = "3.3.0"
+  spec.version       = "3.7.0"
   spec.authors       = ["Glia TechMovers"]
   spec.email         = ["techmovers@glia.com"]
 
@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry", "~> 0.10.4"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salestation
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Glia TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ''