async-tools 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e6e1090999fdea25dd828cc680fcf23c2a689b9d4e496c5a3b7cff917ea9a34
-  data.tar.gz: 9d9e7828f26eb1e31da2d0f4ca7cc9912614b8fe69a6e5f61e830f0be0cab6b6
+  metadata.gz: '0906d98b66177300144f1f52414ab79d077bfd75874ba4ebdee3bcac7c12f91b'
+  data.tar.gz: 26b18c911296ac5ea3ac5673417b9fef92e83eae475a5ac7ba79a4037e0a7c91
 SHA512:
-  metadata.gz: 777703b396852748b6113c3b2e5b201838cf7be184b7c00693f6e21bbbca7e08ac99ca09b43932719a2273985ef218afcb9803f38618ca520bf206db1f328234
-  data.tar.gz: 321d4d42cdce361e467c6f9e5bb94e00ad7c02694628ca7851b2997f09e7cdbdaa8e435c60f15e9cdeebb6490235d48b412e08bf6de9fb9fd2d2fa46996f4d01
+  metadata.gz: 5b3f48863641bd02bd74d58267c5c3f1c44023d25ca8f06df50daec535913118d5ff121e6d3f38f158d41f365001aa81e80d2353ee0abdf17c2028a9ff4fdcf8
+  data.tar.gz: 86128a933957cf1efae7f67e47361cc02c72201836abf715db193b40cc36300bda9fb9ee7b0fafd9e1555ea57afd9f8a39f87da23fced2786cc3057487551448

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    async-tools (0.2.6)
+    async-tools (0.2.8)
       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,15 +18,19 @@ 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
     exit(1)
   end
-  # rubocop:enable Style/GlobalVars
 
   def container = @container ||= Dry::Container.new
   def run! = nil
@@ -35,9 +39,12 @@ class Async::App
 
   def stop
     @task&.stop
+    $__ASYNC_APP = nil
     info { "Stopped" }
   end
 
+  # rubocop:enable Style/GlobalVars
+
   private
 
   def set_traps!
@@ -63,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/tools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 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