opener-webservice 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b9a0d7f72b7b86539f4a3dd8b04610a7cf90dce
-  data.tar.gz: f1b8a5540c7938cfee71a5afbb055bd66b325167
+  metadata.gz: 60efcf46d3e5c00cd804fbaace65fe4ac22d5a42
+  data.tar.gz: 2c59b1584c51702482b03a6c86d60939a2b2f0dc
 SHA512:
-  metadata.gz: 1955c6e951925ca16b085bc3db87c4b3181eecef36f800a6fa7af07a0d95d8d199dbe613cbed745da62b1d92ee5070d6d1c4b3a22a87a41158bf2b2b7ed52368
-  data.tar.gz: 8105f3b2517aa72a2fbfdbd789ba0cc2ffcd4991b81f9fa3f786ec02fb7cf4e2fa5e834e758cecdd58ab00a3fbe740a7c04f2f8b803895ae6a200ebc665297b6
+  metadata.gz: aa3ffd21a7473bd15a595466709b01c7f84210c816d5746c36e138f43d5aee591c85f741e54af6d2d474cceab6ddd919c6f845d1c94d0b7ceeca511900bc6919
+  data.tar.gz: 7747fcad14b44ffd8afaab6ca0d14a307ca5c3c0f74c90e294f384f3859250f43513ed250bfdd62ce21e2a2081f3832c9e4a5fb482d049e5298732ef50f747c1

data/lib/opener/webservice.rb

@@ -17,3 +17,4 @@ require_relative 'webservice/error_handler'
 require_relative 'webservice/input_extractor'
 require_relative 'webservice/input_sanitizer'
 require_relative 'webservice/option_parser'
+require_relative 'webservice/transaction'

data/lib/opener/webservice/configuration.rb

@@ -68,6 +68,15 @@ module Opener
         return !!ENV['ROLLBAR_TOKEN']
       end
 
+      ##
+      # Returns `true` if New Relic monitoring should be enabled.
+      #
+      # @return [TrueClass|FalseClass]
+      #
+      def self.newrelic?
+        return !!ENV['NEWRELIC_TOKEN']
+      end
+
       ##
       # Configures Rollbar.
       #

data/lib/opener/webservice/server.rb

@@ -56,7 +56,12 @@ module Opener
       end
 
       error do
-        Rollbar.report_exception(env['sinatra.error'])
+        Rollbar.error(
+          env['sinatra.error'],
+          :parameters => Transaction.current.parameters
+        )
+
+        Transaction.reset_current
 
         halt(
           500,
@@ -145,6 +150,8 @@ module Opener
 
         content_type(ctype)
 
+        Transaction.reset_current
+
         return output
       end
 
@@ -182,6 +189,8 @@ module Opener
       # @return [Array]
       #
       def analyze(options)
+        add_transaction_parameters(options)
+
         comp_options = InputSanitizer.new.whitelist_options(
           options,
           self.class.accepted_params
@@ -262,6 +271,22 @@ module Opener
         CallbackHandler.new.post(next_url, new_payload)
       end
 
+      ##
+      # @param [Hash] options
+      #
+      def add_transaction_parameters(options)
+        # If raw input is given we'll trim it so the payload isn't too large for
+        # Rollbar/New Relic. This uses Hash#merge so we don't modify the
+        # original options variable.
+        if options['input']
+          options = options.merge(
+            'input' => options['input'].byteslice(0, 256)
+          )
+        end
+
+        Transaction.current.add_parameters(options)
+      end
+
       ##
       # Returns a Hash containing the parameters from a JSON payload. The keys
       # of this Hash are returned as _strings_ to prevent Symbol DOS attacks.

data/lib/opener/webservice/transaction.rb

@@ -0,0 +1,56 @@
+module Opener
+  module Webservice
+    ##
+    # Class for storing information of a single transaction in a thread.
+    #
+    # @!attribute [r] parameters
+    #  @return [Hash]
+    #
+    class Transaction
+      attr_reader :parameters
+
+      ##
+      # The name of the key to store the current transaction in.
+      #
+      # @return [Symbol]
+      #
+      THREAD_KEY = :opener_webservices_transaction
+
+      ##
+      # Returns the current transaction.
+      #
+      # @return [Opener::Daemons::Transaction]
+      #
+      def self.current
+        return Thread.current[THREAD_KEY] ||= new
+      end
+
+      ##
+      # Removes the current transaction
+      #
+      def self.reset_current
+        Thread.current[THREAD_KEY] = nil
+      end
+
+      def initialize
+        @parameters = {}
+      end
+
+      ##
+      # Merges the given parameters with the existing ones.
+      #
+      # If New Relic is enabled the parameters are also added to the current
+      # New Relic transaction.
+      #
+      # @param [Hash] parameters
+      #
+      def add_parameters(parameters = {})
+        @parameters = @parameters.merge(parameters)
+
+        if Configuration.newrelic?
+          NewRelic::Agent.add_custom_parameters(parameters)
+        end
+      end
+    end # Transaction
+  end # Webservice
+end # Opener

data/lib/opener/webservice/version.rb

@@ -1,5 +1,5 @@
 module Opener
   module Webservice
-    VERSION = '2.1.3'
+    VERSION = '2.2.0'
   end # Webservice
 end # Opener

data/opener-webservice.gemspec

@@ -18,11 +18,10 @@ Gem::Specification.new do |spec|
   ]).select { |file| File.file?(file) }
 
   spec.add_dependency 'sinatra', '~> 1.4.3'
-  spec.add_dependency 'uuidtools'
   spec.add_dependency 'json'
   spec.add_dependency 'opener-callback-handler', '~> 1.0'
   spec.add_dependency 'httpclient', ['~> 2.0', '>= 2.5.3.3']
-  spec.add_dependency 'opener-core', '~> 2.0'
+  spec.add_dependency 'opener-core', '~> 2.3'
   spec.add_dependency 'puma'
   spec.add_dependency 'slop', '~> 3.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opener-webservice
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - development@olery.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.3
-- !ruby/object:Gem::Dependency
-  name: uuidtools
-  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: json
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +228,7 @@ files:
 - lib/opener/webservice/input_sanitizer.rb
 - lib/opener/webservice/option_parser.rb
 - lib/opener/webservice/server.rb
+- lib/opener/webservice/transaction.rb
 - lib/opener/webservice/uploader.rb
 - lib/opener/webservice/version.rb
 - opener-webservice.gemspec