nexus_semantic_logger 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f13512ab6f95abaa8a782f2718438d924eeca7dd1ae014c0f5419b14f0b13bfa
-  data.tar.gz: 54594c63bca42969a1639e1d6295f51a6b4faf5222e340c8dbd0e00a9e16390b
+  metadata.gz: 71ea65404e5b4980ffa32eda0d91588142cd2571252117f1f651f566f506bb98
+  data.tar.gz: ade58c1fcc429f832d26ed23786d859068cefb6e33a1f7b5b32d2627de999c91
 SHA512:
-  metadata.gz: bc42282551ce7a194ab0e4891296891cfb0520943f7c4ba383c259a90ef59d035aacdc756c11f5ab2d18d17175e655d919d6d46f50399c8c51bde831343801e1
-  data.tar.gz: b4e966ed8e476ede32c07cfb85e16ebfb00337d7b7ba8fb9989bae1f180a2f170349f78b617b5aeae2d0c4edacf2b16d77748e566db7e89967fb8004eea3c186
+  metadata.gz: 0d488c447d1e7f14c49a0c33ff0ee79ff512346ea17557c68a91e4b204dd37d9bdafb04383ed4db1c7c2c71d15273a9375c49c1e031a9a710e2345b34f143db9
+  data.tar.gz: 3712bf027d2fc5668c3a593d8cbd79457aef86d69a19e5602bfe4929ba301e14f6ce9006680acfbf4ce777ba5ae42f18ee45cdb6fded3a3fa4d1e0f8c284479b

data/lib/nexus_semantic_logger/application.rb

@@ -39,6 +39,8 @@ module NexusSemanticLogger
 
       NexusSemanticLogger::DatadogTracer.new(service)
 
+      SemanticLogger.on_log(NexusSemanticLogger::LoggerMetricsSubscriber.new)
+
       logger.info('SemanticLogger initialised.', level: config.log_level)
 
       config.after_initialize do

data/lib/nexus_semantic_logger/datadog_singleton.rb

@@ -17,7 +17,7 @@ module NexusSemanticLogger
     # @param [String] metric Metric name.
     # @param [Array<String>] tags Additional tags.
     def increment(metric, tags: [])
-      statsd&.increment(metric, tags: global_tags + tags)
+      statsd&.increment(metric, tags: combine_tags(tags))
       flush
     end
 
@@ -25,7 +25,7 @@ module NexusSemanticLogger
     # @param [String] metric Metric name.
     # @param [Array<String>] tags Additional tags.
     def decrement(metric, tags: [])
-      statsd&.decrement(metric, tags: global_tags + tags)
+      statsd&.decrement(metric, tags: combine_tags(tags))
       flush
     end
 
@@ -34,7 +34,7 @@ module NexusSemanticLogger
     # @param [Integer] ms Timing in milliseconds.
     # @param [Array<String>] tags Additional tags.
     def timing(metric, ms, tags: [])
-      statsd&.timing(metric, ms, tags: global_tags + tags)
+      statsd&.timing(metric, ms, tags: combine_tags(tags))
       flush
     end
 
@@ -43,7 +43,7 @@ module NexusSemanticLogger
     # @param [Numeric] value Distribution value.
     # @param [Array<String>] tags Additional tags.
     def distribution(metric, value, tags: [])
-      statsd&.distribution(metric, value, tags: global_tags + tags)
+      statsd&.distribution(metric, value, tags: combine_tags(tags))
       flush
     end
 
@@ -52,8 +52,18 @@ module NexusSemanticLogger
     # @param [Numeric] value Gauge value.
     # @param [Array<String>] tags Additional tags.
     def gauge(metric, value, tags: [])
-      statsd&.gauge(metric, value, tags: global_tags + tags)
+      statsd&.gauge(metric, value, tags: combine_tags(tags))
       flush
     end
+
+    private
+
+    # Safely combine the global tags with the supplied tags.
+    def combine_tags(tags)
+      final_tags = []
+      final_tags += global_tags unless global_tags.nil?
+      final_tags += tags unless tags.nil?
+      final_tags
+    end
   end
 end

data/lib/nexus_semantic_logger/logger_metrics_subscriber.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+require 'semantic_logger'
+
+module NexusSemanticLogger
+  # Sends SemanticLogger metrics to statsd.
+  # This is a candidate to move into the nexus_semantic_logger gem if it becomes widely useful.
+  # See https://logger.rocketjob.io/metrics.html
+  # Based on https://github.com/reidmorrison/semantic_logger/blob/master/lib/semantic_logger/metric/statsd.rb
+  class LoggerMetricsSubscriber < SemanticLogger::Subscriber
+    def call(log)
+      log(log) if should_log?(log)
+    end
+
+    def log(log)
+      metric = log.metric
+      tags = log.payload.nil? ? nil : []
+      log.payload&.each_pair { |key, value| tags << "#{key}:#{value}" }
+      if (duration = log.duration)
+        NexusSemanticLogger.metrics.timing(metric, duration, tags: tags)
+      else
+        amount = (log.metric_amount || 1).round
+        if amount.negative?
+          NexusSemanticLogger.metrics.decrement(metric, tags: tags)
+        else
+          NexusSemanticLogger.metrics.increment(metric, tags: tags)
+        end
+      end
+    end
+
+    # Only forward log entries that contain metrics.
+    def should_log?(log)
+      # Does not support metrics with dimensions.
+      log.metric && !log.dimensions && meets_log_level?(log) && !filtered?(log)
+    end
+  end
+end

data/lib/nexus_semantic_logger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module NexusSemanticLogger
-  # Leave this as 1.8.0 in order for CI process to replace with the tagged version.
-  VERSION = '1.8.0'
+  # Leave this as 1.9.0 in order for CI process to replace with the tagged version.
+  VERSION = '1.9.0'
 end

data/lib/nexus_semantic_logger.rb

@@ -4,6 +4,7 @@ require 'nexus_semantic_logger/application'
 require 'nexus_semantic_logger/datadog_formatter'
 require 'nexus_semantic_logger/datadog_singleton'
 require 'nexus_semantic_logger/datadog_tracer'
+require 'nexus_semantic_logger/logger_metrics_subscriber'
 
 module NexusSemanticLogger
   # Get application wide object for sending metrics.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nexus_semantic_logger
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Johnathon Harris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 2022-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -112,6 +112,7 @@ files:
 - lib/nexus_semantic_logger/datadog_singleton.rb
 - lib/nexus_semantic_logger/datadog_tracer.rb
 - lib/nexus_semantic_logger/extensions/action_dispatch/debug_exceptions.rb
+- lib/nexus_semantic_logger/logger_metrics_subscriber.rb
 - lib/nexus_semantic_logger/sneakers_metrics.rb
 - lib/nexus_semantic_logger/version.rb
 - nexus_semantic_logger.gemspec