yabeda 0.5.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 324b1326a709ae2ef5754ab07f117a6f7ee801df3f35c0c973198e85c6e7c1b1
-  data.tar.gz: b06be1f053df8d40fa31a3cd0f84ecc52ea7f0fc59c72bf1d13f938862dc16dd
+  metadata.gz: f7c6b79b60dd1c6ea62fe35f811be834bb64baecd5a7fcdfcd35b3f42415d45d
+  data.tar.gz: 7f1d0130e059e95769e8a663edde3c05b0cc0a49f7af91e22a8ba2cf2a55027a
 SHA512:
-  metadata.gz: 61a38c13f05a2357c1dee89891e6738675be94c587fd271950584aa14e581ab49cf87fe27d023b39290357763fed11e8d22f53a6e39930a4d8e0f7959f420cc7
-  data.tar.gz: e5c8f67eed9e8c2e46d8ae6367c12ea287a39eadd75985e78942da285ea8e2ec8d73ea73c54b04c9efe7eb0215ffcff48c0c60fe0fa61c4ca50b134e024fe1aa
+  metadata.gz: 40a72d78f2a675c8b0b1c476a9dd29345454a341e7cccbc5353862c4783b85f0825ee387a558547f5b796a126b2c229a6347f09bd1cde1c3935002dbabeea3a2
+  data.tar.gz: 502631f8472f5f474c3cdbfac887e3e62015a6231246f84512b1251446a4f8913fb62a0cd97f7f6c4d60679318fcac421c9563397ec656f16b3fafc0c38b4f6f

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,45 @@ 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.8.0 - 2020-08-21
+
+### Added
+
+ - Added railtie to automatically configure Yabeda on Rails: moved from [yabeda-rails](https://github.com/yabeda-rb/yabeda-rails) gem. [@Envek]
+
+## 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
@@ -45,7 +84,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
 
@@ -58,4 +97,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

@@ -49,7 +49,7 @@ And then execute:
     Yabeda.configure!
     ```
 
-    _But [yabeda-rails] will do this for you automatically._
+    _If you're using Ruby on Rails then it will be configured automatically!_
 
  3. Access metric in your app and use it!
 
@@ -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

@@ -6,6 +6,7 @@ require "yabeda/version"
 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
@@ -60,6 +61,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 +71,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

@@ -17,7 +17,7 @@ module Yabeda
 
     # Returns the value for the given label set
     def get(labels = {})
-      values[labels]
+      values[::Yabeda::Tags.build(labels)]
     end
 
     def values

data/lib/yabeda/railtie.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Yabeda
+  module Rails
+    class Railtie < ::Rails::Railtie # :nodoc:
+      config.after_initialize do
+        Yabeda.configure! unless Yabeda.already_configured?
+      end
+    end
+  end
+end

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.5.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabeda
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Andrey Novikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -142,6 +142,7 @@ files:
 - lib/yabeda/group.rb
 - lib/yabeda/histogram.rb
 - lib/yabeda/metric.rb
+- lib/yabeda/railtie.rb
 - lib/yabeda/tags.rb
 - lib/yabeda/version.rb
 - yabeda.gemspec
@@ -164,7 +165,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