nexus_semantic_logger 1.12 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70e0537b45679788fc9dc6ce2c5e6ae6698e840735039bfc8d55ac324e03d062
-  data.tar.gz: 6a489153ff7db8a3d2bca5696a3ceec917014f9e10416f3a04f5446114a0514b
+  metadata.gz: 903718bb8acb37308fee8d2b0739ae7a708538a6372029d50f198229646cca93
+  data.tar.gz: 4c40fdfa07c84b82938b4ca185aec63840d35f86222fdd3cdf058a0e4c453c27
 SHA512:
-  metadata.gz: 25f789b5449465c5466d74c780cfb6401e4c5f4df493b40d616f55de5d986366d3d677b69ea1ce51f20e7c94ce71c7e896ec3c61470969db96c213a5c8ad26d8
-  data.tar.gz: a28d97cf7fa44c87511388145e38f2132e1787f711995523226ce388c5c4260ae59c5a975e52daa072bc11273f5fb6698b10ee5ebec3e21b43479b3f59bbfd33
+  metadata.gz: 7d30a09cc0440a01ea89fc0cc48e04e883ec955e05749c5b7b406dd2b1013dc540f1e9a2e2a95befba6f8248b2f970440bdb53ab28dce572fb6f2c45794cd3d1
+  data.tar.gz: 15ae5d8e3bfad2eab8f81649a27b2755a302f04e00eea1248738edba543ab2824d56bd6298608c13a1a7eb8953eac6bf88183fe8530fa6eacb753a351a4583eb

data/lib/nexus_semantic_logger/version.rb

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

data/lib/puma/plugin/nexus_puma_statsd.rb

@@ -2,40 +2,12 @@
 require 'puma'
 require 'puma/plugin'
 require 'socket'
-require 'nexus_semantic_logger/datadog_singleton'
+require 'nexus_semantic_logger'
 
 # Forked from puma-plugin-statsd.
 # Uses the same datadog settings as nexus_semantic_logger.
 # To use, add to puma.rb:
 #   plugin :nexus_puma_statsd
-class StatsdConnector
-  STATSD_TYPES = { count: 'c', gauge: 'g' }
-  METRIC_DELIMETER = "."
-
-  attr_reader :host, :port
-
-  def initialize
-    @host = ENV.fetch('DD_AGENT_HOST', '127.0.0.1')
-    @port = ENV.fetch('DD_STATSD_PORT', 8125)
-    @socket_path = ENV.fetch('DD_STATSD_SOCKET_PATH', '')
-  end
-
-  def send(metric_name:, value:, type:, tags: nil)
-    data = "#{metric_name}:#{value}|#{STATSD_TYPES.fetch(type)}"
-    data = "#{data}|##{tags}" unless tags.nil?
-
-    if @socket_path.to_s.strip.empty?
-      socket = UDPSocket.new
-      socket.send(data, 0, host, port)
-    else
-      socket = Socket.new(Socket::AF_UNIX, Socket::SOCK_DGRAM)
-      socket.connect(Socket.pack_sockaddr_un(@socket_path))
-      socket.sendmsg_nonblock(data)
-    end
-  ensure
-    socket.close
-  end
-end
 
 # Wrap puma's stats in a safe API
 class PumaStats
@@ -111,14 +83,7 @@ Puma::Plugin.create do
         @launcher.events
       end
 
-    @statsd = ::StatsdConnector.new
-    @log_writer.debug("statsd: enabled (host: #{@statsd.host})")
-
-    # Fetch global metric prefix from env variable
-    @metric_prefix = ENV.fetch('DD_STATSD_METRIC_PREFIX', nil)
-    if @metric_prefix && !@metric_prefix.end_with?(::StatsdConnector::METRIC_DELIMETER)
-      @metric_prefix += ::StatsdConnector::METRIC_DELIMETER
-    end
+    @log_writer.debug('statsd: enabled')
 
     register_hooks
   end
@@ -137,8 +102,6 @@ Puma::Plugin.create do
     # Examples: simple-tag-0 tag-key-1:tag-value-1
     #
     tags = []
-    global_tags = NexusSemanticLogger::DatadogSingleton.instance.global_tags
-    tags += global_tags unless global_tags.nil?
 
     if ENV.key?('HOSTNAME')
       tags << "pod_name:#{ENV['HOSTNAME']}"
@@ -179,15 +142,9 @@ Puma::Plugin.create do
       tags << "dd.internal.entity_id:#{ENV['DD_ENTITY_ID']}"
     end
 
-    # Return nil if we have no environment variable tags. This way we don't
-    # send an unnecessary '|' on the end of each stat
     return nil if tags.empty?
 
-    tags.join(",")
-  end
-
-  def prefixed_metric_name(puma_metric)
-    "#{@metric_prefix}#{puma_metric}"
+    tags
   end
 
   # Send data to statsd every few seconds
@@ -196,24 +153,19 @@ Puma::Plugin.create do
 
     sleep(5)
     loop do
-      @log_writer.debug("statsd: notify statsd")
+      @log_writer.debug('statsd: notify statsd')
       begin
         stats = ::PumaStats.new(Puma.stats_hash)
-        @statsd.send(metric_name: prefixed_metric_name("puma.workers"), value: stats.workers, type: :gauge, tags: tags)
-        @statsd.send(metric_name: prefixed_metric_name("puma.booted_workers"), value: stats.booted_workers,
-type: :gauge, tags: tags)
-        @statsd.send(metric_name: prefixed_metric_name("puma.old_workers"), value: stats.old_workers, type: :gauge,
-tags: tags)
-        @statsd.send(metric_name: prefixed_metric_name("puma.running"), value: stats.running, type: :gauge, tags: tags)
-        @statsd.send(metric_name: prefixed_metric_name("puma.backlog"), value: stats.backlog, type: :gauge, tags: tags)
-        @statsd.send(metric_name: prefixed_metric_name("puma.pool_capacity"), value: stats.pool_capacity, type: :gauge,
-tags: tags)
-        @statsd.send(metric_name: prefixed_metric_name("puma.max_threads"), value: stats.max_threads, type: :gauge,
-tags: tags)
-        @statsd.send(metric_name: prefixed_metric_name("puma.requests_count"), value: stats.requests_count,
-type: :gauge, tags: tags)
+        NexusSemanticLogger.metrics.gauge('puma.workers', stats.workers, tags: tags)
+        NexusSemanticLogger.metrics.gauge('puma.booted_workers', stats.booted_workers, tags: tags)
+        NexusSemanticLogger.metrics.gauge('puma.old_workers', stats.old_workers, tags: tags)
+        NexusSemanticLogger.metrics.gauge('puma.running', stats.running, tags: tags)
+        NexusSemanticLogger.metrics.gauge('puma.backlog', stats.backlog, tags: tags)
+        NexusSemanticLogger.metrics.gauge('puma.pool_capacity', stats.pool_capacity, tags: tags)
+        NexusSemanticLogger.metrics.gauge('puma.max_threads', stats.max_threads, tags: tags)
+        NexusSemanticLogger.metrics.gauge('puma.requests_count', stats.requests_count, tags: tags)
       rescue StandardError => e
-        @log_writer.unknown_error(e, nil, "! statsd: notify stats failed")
+        @log_writer.unknown_error(e, nil, '! statsd: notify stats failed')
       ensure
         sleep(2)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexus_semantic_logger
 version: !ruby/object:Gem::Version
-  version: '1.12'
+  version: 1.12.1
 platform: ruby
 authors:
 - Johnathon Harris