yabeda 0.13.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c713eeb29eb6f5eb9a022b2bb43f85961a72dca331629ca0ab335b2c72e9bd4d
-  data.tar.gz: e9309522c7b6e8982518d8a03d52e6b3096c61647cdb63a618e957da5b6f50d4
+  metadata.gz: 4a403c359e0c88e79f3352df2521a880d17c2fee74457cd911e776d51042060f
+  data.tar.gz: 795a2312ba8de8ff41198444b87614fae3eb5fa803feed950f83d965c67f76a8
 SHA512:
-  metadata.gz: 9cb7676c26c849772cd27ddb180e5d733af2243b890d9dbb83dc7ff73ca57ed861a651ee7fa22f36410800600976ee0920115b96f36d036ed65b5652b6ff4dce
-  data.tar.gz: 0a145163ed0af2f669b8eaa235784b1bbbb0011a2222d4c5a44adca6461d264024a075c7c48a54fbdab089d8e8d2f41a3e96f9009fdb272b46ca2ba35d567c0c
+  metadata.gz: 1e432f7754fcbe31703dca2f753e8c19552e7e941a7e9e064430cd34066fbfb8f714920af8a8c88c2b1deadeab4f6ec464b24bc466d413d2f819670d59d21a70
+  data.tar.gz: 88f8f047866dff1244fc5609586d2ec4560bae818c926fae2de5428c073ebc10655ea3997a163d9923f86ef63720614ea3b49236025a54f91c27673564c0f4d0

data/.github/workflows/test.yml

@@ -21,6 +21,7 @@ jobs:
         include:
           - ruby: head
             optional: true
+          - ruby: "4.0"
           - ruby: "3.4"
           - ruby: "3.3"
           - ruby: "3.2"

data/CHANGELOG.md

@@ -7,6 +7,30 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 0.15.0 - 2026-03-04
+
+### Fixed
+
+- Concurrency issues with metrics' increment/decrement helper methods. [@cconstantine-onesignal][] in [#45](https://github.com/yabeda-rb/yabeda/pull/45)
+
+## 0.14.0 - 2025-09-10
+
+### Added
+
+- Allow to limit groups per adapter. [@killondark][] in [#41](https://github.com/yabeda-rb/yabeda/pull/41)
+
+  ```ruby
+  Yabeda.configure do
+    group :mushrooms do
+      counter :champignon_counter
+    end
+
+    adapter :basket_adapter do
+      include_group :mushrooms
+    end
+  end
+  ```
+
 ## 0.13.2 - 2025-09-09
 
 ### Fixed
@@ -196,3 +220,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 [@bibendi]: https://github.com/bibendi "Misha Merkushin"
 [@Keallar]: https://github.com/Keallar "Eugene Lysanskiy"
 [@jbockler]: https://github.com/jbockler "Josch Bockler"
+[@killondark]: https://github.com/killondark "Alexander Marychev"
+[@cconstantine-onesignal]: https://github.com/cconstantine-onesignal "Chris Constantine"

data/Gemfile

@@ -13,8 +13,7 @@ group :development, :test do
   gem "yard"
   gem "yard-dry-initializer"
 
-  gem "pry"
-  gem "pry-byebug", platform: :mri
+  gem "debug"
 
   gem "rubocop", "~> 1.0", require: false
   gem "rubocop-rspec", require: false

data/README.md

@@ -158,6 +158,8 @@ These are developed and maintained by other awesome folks:
  - [yabeda-shoryuken](https://github.com/retsef/yabeda-shoryuken) — metrics for [Shoryuken](https://github.com/ruby-shoryuken/shoryuken) jobs execution message queues.
  - [yabeda-rack-ratelimit](https://github.com/basecamp/yabeda-rack-ratelimit) — metrics for [Rack::Ratelimit](https://github.com/jeremy/rack-ratelimit)
  - [yabeda-hanami](https://github.com/mlibrary/yabeda-hanami) — metrics for [Hanami](https://hanamirb.org/) The web, with simplicity.
+ - [yabeda-jemalloc](http://github.com/jondavidschober/yabeda-jemalloc) - metrics for [Jemalloc](https://jemalloc.net/) via the `stats` FFI
+ - [yabeda-rack-queue](https://github.com/speedshop/yabeda-rack-queue) - metrics for reporting queue times of Rack applications.
  - _…and more! You can write your own adapter and open a pull request to add it into this list._
 
 ## Configuration
@@ -246,6 +248,19 @@ Yabeda.configure do
 end
 ```
 
+Or use another DSL to describe this logic:
+
+```ruby
+Yabeda.configure do
+  group :mushrooms do
+    counter :champignon_counter
+  end
+
+  adapter :basket_adapter do
+    include_group :mushrooms
+  end
+end
+```
 
 ## Roadmap (aka TODO or Help wanted)
 

data/lib/yabeda/base_adapter.rb

@@ -29,6 +29,13 @@ module Yabeda
       raise NotImplementedError, "#{self.class} doesn't support setting gauges"
     end
 
+    # Optional method that adapters can implement for native gauge increment/decrement
+    def perform_gauge_increment!(_gauge, _tags, _increment)
+      # used to indicate adapter does not implement this method. return a non-nil value
+      # in your adapter to indicate it is supported
+      nil
+    end
+
     def register_histogram!(_metric)
       raise NotImplementedError, "#{self.class} doesn't support histograms as metric type!"
     end

data/lib/yabeda/counter.rb

@@ -10,15 +10,11 @@ module Yabeda
     def increment(*args)
       tags, by = self.class.parse_args(*args)
       all_tags = ::Yabeda::Tags.build(tags, group)
-      values[all_tags] += by
+      value = increment_value(all_tags, by: by)
       adapters.each_value do |adapter|
         adapter.perform_counter_increment!(self, all_tags, by)
       end
-      values[all_tags]
-    end
-
-    def values
-      @values ||= Concurrent::Hash.new(0)
+      value
     end
 
     # @api private

data/lib/yabeda/dsl/class_methods.rb

@@ -96,10 +96,25 @@ module Yabeda
       #
       # @param adapter_names [Array<Symbol>] Names of adapters to use
       def adapter(*adapter_names, group: @group)
-        raise ConfigurationError, "Adapter limitation can't be defined outside of group" unless group
+        raise ConfigurationError, "Adapter limitation can't be defined without adapter_names" if adapter_names.empty?
+
+        @adapter_names = adapter_names
+        if group
+          include_group(group)
+        else
+          return yield if block_given?
+
+          raise ConfigurationError, "Yabeda.adapter should be called either inside group declaration " \
+            "or should have block provided with a call to include_group. No metric group provided."
+        end
+      ensure @adapter_names = nil
+      end
+
+      def include_group(group)
+        raise ConfigurationError, "Adapter limitation can't be defined without of group name" unless group
 
         Yabeda.groups[group] ||= Yabeda::Group.new(group)
-        Yabeda.groups[group].adapter(*adapter_names)
+        Yabeda.groups[group].adapter(*@adapter_names)
       end
 
       private

data/lib/yabeda/gauge.rb

@@ -5,7 +5,8 @@ module Yabeda
   class Gauge < Metric
     def set(tags, value)
       all_tags = ::Yabeda::Tags.build(tags, group)
-      values[all_tags] = value
+      atomic_value = values[all_tags] ||= Concurrent::Atom.new(0)
+      atomic_value.swap { |_| value }
       adapters.each_value do |adapter|
         adapter.perform_gauge_set!(self, all_tags, value)
       end
@@ -18,7 +19,14 @@ module Yabeda
     #   @param by [Integer] increment value
     def increment(*args)
       tags, by = Counter.parse_args(*args)
-      set(tags, get(tags).to_i + by)
+      all_tags = ::Yabeda::Tags.build(tags, group)
+      next_value = increment_value(all_tags, by: by)
+      adapters.each_value do |adapter|
+        if adapter.perform_gauge_increment!(self, all_tags, by).nil?
+          adapter.perform_gauge_set!(self, all_tags, next_value)
+        end
+      end
+      next_value
     end
 
     # @overload decrement(tags = {}, by: 1)
@@ -27,7 +35,14 @@ module Yabeda
     #   @param by [Integer] decrement value
     def decrement(*args)
       tags, by = Counter.parse_args(*args)
-      set(tags, get(tags).to_i - by)
+      all_tags = ::Yabeda::Tags.build(tags, group)
+      next_value = increment_value(all_tags, by: -by)
+      adapters.each_value do |adapter|
+        if adapter.perform_gauge_increment!(self, all_tags, -by).nil?
+          adapter.perform_gauge_set!(self, all_tags, next_value)
+        end
+      end
+      next_value
     end
   end
 end

data/lib/yabeda/metric.rb

@@ -17,14 +17,11 @@ module Yabeda
     # rubocop:disable Layout/LineLength
     option :adapter, optional: true, comment: "Monitoring system adapter to register metric in and report metric values to (other adapters won't be used)"
     # rubocop:enable Layout/LineLength
+    option :values, optional: true, default: proc { Concurrent::Hash.new }
 
     # Returns the value for the given label set
     def get(labels = {})
-      values[::Yabeda::Tags.build(labels, group)]
-    end
-
-    def values
-      @values ||= Concurrent::Hash.new
+      @values[::Yabeda::Tags.build(labels, group)]&.value
     end
 
     # Returns allowed tags for metric (with account for global and group-level +default_tags+)
@@ -62,5 +59,12 @@ module Yabeda
 
       super
     end
+
+    # Atomically increment the stored value, assumed to be given all labels, including group labels
+    # @api private
+    def increment_value(labels = {}, by: 1)
+      atomic_value = values[labels] ||= Concurrent::Atom.new(0)
+      atomic_value.swap { |prev| prev + by }
+    end
   end
 end

data/lib/yabeda/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yabeda
-  VERSION = "0.13.2"
+  VERSION = "0.15.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabeda
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Andrey Novikov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-09 00:00:00.000000000 Z
+date: 2026-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config