nexus_semantic_logger 1.3.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e650ec4b4c57cb7d85a5abde066ef34219502ff5d995e37fdf2b431833b2a086
-  data.tar.gz: 6285058765fa7ff89bf071714bcdd1978c83b4f64dfd17c2ddffc5a3843e190b
+  metadata.gz: b1e939b1284c82361caf156ea59fd20cdb09227a978871b329e8b5daced1cb98
+  data.tar.gz: be51dfd6de0f9e61f9c08152a4c37593c54094f91c3f6fa70f9e1303d979649a
 SHA512:
-  metadata.gz: dfbe1816ddd0f82a9009e863b94d4efe76551a35511df893a74ef328b1fee41964b2b0bdeaa219355da3e3fa03e00e9e2fb3b129d2459bbea1332ba37069c6f4
-  data.tar.gz: 70bc5a9ba7bc1d24b8dbac2fc84afbf7bb94c39a48d34036ca6b59446d1293778802984268f38ef7b80adcb74397a04225edfc3173be481d830d0180c79b2e25
+  metadata.gz: f9cac5834a9b8c2f105e8bf86fcf607c68fdb2ce9a48f3825e45ea8fb4e55b9b9cba37a052c05e49c8f70a33123ac898fe7d16bf5e44ea97784423bd4bae05a6
+  data.tar.gz: 437239b92a721285cb366ac917114468bef1a98e28bae0c83a6f3bfc3ce59be76bee9314c1ac7c2760566c92c402073f83923945bcd7e21d41bb413e3c05e76a

data/.gitignore

@@ -0,0 +1,3 @@
+.idea/
+.vscode/
+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

@@ -7,7 +7,7 @@ module NexusSemanticLogger
   # own statsd instance.
   class DatadogSingleton
     include Singleton
-    attr_accessor :statsd, :tags
+    attr_accessor :statsd, :global_tags
 
     def flush
       statsd&.flush(sync: Rails.env.development?) # Force flush sync in development, speed up checks.
@@ -15,16 +15,18 @@ module NexusSemanticLogger
 
     # Delegate to statsd (if available).
     # @param [String] metric Metric name.
-    def increment(metric)
-      statsd&.increment(metric, tags: tags)
+    # @param [Array<String>] tags Additional tags.
+    def increment(metric, tags: [])
+      statsd&.increment(metric, tags: global_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)
+    # @param [Array<String>] tags Additional tags.
+    def timing(metric, ms, tags: [])
+      statsd&.timing(metric, ms, tags: global_tags + tags)
       flush
     end
   end

data/lib/nexus_semantic_logger/datadog_tracer.rb

@@ -15,13 +15,18 @@ 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.global_tags = ["railsenv:#{Rails.env}", "service:#{service}"]
+          c.tags = datadog_singleton.global_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)
+          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.2 in order for CI process to replace with the tagged version.
-  VERSION = '1.3.2'
+  # Leave this as 1.5.0 in order for CI process to replace with the tagged version.
+  VERSION = '1.5.0'
 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.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Johnathon Harris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-02 00:00:00.000000000 Z
+date: 2022-09-09 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
@@ -102,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.21
+rubygems_version: 3.3.22
 signing_key: 
 specification_version: 4
 summary: semantic_logger usage for nexus