yabeda 0.4.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30e7d6e3fee4aac1922285af3fe9abc61cbfedff88ec2c2b95f70478383c02df
-  data.tar.gz: b5ff1691c1c692672b3d03fd46fc13f299d8851f61d3a65e1571389787b8b050
+  metadata.gz: 8e30282089c3784919bbdfef129e36f9898bbe30376dec4148ab45551835e95a
+  data.tar.gz: 9abb1750e05b17f4f97f5d3c91d9eaf6f638c735b82d46baa1618500edf373da
 SHA512:
-  metadata.gz: 0b0872f973fe39a30be8c3c74f91e7c472aa246f7be08ed0d719c605b9ab42c7625b47c294dec04a15f82b4cc90984953b5658cc8041c51776ce3bb3ea70a1a9
-  data.tar.gz: 6ae9978212486a4deeefbb173cc7c103f5fa3a3f64db4c5ec21188a9a38aa94af39c741b900970ab5649d5ced0bf5979acd65bd531fdfa7b577640d85e7ab531
+  metadata.gz: b8fb61bea63f36d9f8ea98985c12d5247cefe7463ad2129f3bbda1ffbff34cc8faa4b71d797f44e02cc957a2159cdca3b53996fbf641e496476ab04e47489f3d
+  data.tar.gz: 66f06b7e63832eda3d43e0266fc4aa38726b261215a5308930bc9757a344dd60f43844a3d9b5f74a62069e1c090664248505d8a2408f0d6801685ccd926ea8b4

data/.rubocop.yml

@@ -10,12 +10,9 @@ Metrics/BlockLength:
   - "Gemfile"
   - "spec/**/*"
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 
-Style/BracesAroundHashParameters:
-  EnforcedStyle: context_dependent
-
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
@@ -47,3 +44,11 @@ Style/TrailingCommaInHashLiteral:
   Enabled: true
   EnforcedStyleForMultiline: consistent_comma
 
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true

data/.travis.yml

@@ -1,5 +1,4 @@
 ---
-sudo: false
 language: ruby
 cache: bundler
 rvm:

data/CHANGELOG.md

@@ -5,6 +5,47 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 0.7.0 - 2020-08-07
+
+### Added
+
+ - `#increment` and `#decrement` convenience methods for `Yabeda::Gauge`. [#13](https://github.com/yabeda-rb/yabeda/pull/13) by [@dsalahutdinov]
+ - Ability to use custom step in `#increment` and `#decrement` for gauges. [@Envek]
+
+### Fixed
+
+ - Account for default tags in `Yabeda::Metric#get`. [@Envek]
+
+## 0.6.2 - 2020-08-04
+
+### Fixed
+
+ - Compatibility with plugins (like [yabeda-puma-plugin](https://github.com/yabeda-rb/yabeda-puma-plugin)) that for some reason configures itself after Yabeda configuration was already applied by `Yabeda.configure!` (was broken in 0.6.0). [@Envek]
+
+## 0.6.1 - 2020-07-16
+
+### Fixed
+
+ - Compatibility with Ruby < 2.6 due to usage of [new `Hash#merge(*others)` with multiple arguments](https://rubyreferences.github.io/rubychanges/2.6.html#hashmerge-with-multiple-arguments) in 0.6.0. [@Envek]
+
+## 0.6.0 - 2020-07-15
+
+### Added
+
+ - `Yabeda.with_tags` to redefine default tags for limited amount of time–for all metrics measured during a block execution. [@Envek]
+
+### Fixed
+
+ - Default tags were not sent to adapters for metrics declared before `default_tag` declaration. [@Envek]
+
+## 0.5.0 - 2020-01-29
+
+### Added
+
+ - Ability to specify aggregation policy for metrics collected from multiple process and exposed via single endpoint. [@Envek]
+
+   For now it is only used by yabeda-prometheus when official Prometheus client is configured to use file storage for metrics.
+
 ## 0.4.0 - 2020-01-28
 
 ### Changed
@@ -37,7 +78,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 
- - Removed accidental dependency from Rails. @dsalahutdinov
+ - Removed accidental dependency from Rails. [@dsalahutdinov]
 
 ## 0.1.1 - 2018-10-17
 
@@ -50,4 +91,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
  - Initial release of evil-metrics gem. @Envek
 
 [@Envek]: https://github.com/Envek "Andrey Novikov"
+[@dsalahutdinov]: https://github.com/dsalahutdinov "Dmitry Salahutdinov"
 [@asusikov]: https://github.com/asusikov "Alexander Susikov"

data/Gemfile

@@ -11,6 +11,6 @@ group :development, :test do
   gem "pry"
   gem "pry-byebug", platform: :mri
 
-  gem "rubocop"
+  gem "rubocop", "~> 0.80.0"
   gem "rubocop-rspec"
 end

data/README.md

@@ -84,11 +84,24 @@ And then execute:
      Yabeda.configure do
        default_tag :rails_environment, 'production'
      end
+
+     # You can redefine them for limited amount of time
+     Yabeda.with_tags(rails_environment: 'staging') do
+       Yabeda.your_app.bells_rang_count.increment({bell_size: bell.size}, by: 1)
+     end
      ```
 
   6. See the docs for the adapter you're using
   7. Enjoy!
 
+## Available monitoring system adapters
+
+ - [Prometheus](https://github.com/yabeda-rb/yabeda-prometheus)
+ - [Datadog](https://github.com/yabeda-rb/yabeda-datadog)
+ - [NewRelic](https://github.com/yabeda-rb/yabeda-newrelic)
+ - [Statsd](https://github.com/asusikov/yabeda-statsd)
+ - _…and more! You can write your own adapter and open a pull request to add it into this list._
+
 ## Roadmap (aka TODO or Help wanted)
 
  - Ability to change metric settings for individual adapters

data/lib/yabeda.rb

@@ -60,6 +60,7 @@ module Yabeda
 
     # Perform configuration: registration of metrics and collector blocks
     # @return [void]
+    # rubocop: disable Metrics/MethodLength, Metrics/AbcSize
     def configure!
       raise(AlreadyConfiguredError, @configured_by) if already_configured?
 
@@ -69,8 +70,17 @@ module Yabeda
         group nil
       end
 
+      # 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|
+          adapter.register!(metric)
+        end
+      end
+
       @configured_by = caller_locations(1, 1)[0].to_s
     end
+    # rubocop: enable Metrics/MethodLength, Metrics/AbcSize
 
     # Forget all the configuration.
     # For testing purposes as it doesn't rollback changes in adapters.

data/lib/yabeda/dsl/class_methods.rb

@@ -62,14 +62,30 @@ module Yabeda
         ::Yabeda.default_tags[name] = value
       end
 
+      # Redefine default tags for a limited amount of time
+      # @param tags Hash{Symbol=>#to_s}
+      def with_tags(**tags)
+        Thread.current[:yabeda_temporary_tags] = tags
+        yield
+      ensure
+        Thread.current[:yabeda_temporary_tags] = {}
+      end
+
+      # Get tags set by +with_tags+
+      # @api private
+      # @return Hash
+      def temporary_tags
+        Thread.current[:yabeda_temporary_tags] || {}
+      end
+
       private
 
       def register_metric(metric)
         name = [metric.group, metric.name].compact.join("_")
         ::Yabeda.define_singleton_method(name) { metric }
         ::Yabeda.metrics[name] = metric
-        ::Yabeda.adapters.each_value { |adapter| adapter.register!(metric) }
         register_group_for(metric) if metric.group
+        ::Yabeda.adapters.each_value { |adapter| adapter.register!(metric) } if ::Yabeda.configured?
         metric
       end
 

data/lib/yabeda/gauge.rb

@@ -11,5 +11,13 @@ module Yabeda
       end
       value
     end
+
+    def increment(tags, by: 1)
+      set(tags, get(tags).to_i + by)
+    end
+
+    def decrement(tags, by: 1)
+      set(tags, get(tags).to_i - by)
+    end
   end
 end

data/lib/yabeda/metric.rb

@@ -13,10 +13,11 @@ module Yabeda
     option :unit,    optional: true, comment: "In which units it is measured. E.g. `seconds`"
     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"
 
     # Returns the value for the given label set
     def get(labels = {})
-      values[labels]
+      values[::Yabeda::Tags.build(labels)]
     end
 
     def values

data/lib/yabeda/tags.rb

@@ -4,7 +4,7 @@ module Yabeda
   # Class to merge tags
   class Tags
     def self.build(tags)
-      ::Yabeda.default_tags.merge(tags)
+      ::Yabeda.default_tags.merge(Yabeda.temporary_tags).merge(tags)
     end
   end
 end

data/lib/yabeda/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabeda
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Andrey Novikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -111,7 +111,7 @@ dependencies:
 description: 'Collect statistics about how your application is performing with ease.
   Export metrics to various monitoring systems.
 
-  '
+'
 email:
 - envek@envek.name
 executables: []
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Extensible framework for collecting metric for your Ruby application