alephant-broker 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fda6d6a6605e71b9eb66abf08dddb9d5e1baab44
-  data.tar.gz: cec4b99897a6bcbf1265586d48ef6bac5cd182e0
+  metadata.gz: 8c13b7a9cc8002ce3f9aa7e486c365f043869ac3
+  data.tar.gz: 4b1e0a001451521746c6d2f716b8291f0f73c22b
 SHA512:
-  metadata.gz: de0065a472ec3619e4ff4ef17b05d797bf80d3a9653b63d635a37a9c76c2a5f86b01ae901d628cc8280d9c4b1437c2f97b0e48522816bd26b61147b805216edf
-  data.tar.gz: af56c9641a638cb8c2683f713774701530f7972e6bf53e29efe9d46ba3afab8832f353d9899128f1de7965160e061c9f0e58c982792aee35a1cb88f3a8c23201
+  metadata.gz: 3cb2662440354ddb7a1d789c1ad268fb008953566d903cb8e051f34dc9850bfd6e87261a8b86ae0c5cb3755b07d3e80d6f862f116b5b6661758f8f63f1ca853e
+  data.tar.gz: c845bd7e4e2b8cb82dcf7ff09cd996adad013c3cafa3321f49e9766dcbe2257bcfc88bee6bc12f31f3d1a23ff8d57ab532498df1085c32f71c1f3db30fb13393

data/alephant-broker.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "alephant-lookup"
   spec.add_runtime_dependency "alephant-cache"
-  spec.add_runtime_dependency "alephant-logger", "~> 1"
+  spec.add_runtime_dependency "alephant-logger", "1.2.0"
   spec.add_runtime_dependency 'alephant-sequencer'
   spec.add_runtime_dependency "dalli-elasticache"
   spec.add_runtime_dependency "pmap"

data/lib/alephant/broker/cache.rb

@@ -14,8 +14,8 @@ module Alephant
             @@elasticache ||= ::Dalli::ElastiCache.new(config_endpoint, { :expires_in => ttl })
             @@client ||= @@elasticache.client
           else
-            logger.debug('Broker::Cache::Client#initialize: No config endpoint, NullClient used')
-            logger.metric(:name => "BrokerCacheClientNoConfigEndpoint", :unit => "Count", :value => 1)
+            logger.debug "Broker::Cache::Client#initialize: No config endpoint, NullClient used"
+            logger.metric("NoConfigEndpoint", opts.merge(:function => "initialize"))
             @@client = NullClient.new
           end
         end
@@ -24,8 +24,11 @@ module Alephant
           begin
             versioned_key = versioned key
             result = @@client.get versioned_key
-            logger.info("Broker::Cache::Client#get key: #{versioned_key} - #{result ? 'hit' : 'miss'}")
-            logger.metric(:name => "BrokerCacheClientGetKeyMiss", :unit => "Count", :value => 1) unless result
+            logger.info "Broker::Cache::Client#get key: #{versioned_key} - #{result ? 'hit' : 'miss'}"
+            logger.metric(
+              "GetKeyMiss",
+              opts[:dimensions].merge(:function => "get")
+            ) unless result
             result ? result : set(key, block.call)
           rescue StandardError => e
             block.call if block_given?
@@ -38,12 +41,21 @@ module Alephant
 
         private
 
+        def opts
+          {
+            :dimensions => {
+              :module   => "AlephantBrokerCache",
+              :class    => "Client"
+            }
+          }
+        end
+
         def config_endpoint
           Broker.config['elasticache_config_endpoint']
         end
 
         def ttl
-           Broker.config['elasticache_ttl'] || DEFAULT_TTL
+          Broker.config['elasticache_ttl'] || DEFAULT_TTL
         end
 
         def versioned(key)
@@ -65,4 +77,3 @@ module Alephant
     end
   end
 end
-

data/lib/alephant/broker/component_factory.rb

@@ -19,14 +19,26 @@ module Alephant
           @load_strategy.load(component_meta)
         )
       rescue Alephant::Broker::Errors::ContentNotFound => e
-        logger.warn 'Broker.ComponentFactory.create: Exception raised (ContentNotFound)'
-        logger.metric(:name => "BrokerComponentFactoryContentNotFound", :unit => "Count", :value => 1)
+        logger.warn "Broker.ComponentFactory.create: Exception raised (ContentNotFound)"
+        logger.metric("ContentNotFound", opts)
         ErrorComponent.new(component_meta, 404, e)
       rescue => e
-        logger.warn("Broker.ComponentFactory.create: Exception raised (#{e.message}, #{e.backtrace.join('\n')})")
-        logger.metric(:name => "BrokerComponentFactoryExceptionRaised", :unit => "Count", :value => 1)
+        logger.warn "Broker.ComponentFactory.create: Exception raised (#{e.message}, #{e.backtrace.join('\n')})"
+        logger.metric("ExceptionRaised", opts)
         ErrorComponent.new(component_meta, 500, e)
       end
+
+      private
+
+      def opts
+        {
+          :dimensions => {
+            :module   => "AlephantBroker",
+            :class    => "ComponentFactory",
+            :function => "create"
+          }
+        }
+      end
     end
   end
 end

data/lib/alephant/broker/environment.rb

@@ -50,11 +50,21 @@ module Alephant
         begin
           JSON.parse(json)
         rescue JSON::ParserError => e
-          logger.warn("Broker.environment#data: ParserError")
-          logger.metric(:name => "BrokerEnvironmentJSONParserError", :unit => "Count", :value => 1)
+          logger.warn "Broker.environment#data: ParserError"
+          logger.metric("JSONParserError", opts)
           nil
         end
       end
+
+      def opts
+        {
+          :dimensions => {
+            :module   => "AlephantBroker",
+            :class    => "Environment",
+            :function => "parse"
+          }
+        }
+      end
     end
   end
 end

data/lib/alephant/broker/load_strategy/http.rb

@@ -22,7 +22,10 @@ module Alephant
         def load(component_meta)
           cache_object(component_meta)
         rescue
-          logger.metric(:name => "BrokerLoadStrategyHTTPCacheMiss", :unit => "Count", :value => 1)
+          logger.metric(
+            "CacheMiss",
+            opts[:dimensions].merge(:function => "load")
+          )
           cache.set(component_meta.cache_key, content(component_meta))
         end
 
@@ -56,12 +59,17 @@ module Alephant
 
           Faraday.get(url_for component_meta).tap do |r|
             unless r.success?
-              logger.metric(:name => "BrokerLoadStrategyHTTPContentNotFound", :unit => "Count", :value => 1)
+              logger.metric(
+                "ContentNotFound",
+                opts[:dimensions].merge(:function => "request")
+              )
               raise Alephant::Broker::Errors::ContentNotFound
             end
 
             request_time = Time.new - before
-            logger.metric(:name => "BrokerHTTPLoadComponentTime", :unit => "Seconds", :value => request_time)
+            logger.metric("LoadComponentTime", opts.merge(
+              :unit  => "Seconds", :value => request_time,
+            ).tap { |h| h[:dimensions].merge!(:function => "request") })
           end
         end
 
@@ -71,6 +79,15 @@ module Alephant
             component_meta.options
           )
         end
+
+        def opts
+          {
+            :dimensions => {
+              :module   => "AlephantBrokerLoadStrategy",
+              :class    => "HTTP"
+            }
+          }
+        end
       end
     end
   end

data/lib/alephant/broker/load_strategy/s3/base.rb

@@ -22,9 +22,8 @@ module Alephant
             )
           rescue
             logger.metric(
-              :name  => "BrokerLoadStrategyS3CacheMiss",
-              :unit  => "Count",
-              :value => 1
+              "S3CacheMiss",
+              opts[:dimensions].merge(:function => "load")
             )
             add_s3_headers(
               cache.set(
@@ -47,6 +46,15 @@ module Alephant
 
           private
 
+          def opts
+            {
+              :dimensions => {
+                :module   => "AlephantBrokerLoadStrategyS3",
+                :class    => "Base"
+              }
+            }
+          end
+
           def s3_path(component_meta)
             fail NotImplementedError
           end
@@ -66,9 +74,8 @@ module Alephant
             s3.get s3_path(component_meta)
           rescue AWS::S3::Errors::NoSuchKey, InvalidCacheKey
             logger.metric(
-              :name  => "BrokerLoadStrategyS3InvalidCacheKey",
-              :unit  => "Count",
-              :value => 1
+              "S3InvalidCacheKey",
+              opts[:dimensions].merge(:function => "retrieve_object")
             )
             raise Alephant::Broker::Errors::ContentNotFound
           end

data/lib/alephant/broker/request/asset.rb

@@ -17,8 +17,8 @@ module Alephant
             env.options
           )
         rescue InvalidAssetId
-          logger.metric(:name => "BrokerRequestAssetInvalidAssetId", :unit => "Count", :value => 1)
-          logger.warn 'Broker.Request.Asset.initialize: Exception raised (InvalidAssetId)'
+          logger.metric("InvalidAssetId", opts)
+          logger.error "Broker.Request.Asset.initialize: Exception raised (InvalidAssetId)"
         end
 
         private
@@ -26,6 +26,16 @@ module Alephant
         def component_id(path)
           path.split('/')[2] || (raise InvalidAssetId.new 'No Asset ID specified')
         end
+
+        def opts
+          {
+            :dimensions => {
+              :module   => "AlephantBrokerRequest",
+              :class    => "Asset",
+              :function => "initialize"
+            }
+          }
+        end
       end
     end
   end

data/lib/alephant/broker/response/base.rb

@@ -47,11 +47,17 @@ module Alephant
         end
 
         def log
-          logger.metric(
-            :name  => "BrokerResponse#{status}",
-            :unit  => "Count",
-            :value => 1
-          )
+          logger.metric("BrokerResponse#{status}", opts)
+        end
+
+        def opts
+          {
+            :dimensions => {
+              :module   => "AlephantBrokerResponse",
+              :class    => "Base",
+              :function => "log"
+            }
+          }
         end
       end
     end

data/lib/alephant/broker/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Broker
-    VERSION = "3.5.0"
+    VERSION = "3.5.1"
   end
 end

metadata

@@ -1,281 +1,281 @@
 --- !ruby/object:Gem::Specification
 name: alephant-broker
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Steven Jack
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec-nc
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-nc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: guard
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: pry-remote
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-remote
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: pry-nav
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-nav
   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'
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake-rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rack-test
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: alephant-lookup
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: alephant-lookup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: alephant-cache
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: alephant-cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: alephant-logger
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: alephant-logger
+        version: 1.2.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
+        version: 1.2.0
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: alephant-sequencer
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: alephant-sequencer
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: dalli-elasticache
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: dalli-elasticache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: pmap
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pmap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: faraday
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: crimp
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: crimp
   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'
+  type: :runtime
 description: Brokers requests for alephant components
 email:
 - stevenmajack@gmail.com
@@ -329,7 +329,7 @@ homepage: https://github.com/BBC-News/alephant-broker
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -344,9 +344,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: Brokers requests for alephant components
 test_files: