liquid-ext 3.4.2 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ab68e51c9209484d0aa966b8498578a715ebba1
-  data.tar.gz: 13123b71496c35456f68419ac5868a06a730c1fe
+  metadata.gz: f1eb7c79616fa8b96ebb46d0dbff36b696b54896
+  data.tar.gz: bf5333639d97bf2c6b7842d0d3cff015cac441af
 SHA512:
-  metadata.gz: 6ff8cddc75aef8e7e262451341db272c9e7fe2cf0003bead9d8cedb9247cef145b42d4513ebee0615b01461e06e5d0a9108b546b7003e0f5563f57fb0994ad2a
-  data.tar.gz: 8ca4dcdf20fdf87b1aa0714f5253e4f5f89a69b76a0219e3d670b983ddff16625be2fb49cb3b5ce46129e1dbb37cd538bba40007a21332bad442466581cac8e9
+  metadata.gz: 6ed90f105bc6ae3888833d2f03a3161ff639d46715a41cf4b54a71a322decdd3c5f90f369f4e3b76563051d6551f3c0c99a543108d2eedf042f6802161d1d6f8
+  data.tar.gz: a0ee19cd66b5906d89d50fb4437fd42db27084be22b8f5fa98633d6237b718ea11550f2d41360da11691309168917d910193d83b274b62596bb74bb00897ff60

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    liquid-ext (3.4.2)
+    liquid-ext (3.5.0)
       activesupport
       erubis
       jmx4r
@@ -57,7 +57,7 @@ GEM
     method_source (0.8.2)
     minitest (5.3.4)
     mixlib-cli (1.5.0)
-    multi_json (1.10.0)
+    multi_json (1.10.1)
     nokogiri (1.6.2.1-java)
     parallel (1.0.0)
     pry (0.9.12.6-java)

data/lib/liquid/boot.rb

@@ -87,6 +87,9 @@ $conf.mixin({
       level: :info,
       format: "%d{ISO8601} %-5p #{File.basename($0)}(#{Process.pid})[%t]: %m%n",
     },
+    metrics: {
+      interval: 60,
+    },
     tracker: {
       dimensions: {},
       kafka: {

data/lib/liquid/configuration.rb

@@ -106,7 +106,7 @@ module Liquid
 
       value = Section.from_hash(value)
 
-      deep_merge!(value[:generic]) if value.has_key?(:generic)
+      deep_merge!(value.delete(:generic)) if value.has_key?(:generic)
 
       if value.has_key?(Env.to_sym)
         deep_merge!(value[Env.to_sym])

data/lib/liquid/health_checks.rb

@@ -16,7 +16,7 @@ class HealthCheck
     end
 
     def to_s
-      "Result{isHealthy=#{healthy?},message=#{message.inspect},exception=#{exception.inspect}}"
+      "Result(healthy=#{healthy?},message=#{message.inspect},exception=#{exception.inspect})"
     end
   end
 

data/lib/liquid/metrics.rb

@@ -1,4 +1,5 @@
 if RUBY_PLATFORM == "java"
+  java_import 'com.codahale.metrics.Gauge'
   java_import 'com.codahale.metrics.Histogram'
   java_import 'com.codahale.metrics.JmxReporter'
   java_import 'com.codahale.metrics.MetricRegistry'
@@ -12,9 +13,9 @@ if RUBY_PLATFORM == "java"
     @registry = MetricRegistry.new
     @reporters = []
 
-    def self.start(period = nil, unit = nil)
-      @period ||= 60
-      @unit ||= TimeUnit::SECONDS
+    def self.start
+      @period = $conf.metrics.interval
+      @unit = TimeUnit::SECONDS
       JmxReporter.forRegistry(@registry).build.start
       Signal.register_shutdown_handler { stop }
     end
@@ -36,6 +37,10 @@ if RUBY_PLATFORM == "java"
       @registry
     end
 
+    def self.gauge(name, handler)
+      registry.register(name, handler)
+    end
+
     def self.counter(name)
       registry.counter(name)
     end

data/lib/liquid/metrics/reporter.rb

@@ -84,7 +84,7 @@ module Metrics
         timestamp: Time.now.to_i,
         type: :gauge,
         name: name,
-        value: gauge.value,
+        value: gauge.getValue,
       }
     end
 

data/lib/liquid/server.rb

@@ -4,9 +4,16 @@ if RUBY_PLATFORM == "java"
 
   module Liquid
     class Server
+      attr_reader :started_at
+
+      def name
+        @name ||= self.class.name.downcase.gsub(/::/, '.')
+      end
+
       def initialize
-        $log.info("#{self.class.name.downcase} #{RUBY_DESCRIPTION}")
-        $log.info("#{self.class.name.downcase}", env: Env.mode)
+        @started_at = Time.now
+        $log.info("#{name} #{RUBY_DESCRIPTION}")
+        $log.info("#{name}", env: Env.mode)
         Signal.register_shutdown_handler { System.exit(0) }
         Signal.register_shutdown_handler { ZContext.destroy }
         initialize_raven
@@ -41,9 +48,31 @@ if RUBY_PLATFORM == "java"
         Signal.register_shutdown_handler { $tracker.shutdown }
       end
 
+      class HealthGauge
+        include Gauge
+
+        def getValue
+          HealthCheck.healthy? ? 1 : 0
+        end
+      end
+
+      class UptimeGauge
+        include Gauge
+
+        def initialize(server)
+          @server = server
+        end
+
+        def getValue
+          @server.uptime.to_i
+        end
+      end
+
       def initialize_metrics
         ::Metrics.start
         ::Metrics::TrackerReporter.new($tracker.with_topic('metrics'))
+        ::Metrics.gauge("#{name}.healthy", HealthGauge.new)
+        ::Metrics.gauge("#{name}.uptime", UptimeGauge.new(self))
         Signal.register_shutdown_handler { ::Metrics.stop }
       end
 
@@ -67,6 +96,10 @@ if RUBY_PLATFORM == "java"
         Thread.join
       end
 
+      def uptime
+        Time.now - @started_at
+      end
+
     end
   end
 end

data/liquid-ext.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "liquid-ext"
-  spec.version       = "3.4.2"
+  spec.version       = "3.5.0"
   spec.authors       = ["LiquidM, Inc."]
   spec.email         = ["opensource@liquidm.com"]
   spec.description   = %q{Ruby core extensions and helper libraries}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquid-ext
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.5.0
 platform: ruby
 authors:
 - LiquidM, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport