event_tracer 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc787e6f2e531d8525792eec4d55f3576f7b6543e356319fce7c065c436385d6
-  data.tar.gz: 22172cf85886ee0b668820d55bd13346997cd648b542337cc982c91510f01f50
+  metadata.gz: 4e70e560e8704ed46e36010878ec3419edbf1b0f6674c82b92a28fbe17ea0caf
+  data.tar.gz: 6c2c3fa61d240cd7ea67460042125a030576f44797c002b3359a8fb547cf8af4
 SHA512:
-  metadata.gz: d2afa747344e9e07aa85fa1d22a6612fca83df74e2bcfeb384b4f91e742e2d4a545c1070ceb9006592dff7bc97fefefe40ed4f326002f7f76119be24e9e26287
-  data.tar.gz: c176243abadde0675d267138476b2dbe9cbe20f78a3d49a479c96e9a086abb83ff4df859da65029aadb115d7d42a83fddf630de32ed797e7f7c8d930dec05fcf
+  metadata.gz: cc24ff64d2d48630c583a62fe53e9d1e328ad8fd4eed07a22fd24efda21b8f4478bf9f1f3736c54f50437a088cc0bae374d7f825e237275b06ef3ffd6951e438
+  data.tar.gz: 66b76929a73eddc3e136874729c96e8e9b3cda82131b6799d92c4266445ebc3af4fa2c2985c2698d84fe9f541d37ceecf1e9d80ff051bcece76fe93866e84c03

data/lib/event_tracer/appsignal_logger.rb

@@ -1,4 +1,4 @@
-require_relative './basic_decorator'
+require_relative './metric_logger'
 
 # NOTES
 # Appsignal interface to send our usual actions
@@ -10,55 +10,32 @@ require_relative './basic_decorator'
 #        appsignal_logger.info metrics: [:counter_1, :counter_2]
 #        appsignal_logger.info metrics: { counter_1: { type: :counter, value: 1 }, gauce_2: { type: :gauce, value: 10 } }
 module EventTracer
-  class AppsignalLogger < BasicDecorator
+  class AppsignalLogger < MetricLogger
 
     SUPPORTED_METRIC_TYPES = {
       counter: :increment_counter,
       distribution: :add_distribution_value,
       gauge: :set_gauge
-    }
+    }.freeze
     DEFAULT_METRIC_TYPE = :increment_counter
     DEFAULT_COUNTER = 1
 
-    attr_reader :allowed_tags
-
     def initialize(decoratee, allowed_tags: [])
       super(decoratee)
       @allowed_tags = allowed_tags.freeze
     end
 
-    LOG_TYPES.each do |log_type|
-      define_method log_type do |**args|
-        metrics = args[:metrics]
-
-        return fail_result('Invalid appsignal config') unless valid_args?(metrics)
-        return success_result if metrics.empty?
-
-        tags = args.slice(*allowed_tags)
-
-        case metrics
-        when Array
-          metrics.each do |metric|
-            appsignal.public_send(DEFAULT_METRIC_TYPE, metric, DEFAULT_COUNTER, tags)
-          end
-        when Hash
-          metrics.each do |metric_name, metric_payload|
-            payload = metric_payload.transform_keys(&:to_sym)
-            metric_type = SUPPORTED_METRIC_TYPES[payload.fetch(:type).to_sym]
-            appsignal.public_send(metric_type, metric_name, payload.fetch(:value), tags) if metric_type
-          end
-        end
+    private
 
-        success_result
+      def send_metric(metric_type, metric_name, value, tags)
+        appsignal.public_send(metric_type, metric_name, value, tags)
       end
-    end
 
-    private
+      def build_tags(args)
+        args.slice(*allowed_tags)
+      end
 
       alias_method :appsignal, :decoratee
 
-      def valid_args?(metrics)
-        metrics && (metrics.is_a?(Hash) || metrics.is_a?(Array))
-      end
   end
 end

data/lib/event_tracer/buffer.rb

@@ -43,7 +43,10 @@ module EventTracer
     def flush
       data = []
 
-      data << buffer.shift[:item] until buffer.empty?
+      # NOTE: We need to use this to avoid race-condition
+      buffer.cycle do
+        data << buffer.shift[:item]
+      end
 
       data
     end

data/lib/event_tracer/datadog_logger.rb

@@ -1,4 +1,5 @@
-require_relative './basic_decorator'
+require_relative './metric_logger'
+
 # NOTES
 # Datadog interface to send our usual actions
 # BasicDecorator adds a transparent interface on top of the datadog interface
@@ -10,7 +11,7 @@ require_relative './basic_decorator'
 #        data_dog_logger.info metrics: { counter_1: { type: :counter, value: 1}, gauce_2: { type: :gauce, value: 10 } }
 
 module EventTracer
-  class DatadogLogger < BasicDecorator
+  class DatadogLogger < MetricLogger
 
     SUPPORTED_METRIC_TYPES = {
       counter: :count,
@@ -22,50 +23,20 @@ module EventTracer
     DEFAULT_METRIC_TYPE = :count
     DEFAULT_COUNTER = 1
 
-    attr_reader :allowed_tags
-
     def initialize(decoratee, allowed_tags: [], default_tags: {})
       super(decoratee)
       @allowed_tags = allowed_tags.freeze
       @default_tags = default_tags.freeze
     end
 
-    LOG_TYPES.each do |log_type|
-      define_method log_type do |**args|
-        metrics = args[:metrics]
-
-        return fail_result('Invalid Datadog config') unless valid_args?(metrics)
-        return success_result if metrics.empty?
-
-        tags = build_tags(args)
-
-        case metrics
-        when Array
-          metrics.each do |metric|
-            datadog.public_send(DEFAULT_METRIC_TYPE, metric, DEFAULT_COUNTER, tags: tags)
-          end
-        when Hash
-          metrics.each do |metric_name, metric_payload|
-            payload = metric_payload.transform_keys(&:to_sym)
-            metric_type = SUPPORTED_METRIC_TYPES[payload.fetch(:type).to_sym]
-            datadog.public_send(metric_type, metric_name, payload.fetch(:value), tags: tags) if metric_type
-          end
-        end
+    private
 
-        success_result
-      end
+    def send_metric(metric_type, metric_name, value, tags)
+      datadog.public_send(metric_type, metric_name, value, tags: tags)
     end
 
-    private
-
     alias_method :datadog, :decoratee
 
-    attr_reader :default_tags
-
-    def valid_args?(metrics)
-      metrics && (metrics.is_a?(Hash) || metrics.is_a?(Array))
-    end
-
     def build_tags(args)
       default_tags.merge(args.slice(*allowed_tags)).map do |tag, value|
         "#{tag}:#{value}"

data/lib/event_tracer/metric_logger.rb

@@ -0,0 +1,42 @@
+require_relative './basic_decorator'
+
+module EventTracer
+  class MetricLogger < BasicDecorator
+
+    attr_reader :allowed_tags
+
+    LOG_TYPES.each do |log_type|
+      define_method log_type do |**args|
+        metrics = args[:metrics]
+
+        return fail_result("Invalid metrics for #{self.class.name}") unless valid_args?(metrics)
+        return success_result if metrics.empty?
+
+        tags = build_tags(args)
+
+        case metrics
+        when Array
+          metrics.each do |metric|
+            send_metric(self.class::DEFAULT_METRIC_TYPE, metric, self.class::DEFAULT_COUNTER, tags)
+          end
+        when Hash
+          metrics.each do |metric_name, metric_payload|
+            payload = metric_payload.transform_keys(&:to_sym)
+            metric_type = self.class::SUPPORTED_METRIC_TYPES[payload.fetch(:type).to_sym]
+            send_metric(metric_type, metric_name, payload.fetch(:value), tags) if metric_type
+          end
+        end
+
+        success_result
+      end
+    end
+
+    private
+
+    attr_reader :default_tags
+
+    def valid_args?(metrics)
+      metrics && (metrics.is_a?(Hash) || metrics.is_a?(Array))
+    end
+  end
+end

data/lib/event_tracer/prometheus_logger.rb

@@ -1,13 +1,14 @@
+require_relative './metric_logger'
+
 module EventTracer
-  class PrometheusLogger < BasicDecorator
+  class PrometheusLogger < MetricLogger
 
     SUPPORTED_METRIC_TYPES = {
       counter: :increment_count,
       gauge: :set_gauge
     }.freeze
-    DEFAULT_INCREMENT = 1
-
-    attr_reader :allowed_tags
+    DEFAULT_METRIC_TYPE = :increment_count
+    DEFAULT_COUNTER = 1
 
     def initialize(prometheus, allowed_tags: [], default_tags: {}, raise_if_missing: true)
       super(prometheus)
@@ -16,49 +17,15 @@ module EventTracer
       @raise_if_missing = raise_if_missing
     end
 
-    LOG_TYPES.each do |log_type|
-      define_method log_type do |**args|
-        metrics = args[:metrics]
-
-        return fail_result('Invalid metrics for Prometheus') unless valid_args?(metrics)
-        return success_result if metrics.empty?
-
-        labels = build_metric_labels(args)
-
-        case metrics
-        when Array
-          metrics.each do |metric_name|
-            increment_count(metric_name, DEFAULT_INCREMENT, labels: labels)
-          end
-        when Hash
-          metrics.each do |metric_name, metric_payload|
-            payload = metric_payload.transform_keys(&:to_sym)
-            metric_type = SUPPORTED_METRIC_TYPES[payload.fetch(:type).to_sym]
-
-            if metric_type
-              send(
-                metric_type,
-                metric_name,
-                payload.fetch(:value),
-                labels: labels
-              )
-            end
-          end
-        end
+    private
 
-        success_result
+      def send_metric(metric_type, metric_name, value, labels)
+        send(metric_type, metric_name, value, labels: labels)
       end
-    end
-
-    private
 
       alias_method :prometheus, :decoratee
 
-      attr_reader :default_tags, :raise_if_missing
-
-      def valid_args?(metrics)
-        metrics && (metrics.is_a?(Hash) || metrics.is_a?(Array))
-      end
+      attr_reader :raise_if_missing
 
       def increment_count(metric_name, value, labels:)
         metric = get_metric(metric_name.to_sym, :counter)
@@ -84,7 +51,7 @@ module EventTracer
         )
       end
 
-      def build_metric_labels(args)
+      def build_tags(args)
         allowed_tags.inject(default_tags) do |metric_labels, tag|
           metric_labels.merge(tag => args[tag])
         end

data/lib/event_tracer/version.rb

@@ -1,3 +1,3 @@
 module EventTracer
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.6.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_tracer
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - melvrickgoh
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -102,6 +102,7 @@ files:
 - lib/event_tracer/dynamo_db/worker.rb
 - lib/event_tracer/error_with_payload.rb
 - lib/event_tracer/log_result.rb
+- lib/event_tracer/metric_logger.rb
 - lib/event_tracer/prometheus_logger.rb
 - lib/event_tracer/version.rb
 homepage: https://github.com/melvrickgoh/event_tracer