nexus_semantic_logger 1.12.1 → 1.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 903718bb8acb37308fee8d2b0739ae7a708538a6372029d50f198229646cca93
-  data.tar.gz: 4c40fdfa07c84b82938b4ca185aec63840d35f86222fdd3cdf058a0e4c453c27
+  metadata.gz: 027f845d9e52d9f2b489fdee4322de8da733d3d8b6b61164a26b7e65752cbd80
+  data.tar.gz: f3bab4633d763ea390e36347171b003bc046c452ffaa3c9bf2cec0c1d1ed0cdd
 SHA512:
-  metadata.gz: 7d30a09cc0440a01ea89fc0cc48e04e883ec955e05749c5b7b406dd2b1013dc540f1e9a2e2a95befba6f8248b2f970440bdb53ab28dce572fb6f2c45794cd3d1
-  data.tar.gz: 15ae5d8e3bfad2eab8f81649a27b2755a302f04e00eea1248738edba543ab2824d56bd6298608c13a1a7eb8953eac6bf88183fe8530fa6eacb753a351a4583eb
+  metadata.gz: 888523a95588e73193a0e25bf788a4c1345815f67ad2815de793579394834be50ec3630a89d848a8b4b1d150deefdaad23b8be2d487863e97935c7f9f9b06e68
+  data.tar.gz: 13b686749756c64fa5011e5260da75ddacd991c38b1d944104ae3843ef606347e8b05300f485a62b3512922e5b8bd212f8917bcd1ede6b610ffaf5d100fb1a06

data/lib/nexus_semantic_logger/datadog_singleton.rb

@@ -7,7 +7,7 @@ module NexusSemanticLogger
   # own statsd instance.
   class DatadogSingleton
     include Singleton
-    attr_accessor :statsd, :global_tags
+    attr_accessor :statsd
 
     def flush
       statsd&.flush(sync: Rails.env.development?) # Force flush sync in development, speed up checks.
@@ -58,10 +58,9 @@ module NexusSemanticLogger
 
     private
 
-    # Safely combine the global tags with the supplied tags.
+    # Safely combine 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

data/lib/nexus_semantic_logger/datadog_tracer.rb

@@ -7,6 +7,22 @@ module NexusSemanticLogger
     def initialize(service)
       Datadog.configure do |c|
         if ENV['DD_AGENT_HOST'].present?
+
+          # Container and pod names should be set as env vars via the helm chart. Tagging metrics from the app
+          # with these values helps correlation with metrics from the kubernetes cluster.
+          container_name = ENV.fetch('CONTAINER_NAME') { '' }
+          pod_name = ENV.fetch('POD_NAME') { '' }
+
+          # Configure tags to be sent on all 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.
+          global_tags = [
+            "railsenv:#{Rails.env}",
+            "service:#{service}",
+            "container_name:#{container_name}",
+            "pod_name:#{pod_name}",
+          ]
+
           # To enable runtime metrics collection, set `true`. Defaults to `false`
           # You can also set DD_RUNTIME_METRICS_ENABLED=true to configure this.
           c.runtime_metrics.enabled = true
@@ -16,20 +32,19 @@ module NexusSemanticLogger
           datadog_singleton = DatadogSingleton.instance
           datadog_statsd_socket_path = ENV.fetch('DD_STATSD_SOCKET_PATH') { '' }
           datadog_singleton.statsd = if datadog_statsd_socket_path.to_s.strip.empty?
-            Datadog::Statsd.new(ENV['DD_AGENT_HOST'], 8125)
+            Datadog::Statsd.new(ENV['DD_AGENT_HOST'], 8125, tags: global_tags)
           else
-            Datadog::Statsd.new(socket_path: datadog_statsd_socket_path)
+            Datadog::Statsd.new(socket_path: datadog_statsd_socket_path, tags: global_tags)
           end
           c.runtime_metrics.statsd = datadog_singleton.statsd
 
-          # Configure tags to be sent on all 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}"]
           # Trace tags API is Hash<String,String>, see https://www.rubydoc.info/gems/ddtrace/Datadog/Tracing
+          # Should match the global tags, but as a Hash.
           c.tags = {
             railsenv: Rails.env,
             service: service,
+            container_name: container_name,
+            pod_name: pod_name,
           }
 
           # Tracer requires configuration to a datadog agent via DD_AGENT_HOST.

data/lib/nexus_semantic_logger/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nexus_semantic_logger
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.12.2
 platform: ruby
 authors:
 - Johnathon Harris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2023-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.17
 signing_key: 
 specification_version: 4
 summary: semantic_logger usage for nexus