event_tracer 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0c3405136a8481cab1e0af88ad64f86362caa41a
-  data.tar.gz: 2ea5ddc4c86f075b15f13a568c0ceebd13fd3be5
+SHA256:
+  metadata.gz: 72b9ead92b130709f1d0a48bac3508af836e65467b8815aa733c4f7101308472
+  data.tar.gz: 47dce77a79c44aa0c012f06a79f3ec3180777f107658c95d1b88d623f33efeba
 SHA512:
-  metadata.gz: d1dc0e74037f877d946130b76a9ac6c336f1174601fb6263494341c26298547ca39e6aa0ca48109a107d88412cec8e4cf46408de2f4d7c1dd8cd400e0533b7b5
-  data.tar.gz: 96341db4a9e6967a573d9aa4a0147d55357f5db20630785aff5de44491d129136a157f8ece4939b24e10dd0ce992696e489cdb93e364c391587f4b54251e23e9
+  metadata.gz: 2c421202ce3c265caa5db1c61d8138252b3bf4b8944de665569f3794b26ea1753e64023fda526577af4b36bb82e4c6724f89d5f823b9e2750a004830b206bafc
+  data.tar.gz: 005d7c0b9b652e5020bce39afa4619c2774db3a4101d0981dcf48ee0d2dc9568c053b66268d403ef6ab599f7d16a1c9d4053adea3f2e618767e356344e252cf2

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

@@ -7,6 +7,7 @@ require_relative './basic_decorator'
 #
 # Usage: EventTracer.register :appsignal, EventTracer::AppsignalLogger.new(Appsignal)
 #        appsignal_logger.info appsignal: { increment_counter: { counter_1: 1, counter_2: 2 }, set_gauge: { gauge_1: 1 } }
+#        appsignal_logger.info appsignal: { set_gauge: { gauge_1: { value: 1, tags: { region: 'eu' } } } }
 module EventTracer
   class AppsignalLogger < BasicDecorator
 
@@ -14,11 +15,18 @@ 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
+        rescue InvalidTagError => e
+          return LogResult.new(false, e.message)
         end
-        true
+
+        LogResult.new(true)
       end
     end
 
@@ -27,11 +35,29 @@ 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)
+        payload.each do |increment, attribute|
+          if attribute.is_a?(Hash)
+            begin
+              appsignal.send(
+                metric,
+                increment,
+                attribute.fetch(:value),
+                attribute.fetch(:tags)
+              )
+            rescue KeyError
+              raise InvalidTagError, "Appsignal payload { #{increment}: #{attribute} } invalid"
+            end
+          else
+            appsignal.send(metric, increment, attribute)
+          end
         end
       end
-
   end
+
+  class InvalidTagError < StandardError; end
 end

data/lib/event_tracer/base_logger.rb

@@ -7,8 +7,9 @@ module EventTracer
   class BaseLogger < BasicDecorator
 
     LOG_TYPES.each do |log_type|
-      define_method log_type do |*args|
-        send_message(log_type, *args)
+      define_method log_type do |**args|
+        send_message(log_type, **args)
+        LogResult.new(true)
       end
     end
 
@@ -17,11 +18,10 @@ 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)
+        data = args.merge(action: action, message: message)
+        logger.public_send(log_method, data)
       end
 
   end

data/lib/event_tracer/basic_decorator.rb

@@ -1,3 +1,5 @@
+require 'delegate'
+
 module EventTracer
   class BasicDecorator < Delegator
 
@@ -15,4 +17,4 @@ module EventTracer
     end
 
   end
-end
+end

data/lib/event_tracer/datadog_logger.rb

@@ -0,0 +1,75 @@
+require_relative '../event_tracer'
+require_relative './basic_decorator'
+# NOTES
+# Datadog interface to send our usual actions
+# BasicDecorator adds a transparent interface on top of the datadog interface
+#
+# Usage: EventTracer.register :datadog, EventTracer::DataDogLogger.new(DataDog)
+#        data_dog_logger.info datadog: { count: { counter_1: 1, counter_2: 2 }, set: { gauge_1: 1 } }
+#        data_dog_logger.info datadog: { count: { counter_1: { value: 1, tags: ['tag1, tag2']} } }
+
+module EventTracer
+  class DatadogLogger < BasicDecorator
+
+    class InvalidTagError < StandardError; end
+
+    SUPPORTED_METRICS ||= %i[count set distribution gauge histogram].freeze
+
+    LOG_TYPES.each do |log_type|
+      define_method log_type do |**args|
+        return LogResult.new(false, 'Invalid datadog config') unless args[:datadog]&.is_a?(Hash)
+
+        applied_metrics(args[:datadog]).each do |metric|
+          metric_args = args[:datadog][metric]
+          return LogResult.new(false, "Datadog metric #{metric} invalid") unless metric_args.is_a?(Hash)
+
+          send_metric metric, metric_args
+        end
+
+        LogResult.new(true)
+      end
+    end
+
+    private
+
+    attr_reader :datadog, :decoratee
+    alias_method :datadog, :decoratee
+
+    def applied_metrics(datadog_args)
+      datadog_args.keys.select { |metric| SUPPORTED_METRICS.include?(metric) }
+    end
+
+    def send_metric(metric, payload)
+      payload.each do |increment, attribute|
+        if attribute.is_a?(Hash)
+          begin
+            datadog.public_send(
+              metric,
+              increment,
+              attribute.fetch(:value),
+              build_options(attribute[:tags])
+            )
+          rescue KeyError
+            raise InvalidTagError, "Datadog payload { #{increment}: #{attribute} } invalid"
+          end
+        else
+          datadog.public_send(metric, increment, attribute)
+        end
+      end
+    end
+
+    def build_options(tags)
+      return {} unless tags
+
+      formattted_tags =
+        if tags.is_a?(Array)
+          tags
+        else
+          tags.inject([]) do |acc, (tag, value)|
+            acc << "#{tag}:#{value}"
+          end
+        end
+      { tags: formattted_tags }
+    end
+  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.2.2'.freeze
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: event_tracer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - melvrickgoh
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-01-07 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -64,12 +64,14 @@ files:
 - lib/event_tracer/appsignal_logger.rb
 - lib/event_tracer/base_logger.rb
 - lib/event_tracer/basic_decorator.rb
+- lib/event_tracer/datadog_logger.rb
+- lib/event_tracer/log_result.rb
 - lib/event_tracer/version.rb
 homepage: https://github.com/melvrickgoh/event_tracer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib/event_tracer
@@ -85,9 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Thin wrapper for formatted logging/ metric services to be used as a single
   service