event_tracer 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c3405136a8481cab1e0af88ad64f86362caa41a
-  data.tar.gz: 2ea5ddc4c86f075b15f13a568c0ceebd13fd3be5
+  metadata.gz: e56b2ea7016745d2ba377a333e9519ef5ee67cfe
+  data.tar.gz: d50a901de9514382b3d51f474c1c424c4cfa86f8
 SHA512:
-  metadata.gz: d1dc0e74037f877d946130b76a9ac6c336f1174601fb6263494341c26298547ca39e6aa0ca48109a107d88412cec8e4cf46408de2f4d7c1dd8cd400e0533b7b5
-  data.tar.gz: 96341db4a9e6967a573d9aa4a0147d55357f5db20630785aff5de44491d129136a157f8ece4939b24e10dd0ce992696e489cdb93e364c391587f4b54251e23e9
+  metadata.gz: a49cc7f8647c7a6ca1b5949179e452b7df5bb0b22bdc6efe4d9a753907acbe813eb2a60bb7eaaa45a0a9649d808c2e5e950d841f2e1be0047b06cfcf171d8d96
+  data.tar.gz: 75de1c117e50cb645f733500c8d5324e93c5012cf0fd0dd4bbb0817683f6ac5e803258888477e0f3050a21304cc29cd7fe11830fb771203d755650c5b8744859

data/lib/event_tracer.rb

@@ -1,4 +1,5 @@
-require "event_tracer/version"
+require 'event_tracer/version'
+require 'event_tracer/log_result'
 
 module EventTracer
 
@@ -16,30 +17,68 @@ module EventTracer
 
   LOG_TYPES.each do |log_type|
     define_singleton_method log_type do |loggers: nil, **args|
-      begin
-        (selected_loggers(loggers) || @loggers).each do |_code, logger|
-          logger.send(log_type, **args)
-        end
-        true
-      rescue Exception => e
-        p e.message
-        false
-      end
+      send_log_messages(
+        log_type,
+        (selected_loggers(loggers) || @loggers),
+        args
+      )
     end
   end
 
   private
 
+    def self.send_log_messages(log_type, loggers, args)
+      result = Result.new
+
+      loggers.each do |code, logger|
+        begin
+          if args[:action] && args[:message]
+            result.record code, logger.send(log_type, filtered_log_arguments(code, args))
+          else
+            result.record code, LogResult.new(false, 'Fields action & message need to be populated')
+          end
+        rescue Exception => e
+          result.record code, LogResult.new(false, e.message)
+        end
+      end
+
+      result
+    end
+
     def self.selected_loggers(logger_codes)
       return unless logger_codes.is_a?(Array)
       return if logger_codes.detect { |code| !code.is_a?(Symbol) }
 
-      selected_codes = logger_codes.uniq & @loggers.keys
+      selected_codes = logger_codes.uniq & registered_logger_codes
 
       return if selected_codes.empty?
       @loggers.select { |code, _logger| selected_codes.include?(code) }
     end
 
+    def self.filtered_log_arguments(logger_code, args)
+      blacklisted_logger_keys = registered_logger_codes - [logger_code]
+
+      args.reject do |key, _value|
+        blacklisted_logger_keys.include?(key)
+      end
+    end
+
+    def self.registered_logger_codes
+      @loggers.keys
+    end
+
+    class Result
+      attr_reader :records
+
+      def initialize
+        @records = {}
+      end
+
+      def record(logger_code, outcome)
+        records[logger_code] = outcome
+      end
+    end
+
 end
 
 project_root = File.dirname(File.absolute_path(__FILE__))

data/lib/event_tracer/appsignal_logger.rb

@@ -14,11 +14,16 @@ module EventTracer
 
     LOG_TYPES.each do |log_type|
       define_method log_type do |**args|
-        SUPPORTED_METRICS.each do |metric|
-          next unless args[:appsignal] && args[:appsignal][metric].is_a?(Hash)
-          send_metric(metric, args[:appsignal][metric]) unless args[:appsignal][metric].empty?
+        return LogResult.new(false, "Invalid appsignal config") unless args[:appsignal] && args[:appsignal].is_a?(Hash)
+
+        applied_metrics(args[:appsignal]).each do |metric|
+          metric_args = args[:appsignal][metric]
+          return LogResult.new(false, "Appsignal metric #{metric} invalid") unless metric_args && metric_args.is_a?(Hash) 
+
+          send_metric metric, metric_args
         end
-        true
+
+        LogResult.new(true)
       end
     end
 
@@ -27,6 +32,10 @@ module EventTracer
       attr_reader :appsignal, :decoratee
       alias_method :appsignal, :decoratee
 
+      def applied_metrics(appsignal_args)
+        appsignal_args.keys.select { |metric| SUPPORTED_METRICS.include?(metric) }
+      end
+
       def send_metric(metric, payload)
         payload.each do |increment, value|
           appsignal.send(metric, increment, value)

data/lib/event_tracer/base_logger.rb

@@ -9,6 +9,7 @@ module EventTracer
     LOG_TYPES.each do |log_type|
       define_method log_type do |*args|
         send_message(log_type, *args)
+        LogResult.new(true)
       end
     end
 
@@ -17,11 +18,9 @@ module EventTracer
       attr_reader :logger, :decoratee
       alias_method :logger, :decoratee
 
-      # execute only if there's a message to be logged
-      def send_message(log_method, action: nil, simple_message: nil, **args)
-        return false unless simple_message || args[:message]
-        message_to_send = simple_message ? simple_message : args.to_json
-        logger.send(log_method, "[#{action}] #{message_to_send}")
+      # EventTracer ensures action & message is always populated
+      def send_message(log_method, action:, message:, **args)
+        logger.send(log_method, "[#{action}] #{message} #{args.to_json}")
       end
 
   end

data/lib/event_tracer/log_result.rb

@@ -0,0 +1,4 @@
+module EventTracer
+  class LogResult < Struct.new(:success?, :error)
+  end
+end

data/lib/event_tracer/version.rb

@@ -1,3 +1,3 @@
 module EventTracer
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_tracer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - melvrickgoh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-07 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,6 +64,7 @@ files:
 - lib/event_tracer/appsignal_logger.rb
 - lib/event_tracer/base_logger.rb
 - lib/event_tracer/basic_decorator.rb
+- lib/event_tracer/log_result.rb
 - lib/event_tracer/version.rb
 homepage: https://github.com/melvrickgoh/event_tracer
 licenses: