rails_pod_kit 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dda5e5202f1bb5e509fad032de8449c5d8e9eec78c0cedcd0a59d20cc4f0d32
-  data.tar.gz: ebccb551ba5dcfd23c1dc2e668d417f59fb1d76f06522e02c352cea1f5e0dca5
+  metadata.gz: a40b144ace0af8e73c9a44f21ebb7111e726543a343be3c8f8969ee7befb166c
+  data.tar.gz: 5ec92a058a63671e877011591d2a5585a98a9da5c851db86ea5924814cbed32a
 SHA512:
-  metadata.gz: f6ab1b5432bf79341efabb50d0d3d1862dafa49523bbbc8f70ea718eb520d258b7c216da274f0d184dbeb1737c887ebfb19f04fbcc656e8fd39c6a0e057d6346
-  data.tar.gz: c2e8aa9a3b35a1ea4d557a47be04810c69e79de50a0297593388f90c1be48f8a144a281ad3d26a6c42c4564ba608d6ded064ba53b12f5f49279ddefa940e049c
+  metadata.gz: fca2fbe470f2eaa9c8039034d8795ca9006ea10e835d8db907c20aa3a1740eeffa2bc94a2d31bc024130028f15e4340e4c59dcc3fc330cbb34d12b649bd1f4b1
+  data.tar.gz: 04e115d689e42b62975846ca67a5312ba7de26fbec65ca970864dbc844131dda53188839ff05f1a81601aeaa652bd42e1f17682d8d22cc08203322b5072bf1b7

data/README.md

@@ -611,7 +611,7 @@ serves `solid_queue_*` and nothing else, so the check config needs no filters.
   localhost-only socket (`no_token: true`, never network-exposed).
 - **Rack version.** Under **Rack 3+** the mmap exporter's WEBrick handler also
   needs the `rackup` gem. Under Rack 2.x `webrick` alone is enough, but on
-  Ruby ≥ 3.5 make sure `ostruct` is in the bundle (Rack 2.2 requires it
+  Ruby ≥ 4.0 make sure `ostruct` is in the bundle (Rack 2.2 requires it
   without declaring it, and it's no longer a default gem).
 - **Two kinds of entry point.** The main file (`require 'rails_pod_kit'`,
   what Bundler.require loads in a Rails app) pulls in every integration

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/rails_pod_kit/puma.rb

@@ -43,10 +43,16 @@ module RailsPodKit
       puma_config.plugin :yabeda
       puma_config.plugin :yabeda_prometheus
 
-      # Silence the exporter's per-scrape access log. The `prometheus_silence_logger`
-      # DSL method is defined by the :yabeda_prometheus plugin, so this must run
-      # after the plugin is loaded above. See Config#silence_exporter_access_log.
-      puma_config.prometheus_silence_logger(true) if RailsPodKit.config.silence_exporter_access_log
+      # Drop the exporter's per-scrape access log the same way the WEBrick path
+      # does (see RailsPodKit::Exporter.start!): the log line comes from the
+      # Rack::CommonLogger the exporter's rack app mounts unless this is exactly
+      # 'false'. See Config#silence_exporter_access_log.
+      #
+      # Deliberately not `prometheus_silence_logger(true)`, which is the plugin's
+      # own knob: it swaps Puma's whole log writer for LogWriter.null, and that
+      # writer also carries the exporter's errors — so a /metrics that raises on
+      # every scrape would fail completely silently.
+      ENV['PROMETHEUS_EXPORTER_LOG_REQUESTS'] = 'false' if RailsPodKit.config.silence_exporter_access_log
 
       # `config/puma.rb` is evaluated before Rails is loaded, so requiring this
       # gem here loads yabeda *before* `defined?(Rails)`, and yabeda's Railtie

data/lib/rails_pod_kit/sidekiq.rb

@@ -21,6 +21,8 @@ module RailsPodKit
     def install!(sidekiq_config = nil)
       return unless RailsPodKit.enabled?
 
+      export_policy_env!(collect_cluster_metrics: RailsPodKit.config.sidekiq_global_metrics == :all)
+
       require 'yabeda/sidekiq'
       require 'yabeda/prometheus/mmap'
 
@@ -72,9 +74,10 @@ module RailsPodKit
     # server — i.e. the web (Puma) process under the :web policy. The web has the
     # Sidekiq client configured (Redis access), so yabeda-sidekiq can read the
     # cluster stats there. We force `collect_cluster_metrics` on and keep
-    # `declare_process_metrics` off (the web runs no jobs). Must run before
-    # Yabeda.configure! so the gauges are declared.
+    # `declare_process_metrics` off (the web runs no jobs).
     def enable_global_collection!
+      export_policy_env!(collect_cluster_metrics: true, declare_process_metrics: false)
+
       require 'yabeda/sidekiq'
 
       Yabeda::Sidekiq.config.collect_cluster_metrics = true
@@ -82,6 +85,24 @@ module RailsPodKit
       apply_retries_segmentation!
     end
 
+    # Publishes the policy through yabeda-sidekiq's own env-backed config, and it
+    # has to happen *before* `require 'yabeda/sidekiq'`.
+    #
+    # yabeda-sidekiq declares its cluster gauges inside its own `Yabeda.configure`
+    # block, guarded by `collect_cluster_metrics` — and when Yabeda has already
+    # been configured (any host where its Railtie ran first) requiring the file
+    # evaluates that block immediately. Assigning the flag afterwards is then too
+    # late: the gauges are never declared, while the `collect` block — which reads
+    # the same flag on every scrape — starts referencing them, and /metrics 500s
+    # with a NameError. The env values are read when the config object is built,
+    # so setting them here makes the declaration see the policy whenever the
+    # require lands.
+    def export_policy_env!(collect_cluster_metrics:, declare_process_metrics: nil)
+      ENV['YABEDA_SIDEKIQ_COLLECT_CLUSTER_METRICS'] = collect_cluster_metrics.to_s
+      ENV['YABEDA_SIDEKIQ_DECLARE_PROCESS_METRICS'] = declare_process_metrics.to_s unless declare_process_metrics.nil?
+      ENV['YABEDA_SIDEKIQ_RETRIES_SEGMENTED_BY_QUEUE'] = RailsPodKit.config.retries_segmented_by_queue.to_s
+    end
+
     # Starts the background WEBrick exporter shared with the other non-Puma
     # entry points; guarded there so a re-entrant Sidekiq boot can't double-bind
     # the port.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_pod_kit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Fabio Napoleoni