logstash-output-statsd 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 322eaa3dc699b21da712d6f8e87a29478c12e54f
-  data.tar.gz: 2caa3d76629ff0105b5784b42ccdd42af7d4578a
+  metadata.gz: 5ee8b283b94fd2486d21062eae81d0150b361c94
+  data.tar.gz: 775d8a1f5883e3699f4ff1f37bd403c5b13f7ae9
 SHA512:
-  metadata.gz: 74d8991d2d49605ffb63e31fc79baea8bed725c86697b29c7c1817d429e84d68e8312a1f4a63146b07527e29f68d9bcfdd829ca757ce60796c07c1c40d6cfc74
-  data.tar.gz: d297957aa5fceab2b7b7b94bddc5048ce96863b2629cd072b1c50a80f61d1c3a3b0ac8635b5b8601295298a9b1b19be945bce01d21b3fbfb126e99ef025a8de9
+  metadata.gz: a6a2b13c8b360b1e486f0e25c7471e31b0a8924c2c952f6dd92943189150307842830cddc324272b40ceb93dfd73310186b38fdc714b4bb834d2ed5996006d78
+  data.tar.gz: cf1f332c840b40b1b0cff4a221a64ea5c8fde7e78006563648c4c138404d784550d0b3ce1c3c2f274c1869e74699964c39fb3bedb3342f3ba42b499d9abf43ca

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+# 1.1.0
+  - improved test design to be more rspec3 friendly, including the usage
+    of random ports to avoid colisions in integration test.

data/lib/logstash/outputs/statsd.rb

@@ -90,7 +90,6 @@ class LogStash::Outputs::Statsd < LogStash::Outputs::Base
   public
   def receive(event)
     return unless output?(event)
-
     @client.namespace = event.sprintf(@namespace) if not @namespace.empty?
     @logger.debug? and @logger.debug("Original sender: #{@sender}")
     sender = event.sprintf(@sender)

data/logstash-output-statsd.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-statsd'
-  s.version         = '1.0.0'
+  s.version         = '1.1.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Send metrics to StatsD"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"

data/spec/outputs/statsd_spec.rb

@@ -1,91 +1,47 @@
 # encoding: utf-8
-require "logstash/devutils/rspec/spec_helper"
 require "logstash/outputs/statsd"
-require "socket"
+require_relative "../spec_helper"
 
 describe LogStash::Outputs::Statsd do
-  port = 4399
 
-  udp_server = UDPSocket.new
-  udp_server.bind("127.0.0.1", port)
-  udp_server
+  let(:host)   { "localhost" }
+  let(:port)   { @server.port }
+
+  describe "registration and teardown" do
+
+    it "should register without errors" do
+      output = LogStash::Plugin.lookup("output", "statsd").new
+      expect {output.register}.to_not raise_error
+    end
 
-  after(:all) do
-    udp_server.close
   end
 
-  describe "send metric to statsd" do
-    config <<-CONFIG
-      input {
-        generator {
-          message => "valid"
-          count => 1
-        }
-      }
+  describe "#send" do
 
-      output {
-        statsd {
-          host => "localhost"
-          sender => "spec"
-          port => #{port}
-          count => [ "test.valid", "0.1" ]
-        }
-      }
-    CONFIG
+    context "count metrics" do
 
-    agent do
-      metric, *data = udp_server.recvfrom(100)
-      insist { metric } == "logstash.spec.test.valid:0.1|c"
-    end
-  end
+      let(:config) do
+        { "host" => host, "sender" => "spec", "port" => port, "count" => [ "foo.bar", "0.1" ] }
+      end
 
-  describe "output a very small float" do
-    config <<-CONFIG
-      input {
-        generator {
-          message => "valid"
-          count => 1
-        }
-      }
+      let(:properties) do
+        { "metric" => "foo.bar", "count" => 10 }
+      end
 
-      output {
-        statsd {
-          host => "localhost"
-          sender => "spec"
-          port => #{port}
-          count => [ "test.valid", 0.000001 ]
-        }
-      }
-    CONFIG
+      let(:event) { LogStash::Event.new(properties) }
 
-    agent do
-      metric, *data = udp_server.recvfrom(100)
-      insist { metric } == "logstash.spec.test.valid:0.000001|c"
-    end
-  end
+      subject { LogStash::Outputs::Statsd.new(config) }
 
-  describe "output a very big float" do
-    config <<-CONFIG
-      input {
-        generator {
-          message => "valid"
-          count => 1
-        }
-      }
+      before(:each) do
+        subject.register
+      end
 
-      output {
-        statsd {
-          host => "localhost"
-          sender => "spec"
-          port => #{port}
-          count => [ "test.valid", 9999999999999.01 ]
-        }
-      }
-    CONFIG
+      it "should receive data send to the server" do
+        subject.receive(event)
+        expect(@server.received).to include("logstash.spec.foo.bar:0.1|c")
+      end
 
-    agent do
-      metric, *data = udp_server.recvfrom(100)
-      insist { metric } == "logstash.spec.test.valid:9999999999999.01|c"
     end
   end
+
 end

data/spec/spec_helper.rb

@@ -0,0 +1,69 @@
+require "logstash/devutils/rspec/spec_helper"
+require "socket"
+
+class StatsdServer
+
+  attr_reader :received, :port
+
+  def initialize
+    @sync_lock = Mutex.new
+    @terminated = false
+    @received   = []
+  end
+
+  def register(port)
+    @port   = port
+    @socket = UDPSocket.new
+    @socket.bind("127.0.0.1", port)
+  end
+
+  def run(port)
+    register(port)
+    Thread.new do
+      while(!closed?)
+        metric, _ = @socket.recvfrom(100)
+        append(metric)
+      end
+    end
+    self
+  end
+
+  def append(metric)
+    @sync_lock.synchronize do
+      @received << metric
+    end
+  end
+
+  def close
+    @sync_lock.synchronize do
+      @terminated = true
+    end
+  end
+
+  def closed?
+    @terminated == true
+  end
+
+end
+
+module StatdHelpers
+
+  def random_port
+    rand(2000..10000)
+  end
+
+end
+
+RSpec.configure do |c|
+
+  c.include StatdHelpers
+
+  c.before(:all) do
+    srand(c.seed)
+    @server = StatsdServer.new.run(random_port)
+  end
+
+  c.after(:all) do
+    @server.close
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-statsd
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -89,6 +89,7 @@ files:
 - lib/logstash/outputs/statsd.rb
 - logstash-output-statsd.gemspec
 - spec/outputs/statsd_spec.rb
+- spec/spec_helper.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -111,9 +112,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Send metrics to StatsD
 test_files:
 - spec/outputs/statsd_spec.rb
+- spec/spec_helper.rb