active_statsd 0.1.0 → 0.1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ba98bd3462d5bb72af512e20ed1a28889a1b8ace4d47478a429086e76007222
-  data.tar.gz: 524bb2108f7b84aa9e13d06c22edbd088a65b8ce2cb0716b3355e191f7cf1ed8
+  metadata.gz: 2d6a863b23d647b528f8b3bd62c1f37537e389b9042674454012f8908878ec0c
+  data.tar.gz: b81303f0442c397650344875d61aee68738f30a6f5c87643b0886075076c423d
 SHA512:
-  metadata.gz: a1269bae74e65c2b55a92720cc962abdb2e8794a145826332b87a0540caefb141faf0bb4c9a4d28a5a6ebca501b0356afab8f7b10125c6d725fe27407dad32e0
-  data.tar.gz: 318929577949d3447672166ed61cbb8c1d81b689a814fa25b05c49b916f852ecb1f2f8707746bfca00a0074b25322c011c3fe8015447c73d4e792d2505e50d58
+  metadata.gz: 4bfc3764aaccf595f1391e46b3eae23a98ec56af933098f4d6f66673883f26077c03d34838e330b33c3f3f0d7f4790ebc1916bc9402dfc4d18b483eb0a1e1cdb
+  data.tar.gz: 723aff4bf12e0b4facc5a15fbb8b205ab767c6bb7e545d2f8277c94a4939c0a75792628b866a99b2970fe6555b027e1e7328a553cd46b17c4669f4278d1f3057

data/lib/active_statsd/configuration.rb

@@ -1,11 +1,15 @@
+# lib/active_statsd/configuration.rb
 module ActiveStatsD
   class Configuration
-    attr_accessor :host, :port, :namespace
+    attr_accessor :host, :port, :namespace, :aggregation, :forward_host, :forward_port
 
     def initialize
       @host = '127.0.0.1'
       @port = 8125
       @namespace = 'rails_app'
+      @aggregation = true  # Aggregation enabled by default
+      @forward_host = nil  # Set if forwarding
+      @forward_port = nil
     end
   end
 end

data/lib/active_statsd/railtie.rb

@@ -7,12 +7,12 @@ module ActiveStatsD
       ActiveSupport.on_load(:after_initialize) do
         server = ActiveStatsD::Server.new(
           host: ActiveStatsD.configuration.host,
-          port: ActiveStatsD.configuration.port
+          port: ActiveStatsD.configuration.port,
+          aggregation: ActiveStatsD.configuration.aggregation,
+          forward_host: ActiveStatsD.configuration.forward_host,
+          forward_port: ActiveStatsD.configuration.forward_port
         )
-
         server.start
-
-        Rails.logger.info "[ActiveStatsD] Embedded StatsD server started on #{ActiveStatsD.configuration.host}:#{ActiveStatsD.configuration.port}"
       end
     end
 

data/lib/active_statsd/server.rb

@@ -3,25 +3,43 @@ require 'socket'
 
 module ActiveStatsD
   class Server
-    def initialize(host: '127.0.0.1', port: 8125)
+    def initialize(host:, port:, aggregation:, forward_host:, forward_port:)
       @host = host
       @port = port
+      @aggregation = aggregation
+      @forward_host = forward_host
+      @forward_port = forward_port
       @counters = Hash.new(0)
       @mutex = Mutex.new
+      @forward_socket = UDPSocket.new if forwarding_enabled?
+      @running = false
     end
 
     def start
-      start_aggregation_thread
+      return if @running  # Don't attempt to start twice
 
       Thread.new do
-        Rails.logger.info "[ActiveStatsD] UDP StatsD listener started on #{@host}:#{@port}"
         begin
-          Socket.udp_server_loop(@host, @port) do |msg, _|
+          sockets = Socket.udp_server_sockets(@host, @port)
+        rescue Errno::EADDRINUSE
+          Rails.logger.warn "[ActiveStatsD] Server already running on #{@host}:#{@port}, skipping startup."
+          next
+        end
+
+        @running = true
+        Rails.logger.info "[ActiveStatsD] UDP StatsD listener started on #{@host}:#{@port} (aggregation=#{@aggregation})"
+        start_aggregation_thread if aggregation_enabled?
+
+        begin
+          Socket.udp_server_loop_on(sockets) do |msg, _|
             Rails.logger.debug "[ActiveStatsD] UDP packet received: #{msg.strip}"
             handle_message(msg.strip)
           end
         rescue => e
           Rails.logger.error "[ActiveStatsD] Server error: #{e.class.name} - #{e.message}\n#{e.backtrace.join("\n")}"
+        ensure
+          sockets.each(&:close)
+          @running = false
         end
       end
     end
@@ -30,19 +48,16 @@ module ActiveStatsD
 
     def handle_message(message)
       metric, value, type = parse_metric(message)
-
       return unless metric && type == 'c'
 
-      @mutex.synchronize do
-        @counters[metric] += value
-      end
+      @mutex.synchronize { @counters[metric] += value } if aggregation_enabled?
+      forward_message(message) if forwarding_enabled?
+      log_message(metric, value, type) unless aggregation_enabled?
     end
 
     def parse_metric(message)
-      # Example message: "rails_app.test.metric:1|c"
       metric_data, type = message.split('|')
       metric, value = metric_data.split(':')
-
       [metric, value.to_i, type]
     rescue
       Rails.logger.error "[ActiveStatsD] Failed to parse metric: #{message}"
@@ -52,7 +67,7 @@ module ActiveStatsD
     def start_aggregation_thread
       Thread.new do
         loop do
-          sleep 10 # flush metrics every 10 seconds
+          sleep 10
           flush_metrics
         end
       end
@@ -69,5 +84,23 @@ module ActiveStatsD
         Rails.logger.info "[ActiveStatsD] Aggregated metric - #{metric}: #{count}"
       end
     end
+
+    def forwarding_enabled?
+      @forward_host && @forward_port
+    end
+
+    def aggregation_enabled?
+      @aggregation
+    end
+
+    def forward_message(message)
+      @forward_socket.send(message, 0, @forward_host, @forward_port)
+    rescue => e
+      Rails.logger.error "[ActiveStatsD] Forwarding error: #{e.message}"
+    end
+
+    def log_message(metric, value, type)
+      Rails.logger.info "[ActiveStatsD] Metric received (no aggregation) - #{metric}:#{value}|#{type}"
+    end
   end
 end

data/lib/active_statsd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveStatsd
-  VERSION = "0.1.0"
+  VERSION = "0.1.0.2"
 end

data/lib/generators/active_statsd/active_statsd_generator.rb

@@ -0,0 +1,12 @@
+# lib/generators/active_statsd/active_statsd_generator.rb
+require 'rails/generators'
+
+module ActiveStatsd
+  class ActiveStatsdGenerator < Rails::Generators::Base
+    source_root File.expand_path('templates', __dir__)
+
+    def copy_initializer_file
+      copy_file 'active_statsd_initializer.rb', 'config/initializers/active_statsd.rb'
+    end
+  end
+end

data/lib/generators/active_statsd/templates/active_statsd_initializer.rb

@@ -0,0 +1,5 @@
+ActiveStatsD.configure do |config|
+  config.host = '127.0.0.1'
+  config.port = 8125
+  config.namespace = 'my_rails_app'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_statsd
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.0.2
 platform: ruby
 authors:
 - Mike Poage
@@ -74,6 +74,8 @@ files:
 - lib/active_statsd/railtie.rb
 - lib/active_statsd/server.rb
 - lib/active_statsd/version.rb
+- lib/generators/active_statsd/active_statsd_generator.rb
+- lib/generators/active_statsd/templates/active_statsd_initializer.rb
 - sig/active_statsd.rbs
 homepage: https://github.com/RubyBrewsday/active_statsd
 licenses: