riemann-tools 1.7.1 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fa44263a952846fc5cc62c61b6ffec769d0be379f28acb4e93b4daf3e0837bb
-  data.tar.gz: 1efb518984161d6ffa35d1f73ac54bfa2d4f95096c2b854ea1a7fb32f5e5394c
+  metadata.gz: fa9747ae11420451d621eac1f337dc543d3ee395cfde545ca1b819070ad0caef
+  data.tar.gz: f7d3b2a6493bcf478778a517f57a46179659e6c8b49bbe73c2769a82de3dbf8d
 SHA512:
-  metadata.gz: 5dc1d992536ac76647acf1777139b8c793df76e3d7373f3f86f40f2de54d551d0eca5d5703f9a4a0986bedb05af0b0256bd888a518be90eeb75b6a09112c1c1f
-  data.tar.gz: 66f578a6b3b39602800345693699a0653e86fd169ff622dcce17e651f1ba8ca945ced131d6b1e65264aa7d6ac13b2c0b94effcacb7820fd39f697b1bd855e1af
+  metadata.gz: 70855a5ff26bf7f02a35f80a86348ba3401db6576c6e7b97fa900c5ae134c6d4f4d066a1a6455c83a268442fb38b4a6ed36fae70d1aad3f759db9de97e1aa8fd
+  data.tar.gz: f9658262416652b5844b2f9b25d507e200da60b28ec50d6b8d56c1889b820e0c97457b79faf8feb19eaf7f40f8edb23ebc29676f49a078a478b1e78cc943c6a0

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [v1.8.1](https://github.com/riemann/riemann-tools/tree/v1.8.1) (2023-02-27)
+
+[Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.8.0...v1.8.1)
+
+**Fixed bugs:**
+
+- Improve event sending thread lifecycle management [\#265](https://github.com/riemann/riemann-tools/pull/265) ([smortex](https://github.com/smortex))
+- Make sure all events are send before terminating [\#264](https://github.com/riemann/riemann-tools/pull/264) ([smortex](https://github.com/smortex))
+
+## [v1.8.0](https://github.com/riemann/riemann-tools/tree/v1.8.0) (2023-02-02)
+
+[Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.7.1...v1.8.0)
+
+**Implemented enhancements:**
+
+- Send events in bulk when they are stacking [\#261](https://github.com/riemann/riemann-tools/pull/261) ([smortex](https://github.com/smortex))
+
 ## [v1.7.1](https://github.com/riemann/riemann-tools/tree/v1.7.1) (2023-01-12)
 
 [Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.7.0...v1.7.1)
@@ -378,7 +395,7 @@
 
 **Merged pull requests:**
 
-- Update FreeBSD load average for 1 min [\#79](https://github.com/riemann/riemann-tools/pull/79) ([xaque208](https://github.com/xaque208))
+- Update FreeBSD load average for 1 min [\#79](https://github.com/riemann/riemann-tools/pull/79) ([zachfi](https://github.com/zachfi))
 - Added riemann-varnish collector script [\#77](https://github.com/riemann/riemann-tools/pull/77) ([pradeepchhetri](https://github.com/pradeepchhetri))
 - allow dashes in diskstats volume names to support lvm volumes like "dm-0" [\#75](https://github.com/riemann/riemann-tools/pull/75) ([cmerrick](https://github.com/cmerrick))
 - rieman-tools aws billing [\#74](https://github.com/riemann/riemann-tools/pull/74) ([jespada](https://github.com/jespada))

data/lib/riemann/tools/riemann_client_wrapper.rb

@@ -7,36 +7,65 @@ require 'riemann/client'
 module Riemann
   module Tools
     class RiemannClientWrapper
-      include Singleton
+      attr_reader :options
 
-      def initialize
-        @client = nil
+      def initialize(options)
+        @options = options
+
+        @queue = Queue.new
+        @max_bulk_size = 1000
+        @draining = false
+
+        @worker = Thread.new do
+          Thread.current.abort_on_exception = true
+          loop do
+            events = []
+
+            events << @queue.pop
+            events << @queue.pop while !@queue.empty? && events.size < @max_bulk_size
+
+            client.bulk_send(events)
+          rescue Riemann::Client::Error => e
+            warn "Dropping #{events.size} event#{'s' if events.size > 1} due to #{e}"
+          rescue StandardError => e
+            warn "#{e.class} #{e}\n#{e.backtrace.join "\n"}"
+            Thread.main.terminate
+          end
+        end
+
+        at_exit { drain }
       end
 
-      def configure(options)
-        return self unless @client.nil?
-
-        r = Riemann::Client.new(
-          host: options[:host],
-          port: options[:port],
-          timeout: options[:timeout],
-          ssl: options[:tls],
-          key_file: options[:tls_key],
-          cert_file: options[:tls_cert],
-          ca_file: options[:tls_ca_cert],
-          ssl_verify: options[:tls_verify],
-        )
-
-        @client = if options[:tcp] || options[:tls]
-                    r.tcp
-                  else
-                    r
-                  end
-        self
+      def client
+        @client ||= begin
+          r = Riemann::Client.new(
+            host: options[:host],
+            port: options[:port],
+            timeout: options[:timeout],
+            ssl: options[:tls],
+            key_file: options[:tls_key],
+            cert_file: options[:tls_cert],
+            ca_file: options[:tls_ca_cert],
+            ssl_verify: options[:tls_verify],
+          )
+
+          if options[:tcp] || options[:tls]
+            r.tcp
+          else
+            r
+          end
+        end
       end
 
       def <<(event)
-        @client << event
+        raise('Cannot queue events when draining') if @draining
+
+        @queue << event
+      end
+
+      def drain
+        @draining = true
+        sleep(1) until @queue.empty? || @worker.stop?
       end
     end
   end

data/lib/riemann/tools/uptime_parser.tab.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.2
+# This file is automatically generated by Racc 1.6.0
 # from Racc grammar file "".
 #
 

data/lib/riemann/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Riemann
   module Tools # :nodoc:
-    VERSION = '1.7.1'
+    VERSION = '1.8.1'
   end
 end

data/lib/riemann/tools.rb

@@ -73,7 +73,7 @@ module Riemann
     end
 
     def riemann
-      @riemann ||= RiemannClientWrapper.instance.configure(options)
+      @riemann ||= RiemannClientWrapper.new(options)
     end
     alias r riemann
 

data/riemann-tools.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'json', '>= 1.8'
   spec.add_runtime_dependency 'optimist', '~> 3.0', '>= 3.0.0'
-  spec.add_runtime_dependency 'riemann-client', '~> 1.0'
+  spec.add_runtime_dependency 'riemann-client', '~> 1.1'
 
   spec.add_development_dependency 'github_changelog_generator'
   spec.add_development_dependency 'racc'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.1
 platform: ruby
 authors:
 - Kyle Kingsbury
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
@@ -352,7 +352,7 @@ metadata:
   homepage_uri: https://github.com/aphyr/riemann-tools
   source_code_uri: https://github.com/aphyr/riemann-tools
   changelog_uri: https://github.com/aphyr/riemann-tools
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -367,8 +367,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
-signing_key: 
+rubygems_version: 3.4.5
+signing_key:
 specification_version: 4
 summary: Utilities which submit events to Riemann.
 test_files: []