nexus_semantic_logger 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d90e3661ba7e5c82b2e1777d465df8f88617a3ad8287f8d0b9bdd461f0729a6
-  data.tar.gz: 1217216fdf855b72558510e52a50f0308c10b3e07ccbc80369fb228f0fe51040
+  metadata.gz: 20e028ad18202f320d470e8d8f8d663433385abd129c55b326b4589385ef8fa8
+  data.tar.gz: cecbaf81978d2a5bac1719e8f495dadc0f3846595d104db8a869964e1cc14dda
 SHA512:
-  metadata.gz: a4261cc18604aade1ebd48efcd2cbb680ee26da22c366bcb544c786d42bffdad1a57ec2249f53347f1bcb5dadd2b0c13ff20f8699a7e30131e1e85fb7f1d2244
-  data.tar.gz: f2ea77247cc5e769e1dc7706595b85dc62179ceef8d05f11d78904632cd6cb39c837d64e401e278edf52333a75552dc6de41634f8b6862ac26155d528de9397b
+  metadata.gz: 6d310eb559bf59b3d46c97a5942388dd1b8deda3a3295c5c93d37cb5aff71de31db22c2fbebe8c0d0d392cab245484eaf32c3c0d1b238fd96ac47434d725c8a3
+  data.tar.gz: 3866923bff2765c6c2ebf0eacc3537fc7e31cd64a1e80b26991d5785a51e95dfced9297401516e398d1517288f19f6e0df33a2665f9aa5d9ef023d46f17f0619

data/.gitignore

@@ -0,0 +1 @@
+results/

data/lib/nexus_semantic_logger/datadog_formatter.rb

@@ -22,7 +22,7 @@ module NexusSemanticLogger
       hash[:source] = :rails
       level = hash.delete(:level)
       hash[:status] = level
-      hash[:env] = Rails.env
+      hash[:railsenv] = Rails.env
       hash[:service] = @service
       hash.delete(:application)
       hash.delete(:environment)

data/lib/nexus_semantic_logger/datadog_singleton.rb

@@ -13,8 +13,18 @@ module NexusSemanticLogger
       statsd&.flush(sync: Rails.env.development?) # Force flush sync in development, speed up checks.
     end
 
-    def increment(metric_name)
-      statsd&.increment(metric_name, tags: tags)
+    # Delegate to statsd (if available).
+    # @param [String] metric Metric name.
+    def increment(metric)
+      statsd&.increment(metric, tags: tags)
+      flush
+    end
+
+    # Delegate to statsd (if available).
+    # @param [String] metric Metric name.
+    # @param [Integer] ms Timing in milliseconds.
+    def timing(metric, ms)
+      statsd&.timing(metric, ms, tags: tags)
       flush
     end
   end

data/lib/nexus_semantic_logger/datadog_tracer.rb

@@ -15,13 +15,19 @@ module NexusSemanticLogger
           # By default, runtime metrics from the application are sent to the Datadog Agent with DogStatsD on port 8125.
           datadog_singleton = DatadogSingleton.instance
           datadog_singleton.statsd = Datadog::Statsd.new(ENV['DD_AGENT_HOST'], 8125)
-          datadog_singleton.tags = ["env:#{Rails.env}", "service:#{service}"]
           c.runtime_metrics.statsd = datadog_singleton.statsd
 
+          # Configure tags to be sent on all traces and metrics.
+          # Note that 'env' is NOT sent- that is set as the default on the agent e.g. staging, canary, production.
+          # It does not necessarily align with the Rails env, and we do not want to double tag the env.
+          datadog_singleton.tags = ["railsenv:#{Rails.env}", "service:#{service}"]
+          c.tags = datadog_singleton.tags
+
           # Tracer requires configuration to a datadog agent via DD_AGENT_HOST.
           dd_force_tracer_val = ENV.fetch('DD_FORCE_TRACER', false)
           dd_force_tracer = dd_force_tracer_val.present? && dd_force_tracer_val.to_s == 'true'
-          c.tracer(enabled: Rails.env.production? || dd_force_tracer, env: Rails.env)
+          puts "** dd_force_tracer: #{dd_force_tracer}"
+          c.tracer(enabled: Rails.env.production? || dd_force_tracer)
         end
 
         c.use(:rails, service_name: service)

data/lib/nexus_semantic_logger/version.rb

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

data/lib/nexus_semantic_logger.rb

@@ -7,7 +7,7 @@ require 'nexus_semantic_logger/datadog_tracer'
 
 module NexusSemanticLogger
   # Get application wide object for sending metrics.
-  def metrics
+  def self.metrics
     DatadogSingleton.instance
   end
 end

data/nexus_semantic_logger.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
   spec.add_dependency('amazing_print', '~> 1.4.0')
-  spec.add_dependency('rails_semantic_logger', '~> 4.10.0')
-  spec.add_dependency('net_tcp_client', '~> 2.2.0') # For TCP logging.
   spec.add_dependency('dogstatsd-ruby', '~> 5.4.0') # For custom application metrics.
+  spec.add_dependency('net_tcp_client', '~> 2.2.0') # For TCP logging.
+  spec.add_dependency('rails_semantic_logger', '~> 4.10.0')
   spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nexus_semantic_logger
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Johnathon Harris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: rails_semantic_logger
+  name: dogstatsd-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.10.0
+        version: 5.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.10.0
+        version: 5.4.0
 - !ruby/object:Gem::Dependency
   name: net_tcp_client
   requirement: !ruby/object:Gem::Requirement
@@ -53,25 +53,26 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: dogstatsd-ruby
+  name: rails_semantic_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: 4.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: 4.10.0
 description: 
 email: john.harris@nexusmods.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".gitlab-ci.yml"
 - ".rubocop.yml"
 - Gemfile