alephant-broker 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c13b7a9cc8002ce3f9aa7e486c365f043869ac3
-  data.tar.gz: 4b1e0a001451521746c6d2f716b8291f0f73c22b
+  metadata.gz: 52e4a653a307d66e0da474f0dfd58bb93a5119a5
+  data.tar.gz: 09de927d1e746c1366a53fabc46d258a515bd69b
 SHA512:
-  metadata.gz: 3cb2662440354ddb7a1d789c1ad268fb008953566d903cb8e051f34dc9850bfd6e87261a8b86ae0c5cb3755b07d3e80d6f862f116b5b6661758f8f63f1ca853e
-  data.tar.gz: c845bd7e4e2b8cb82dcf7ff09cd996adad013c3cafa3321f49e9766dcbe2257bcfc88bee6bc12f31f3d1a23ff8d57ab532498df1085c32f71c1f3db30fb13393
+  metadata.gz: 2c8e3714596e1493e016ce1c5cb86d918620466f599e3f2515899ebe24de938e8cd7861f5e4fc7eeac95f7fb1b74111040badb9f33f405f14c625463e0400286
+  data.tar.gz: 8294f0c17edb5f12b706f88aa7e3588973a82098d02880170fa7b5d4f6ef1b7cfafc892b0c52e643a0318c0e8f6bf8c8d4eddf98feb1b6b49fb2a605ecb7ed70

data/.ruby-version

@@ -1 +1 @@
-jruby-1.7
+jruby-1.7.17

data/lib/alephant/broker/cache.rb

@@ -15,7 +15,7 @@ module Alephant
             @@client ||= @@elasticache.client
           else
             logger.debug "Broker::Cache::Client#initialize: No config endpoint, NullClient used"
-            logger.metric("NoConfigEndpoint", opts.merge(:function => "initialize"))
+            logger.metric "NoConfigEndpoint"
             @@client = NullClient.new
           end
         end
@@ -25,10 +25,7 @@ module Alephant
             versioned_key = versioned key
             result = @@client.get versioned_key
             logger.info "Broker::Cache::Client#get key: #{versioned_key} - #{result ? 'hit' : 'miss'}"
-            logger.metric(
-              "GetKeyMiss",
-              opts[:dimensions].merge(:function => "get")
-            ) unless result
+            logger.metric "GetKeyMiss" unless result
             result ? result : set(key, block.call)
           rescue StandardError => e
             block.call if block_given?
@@ -41,15 +38,6 @@ module Alephant
 
         private
 
-        def opts
-          {
-            :dimensions => {
-              :module   => "AlephantBrokerCache",
-              :class    => "Client"
-            }
-          }
-        end
-
         def config_endpoint
           Broker.config['elasticache_config_endpoint']
         end

data/lib/alephant/broker/component_factory.rb

@@ -20,25 +20,13 @@ module Alephant
         )
       rescue Alephant::Broker::Errors::ContentNotFound => e
         logger.warn "Broker.ComponentFactory.create: Exception raised (ContentNotFound)"
-        logger.metric("ContentNotFound", opts)
+        logger.metric "ContentNotFound"
         ErrorComponent.new(component_meta, 404, e)
       rescue => e
         logger.warn "Broker.ComponentFactory.create: Exception raised (#{e.message}, #{e.backtrace.join('\n')})"
-        logger.metric("ExceptionRaised", opts)
+        logger.metric "ExceptionRaised"
         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

@@ -51,20 +51,10 @@ module Alephant
           JSON.parse(json)
         rescue JSON::ParserError => e
           logger.warn "Broker.environment#data: ParserError"
-          logger.metric("JSONParserError", opts)
+          logger.metric "JSONParserError"
           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,10 +22,7 @@ module Alephant
         def load(component_meta)
           cache_object(component_meta)
         rescue
-          logger.metric(
-            "CacheMiss",
-            opts[:dimensions].merge(:function => "load")
-          )
+          logger.metric "CacheMiss"
           cache.set(component_meta.cache_key, content(component_meta))
         end
 
@@ -59,17 +56,15 @@ module Alephant
 
           Faraday.get(url_for component_meta).tap do |r|
             unless r.success?
-              logger.metric(
-                "ContentNotFound",
-                opts[:dimensions].merge(:function => "request")
-              )
+              logger.metric "ContentNotFound"
               raise Alephant::Broker::Errors::ContentNotFound
             end
 
             request_time = Time.new - before
-            logger.metric("LoadComponentTime", opts.merge(
-              :unit  => "Seconds", :value => request_time,
-            ).tap { |h| h[:dimensions].merge!(:function => "request") })
+            logger.metric("LoadComponentTime",
+                          :unit  => "Seconds",
+                          :value => request_time
+                         )
           end
         end
 
@@ -79,15 +74,6 @@ 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

@@ -21,10 +21,7 @@ module Alephant
               component_meta
             )
           rescue
-            logger.metric(
-              "S3CacheMiss",
-              opts[:dimensions].merge(:function => "load")
-            )
+            logger.metric "S3CacheMiss"
             add_s3_headers(
               cache.set(
                 cache_key(component_meta),
@@ -46,15 +43,6 @@ module Alephant
 
           private
 
-          def opts
-            {
-              :dimensions => {
-                :module   => "AlephantBrokerLoadStrategyS3",
-                :class    => "Base"
-              }
-            }
-          end
-
           def s3_path(component_meta)
             fail NotImplementedError
           end
@@ -73,10 +61,7 @@ module Alephant
             cached = false
             s3.get s3_path(component_meta)
           rescue AWS::S3::Errors::NoSuchKey, InvalidCacheKey
-            logger.metric(
-              "S3InvalidCacheKey",
-              opts[:dimensions].merge(:function => "retrieve_object")
-            )
+            logger.metric "S3InvalidCacheKey"
             raise Alephant::Broker::Errors::ContentNotFound
           end
 

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

@@ -17,7 +17,7 @@ module Alephant
             env.options
           )
         rescue InvalidAssetId
-          logger.metric("InvalidAssetId", opts)
+          logger.metric "InvalidAssetId"
           logger.error "Broker.Request.Asset.initialize: Exception raised (InvalidAssetId)"
         end
 
@@ -26,16 +26,6 @@ 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,17 +47,7 @@ module Alephant
         end
 
         def log
-          logger.metric("BrokerResponse#{status}", opts)
-        end
-
-        def opts
-          {
-            :dimensions => {
-              :module   => "AlephantBrokerResponse",
-              :class    => "Base",
-              :function => "log"
-            }
-          }
+          logger.metric "BrokerResponse#{status}"
         end
       end
     end

data/lib/alephant/broker/version.rb

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

metadata

@@ -1,281 +1,281 @@
 --- !ruby/object:Gem::Specification
 name: alephant-broker
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - Steven Jack
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-23 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'
+  name: rspec
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rspec-nc
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: guard
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: guard-rspec
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: pry
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: pry-remote
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: pry-nav
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake-rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
+  name: rake-rspec
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
+  name: bundler
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rake
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rack-test
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: alephant-lookup
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: alephant-cache
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: alephant-logger
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
+  name: alephant-logger
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: alephant-sequencer
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: alephant-sequencer
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: dalli-elasticache
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: pmap
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: faraday
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: crimp
   prerelease: false
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Brokers requests for alephant components
 email:
 - stevenmajack@gmail.com