salus 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b56bade24de8297f44086c6035316c68214523b6
-  data.tar.gz: 10bcca08fa4f0118acdc53c7c1da1901966ab444
+SHA256:
+  metadata.gz: 554783e06ea0a59372b6d61ef229caa7382fb9ecf97af677efced15303d0c6f1
+  data.tar.gz: 65ce8c9414a4385bdf98dd57c15ee8578e94c5a8c03b3f272164c753991edcd1
 SHA512:
-  metadata.gz: 424d2f341e0a30c5655dad641eae6debf3fc3aa5721484b7f52b6712e0a8d52f2551566bfe5b3e9cd52965e5a6f37a87bd89961c9abe15a3899ac681ec7e7f43
-  data.tar.gz: e97184252606e60b39c08a2ab817176b630e2008ede013b37404584ad8d758878af970cad22ee22d0f7c5ff24f9f73f465d2f0ceb331f5154448afc7fb29ca9b
+  metadata.gz: c50d9665b6f3334e5b41080003f8e18716a038de2fc8ece1a7efd3cc407e605db6014538cff79d6abef25cd4f65e3f1e103ffbd26b1f91b5f3af8ba421643963
+  data.tar.gz: d18166bcf2ca0deb09918a543967810ad9d075ff821dbb7fe89a3486a9477d207d20cc740f7fa93349d9880082bee8bf1762491dd66cc80641ed83df0df620e7

data/lib/salus.rb

@@ -129,11 +129,13 @@ module Salus
     end
 
     def tick
+      log DEBUG, "Tick..."
       lazy_eval
       return if @@_groups.empty?
       pause = (Salus.interval - Salus.tick_timeout - Salus.render_timeout) / 2
       pause = 1 if (pause <= 0)
 
+      log DEBUG, "Starting collection. Top-level groups to spawn: #{@@_groups.count}"
       latch = CountDownLatch.new(@@_groups.count)
       @@_groups.each do |k, v|
         pool.process do
@@ -150,6 +152,7 @@ module Salus
       log DEBUG, "Collection finished. Threads: #{pool.spawned} spawned, #{pool.waiting} waiting, #{Thread.list.count} total"
 
       return if @@_renders.empty?
+      log DEBUG, "Starting #{@_renders.count} renderers"
       latch = CountDownLatch.new(@@_renders.count)
       @@_renders.each do |v|
         pool.process do

data/lib/salus/group.rb

@@ -1,7 +1,9 @@
 require "forwardable"
 require "salus/metric"
 require "salus/metric/absolute"
+require "salus/metric/accumulator"
 require "salus/metric/counter"
+require "salus/metric/delta"
 require "salus/metric/derive"
 require "salus/metric/gauge"
 require "salus/metric/text"

data/lib/salus/metric.rb

@@ -144,6 +144,15 @@ module Salus
       end
     end
 
+    def clear
+      synchronize do
+        @last_calced_value = nil
+        @last_calced_ts    = nil
+        @needs_update      = true
+        @values.clear
+      end
+    end
+
     protected
     def option(key, *types)
       @attributes[key] = types

data/lib/salus/metric/accumulator.rb

@@ -0,0 +1,34 @@
+module Salus
+  class Accumulator < Metric
+    STORAGE_DEPTH = 1
+
+    def push(opts={}, &block)
+      opts = {} unless opts.is_a?(Hash)
+
+      synchronize do
+        opts.each do |k, v|
+          validate(k, v)
+          @opts[k] = v unless [:value, :ttl, :timestamp].include?(k)
+        end
+
+        if block_given?
+          v = begin
+            yield
+          rescue Exception => e
+            log DEBUG, e
+            nil
+          end
+          validate(:value, v)
+          opts[:value] = v
+        end
+
+        prev  = @values.empty? ? 0 : (@values.last.value || 0)
+        curr  = opts[:value] || 0
+        
+        @values << Value.new(prev+curr, opts[:timestamp] || Time.now.to_f, opts[:ttl] || @opts[:ttl])
+        @needs_update = true
+      end
+    end
+  end
+end
+  

data/lib/salus/metric/delta.rb

@@ -0,0 +1,36 @@
+module Salus
+  class Delta < Metric
+    def initialize(defaults={})
+      super(defaults)
+      option :minimum, Numeric
+      validate(:minimum, @opts[:minimum]) if @opts.key?(:minimum)
+    end
+
+    protected
+    def calc
+      super
+      @last_calced_value = nil
+
+      if @values.length < STORAGE_DEPTH
+        return
+      elsif @values[0].expired?(@values[1].timestamp)
+        return
+      elsif !@values[0].value.is_a?(Numeric)
+        return
+      elsif !@values[1].value.is_a?(Numeric)
+        return
+      end
+
+      @last_calced_value = begin
+        dt = (@values[1].timestamp - @values[0].timestamp)
+        dv = (@values[1].value - @values[0].value)
+        r = (dt == 0) ? nil : dv
+        if @opts.key?(:minimum) && !r.nil? && r < @opts[:minimum]
+          nil
+        else
+          r
+        end
+      end
+    end
+  end
+end

data/lib/salus/version.rb

@@ -1,3 +1,3 @@
 module Salus
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/salus.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "bundler", "~> 2.1"
 
-  spec.add_dependency "thor", "~> 0.20"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "thor", "~> 1.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salus
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - divanikus
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-08 00:00:00.000000000 Z
+date: 2020-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +93,9 @@ files:
 - lib/salus/logging.rb
 - lib/salus/metric.rb
 - lib/salus/metric/absolute.rb
+- lib/salus/metric/accumulator.rb
 - lib/salus/metric/counter.rb
+- lib/salus/metric/delta.rb
 - lib/salus/metric/derive.rb
 - lib/salus/metric/gauge.rb
 - lib/salus/metric/text.rb
@@ -136,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Simple DSL for writing metrics collecting agents.