presto-metrics 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a43804112e1f231ae1f0385b6d4c23909d4b0c37
-  data.tar.gz: ee961aa3796169912449f4db7c4fac1870dd8362
+  metadata.gz: 0a2bf2d4c30bd55568e9b94d7f9fd1597303a8d3
+  data.tar.gz: 0f7c7864bacaa407c2c526d6f1d3ac3eb6e36c1d
 SHA512:
-  metadata.gz: ac35fadd641b03a7609d3067bef8b0fbca98e8869c9130f0a6ac19aba5c1c3e0675da3788572ff3cf2eb5b223822f4c895955d5dd2c5b44e053189923281ccd0
-  data.tar.gz: c6856141ac447e3b2eed0b07025ad5856e5f64ba6e75e1806598ea3a0730387c4d5069010210d9f706cc19e8ab95355b1437e37cc934865a2e0c07b348edde81
+  metadata.gz: e944e66ed17d4a470e407d4c7078908f9d4f248ab739b138397a6eda7c4acb7788fb9b5cbf9f2d1327a26fd9cea5293dab6631b23af2000691aa361270752d46
+  data.tar.gz: e4558c716d9f80925f7892a8c2a19062f119575c8353e279653097fc542633d536240824d1e7332929eeccfd3f483c4acec40693988a1c2cdf10c09448d2a5a2

data/README.md

@@ -49,11 +49,11 @@ client.os_metrics([:system_load_average, :free_physical_memory_size])
 
 # Path queries
 client.path("os:physical_memory_size")
-# => {"os.free_physical_memory_size"=>55034294272}
+# => {"free_physical_memory_size"=>55034294272}
 
 # You can use comma-separated list of path queries
 client.path("memory:heap_memory_usage.used,non_heap_memory_usage.used")
-# => {"heap_memory_usage.used"=>926714864, "non_heap_memory_usage.used"=>108948488}
+# => {"heap_memory_usage/used"=>926714864, "non_heap_memory_usage/used"=>108948488}
 
 
 # Retrieve standard metrics

data/lib/presto/metrics.rb

@@ -1,7 +1,6 @@
 require "presto/metrics/version"
 require 'httparty'
 require 'json'
-require 'jsonpath'
 
 module Presto
   module Metrics
@@ -58,17 +57,36 @@ module Presto
 			c = path.split(/:/)
 			target = c[0]
 			mbean = @@MBEAN_ALIAS[target] || target
-			json = get_metrics(mbean)
-			return json if c.size <= 1
+			json_obj = get_metrics(mbean)
+			return json_obj if c.size <= 1
 			query_list = (c[1] || "").split(/,/)
 			result = {}
 			query_list.each{|q|
-				json_path = JsonPath.new(q)
-				result[q] = json_path.first(json)
+				path_elems = q.split("/")
+				target_elem = extract_path(json_obj, path_elems, 0)
+				result[q] = target_elem unless target_elem.nil?
 			}
 			result
 		end
 
+
+		def extract_path(json_obj, path, depth) 
+			return nil if json_obj.nil?
+			if depth >= path.length 
+				json_obj
+			else 
+				if json_obj.kind_of?(Array)
+				   # Handle key, value pairs of GC information
+				   value = json_obj.find{|e| 
+				   	e.is_a?(Hash) && e['key'] == path[depth]
+				   }
+				   extract_path(value['value'], path, depth+1)
+				else
+					extract_path(json_obj[path[depth]], path, depth+1)
+				end
+			end
+		end
+
 		def query 
 			Query.new(self)
 		end
@@ -79,7 +97,11 @@ module Presto
 
 	  	def get(path) 
 	  		resp = HTTParty.get("#{@endpoint}#{path}")
-	  		resp.body
+	  		if resp.code == 200
+	  			resp.body 	  		
+	  		else
+	  			"{}"
+	  		end
 	  	end
 
 	  	def get_mbean_json(mbean) 

data/lib/presto/metrics/version.rb

@@ -1,5 +1,5 @@
 module Presto
   module Metrics
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/presto-metrics.gemspec

@@ -23,6 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
 
   spec.add_runtime_dependency "httparty"
-  spec.add_runtime_dependency "jsonpath"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: presto-metrics
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Taro L. Saito
@@ -66,20 +66,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jsonpath
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Monitoring Presto coordinator and worker processes through JMX REST API
   (/v1/jmx/mbean)
 email: