conrad 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 178acce18a6f1cd584f74d8bcf4d7d181f6d240ec7e3df10c644aa894f4e9b7b
-  data.tar.gz: 88bd011a135527d7068b85ebf94c9b037205622d475798ae029cf9f2786d446e
+  metadata.gz: dca0b05c54f60645fece80d8226d43d6130afb47aac653d8bb92090b619c7812
+  data.tar.gz: 26a24ce8ec5288ab2847fda11442c13dbba14addd883dd2931d32ef1da240222
 SHA512:
-  metadata.gz: 60998b354a36ac3e14160805d012f323c2362e20ffd92eee9c3a65e605af6ecd394d40f8f649e39cdec222de701faea8b6dcc266aedf6c5b3bebe063c5866dd3
-  data.tar.gz: 48e969b3e326cf32dc6270412840025077443abbe8a71ad62cd6f88ca3eeff6519608bbfced6851df7f3a3296a3bca7e48808eaf894003d264e23a62c9f4c659
+  metadata.gz: 3f9023ef66bb257ad4d9ceaa25b4ce63e646128c67e11de7fda8a765622235eefebfc83019a6ff4f0349ce0134b19793c689c0319f07e9e4e2af9e3f5982442d
+  data.tar.gz: fa8f34c73693be7666ee7ccadd9ba54f69d716c197ced407d5788a2a0205dea7755771fd4d359e2362befff766caae9173e89fb183fb757ec0e230c0b335a7c2

data/lib/conrad/collector.rb

@@ -37,6 +37,10 @@ module Conrad
       # instead be sent one-by-one. Defaults to false.
       attr_accessor :default_emit_as_batch
 
+      # Allows assigning a default logger to use for logging out of the gem.
+      # Should respond to #debug, #info, #warn, #error, and #fatal.
+      attr_accessor :default_logger
+
       # @return [Conrad::Collector] the collector for a given Thread that is
       #   currently active
       def current
@@ -79,6 +83,9 @@ module Conrad
     attr_accessor :emit_as_batch
     alias emit_as_batch? emit_as_batch
 
+    # Logger object used for sending log events
+    attr_accessor :logger
+
     # @param processors [Array<#call>] set of processors to run. Defaults to
     #   processors as configured for the class.
     # @param formatter [#call] Formatter to use. Defaults to
@@ -91,7 +98,8 @@ module Conrad
       processors: self.class.default_processors,
       formatter: self.class.default_formatter,
       emitter: self.class.default_emitter,
-      emit_as_batch: self.class.default_emit_as_batch
+      emit_as_batch: self.class.default_emit_as_batch,
+      logger: self.class.default_logger
     )
       @events = []
       @event_metadata = {}
@@ -100,6 +108,7 @@ module Conrad
       @formatter = formatter
       @emitter = emitter
       @emit_as_batch = emit_as_batch
+      @logger = logger
     end
 
     # Adds an event to the Collector to be audited at a later time. The
@@ -123,13 +132,18 @@ module Conrad
 
     # Records the events currently in the collection then clears the state of
     # the Collector by emptying the events stack and clearing out the metadata.
+    #
+    # @note Currently for emitting individual events, if an error is raised then
+    #   a log message will be attempted using the configured logger. For batch
+    #   emitted events, the error will be allowed to bubble up. This is to
+    #   prevent the unexpected loss of events if a single one is malformed.
     def record_events
       if emit_as_batch?
         record_events_as_batch
       else
         record_individual_events
       end
-
+    ensure
       reset_state
     end
 
@@ -140,6 +154,15 @@ module Conrad
       @processors = processors
     end
 
+    # Adds the given hash of data to the already existing event metadata
+    #
+    # @param new_metadata [Hash]
+    #
+    # @return nothing
+    def add_metadata(new_metadata)
+      event_metadata.merge!(new_metadata)
+    end
+
     private
 
     attr_reader :processor_stack
@@ -156,7 +179,11 @@ module Conrad
 
     def record_individual_events
       events.each do |event|
-        emitter.call(event)
+        begin
+          emitter.call(event)
+        rescue StandardError => e
+          write_log(:error, e)
+        end
       end
     end
 
@@ -164,5 +191,11 @@ module Conrad
       event_metadata.clear
       events.clear
     end
+
+    def write_log(level, data)
+      return unless logger
+
+      logger.public_send(level, data)
+    end
   end
 end

data/lib/conrad/version.rb

@@ -1,5 +1,5 @@
 # :nodoc:
 module Conrad
   # :nodoc:
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conrad
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jonathon Anderson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk