logstash-output-statsd 3.1.5 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9375255d0cc0ec934c5317143c293d8ac15f7bac3ab91975abdc1c770f8cc755
-  data.tar.gz: cf939fb95644f3f3b086e3d51b7b1642880f0ca32389196ab9686a406a51250b
+  metadata.gz: 964258cd9a1aae17bd03ba061ee09d438f738920a7d4876fe4f4b135f198cace
+  data.tar.gz: 49733d6030a54c8af5ca28160674c5864fb987a854b42d5217d58cdb7e5e94b7
 SHA512:
-  metadata.gz: 3875ed72d511e73b68e6096e9e645b4842c15b9a93e75d075f871180269fe1aaad4ee28dec2866c6bb5f72c654f4dc9333e136a5fac314a689866345fa72dfaf
-  data.tar.gz: 58674d330177bc186d0e47f6743405ee1849b4caa7553a904e27a251ec85d7100cb6aa415d474e59c6e7e4869946811e7b41d7f55df4f4dce47141cc75a04255
+  metadata.gz: 4655cb2492410e1fa87f025e48e34a2d783485fd0f915d53d6af5b240a56375061851b99b3aeb647d9c7e51000fcd34da9f11410d34543bf37febd3332f80366
+  data.tar.gz: b8350eb84ba61eda26d06cca47dec6c28c1736b18f32e1475e9f67be6eed97847d133558d002907e3348282522f3860710df7b3c744cf446c08ae31c4ef730d2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.2.0
+  - Added TCP support [30](https://github.com/logstash-plugins/logstash-output-statsd/pull/30)
+  - Changed test code for cleanups [31](https://github.com/logstash-plugins/logstash-output-statsd/pull/31)
+  
 ## 3.1.5
   - Docs: Set the default_codec doc attribute.
 

data/docs/index.asciidoc

@@ -153,6 +153,15 @@ allowed.
 
 The port to connect to on your statsd server.
 
+[id="plugins-{type}s-{plugin}-protocol"]
+
+===== `protocol` 
+
+  * Value type is <<string,string>>
+  * Default value is `"udp"`
+
+The protocol to connect to on your statsd server.
+
 [id="plugins-{type}s-{plugin}-sample_rate"]
 ===== `sample_rate` 
 
@@ -193,4 +202,4 @@ are allowed in the metric names.
 [id="plugins-{type}s-{plugin}-common-options"]
 include::{include_path}/{type}.asciidoc[]
 
-:default_codec!:
+:default_codec!:

data/lib/logstash/outputs/statsd.rb

@@ -57,6 +57,9 @@ class LogStash::Outputs::Statsd < LogStash::Outputs::Base
   # The port to connect to on your statsd server.
   config :port, :validate => :number, :default => 8125
 
+  # The protocol to use for the connection.
+  config :protocol, :validate => ['udp', 'tcp'], :default => "udp"
+
   # The statsd namespace to use for this metric. `%{fieldname}` substitutions are
   # allowed.
   config :namespace, :validate => :string, :default => "logstash"
@@ -95,7 +98,7 @@ class LogStash::Outputs::Statsd < LogStash::Outputs::Base
   public
   def register
     require "statsd"
-    @client = Statsd.new(@host, @port)
+    @client = Statsd.new(@host, @port, @protocol.to_sym)
   end # def register
 
   public

data/logstash-output-statsd.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-statsd'
-  s.version         = '3.1.5'
+  s.version         = '3.2.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Sends metrics using the `statsd` network daemon"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
   s.add_runtime_dependency 'logstash-input-generator'
 
-  s.add_runtime_dependency 'statsd-ruby', ['1.2.0']
+  s.add_runtime_dependency 'statsd-ruby', ['1.4.0']
 
   s.add_development_dependency 'logstash-devutils'
 end

data/spec/outputs/statsd_spec.rb

@@ -1,57 +1,60 @@
 # encoding: utf-8
 require_relative "../spec_helper"
 require "logstash/outputs/statsd"
+require "socket"
 
 describe LogStash::Outputs::Statsd do
 
-  let(:host)   { "localhost" }
-  let(:port)   { rand(2000..10000) }
-  let!(:server) { StatsdServer.new.run(port) }
-
-  after(:each) do
-    server.close
-  end
-
   describe "registration and close" do
-
     it "should register without errors" do
       output = LogStash::Plugin.lookup("output", "statsd").new
       expect {output.register}.to_not raise_error
     end
-
   end
 
-  describe "#send" do
+  describe "IO" do
+    let(:host) { "localhost" }
+    let(:port) { rand(2000..10000) }
+    let!(:server) { StatsdServer.new.run(port, protocol) }
 
-    context "count metrics" do
+    after(:each) { server.close }
 
+    shared_examples "it receives sent data" do
       let(:config) do
-        { "host" => host, "sender" => "spec", "port" => port, "count" => [ "foo.bar", "0.1" ] }
+        { "host" => host, "sender" => "spec", "port" => port, "protocol" => protocol, "count" => [ "foo.bar", "0.1" ] }
       end
-
       let(:properties) do
         { "metric" => "foo.bar", "count" => 10 }
       end
-
       let(:event) { LogStash::Event.new(properties) }
 
       subject { LogStash::Outputs::Statsd.new(config) }
 
-      before(:each) do
-        subject.register
-      end
+      before(:each) { subject.register }
 
       it "should receive data send to the server" do
         subject.receive(event)
-        # Since we are dealing with threads and networks, 
+        # Since we are dealing with threads and networks,
         # we might experience delays or timing issues.
         # lets try a few times before giving up completely.
-        try {
-          expect(server.received).to include("logstash.spec.foo.bar:0.1|c")
-        }
+        try { expect(server.received).to include("logstash.spec.foo.bar:0.1|c") }
       end
+    end
+
+    describe "UDP" do
+      let(:protocol) { "udp" }
 
+      context "#send" do
+        include_examples "it receives sent data"
+      end
     end
-  end
 
+    describe "TCP" do
+      let(:protocol) { "tcp" }
+
+      context "#send" do
+        include_examples "it receives sent data"
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -11,20 +11,28 @@ class StatsdServer
     @received   = []
   end
 
-  def register(port)
-    @port   = port
-    @socket = UDPSocket.new
-    @socket.bind("127.0.0.1", port)
+  def register(port, protocol)
+    @port = port
+    if protocol == "udp"
+      @socket = UDPSocket.new
+      @socket.bind("127.0.0.1", port)
+    else
+      @socket = TCPserver.new("127.0.0.1", port)
+    end
   end
 
-  def run(port)
-    register(port)
+
+  def run(port, protocol = "udp")
+    register(port, protocol)
+
     Thread.new do
-      while(!closed?)
-        metric, _ = @socket.recvfrom(100)
-        append(metric)
+      if protocol == "udp"
+        udp_receive
+      else
+        tcp_receive
       end
     end
+
     self
   end
 
@@ -43,7 +51,23 @@ class StatsdServer
   def closed?
     @terminated == true
   end
+end
 
+private
+
+def tcp_receive
+  client = @socket.accept
+  Timeout.timeout(5) { sleep(0.1) while client.nil? }
+  metric = client.recvfrom(100).first
+  append(metric)
+  client.close
+end
+
+def udp_receive
+  while(!closed?)
+    metric, _ = @socket.recvfrom(100)
+    append(metric)
+  end
 end
 
 RSpec.configure do |c|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-statsd
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.2.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.0
   name: statsd-ruby
   prerelease: false
   type: :runtime
@@ -57,7 +57,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Sends metrics using the `statsd` network daemon