Merge pull request #293 from riemann/raise-error-on-stray-arguments

Detect and report stray arguments

Author: jamtur01

lib/riemann/tools.rb

@@ -44,6 +44,14 @@ def options
       end
     end
 
+    attr_reader :argv
+
+    def initialize(allow_arguments: false)
+      options
+      @argv = ARGV.dup
+      abort "Error: stray arguments: #{ARGV.map(&:inspect).join(', ')}" if ARGV.any? && !allow_arguments
+    end
+
     # Returns parsed options (cached) from command line.
     def options
       @options ||= self.class.options
@@ -58,10 +66,7 @@ def attributes
     end
 
     def report(event)
-      if options[:tag]
-        # Work around a bug with beefcake which can't take frozen strings.
-        event[:tags] = [*event.fetch(:tags, [])] + options[:tag].map(&:dup)
-      end
+      event[:tags] = event.fetch(:tags, []) + options[:tag]
 
       event[:ttl] ||= options[:ttl] || (options[:interval] * 2)
 

lib/riemann/tools/apache_status.rb

@@ -18,6 +18,8 @@ class ApacheStatus
       opt :user_agent, 'User-Agent header for HTTP requests', short: :none, default: "#{File.basename($PROGRAM_NAME)}/#{Riemann::Tools::VERSION} (+https://github.com/riemann/riemann-tools)"
 
       def initialize
+        super
+
         @uri = URI.parse("#{opts[:uri]}?auto")
         # Sample Response with ExtendedStatus On
         # Total Accesses: 20643

lib/riemann/tools/bench.rb

@@ -11,6 +11,8 @@ class Bench
       attr_accessor :client, :hosts, :services, :states
 
       def initialize
+        super
+
         @hosts = [nil] + (0...10).map { |i| "host#{i}" }
         @hosts = %w[a b c d e f g h i j]
         @services = %w[test1 test2 test3 foo bar baz xyzzy attack cat treat]

lib/riemann/tools/consul_health.rb

@@ -20,6 +20,8 @@ class ConsulHealth
       opt :user_agent, 'User-Agent header for HTTP requests', short: :none, default: "#{File.basename($PROGRAM_NAME)}/#{Riemann::Tools::VERSION} (+https://github.com/riemann/riemann-tools)"
 
       def initialize
+        super
+
         @hostname = opts[:consul_host]
         @prefix = opts[:prefix]
         @minimum_services_per_node = opts[:minimum_services_per_node]

lib/riemann/tools/dir_files_count.rb

@@ -15,6 +15,8 @@ class DirFilesCount
       opt :alert_on_missing, 'Send a critical metric if the directory is missing?', default: true
 
       def initialize
+        super
+
         @dir = opts.fetch(:directory)
         @service_prefix = opts.fetch(:service_prefix)
         @warning = opts.fetch(:warning, nil)

lib/riemann/tools/dir_space.rb

@@ -15,6 +15,8 @@ class DirSpace
       opt :alert_on_missing, 'Send a critical metric if the directory is missing?', default: true
 
       def initialize
+        super
+
         @dir = opts.fetch(:directory)
         @service_prefix = opts.fetch(:service_prefix)
         @warning = opts.fetch(:warning, nil)

lib/riemann/tools/diskstats.rb

@@ -11,6 +11,8 @@ class Diskstats
       opt :ignore_devices, 'Devices to ignore', type: :strings, default: nil
 
       def initialize
+        super
+
         @old_state = nil
       end
 

lib/riemann/tools/fd.rb

@@ -16,6 +16,8 @@ class Fd
       opt :processes, 'list of processes to measure fd usage in addition to system total', type: :ints
 
       def initialize
+        super
+
         @limits = {
           fd: { critical: opts[:fd_sys_critical], warning: opts[:fd_sys_warning] },
           process: { critical: opts[:fd_proc_critical], warning: opts[:fd_proc_warning] },

lib/riemann/tools/freeswitch.rb

@@ -13,6 +13,8 @@ class Freeswitch
       opt :pid_file, 'FreeSWITCH daemon pidfile', type: String, default: '/var/run/freeswitch/freeswitch.pid'
 
       def initialize
+        super
+
         @limits = {
           calls: { critical: opts[:calls_critical], warning: opts[:calls_warning] },
         }

lib/riemann/tools/haproxy.rb

@@ -16,6 +16,8 @@ class Haproxy
       opt :user_agent, 'User-Agent header for HTTP requests', short: :none, default: "#{File.basename($PROGRAM_NAME)}/#{Riemann::Tools::VERSION} (+https://github.com/riemann/riemann-tools)"
 
       def initialize
+        super
+
         @uri = URI("#{opts[:stats_url]};csv")
       end