yabeda-gruf 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 825cbd87d9e02b2eb8197d8e50411689d52bcb74817642bc354359759b80a34b
-  data.tar.gz: 30f0c2b0080898575b86c4d8087371c911765055654c25e3f91769570f8abb12
+  metadata.gz: cba67831ad6a67773f2de02c9f927ba569f750ca59437e8544dc46530f523338
+  data.tar.gz: 3eca4618f70096714d01ce5a1d1292b24387bdda598f58490a4516e936523ac0
 SHA512:
-  metadata.gz: 373830ae75d21f3803ebd457e3394b15f323b737e739f8ffb6b88ec540e1371094d336e60621711f95ae800bcd23e72329ed72ea2900f7786e62cfdc2628779e
-  data.tar.gz: 7e64ebb48767fc6ed40d8d1e0fa6873cb5d3378a95080d201cdfb1dcf6dce906dbbd514b44ce636ab8b15605261c5c2d13717bb0f2c8354055ffc5be0531d9bf
+  metadata.gz: 31e5b10e22305d7d6859b37791241ae32368cf3555c9bedf4ca32d2788e2727eb4b3f2f0a2033f5bb9654378f48056d7a290ddd97cac8d04fb49ec4c1452279a
+  data.tar.gz: aa12c743c9da5b0078a5d805ae8df158ebbd70102a0b243d2e33cf4986c1e999b2075e4395f149135b55a5c878a32211b1c29ce5d65986384784c61b80245489

data/Gemfile.lock

@@ -1,42 +1,43 @@
 PATH
   remote: .
   specs:
-    yabeda-gruf (1.0.0)
-      gruf
+    yabeda-gruf (1.1.0)
+      gruf (>= 2.7.0)
       yabeda
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
     ast (2.4.0)
     byebug (10.0.2)
     coderay (1.1.2)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    dry-initializer (2.5.0)
-    google-protobuf (3.6.1)
-    googleapis-common-protos-types (1.0.2)
-      google-protobuf (~> 3.0)
-    grpc (1.17.0)
-      google-protobuf (~> 3.1)
-      googleapis-common-protos-types (~> 1.0.0)
-    grpc-tools (1.17.0)
-    gruf (2.5.1)
-      activesupport
-      concurrent-ruby
+    dry-initializer (3.0.3)
+    google-protobuf (3.12.4)
+    googleapis-common-protos-types (1.0.5)
+      google-protobuf (~> 3.11)
+    grpc (1.30.2)
+      google-protobuf (~> 3.12)
+      googleapis-common-protos-types (~> 1.0)
+    grpc-tools (1.30.2)
+    gruf (2.8.1)
+      activesupport (> 4)
+      concurrent-ruby (> 1)
       grpc (~> 1.10)
       grpc-tools (~> 1.10)
       slop (~> 4.6)
-    i18n (1.2.0)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.1)
     method_source (0.9.0)
-    minitest (5.11.3)
+    minitest (5.14.1)
     parallel (1.12.1)
     parser (2.5.1.2)
       ast (~> 2.4.0)
@@ -73,20 +74,21 @@ GEM
     rubocop-rspec (1.24.0)
       rubocop (>= 0.53.0)
     ruby-progressbar (1.9.0)
-    slop (4.6.2)
+    slop (4.8.2)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.4.0)
-    yabeda (0.1.2)
+    yabeda (0.6.1)
       concurrent-ruby
       dry-initializer
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.1)
   pry
   pry-byebug
   rake (~> 10.0)
@@ -96,4 +98,4 @@ DEPENDENCIES
   yabeda-gruf!
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

data/README.md

@@ -16,12 +16,15 @@ And then execute:
 
 ## Usage
 
-Add `Yabeda::Gruf::ServerInterceptor` in gruf configuration.
+Before server starts, `Yabeda.configure!` will be executed!
+
+Add `Yabeda::Gruf::ServerInterceptor` and `Yabeda::Gruf::ServerHook` in gruf configuration.
 Preferably at the beginning of interceptor chain.
 
 ```ruby
 Gruf.configure do |c|
   c.interceptors.use(Yabeda::Gruf::ServerInterceptor)
+  c.hooks.use(Yabeda::Gruf::ServerHook)
 end
 ```
 

data/lib/yabeda/gruf.rb

@@ -5,6 +5,8 @@ require 'yabeda'
 require 'gruf'
 
 require 'yabeda/gruf/server_interceptor'
+require 'yabeda/gruf/server_hook'
+require 'yabeda/gruf/stats_collector'
 
 module Yabeda
   module Gruf
@@ -14,6 +16,8 @@ module Yabeda
     ].freeze
 
     class << self
+      attr_accessor :gruf_server
+
       def install!
         configure_yabeda!
       end
@@ -22,12 +26,24 @@ module Yabeda
 
       def configure_yabeda!
         Yabeda.configure do
-          group :gruf
-
-          # server
-          counter   :served_requests_total, comment: 'A counter of the total number of gRPC requests processed.'
-          histogram :served_request_duration, unit: :seconds, buckets: LONG_RUNNING_REQUEST_BUCKETS,
-                                              comment: 'A histogram of the response latency.'
+          group :gruf do
+
+            # server interceptor
+            counter   :served_requests_total, comment: 'A counter of the total number of gRPC requests processed.'
+            histogram :served_request_duration, unit: :seconds, buckets: LONG_RUNNING_REQUEST_BUCKETS,
+                                                comment: 'A histogram of the response latency.'
+
+            # server collector
+            gauge :pool_jobs_waiting_total, comment: 'Number of jobs in thread pool waiting'
+            gauge :pool_ready_workers_total, comment: 'Number of non-busy workers in thread pool'
+            gauge :pool_workers_total, comment: 'Total number of workers in thread pool'
+            gauge :pool_initial_size, comment: 'Initial size of thread pool'
+            gauge :poll_period, comment: 'Polling period for thread pool'
+          end
+
+          collect do
+            Yabeda::Gruf::StatsCollector.new.collect! if Yabeda::Gruf.gruf_server
+          end
         end
       end
     end

data/lib/yabeda/gruf/server_hook.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Yabeda
+  module Gruf
+    class ServerHook < ::Gruf::Hooks::Base
+      def before_server_start(server:)
+        Yabeda::Gruf.gruf_server = server
+        Yabeda.configure! unless Yabeda.already_configured?
+      end
+    end
+  end
+end

data/lib/yabeda/gruf/server_interceptor.rb

@@ -19,8 +19,8 @@ module Yabeda
 
         l = labels(response, error)
 
-        Yabeda.gruf_served_requests_total.increment(l)
-        Yabeda.gruf_served_request_duration.measure(l, stop_time - start_time)
+        Yabeda.gruf.served_requests_total.increment(l)
+        Yabeda.gruf.served_request_duration.measure(l, stop_time - start_time)
 
         raise error if error
         response

data/lib/yabeda/gruf/stats_collector.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Yabeda
+  module Gruf
+    class StatsCollector
+
+      def collect!
+        return unless server
+
+        server.instance_variable_get(:@run_mutex).synchronize { measure_metrics }
+      end
+
+      private
+
+      def measure_metrics
+        return unless pool
+
+        Yabeda.gruf.pool_jobs_waiting_total.set({}, pool.jobs_waiting.to_i)
+        Yabeda.gruf.pool_ready_workers_total.set({}, pool.instance_variable_get(:@ready_workers)&.size)
+        Yabeda.gruf.pool_workers_total.set({}, pool.instance_variable_get(:@workers)&.size)
+        Yabeda.gruf.pool_initial_size.set({}, server.instance_variable_get(:@pool_size)&.to_i)
+        Yabeda.gruf.poll_period.set({}, server.instance_variable_get(:@poll_period)&.to_i)
+      end
+
+      def pool
+        @pool ||= server&.instance_variable_get(:@pool)
+      end
+
+      def server
+        @server ||= Yabeda::Gruf.gruf_server&.server
+      end
+    end
+  end
+end

data/lib/yabeda/gruf/version.rb

@@ -2,6 +2,6 @@
 
 module Yabeda
   module Gruf
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

data/yabeda-gruf.gemspec

@@ -24,10 +24,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'gruf'
+  spec.add_dependency 'gruf', '>= 2.7.0'
   spec.add_dependency 'yabeda'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabeda-gruf
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - kruczjak
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gruf
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: yabeda
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -99,14 +99,16 @@ files:
 - bin/console
 - bin/setup
 - lib/yabeda/gruf.rb
+- lib/yabeda/gruf/server_hook.rb
 - lib/yabeda/gruf/server_interceptor.rb
+- lib/yabeda/gruf/stats_collector.rb
 - lib/yabeda/gruf/version.rb
 - yabeda-gruf.gemspec
 homepage: https://boostcom.no
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,9 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Yabeda exporter for gruf
 test_files: []