yabeda 0.12.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52ac87de3f6f2edd66e88d967b2e2e7231a87a27189e9d0a129cbafc6041813f
-  data.tar.gz: 2096a9ea457d7aa10efdcb54bc29a6a6e520e15974bba1efafc53df2921b5116
+  metadata.gz: e8a48fc237f75ffdb834af3b14fe7d991cb1f65a37d528a0139d2cc2895d3e6b
+  data.tar.gz: f3b316975ff26a048e9a8361c93b164591f3b3add12bea20a01b0f47316519f2
 SHA512:
-  metadata.gz: 3a75f40eb17ab3d35feef5449bfe07e369487c61609eca03da0f7eec17d1d7e32ad5b51b4a5079d3247b994df8e9730d681d501b7fa7b71d17a9b7d1ede06993
-  data.tar.gz: bcf1c14781cb17a3621ed4f03a3431b2399ee9e4ec80bfa044455903d2d4e9ab25563b94a01207435b05e1898e681dda91c6f36d437e574c33060f0f7c1014ef
+  metadata.gz: e9f252ca373fbf287c6ce674180e7cb58c35177951e903767722e8ad396bbee7cbebff73c6e9fcb7e2e43e30c6599c0aea5a53a7f4f546be28382a173ce5c856
+  data.tar.gz: 43fff38b19ef0fcde369eb4f43f78049543949d54d9f23d130a7e895ed7e10d62a6612f9328d1e9128cf1354578423f6992d56ee354063614c47f350cd960682

data/.github/workflows/lint.yml

@@ -3,7 +3,9 @@ name: Lint Ruby
 on:
   push:
     branches:
-      - master
+      - '**'
+    tags-ignore:
+      - 'v*'
     paths:
       - "gemfiles/*"
       - "Gemfile"
@@ -20,12 +22,15 @@ on:
 
 jobs:
   rubocop:
+    # Skip running tests for local pull requests (use push event instead), run only for foreign ones
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
+    name: RuboCop
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.2
+        ruby-version: "3.3"
         bundler-cache: true
     - name: Lint Ruby code with RuboCop
       run: |

data/.github/workflows/{build-release.yml → release.yml}

@@ -1,4 +1,4 @@
-name: Build and release gem to RubyGems
+name: Build and release gem
 
 on:
   push:
@@ -8,13 +8,17 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
+      packages: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Fetch current tag as annotated. See https://github.com/actions/checkout/issues/290
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: "3.3"
       - name: "Extract data from tag: version, message, body"
         id: tag
         run: |
@@ -75,8 +79,8 @@ jobs:
           GEM_HOST_API_KEY: Bearer ${{ secrets.GITHUB_TOKEN }}
         run: |
           gem push yabeda-${{ steps.tag.outputs.version }}.gem --host https://rubygems.pkg.github.com/${{ github.repository_owner }}
+      - name: Configure RubyGems Credentials
+        uses: rubygems/configure-rubygems-credentials@main
       - name: Publish to RubyGems
-        env:
-          GEM_HOST_API_KEY: "${{ secrets.RUBYGEMS_API_KEY }}"
         run: |
           gem push yabeda-${{ steps.tag.outputs.version }}.gem

data/.github/workflows/test.yml

@@ -11,32 +11,23 @@ on:
 jobs:
   test:
     name: "Ruby ${{ matrix.ruby }}"
+    # Skip running tests for local pull requests (use push event instead), run only for foreign ones
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         include:
+          - ruby: "3.3"
           - ruby: "3.2"
           - ruby: "3.1"
           - ruby: "3.0"
           - ruby: "2.7"
-    container:
-      image: ruby:${{ matrix.ruby }}
-      env:
-        CI: true
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
         with:
-          path: vendor/bundle
-          key: bundle-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}-${{ hashFiles('**/Gemfile') }}
-          restore-keys: |
-            bundle-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}-${{ hashFiles('**/Gemfile') }}
-            bundle-${{ matrix.ruby }}-
-      - name: Bundle install
-        run: |
-          bundle config path vendor/bundle
-          bundle install
-          bundle update
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
       - name: Run RSpec
         run: bundle exec rspec

data/.rubocop.yml

@@ -35,6 +35,9 @@ RSpec/NestedGroups:
 RSpec/MultipleMemoizedHelpers:
   Enabled: false
 
+RSpec/ExampleLength:
+  Max: 10
+
 Bundler/OrderedGems:
   Enabled: false
 

data/CHANGELOG.md

@@ -7,6 +7,53 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 0.13.1 - 2024-10-11
+
+### Fixed
+
+- Compatibility with Ruby 2.x, broken in 0.13.0 due to differences of keywords handling in Ruby 2.x for case when method has arguments with default values. [@Envek]
+
+## 0.13.0 - 2024-10-02
+
+### Added
+
+- Ability to limit some metrics to specific adapters. [#37](https://github.com/yabeda-rb/yabeda/pull/37) by [@Keallar] and [@Envek]
+
+  ```ruby
+  Yabeda.configure do
+    group :cloud do
+      adapter :newrelic, :datadog
+
+      counter :foo
+    end
+
+    counter :bar, adapter: :prometheus
+  end
+  ```
+
+- Multiple expectations in RSpec matchers. [@Envek]
+
+  ```ruby
+  expect { whatever }.to increment_yabeda_counter(:my_counter).with(
+    { tag: "foo" } => 1,
+    { tag: "bar" } => (be >= 42),
+  )
+  ```
+
+### Changed
+
+- Don't require to provide tags for counters and histograms, use empty tags (`{}`) by default. See discussion at [#26](https://github.com/yabeda-rb/yabeda/issues/26). [@Envek]
+
+  ```ruby
+  Yabeda.foo.increment
+  # same as
+  Yabeda.foo.increment({}, by: 1)
+  ```
+
+### Fixed
+
+- Railtie loading to prevent calling methods that have not yet been defined. [#38](https://github.com/yabeda-rb/yabeda/pull/38) by [@bibendi].
+
 ## 0.12.0 - 2023-07-28
 
 ### Added
@@ -37,7 +84,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 
-- Adapters now should use method `Yabeda.collect!` instead of manual calling of every collector block. 
+- Adapters now should use method `Yabeda.collect!` instead of manual calling of every collector block.
 
 ## 0.9.0 - 2021-05-07
 
@@ -140,3 +187,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 [@dsalahutdinov]: https://github.com/dsalahutdinov "Dmitry Salahutdinov"
 [@asusikov]: https://github.com/asusikov "Alexander Susikov"
 [@liaden]: https://github.com/liaden "Joel Johnson"
+[@bibendi]: https://github.com/bibendi "Misha Merkushin"
+[@Keallar]: https://github.com/Keallar "Eugene Lysanskiy"

data/Gemfile

@@ -16,6 +16,6 @@ group :development, :test do
   gem "pry"
   gem "pry-byebug", platform: :mri
 
-  gem "rubocop", "~> 1.0"
-  gem "rubocop-rspec"
+  gem "rubocop", "~> 1.0", require: false
+  gem "rubocop-rspec", require: false
 end

data/README.md

@@ -130,6 +130,7 @@ These are developed and maintained by other awesome folks:
 
  - [Statsd](https://github.com/asusikov/yabeda-statsd)
  - [AWS CloudWatch](https://github.com/retsef/yabeda-cloudwatch)
+ - [Honeybadger Insights](https://github.com/honeybadger-io/yabeda-honeybadger_insights)
  - _…and more! You can write your own adapter and open a pull request to add it into this list._
 
 ## Available plugins to collect metrics
@@ -156,6 +157,7 @@ These are developed and maintained by other awesome folks:
  - [yabeda-activejob](https://github.com/Fullscript/yabeda-activejob) — backend-agnostic metrics for background jobs.
  - [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.
  - _…and more! You can write your own adapter and open a pull request to add it into this list._
 
 ## Configuration
@@ -210,6 +212,41 @@ expect { subject }.to \
   with(be_between(0.005, 0.05))
 ```
 
+You also can specify multiple tags and their expected values in `with`:
+
+```ruby
+expect { whatever }.to increment_yabeda_counter(:my_counter).with(
+  { tag: "foo" } => 1,
+  { tag: "bar" } => (be >= 42),
+)
+```
+
+## Advanced usage
+
+### Limiting metrics and groups to specific adapters
+
+You can limit, which metrics and groups should be available for specific adapter:
+
+```ruby
+Yabeda.configure do
+  group :internal do
+    adapter :prometheus
+
+    counter :foo
+    gauge :bar
+  end
+
+  group :cloud do
+    adapter :newrelic
+
+    counter :baz
+  end
+
+  counter :qux, adapter: :prometheus
+end
+```
+
+
 ## Roadmap (aka TODO or Help wanted)
 
  - Ability to change metric settings for individual adapters
@@ -222,16 +259,6 @@ expect { subject }.to \
    end
    ```
 
- - Ability to route some metrics only for given adapter:
-
-   ```rb
-   adapter :prometheus do
-     include_group :sidekiq
-   end
-   ```
-
-
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/yabeda/counter.rb

@@ -3,10 +3,15 @@
 module Yabeda
   # Growing-only counter
   class Counter < Metric
-    def increment(tags, by: 1)
+    # @overload increment(tags = {}, by: 1)
+    #   Increment the counter for given set of tags by the given increment value
+    #   @param tags Hash{Symbol=>#to_s} tags to identify the counter
+    #   @param by [Integer] strictly positive increment value
+    def increment(*args)
+      tags, by = self.class.parse_args(*args)
       all_tags = ::Yabeda::Tags.build(tags, group)
       values[all_tags] += by
-      ::Yabeda.adapters.each do |_, adapter|
+      adapters.each_value do |adapter|
         adapter.perform_counter_increment!(self, all_tags, by)
       end
       values[all_tags]
@@ -15,5 +20,25 @@ module Yabeda
     def values
       @values ||= Concurrent::Hash.new(0)
     end
+
+    # @api private
+    # rubocop:disable Metrics/MethodLength
+    def self.parse_args(*args)
+      case args.size
+      when 0 # increment()
+        [EMPTY_TAGS, 1]
+      when 1 # increment(by: 5) or increment(tags)
+        if args[0].key?(:by)
+          [EMPTY_TAGS, args.fetch(:by)]
+        else
+          [args[0], 1]
+        end
+      when 2 # increment(tags, by: 5)
+        [args[0], args[1].fetch(:by, 1)]
+      else
+        raise ArgumentError, "wrong number of arguments (given #{args.size}, expected 0..2)"
+      end
+    end
+    # rubocop:enable Metrics/MethodLength
   end
 end

data/lib/yabeda/dsl/class_methods.rb

@@ -92,6 +92,16 @@ module Yabeda
         Thread.current[:yabeda_temporary_tags] ||= {}
       end
 
+      # Limit all group metrics to specific adapters only
+      #
+      # @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
+
+        Yabeda.groups[group] ||= Yabeda::Group.new(group)
+        Yabeda.groups[group].adapter(*adapter_names)
+      end
+
       private
 
       def register_metric(metric)
@@ -99,7 +109,7 @@ module Yabeda
         ::Yabeda.define_singleton_method(name) { metric }
         ::Yabeda.metrics[name] = metric
         register_group_for(metric) if metric.group
-        ::Yabeda.adapters.each_value { |adapter| adapter.register!(metric) } if ::Yabeda.configured?
+        metric.adapters.each_value { |adapter| adapter.register!(metric) } if ::Yabeda.configured?
         metric
       end
 

data/lib/yabeda/gauge.rb

@@ -6,17 +6,27 @@ module Yabeda
     def set(tags, value)
       all_tags = ::Yabeda::Tags.build(tags, group)
       values[all_tags] = value
-      ::Yabeda.adapters.each do |_, adapter|
+      adapters.each_value do |adapter|
         adapter.perform_gauge_set!(self, all_tags, value)
       end
       value
     end
 
-    def increment(tags, by: 1)
+    # @overload increment(tags = {}, by: 1)
+    #   Convenience method to increment current gauge value for given set of tags by the given increment value
+    #   @param tags Hash{Symbol=>#to_s} tags to identify the gauge
+    #   @param by [Integer] increment value
+    def increment(*args)
+      tags, by = Counter.parse_args(*args)
       set(tags, get(tags).to_i + by)
     end
 
-    def decrement(tags, by: 1)
+    # @overload decrement(tags = {}, by: 1)
+    #   Convenience method to decrement current gauge value for given set of tags by the given decrement value
+    #   @param tags Hash{Symbol=>#to_s} tags to identify the gauge
+    #   @param by [Integer] decrement value
+    def decrement(*args)
+      tags, by = Counter.parse_args(*args)
       set(tags, get(tags).to_i - by)
     end
   end

data/lib/yabeda/group.rb

@@ -19,6 +19,13 @@ module Yabeda
       @default_tags[key] = value
     end
 
+    def adapter(*adapter_names)
+      return @adapter if adapter_names.empty?
+
+      @adapter ||= Concurrent::Array.new
+      @adapter.push(*adapter_names)
+    end
+
     def register_metric(metric)
       define_singleton_method(metric.name) { metric }
     end

data/lib/yabeda/histogram.rb

@@ -7,7 +7,7 @@ module Yabeda
     option :buckets
 
     # rubocop: disable Metrics/MethodLength
-    def measure(tags, value = nil)
+    def measure(tags = {}, value = nil)
       if value.nil? ^ block_given?
         raise ArgumentError, "You must provide either numeric value or block for Yabeda::Histogram#measure!"
       end
@@ -20,7 +20,7 @@ module Yabeda
 
       all_tags = ::Yabeda::Tags.build(tags, group)
       values[all_tags] = value
-      ::Yabeda.adapters.each do |_, adapter|
+      adapters.each_value do |adapter|
         adapter.perform_histogram_measure!(self, all_tags, value)
       end
       value

data/lib/yabeda/metric.rb

@@ -14,6 +14,9 @@ module Yabeda
     option :per,     optional: true, comment: "Per which unit is measured `unit`. E.g. `call` as in seconds per call"
     option :group,   optional: true, comment: "Category name for grouping metrics"
     option :aggregation, optional: true, comment: "How adapters should aggregate values from different processes"
+    # 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
 
     # Returns the value for the given label set
     def get(labels = {})
@@ -25,7 +28,7 @@ module Yabeda
     end
 
     # Returns allowed tags for metric (with account for global and group-level +default_tags+)
-    # @return Array<Symbol>
+    # @return [Array<Symbol>]
     def tags
       (Yabeda.groups[group].default_tags.keys + Array(super)).uniq
     end
@@ -33,5 +36,31 @@ module Yabeda
     def inspect
       "#<#{self.class.name}: #{[@group, @name].compact.join('.')}>"
     end
+
+    # Returns the metric adapters
+    # @return [Hash<Symbol, Yabeda::BaseAdapter>]
+    def adapters
+      return ::Yabeda.adapters unless adapter
+
+      @adapters ||= begin
+        adapter_names = Array(adapter)
+        unknown_adapters = adapter_names - ::Yabeda.adapters.keys
+
+        if unknown_adapters.any?
+          raise ConfigurationError,
+                "invalid adapter option #{adapter.inspect} in metric #{inspect}"
+        end
+
+        ::Yabeda.adapters.slice(*adapter_names)
+      end
+    end
+
+    # Redefined option reader to get group-level adapter if not set on metric level
+    # @api private
+    def adapter
+      return ::Yabeda.groups[group]&.adapter if @adapter == Dry::Initializer::UNDEFINED
+
+      super
+    end
   end
 end

data/lib/yabeda/rspec/base_matcher.rb

@@ -8,21 +8,30 @@ module Yabeda
     # Example:
     #  expect { anything }.to do_whatever_with_yabeda_metric(Yabeda.something)
     class BaseMatcher < ::RSpec::Matchers::BuiltIn::BaseMatcher
-      attr_reader :tags, :metric
+      attr_reader :tags, :metric, :expectations
 
       # Specify a scope of labels (tags). Subset of tags can be specified.
       def with_tags(tags)
+        raise ArgumentError, "Can't use `with_tags` with expectations hash provided" if !@tags && @expectations&.any?
+
         @tags = tags
+        @expectations = { tags => nil }
+        self
+      end
+
+      def with(expectations)
+        @expectations = expectations || {}
         self
       end
 
-      def initialize(expected)
+      def initialize(metric)
         super
-        @expected = @metric = resolve_metric(expected)
+        @expected = @metric = resolve_metric(metric)
+        @expectations = {}
       rescue KeyError
         raise ArgumentError, <<~MSG
           Pass metric name or metric instance to matcher (e.g. `increment_yabeda_counter(Yabeda.metric_name)` or \
-          increment_yabeda_counter('metric_name')). Got #{expected.inspect} instead
+          increment_yabeda_counter('metric_name')). Got #{metric.inspect} instead
         MSG
       end
 
@@ -56,9 +65,11 @@ module Yabeda
       # Filter metric changes by tags.
       # If tags specified, treat them as subset of real tags (to avoid bothering with default tags in tests)
       def filter_matching_changes(changes)
-        return changes if tags.nil?
+        return changes.map { |tags, change| [tags, [nil, change]] }.to_h unless expectations&.any?
 
-        changes.select { |t, _v| t >= tags }
+        expectations.map do |tags, expected|
+          [tags, [expected, changes.find { |t, _v| t >= tags }&.[](1)]]
+        end.to_h
       end
     end
   end

data/lib/yabeda/rspec/increment_yabeda_counter.rb

@@ -15,6 +15,7 @@ module Yabeda
     class IncrementYabedaCounter < BaseMatcher
       def by(increment)
         @expected_increment = increment
+        @expectations = { tags => increment } if tags
         self
       end
 
@@ -32,8 +33,12 @@ module Yabeda
 
         increments = filter_matching_changes(Yabeda::TestAdapter.instance.counters.fetch(metric))
 
-        increments.values.any? do |actual_increment|
-          expected_increment.nil? || values_match?(expected_increment, actual_increment)
+        return false if increments.empty?
+
+        increments.values.all? do |expected_increment, actual_increment|
+          next !actual_increment.nil? if expected_increment.nil?
+
+          values_match?(expected_increment, actual_increment)
         end
       end
 
@@ -49,13 +54,16 @@ module Yabeda
 
         increments = filter_matching_changes(Yabeda::TestAdapter.instance.counters.fetch(metric))
 
-        increments.none?
+        increments.none? { |_tags, (_expected, actual)| !actual.nil? }
       end
 
       def failure_message
         "expected #{expected_formatted} " \
           "to be incremented #{"by #{description_of(expected_increment)} " unless expected_increment.nil?}" \
           "#{"with tags #{::RSpec::Support::ObjectFormatter.format(tags)} " if tags}" \
+          "#{if !tags && expectations
+               "with following expectations: #{::RSpec::Support::ObjectFormatter.format(expectations)} "
+             end}" \
           "but #{actual_increments_message}"
       end
 
@@ -63,6 +71,9 @@ module Yabeda
         "expected #{expected_formatted} " \
           "not to be incremented " \
           "#{"with tags #{::RSpec::Support::ObjectFormatter.format(tags)} " if tags}" \
+          "#{if !tags && expectations
+               "with following expectations: #{::RSpec::Support::ObjectFormatter.format(expectations)} "
+             end}" \
           "but #{actual_increments_message}"
       end
 

data/lib/yabeda/rspec/measure_yabeda_histogram.rb

@@ -14,6 +14,8 @@ module Yabeda
     # Custom matcher class with implementation for +measure_yabeda_histogram+
     class MeasureYabedaHistogram < BaseMatcher
       def with(value)
+        return super if value.is_a?(Hash)
+
         @expected_value = value
         self
       end
@@ -32,7 +34,13 @@ module Yabeda
 
         measures = filter_matching_changes(Yabeda::TestAdapter.instance.histograms.fetch(metric))
 
-        measures.values.any? { |measure| expected_value.nil? || values_match?(expected_value, measure) }
+        return false if measures.empty?
+
+        measures.values.all? do |expected_measure, actual_measure|
+          next !actual_measure.nil? if expected_measure.nil?
+
+          values_match?(expected_measure, actual_measure)
+        end
       end
 
       def match_when_negated(metric, block)
@@ -47,13 +55,16 @@ module Yabeda
 
         measures = filter_matching_changes(Yabeda::TestAdapter.instance.histograms.fetch(metric))
 
-        measures.none?
+        measures.none? { |_tags, (_expected, actual)| !actual.nil? }
       end
 
       def failure_message
         "expected #{expected_formatted} " \
           "to be changed #{"to #{expected} " unless expected_value.nil?}" \
           "#{"with tags #{::RSpec::Support::ObjectFormatter.format(tags)} " if tags}" \
+          "#{if !tags && expectations
+               "with following expectations: #{::RSpec::Support::ObjectFormatter.format(expectations)} "
+             end}" \
           "but #{actual_changes_message}"
       end
 
@@ -61,6 +72,9 @@ module Yabeda
         "expected #{expected_formatted} " \
           "not to be incremented " \
           "#{"with tags #{::RSpec::Support::ObjectFormatter.format(tags)} " if tags}" \
+          "#{if !tags && expectations
+               "with following expectations: #{::RSpec::Support::ObjectFormatter.format(expectations)} "
+             end}" \
           "but #{actual_changes_message}"
       end
 

data/lib/yabeda/rspec/observe_yabeda_summary.rb

@@ -14,6 +14,8 @@ module Yabeda
     # Custom matcher class with implementation for +observe_yabeda_summary+
     class ObserveYabedaSummary < BaseMatcher
       def with(value)
+        return super if value.is_a?(Hash)
+
         @expected_value = value
         self
       end
@@ -32,7 +34,13 @@ module Yabeda
 
         observations = filter_matching_changes(Yabeda::TestAdapter.instance.summaries.fetch(metric))
 
-        observations.values.any? { |observation| expected_value.nil? || values_match?(expected_value, observation) }
+        return false if observations.empty?
+
+        observations.values.all? do |expected_observation, actual_observation|
+          next !actual_observation.nil? if expected_observation.nil?
+
+          values_match?(expected_observation, actual_observation)
+        end
       end
 
       def match_when_negated(metric, block)
@@ -47,13 +55,16 @@ module Yabeda
 
         observations = filter_matching_changes(Yabeda::TestAdapter.instance.summaries.fetch(metric))
 
-        observations.none?
+        observations.none? { |_tags, (_expected, actual)| !actual.nil? }
       end
 
       def failure_message
         "expected #{expected_formatted} " \
           "to be observed #{"with #{expected} " unless expected_value.nil?}" \
           "#{"with tags #{::RSpec::Support::ObjectFormatter.format(tags)} " if tags}" \
+          "#{if !tags && expectations
+               "with following expectations: #{::RSpec::Support::ObjectFormatter.format(expectations)} "
+             end}" \
           "but #{actual_changes_message}"
       end
 
@@ -61,6 +72,9 @@ module Yabeda
         "expected #{expected_formatted} " \
           "not to be observed " \
           "#{"with tags #{::RSpec::Support::ObjectFormatter.format(tags)} " if tags}" \
+          "#{if !tags && expectations
+               "with following expectations: #{::RSpec::Support::ObjectFormatter.format(expectations)} "
+             end}" \
           "but #{actual_changes_message}"
       end
 

data/lib/yabeda/rspec/update_yabeda_gauge.rb

@@ -14,6 +14,8 @@ module Yabeda
     # Custom matcher class with implementation for +update_yabeda_gauge+
     class UpdateYabedaGauge < BaseMatcher
       def with(value)
+        return super if value.is_a?(Hash)
+
         @expected_value = value
         self
       end
@@ -32,7 +34,13 @@ module Yabeda
 
         updates = filter_matching_changes(Yabeda::TestAdapter.instance.gauges.fetch(metric))
 
-        updates.values.any? { |update| expected_value.nil? || values_match?(expected_value, update) }
+        return false if updates.empty?
+
+        updates.values.all? do |expected_update, actual_update|
+          next !actual_update.nil? if expected_update.nil?
+
+          expected_update.nil? || values_match?(expected_update, actual_update)
+        end
       end
 
       def match_when_negated(metric, block)
@@ -47,13 +55,16 @@ module Yabeda
 
         updates = filter_matching_changes(Yabeda::TestAdapter.instance.gauges.fetch(metric))
 
-        updates.none?
+        updates.none? { |_tags, (_expected, actual)| !actual.nil? }
       end
 
       def failure_message
         "expected #{expected_formatted} " \
           "to be changed #{"to #{expected_value} " unless expected_value.nil?}" \
           "#{"with tags #{::RSpec::Support::ObjectFormatter.format(tags)} " if tags}" \
+          "#{if !tags && expectations
+               "with following expectations: #{::RSpec::Support::ObjectFormatter.format(expectations)} "
+             end}" \
           "but #{actual_changes_message}"
       end
 
@@ -61,6 +72,9 @@ module Yabeda
         "expected #{expected_formatted} " \
           "not to be changed " \
           "#{"with tags #{::RSpec::Support::ObjectFormatter.format(tags)} " if tags}" \
+          "#{if !tags && expectations
+               "with following expectations: #{::RSpec::Support::ObjectFormatter.format(expectations)} "
+             end}" \
           "but #{actual_changes_message}"
       end
 

data/lib/yabeda/summary.rb

@@ -5,7 +5,7 @@ module Yabeda
   # calculate averages, percentiles, and so on.
   class Summary < Metric
     # rubocop: disable Metrics/MethodLength
-    def observe(tags, value = nil)
+    def observe(tags = {}, value = nil)
       if value.nil? ^ block_given?
         raise ArgumentError, "You must provide either numeric value or block for Yabeda::Summary#observe!"
       end
@@ -18,7 +18,7 @@ module Yabeda
 
       all_tags = ::Yabeda::Tags.build(tags, group)
       values[all_tags] = value
-      ::Yabeda.adapters.each do |_, adapter|
+      adapters.each_value do |adapter|
         adapter.perform_summary_observe!(self, all_tags, value)
       end
       value

data/lib/yabeda/version.rb

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

data/lib/yabeda.rb

@@ -8,12 +8,13 @@ require "yabeda/config"
 require "yabeda/dsl"
 require "yabeda/tags"
 require "yabeda/errors"
-require "yabeda/railtie" if defined?(Rails)
 
 # Extendable framework for collecting and exporting metrics from Ruby apps
 module Yabeda
   include DSL
 
+  EMPTY_TAGS = {}.freeze
+
   class << self
     extend Forwardable
 
@@ -29,7 +30,7 @@ module Yabeda
       end
     end
 
-    # @return [Hash<String, Yabeda::BaseAdapter>] All loaded adapters
+    # @return [Hash<Symbol, Yabeda::BaseAdapter>] All loaded adapters
     def adapters
       @adapters ||= Concurrent::Hash.new
     end
@@ -68,7 +69,9 @@ module Yabeda
     def register_adapter(name, instance)
       adapters[name] = instance
       # NOTE: Pretty sure there is race condition
-      metrics.each do |_, metric|
+      metrics.each_value do |metric|
+        next unless metric.adapters.key?(name)
+
         instance.register!(metric)
       end
     end
@@ -100,8 +103,8 @@ module Yabeda
 
       # Register metrics in adapters after evaluating all configuration blocks
       # to ensure that all global settings (like default tags) will be applied.
-      adapters.each_value do |adapter|
-        metrics.each_value do |metric|
+      metrics.each_value do |metric|
+        metric.adapters.each_value do |adapter|
           adapter.register!(metric)
         end
       end
@@ -129,7 +132,6 @@ module Yabeda
 
       true
     end
-    # rubocop: enable Metrics/MethodLength
 
     # Forget all the configuration.
     # For testing purposes as it doesn't rollback changes in adapters.
@@ -143,8 +145,12 @@ module Yabeda
       @metrics = nil
       collectors.clear
       configurators.clear
+      @config = Config.new
       instance_variable_set(:@configured_by, nil)
       instance_variable_set(:@debug_was_enabled_by, nil)
     end
+    # rubocop: enable Metrics/MethodLength
   end
 end
+
+require "yabeda/railtie" if defined?(Rails)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabeda
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Andrey Novikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-28 00:00:00.000000000 Z
+date: 2024-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
@@ -68,8 +68,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/build-release.yml"
 - ".github/workflows/lint.yml"
+- ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.16
 signing_key: 
 specification_version: 4
 summary: Extensible framework for collecting metric for your Ruby application