async-tools 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5857bd13503604e3465c92d121e209424e5db7bca05b50c8136b59a9880f185
-  data.tar.gz: 459533340df4832809b5e8b03558cef26bc8d580f6dc9169904e4b5d430817c5
+  metadata.gz: fc3694f2f03f7c7845ee1c6911a3a2f2042b0d4b55c20fdef6c616e205c45c64
+  data.tar.gz: d7c56b6cb80b8dc83a041f3f53bc5b876b0f2ea6286bf6b53dd3c0173b264e7d
 SHA512:
-  metadata.gz: e8615f9092884f2376c37200d90bf029f5d79948e7fd61eec4bc5f7eb37f567ab52ed10734aba02367c3c9916ea7b83a4dc357be0956a3c47aedcede1ae16935
-  data.tar.gz: 94900e33d70558be801b8becb7ed59a731d617aa1c7decaebfc09da1c1b0dc395f87b32f29b71c297ce28350b008072ba7fa30b5bafeb2d2ce9f7822c0df6d9c
+  metadata.gz: 42cc9c27e20fca3fd48287c0c0f0bd5c4176d607d540d9e3ecb5237eebecf494ffb4fe8dc9b025e85ed45771bedadfa3b227fb702a344fe11bf42e0ca212699a
+  data.tar.gz: ff2dcf6780a51aad4e220dbb0548a0757dcc603072b1c7b195b7124e9175e14a31300b349d1dfde1868020511317182ad07074499ea94835424e08ebed59e1dd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    async-tools (0.2.7)
+    async-tools (0.2.9)
       async (~> 2.3)
       zeitwerk (~> 2.6)
 

data/lib/async/app/metrics/ruby_runtime_metrics_collector.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class Async::App::Metrics::RubyRuntimeMetricsCollector
+  include Async::App::Component
+
+  INTERVAL = 5
+
+  def run
+    Async::Timer.new(INTERVAL, run_on_start: true, on_error: ->(e) { warn(e) }) do
+      bus.publish("metrics.updated", metrics)
+    end
+    info { "Started" }
+  end
+
+  def metrics
+    fibers = ObjectSpace.each_object(Fiber)
+    threads = ObjectSpace.each_object(Thread)
+    ractors = ObjectSpace.each_object(Ractor)
+    {
+      ruby_fibers: { value: fibers.count },
+      ruby_fibers_active: { value: fibers.count(&:alive?) },
+      ruby_threads: { value: threads.count },
+      ruby_threads_active: { value: threads.count(&:alive?) },
+      ruby_ractors: { value: ractors.count },
+      ruby_memory: { value: GetProcessMem.new.bytes.to_s("F"), suffix: "bytes" }
+    }
+  end
+end

data/lib/async/app/web_server/health_app.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class Async::App::WebServer::HealthApp
+  include Async::App::Component
+
+  PATHS = ["/health", "/health/"].freeze
+
+  def initialize
+    @healthy = false
+
+    bus.subscribe("health.updated") { @healthy = _1 }
+  end
+
+  def can_handle?(request) = PATHS.include?(request.path)
+  def call(_) = [@healthy ? 200 : 500]
+end

data/lib/async/app/web_server/metrics_app/serializer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class Async::App::WebServer::MetricsApp::Serializer
+  def initialize(prefix:, store:)
+    @prefix = prefix
+    @store = store
+  end
+
+  def serialize
+    @store.flat_map { metric_line(_1) }
+          .compact
+          .join("\n")
+          .then { "#{_1}\n" }
+  end
+
+  def metric_name(value) = "#{@prefix}_#{value[:name]}_#{value[:suffix]}"
+
+  def metric_labels(value) = value[:labels].map { |tag, tag_value| "#{tag}=#{tag_value.to_s.inspect}" }.join(",")
+
+  def metric_line(value)
+    "#{metric_name(value)}{#{metric_labels(value)}} #{value[:value]}" if value.key?(:value)
+  end
+end

data/lib/async/app/web_server/metrics_app/store.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class Async::App::WebServer::MetricsApp::Store
+  include Enumerable
+
+  def set(name, value:, suffix: "total", **labels)
+    key = [name, labels]
+    metrics[key] ||= { name:, labels:, suffix:, value: }
+    metrics[key].merge!(value:)
+  end
+
+  def each(&) = metrics.values.each(&)
+
+  private
+
+  def metrics = @metrics ||= {}
+end

data/lib/async/app/web_server/metrics_app.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class Async::App::WebServer::MetricsApp
+  include Async::App::Component
+
+  PATHS = ["/metrics", "/metrics/"].freeze
+
+  def initialize(metrics_prefix:)
+    store = Store.new
+    @serializer = Serializer.new(prefix: metrics_prefix, store:)
+
+    bus.subscribe("metrics.updated") do |metrics|
+      metrics.each { store.set(_1, **_2) }
+    end
+  end
+
+  def can_handle?(request) = PATHS.include?(request.path)
+  def call(*) = [200, {}, @serializer.serialize]
+end

data/lib/async/app/web_server/router.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Async::App::WebServer::Router
+  extend Async::App::Injector
+
+  def initialize(*apps)
+    @apps = apps
+  end
+
+  def call(request)
+    @apps.each { return Protocol::HTTP::Response[*_1.call(request)] if _1.can_handle?(request) }
+
+    Protocol::HTTP::Response[404, {}, ["Not found"]]
+  end
+end

data/lib/async/app/web_server.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Async::App::WebServer
+  include Async::Logger
+
+  def initialize(metrics_prefix:, port: 8080)
+    @router = Async::App::WebServer::Router.new(
+      MetricsApp.new(metrics_prefix:),
+      HealthApp.new
+    )
+    @endpoint = Async::HTTP::Endpoint.parse("http://0.0.0.0:#{port}")
+  end
+
+  def run
+    Async { Async::HTTP::Server.new(@router, @endpoint).run }
+    info { "Started on #{@endpoint.url}" }
+  end
+end

data/lib/async/app.rb

@@ -18,9 +18,14 @@ class Async::App
     init_container!
 
     start_event_logger!
-    start_metrics_server!
+    start_web_server!
+
+    start_runtime_metrics_collector!
+
     run!
+
     info { "Started" }
+    bus.publish("health.updated", true)
   rescue StandardError => e
     fatal { e }
     stop
@@ -65,11 +70,7 @@ class Async::App
     exit(1)
   end
 
-  def start_metrics_server!
-    Metrics::Server.new(prefix: app_name).tap(&:run).tap do |server|
-      bus.subscribe("metrics.updated") { server.update_metrics(_1) }
-    end
-  end
-
+  def start_web_server! = WebServer.new(metrics_prefix: app_name).run
   def start_event_logger! = EventLogger.new.run
+  def start_runtime_metrics_collector! = Async::App::Metrics::RubyRuntimeMetricsCollector.new.run
 end

data/lib/async/bus.rb

@@ -19,12 +19,12 @@ class Async::Bus
   end
 
   # NON-BLOCKING, runs subscriber in a task
-  def async_subscribe(name, parent: Async::Task.current)
-    subscribe(name) do |event|
+  def async_subscribe(pattern, parent: Async::Task.current)
+    subscribe(pattern) do |event|
       parent.async  do
         yield(event)
       rescue StandardError => e
-        log_error(name, e)
+        log_error(pattern, e)
       end
     end
   end

data/lib/async/timer.rb

@@ -27,14 +27,13 @@ class Async::Timer
     self.start if start
   end
 
-  def stop = @task.stop
+  def stop = @task.stop(true)
   def call = @callable.call
 
   def active? = @active
 
   def restart
     stop
-    @task.wait
     start
   end
 

data/lib/async/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Async # rubocop:disable Style/ClassAndModuleChildren
   module Tools
-    VERSION = "0.2.7"
+    VERSION = "0.2.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -64,10 +64,13 @@ files:
 - lib/async/app/component.rb
 - lib/async/app/event_logger.rb
 - lib/async/app/injector.rb
-- lib/async/app/metrics/ruby_runtime_monitor.rb
-- lib/async/app/metrics/serializer.rb
-- lib/async/app/metrics/server.rb
-- lib/async/app/metrics/store.rb
+- lib/async/app/metrics/ruby_runtime_metrics_collector.rb
+- lib/async/app/web_server.rb
+- lib/async/app/web_server/health_app.rb
+- lib/async/app/web_server/metrics_app.rb
+- lib/async/app/web_server/metrics_app/serializer.rb
+- lib/async/app/web_server/metrics_app/store.rb
+- lib/async/app/web_server/router.rb
 - lib/async/bus.rb
 - lib/async/cache.rb
 - lib/async/channel.rb

data/lib/async/app/metrics/ruby_runtime_monitor.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-class Async::App::Metrics::RubyRuntimeMonitor
-  include Async::Logger
-
-  INTERVAL = 2
-
-  def run
-    Async::Timer.new(INTERVAL, run_on_start: true, on_error: ->(e) { warn(e) }) do
-      fibers = ObjectSpace.each_object(Fiber)
-      threads = ObjectSpace.each_object(Thread)
-      ractors = ObjectSpace.each_object(Ractor)
-
-      yield({
-        ruby_fibers: { value: fibers.count },
-        ruby_fibers_active: { value: fibers.count(&:alive?) },
-        ruby_threads: { value: threads.count },
-        ruby_threads_active: { value: threads.count(&:alive?) },
-        ruby_ractors: { value: ractors.count },
-        ruby_memory: { value: GetProcessMem.new.bytes.to_s("F"), suffix: "bytes" }
-      })
-    end
-    info { "Started" }
-  end
-end

data/lib/async/app/metrics/serializer.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-class Async::App::Metrics::Serializer
-  def initialize(prefix:)
-    @prefix = prefix
-  end
-
-  def serialize(metrics)
-    metrics.flat_map { metric_line(_1) }
-           .compact
-           .join("\n")
-           .then { "#{_1}\n" }
-  end
-
-  def metric_name(value) = "#{@prefix}_#{value[:name]}_#{value[:suffix]}"
-
-  def metric_labels(value) = value[:labels].map { |tag, tag_value| "#{tag}=#{tag_value.to_s.inspect}" }.join(",")
-
-  def metric_line(value)
-    labels = metric_labels(value)
-
-    "#{metric_name(value)}{#{labels}} #{value[:value]}" if value.key?(:value)
-  end
-end

data/lib/async/app/metrics/server.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-class Async::App::Metrics::Server
-  include Async::Logger
-
-  PATHS = ["/metrics", "/metrics/"].freeze
-
-  def initialize(prefix:, port: 8080)
-    @prefix = prefix
-    @port = port
-  end
-
-  def run
-    Async::App::Metrics::RubyRuntimeMonitor.new.run { update_metrics(_1) }
-
-    endpoint = Async::HTTP::Endpoint.parse("http://0.0.0.0:#{@port}")
-    Async { Async::HTTP::Server.new(self, endpoint).run }
-    info { "Started on #{endpoint.url}" }
-  end
-
-  def call(request)
-    return Protocol::HTTP::Response[404, {}, ["Not found"]] unless PATHS.include?(request.path)
-
-    Protocol::HTTP::Response[200, {}, serializer.serialize(metrics_store)]
-  end
-
-  def update_metrics(metrics) = metrics.each { metrics_store.set(_1, **_2) }
-
-  private
-
-  def metrics_store = @metrics_store ||= Async::App::Metrics::Store.new
-  def serializer = @serializer ||= Async::App::Metrics::Serializer.new(prefix: @prefix)
-end

data/lib/async/app/metrics/store.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class Async::App::Metrics::Store
-  include Enumerable
-
-  def set(name, value:, suffix: "total", **labels)
-    key = [name, labels]
-    counters[key] ||= { name:, labels:, suffix:, value: }
-    counters[key].merge!(value:)
-  end
-
-  def each(&) = counters.values.each(&)
-
-  private
-
-  def counters = @counters ||= {}
-end