yabeda 0.2.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fce95ac4969384292f6a3151b1aebb3c1affc3a41317f6e9c30543de90e50146
-  data.tar.gz: f1df0f753c8530166727ec53f7fe227f5fa67cafe39fe42d04309632981d0c47
+  metadata.gz: c2f29f3127ff98f3b4d6a31849685b3ad8b0df4fdde074317a2f1bf487f78698
+  data.tar.gz: a2f77eb4d92ab8b17aa85bd4eeec02b221a677d3e210a1abc48a9f39ad905063
 SHA512:
-  metadata.gz: 616b4376b04364a5e6e6c88b9c8b763dbaf02dd304a611fde4968a06be43c2773b6a9b6f6aac4e3629a0481cd5aa81b1ca731b1ecc5118970a1c1f0f0c2ad7d3
-  data.tar.gz: 1ee600f68346abc63dfc2dbc66d52a169584b43005db91f5fd952accf836b66ffcee478d95cb37ffa81bb4921769aeb7f04e0bbeb329c073064ed290de1808c0
+  metadata.gz: 67a977f74a4ed9ac12ef5c6b683c62a39eb7f4a298dbf4bffa2e6fb6245e563ae2a3bc181935ee626d0ef18d4171d856611651bab5a89c5a7a8856856a50055e
+  data.tar.gz: c8000204d2d037e59b29cc37a8605e4106114fee711b7b39ed87b8c0abdabfd247e7e3f60907d0412ff6a745070f5a23898dfdf145a367f900d047b7f90ddfa8

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,44 @@ 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.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
+
+ - Configuration of gem was changed from synchronous (at the moment when `configure` block was executed) to postponed (only on `configure!` method call). [@Envek]
+
+   This should allow to fix problems when metrics from gems are registered too early, before required changes to the monitoring system clients.
+
+## 0.3.0 - 2020-01-15
+
+### Added
+
+ - Ability to specify default tag which value will be automatically added to all metrics. [#7](https://github.com/yabeda-rb/yabeda/pull/7) by [@asusikov].
+
 ## 0.2.0 - 2020-01-14
 
 ### Added
@@ -34,3 +72,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## 0.1.0 - 2018-10-03
 
  - Initial release of evil-metrics gem. @Envek
+
+[@Envek]: https://github.com/Envek "Andrey Novikov"
+[@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

@@ -43,7 +43,15 @@ And then execute:
     end
     ```
 
- 2. Access metric in your app and use it!
+ 2. After your application was initialized and all metrics was declared, you need to apply Yabeda configuration:
+
+    ```ruby
+    Yabeda.configure!
+    ```
+
+    _But [yabeda-rails] will do this for you automatically._
+
+ 3. Access metric in your app and use it!
 
     ```ruby
     def ring_the_bell(id)
@@ -59,7 +67,7 @@ And then execute:
     end
     ```
 
- 3. Setup collecting of metrics that do not tied to specific events in you application. E.g.: reporting your app's current state
+ 4. Setup collecting of metrics that do not tied to specific events in you application. E.g.: reporting your app's current state
     ```ruby
     Yabeda.configure do
       # This block will be executed periodically few times in a minute
@@ -71,8 +79,28 @@ And then execute:
     end
     ```
 
-  4. See the docs for the adapter you're using
-  5. Enjoy!
+  5. _Optionally_ setup default tags that will be added to all metrics
+     ```ruby
+     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)
 
@@ -109,3 +137,5 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/yabeda
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+[yabeda-rails]: https://github.com/yabeda-rb/yabeda-rails/ "Yabeda plugin for collecting and exporting basic metrics for Rails applications"

data/lib/yabeda.rb

@@ -4,6 +4,8 @@ require "concurrent"
 
 require "yabeda/version"
 require "yabeda/dsl"
+require "yabeda/tags"
+require "yabeda/errors"
 
 # Extendable framework for collecting and exporting metrics from Ruby apps
 module Yabeda
@@ -30,6 +32,11 @@ module Yabeda
       @collectors ||= Concurrent::Array.new
     end
 
+    # @return [Hash<Symbol, Symbol>] All added default tags
+    def default_tags
+      @default_tags ||= Concurrent::Hash.new
+    end
+
     # @param [Symbol] name
     # @param [BaseAdapter] instance
     def register_adapter(name, instance)
@@ -39,5 +46,53 @@ module Yabeda
         instance.register!(metric)
       end
     end
+
+    # @return [Array<Proc>] All configuration blocks for postponed setup
+    def configurators
+      @configurators ||= Concurrent::Array.new
+    end
+
+    # @return [Boolean] Whether +Yabeda.configure!+ has been already called
+    def configured?
+      !@configured_by.nil?
+    end
+    alias already_configured? configured?
+
+    # 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?
+
+      configurators.each do |(group, block)|
+        group group
+        class_eval(&block)
+        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.
+    # @api private
+    def reset!
+      default_tags.clear
+      adapters.clear
+      groups.clear
+      metrics.clear
+      collectors.clear
+      configurators.clear
+      instance_variable_set(:@configured_by, nil)
+    end
   end
 end

data/lib/yabeda/counter.rb

@@ -4,11 +4,12 @@ module Yabeda
   # Growing-only counter
   class Counter < Metric
     def increment(tags, by: 1)
-      values[tags] += by
+      all_tags = ::Yabeda::Tags.build(tags)
+      values[all_tags] += by
       ::Yabeda.adapters.each do |_, adapter|
-        adapter.perform_counter_increment!(self, tags, by)
+        adapter.perform_counter_increment!(self, all_tags, by)
       end
-      values[tags]
+      values[all_tags]
     end
 
     def values

data/lib/yabeda/dsl/class_methods.rb

@@ -14,7 +14,8 @@ module Yabeda
     module ClassMethods
       # Block for grouping and simplifying configuration of related metrics
       def configure(&block)
-        class_exec(&block)
+        Yabeda.configurators.push([@group, block])
+        class_exec(&block) if Yabeda.configured?
         @group = nil
       end
 
@@ -53,13 +54,36 @@ module Yabeda
         register_metric(metric)
       end
 
+      # Add default tag for all metric
+      #
+      # @param name [Symbol] Name of default tag
+      # @param value [String] Value of default tag
+      def default_tag(name, value)
+        ::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
         metric
       end

data/lib/yabeda/dsl/metric_builder.rb

@@ -3,8 +3,6 @@
 require "yabeda/dsl/option_builder"
 
 module Yabeda
-  class ConfigurationError < StandardError; end
-
   module DSL
     # Handles DSL for working with individual metrics
     class MetricBuilder

data/lib/yabeda/errors.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Yabeda
+  class ConfigurationError < StandardError; end
+
+  # Raises on repeated call to +Yabeda.configure!+
+  class AlreadyConfiguredError < StandardError
+    def initialize(configuring_location)
+      super
+      @message = "Yabeda was already configured in #{configuring_location}"
+    end
+
+    attr_reader :message
+  end
+end

data/lib/yabeda/gauge.rb

@@ -4,9 +4,10 @@ module Yabeda
   # Arbitrary value, can be changed in both sides
   class Gauge < Metric
     def set(tags, value)
-      values[tags] = value
+      all_tags = ::Yabeda::Tags.build(tags)
+      values[all_tags] = value
       ::Yabeda.adapters.each do |_, adapter|
-        adapter.perform_gauge_set!(self, tags, value)
+        adapter.perform_gauge_set!(self, all_tags, value)
       end
       value
     end

data/lib/yabeda/histogram.rb

@@ -7,9 +7,10 @@ module Yabeda
     option :buckets
 
     def measure(tags, value)
-      values[tags] = value
+      all_tags = ::Yabeda::Tags.build(tags)
+      values[all_tags] = value
       ::Yabeda.adapters.each do |_, adapter|
-        adapter.perform_histogram_measure!(self, tags, value)
+        adapter.perform_histogram_measure!(self, all_tags, value)
       end
       value
     end

data/lib/yabeda/metric.rb

@@ -13,6 +13,7 @@ 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 = {})
@@ -22,5 +23,9 @@ module Yabeda
     def values
       @values ||= Concurrent::Hash.new
     end
+
+    def tags
+      (Yabeda.default_tags.keys + Array(super)).uniq
+    end
   end
 end

data/lib/yabeda/tags.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Yabeda
+  # Class to merge tags
+  class Tags
+    def self.build(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.2.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabeda
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Andrey Novikov
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -137,17 +137,19 @@ files:
 - lib/yabeda/dsl/class_methods.rb
 - lib/yabeda/dsl/metric_builder.rb
 - lib/yabeda/dsl/option_builder.rb
+- lib/yabeda/errors.rb
 - lib/yabeda/gauge.rb
 - lib/yabeda/group.rb
 - lib/yabeda/histogram.rb
 - lib/yabeda/metric.rb
+- lib/yabeda/tags.rb
 - lib/yabeda/version.rb
 - yabeda.gemspec
 homepage: https://github.com/yabeda-rb/yabeda
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -162,8 +164,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Extensible framework for collecting metric for your Ruby application
 test_files: []