opener-daemons 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8541a83a5ab552b4bd656f4622d7f325072778b8
-  data.tar.gz: 93fc204fba7c1f4c9dcf2c80e7c9697bf87529b2
+  metadata.gz: d343e353902637e8107d0fae767b78ae6f1d5088
+  data.tar.gz: ca6e691a8224d1d8b9fdc10e1fa60b688f4e13c3
 SHA512:
-  metadata.gz: f7afbad52756a4e51e17e2f31c5e79d4288e8498632d0f844fbf7d0d9a7b084e515083754652974633a17a681d88d4a19ea5a9f098b3dfe479d8117b04c34fe1
-  data.tar.gz: 4974100fc4211e97fa4f4cd53c8a2718097c481f7b8e0b2277e716b184f56add575e02e918874257f5a76514085415d1048d32bb9049472c1bfa7c321032e8f4
+  metadata.gz: c4e8da4cb952e4168d1e82dcb7c1a50e60558355618919ed33f0384ea8ebfe948701eb369367dde02fab5f1b5c6894a7de0994ed501bba516331e30978eaf228
+  data.tar.gz: c5b0205a179c591d1389c62696aae256e2973a6b446a91f5885aacef2229597384a3d4af095bad50ad01e3bee6e42cb3855dc377828da1b4af920d63788d10a4

data/lib/opener/daemons/daemon.rb

@@ -75,9 +75,7 @@ module Opener
       # @param [StandardError] error
       #
       def error(error)
-        error, params = unwrap_error(error)
-
-        report_exception(error, params)
+        report_exception(error)
       end
 
       ##
@@ -89,39 +87,29 @@ module Opener
         log_msg = "Finished message #{message.id}"
 
         Core::Syslog.info(log_msg)
+
+      ensure
+        Transaction.reset_current
       end
 
       ##
       # Sends an error to Rollbar.
       #
       # @param [StandardError] error
-      # @param [Hash] parameters
       #
-      def report_exception(error, parameters = {})
+      def report_exception(error)
         if Daemons.rollbar?
           Rollbar.error(
             error,
             :active_threads   => Thread.list.count,
             :ruby_description => RUBY_DESCRIPTION,
-            :parameters       => parameters
+            :parameters       => Transaction.current.parameters
           )
         else
           raise error
         end
-      end
-
-      ##
-      # Takes either a regular error or a `Oni::WrappedError` and unwraps it,
-      # returning the original error and the parameters (if any).
-      #
-      # @param [StandardError] error
-      # @return [Array]
-      #
-      def unwrap_error(error)
-        params = error.respond_to?(:parameters) ? error.parameters : {}
-        error  = error.original_error if error.respond_to?(:original_error)
-
-        return error, params
+      ensure
+        Transaction.reset_current
       end
     end # Daemon
   end # Daemons

data/lib/opener/daemons/transaction.rb

@@ -0,0 +1,56 @@
+module Opener
+  module Daemons
+    ##
+    # 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_daemons_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 Daemons.newrelic?
+          NewRelic::Agent.add_custom_parameters(parameters)
+        end
+      end
+    end # Transaction
+  end # Daemons
+end # Opener

data/lib/opener/daemons/version.rb

@@ -1,5 +1,5 @@
 module Opener
   module Daemons
-    VERSION = '2.2.2'
+    VERSION = '2.3.0'
   end # Daemons
 end # Opener

data/lib/opener/daemons/worker.rb

@@ -39,11 +39,11 @@ module Opener
       # @raise [Oni::WrappedError]
       #
       def process
-        add_newrelic_attributes
+        add_transaction_attributes
 
-        input    = downloader.download(config.input_url)
-        output   = config.component_instance.run(input)
-        object   = uploader.upload(config.identifier, output, config.metadata)
+        input  = downloader.download(config.input_url)
+        output = config.component_instance.run(input)
+        object = uploader.upload(config.identifier, output, config.metadata)
 
         Core::Syslog.info(
           "Wrote output to s3://#{Daemons.output_bucket}/#{object.key}",
@@ -51,14 +51,6 @@ module Opener
         )
 
         submit_callbacks(object)
-
-      rescue Exception => error
-        raise Oni::WrappedError.from(
-          error,
-          :input_url => config.input_url,
-          :callbacks => config.callbacks,
-          :metadata  => config.metadata
-        )
       end
 
       ##
@@ -84,14 +76,13 @@ module Opener
 
       private
 
-      def add_newrelic_attributes
-        if Daemons.newrelic?
-          NewRelic::Agent.add_custom_parameters(
-            :input_url => config.input_url,
-            :callbacks => config.callbacks.join(', '),
-            :metadata  => config.metadata
-          )
-        end
+      def add_transaction_attributes
+        Transaction.current.add_parameters(
+          :input_url  => config.input_url,
+          :identifier => config.identifier,
+          :callbacks  => config.callbacks,
+          :metadata   => config.metadata
+        )
       end
 
       if Daemons.newrelic?

data/lib/opener/daemons.rb

@@ -20,6 +20,7 @@ require_relative 'daemons/pidfile'
 require_relative 'daemons/configuration'
 require_relative 'daemons/downloader'
 require_relative 'daemons/uploader'
+require_relative 'daemons/transaction'
 
 require_relative 'daemons/mapper'
 require_relative 'daemons/worker'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opener-daemons
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Wilco van Duinkerken
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -205,6 +205,7 @@ files:
 - lib/opener/daemons/mapper.rb
 - lib/opener/daemons/option_parser.rb
 - lib/opener/daemons/pidfile.rb
+- lib/opener/daemons/transaction.rb
 - lib/opener/daemons/uploader.rb
 - lib/opener/daemons/version.rb
 - lib/opener/daemons/worker.rb