presto-metrics 0.3.11 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9617d545ab8d02a5d52eba1a50a2623f20ae4e55
-  data.tar.gz: 7e5af26f44fd021a19b69e18cc3a8d3f1dad90c7
+SHA256:
+  metadata.gz: '09f100f447203d34c25804b21b62ee7b2a57e3c0b53060be86ddce4518d2ea8a'
+  data.tar.gz: 63d2fb97c402172228943758a7ec95eb0efb86fd9b3014625570afb744dc4edc
 SHA512:
-  metadata.gz: dc12934048e4a46f4c2f29611cbae251462b2db930e99993c454fd9edceb8ec111152ffcb73dc7cbfc508d1d15c7813eb2702780a95730e151c69a8385b142d8
-  data.tar.gz: 1cdcf563633f9a6883f11f21dd97809face44c54adf6058ea052dc41a47ea5296e91a6962bfacd6a3f5e43fd3630c6ff37cbcfd537e6b6f74d985b69dd87d4de
+  metadata.gz: 0beaa114d8a79d0f44539d5e2ceb8135056bcb74cd16ec4ba119e01f76f5563ad126c22d468aaf3308c064eedc9086db7024eb8cad7e116e7e942127e99a3aa3
+  data.tar.gz: a2eb30bf49793be327e984b205daf28d92b001157b2cc0a6071795eb3dc9ad517d7eeb894226de3ad8435867f121f15decdd1922f2cd07387e31b6f4e19a2773

data/README.md

@@ -61,12 +61,12 @@ client.os_metrics                # java.lang:type=OperatingSystm
 client.gc_cms_metrics            # java.lang:type=GarbageCollector,name=ConcurrentMarkSweep
 client.gc_parnew_metrics         # java.lang:type=GarbageCollector,name=ParNew
 client.gc_g1_metrics             # java.lang:type=GarbageCollector,name=G1 Young Generation and G1 Old Genration
-client.query_manager_metrics     # com.facebook.presto.execution:name=QueryManager
-client.query_execution_metrics   # com.facebook.presto.execution:name=QueryExecution
-client.node_scheduler_metrics    # com.facebook.presto.execution:name=NodeScheduler
-client.task_executor_metrics     # com.facebook.presto.execution:name=TaskExecutor
-client.task_manager_metrics      # com.facebook.presto.execution:name=TaskManager
-client.cluster_memory_manager_metrics # com.facebook.presto.memory:name=ClusterMemoryManager
+client.query_manager_metrics     # presto.execution:name=QueryManager
+client.query_execution_metrics   # presto.execution:name=QueryExecution
+client.node_scheduler_metrics    # presto.execution:name=NodeScheduler
+client.task_executor_metrics     # presto.execution:name=TaskExecutor
+client.task_manager_metrics      # presto.execution:name=TaskManager
+client.cluster_memory_manager_metrics # presto.memory:name=ClusterMemoryManager
 
 # Memory resource manager metrics (since Presto 0.103)
 client.memory_pool_metrics
@@ -251,3 +251,10 @@ irb> load "presto/metrics/client.rb"
 
 ```
 
+
+### Releasing a new version
+```
+# Update version in lib/presto/metrics/version.rb
+# Publish to RubyGem
+$ bundle exec rake release
+```

data/lib/presto/metrics/client.rb

@@ -16,6 +16,7 @@ module Presto
         @query_path = opts[:query_path] || '/v1/query'
         @node_path = opts[:node_path] || '/v1/node'
         @caml_case = opts[:caml_case] || false
+        @headers = opts[:headers] || {}
       end
 
       @@MBEAN_ALIAS = {
@@ -23,18 +24,18 @@ module Presto
           'gc_cms' => 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep',
           'gc_parnew' => 'java.lang:type=GarbageCollector,name=ParNew',
           'os' => 'java.lang:type=OperatingSystem',
-          'query_manager' => 'com.facebook.presto.execution:name=QueryManager',
-          'query_execution' => 'com.facebook.presto.execution:name=QueryExecution',
-          'node_scheduler' => 'com.facebook.presto.execution:name=NodeScheduler',
-          'task_executor' => 'com.facebook.presto.execution:name=TaskExecutor',
-          'task_manager' => 'com.facebook.presto.execution:name=TaskManager',
-          'memory_pool_general' => 'com.facebook.presto.memory:type=MemoryPool,name=general',
-          'memory_pool_reserved' => 'com.facebook.presto.memory:type=MemoryPool,name=reserved',
-          'memory_pool_system' => 'com.facebook.presto.memory:type=MemoryPool,name=system',
-          'cluster_memory_manager' => 'com.facebook.presto.memory:name=ClusterMemoryManager',
-          'cluster_memory_pool_general' => 'com.facebook.presto.memory:type=ClusterMemoryPool,name=general',
-          'cluster_memory_pool_reserved' => 'com.facebook.presto.memory:type=ClusterMemoryPool,name=reserved',
-          'cluster_memory_pool_system' => 'com.facebook.presto.memory:type=ClusterMemoryPool,name=system',
+          'query_manager' => 'presto.execution:name=QueryManager',
+          'query_execution' => 'presto.execution:name=QueryExecution',
+          'split_scheduler_stats' => 'presto.execution.scheduler:name=SplitSchedulerStats',
+          'task_executor' => 'presto.execution.executor:name=TaskExecutor',
+          'task_manager' => 'presto.execution:name=TaskManager',
+          'memory_pool_general' => 'presto.memory:type=MemoryPool,name=general',
+          'memory_pool_reserved' => 'presto.memory:type=MemoryPool,name=reserved',
+          'cluster_memory_manager' => 'presto.memory:name=ClusterMemoryManager',
+          'cluster_memory_pool_general' => 'presto.memory:type=ClusterMemoryPool,name=general',
+          'cluster_memory_pool_reserved' => 'presto.memory:type=ClusterMemoryPool,name=reserved',
+          'discovery_node_manager' => 'presto.metadata:name=DiscoveryNodeManager',
+          'pause_meter' => 'io.airlift.stats:name=PauseMeter',
       }
 
       def path(path)
@@ -79,7 +80,7 @@ module Presto
       end
 
       def get(path, default='{}')
-        resp = HTTParty.get(URI.encode("#{@endpoint}#{path}"))
+        resp = HTTParty.get(URI.encode("#{@endpoint}#{path}"), headers: @headers)
         if resp.code == 200
           resp.body
         else
@@ -197,39 +198,39 @@ module Presto
       end
 
       def query_manager_metrics(target_attr=[])
-        get_metrics('com.facebook.presto.execution:name=QueryManager', target_attr)
+        get_metrics('presto.execution:name=QueryManager', target_attr)
       end
 
       def query_execution_metrics(target_attr=[])
-        get_metrics('com.facebook.presto.execution:name=QueryExecution', target_attr)
+        get_metrics('presto.execution:name=QueryExecution', target_attr)
       end
 
       def node_scheduler_metrics(target_attr=[])
-        get_metrics('com.facebook.presto.execution:name=NodeScheduler', target_attr)
+        get_metrics('presto.execution:name=NodeScheduler', target_attr)
       end
 
       def task_executor_metrics(target_attr=[])
-        get_metrics('com.facebook.presto.execution:name=TaskExecutor', target_attr)
+        get_metrics('presto.execution:name=TaskExecutor', target_attr)
       end
 
       def task_manager_metrics(target_attr=[])
-        get_metrics('com.facebook.presto.execution:name=TaskManager', target_attr)
+        get_metrics('presto.execution:name=TaskManager', target_attr)
       end
 
       def memory_pool_metrics(target_attr=[])
-        ['general', 'reserved', 'system'].each_with_object({}) {|type, hash|
-          hash[type] = get_metrics("com.facebook.presto.memory:type=MemoryPool,name=#{type}", target_attr)
+        ['general', 'reserved'].each_with_object({}) {|type, hash|
+          hash[type] = get_metrics("presto.memory:type=MemoryPool,name=#{type}", target_attr)
         }
       end
 
       def cluster_memory_pool_metrics(target_attr=[])
-        ['general', 'reserved', 'system'].each_with_object({}) {|type, hash|
-          hash[type] = get_metrics("com.facebook.presto.memory:type=ClusterMemoryPool,name=#{type}", target_attr)
+        ['general', 'reserved'].each_with_object({}) {|type, hash|
+          hash[type] = get_metrics("presto.memory:type=ClusterMemoryPool,name=#{type}", target_attr)
         }
       end
 
       def cluster_memory_manager_metrics(target_attr=[])
-        get_metrics("com.facebook.presto.memory:name=ClusterMemoryManager", target_attr)
+        get_metrics("presto.memory:name=ClusterMemoryManager", target_attr)
       end
 
 

data/lib/presto/metrics/query.rb

@@ -144,15 +144,16 @@ module Presto
           h['query_id'] = qi['queryId'] || ''
           h['state'] = qi['state'] || ''
           session = qi['session'] || {}
+          stats = qi['queryStats'] || {}
           h['source'] = session['source'] || ''
           h['user'] = session['user'] || h['source'].gsub(/[^a-zA-Z0-9]/, '')
-          h['running_drivers'] = qi['runningDrivers'] || 0
-          h['queued_drivers'] = qi['queuedDrivers'] || 0
-          h['completed_drivers'] = qi['completedDrivers'] || 0
-          h['total_drivers'] = qi['totalDrivers'] || 0
-          h['elapsed_time'] = qi['elapsedTime'] || '0.0m'
-          h['create_time'] = qi['createTime']
-          h['running_time'] = qi['endTime'] || Time.now.utc.iso8601(3)
+          h['running_drivers'] = stats['runningDrivers'] || 0
+          h['queued_drivers'] = stats['queuedDrivers'] || 0
+          h['completed_drivers'] = stats['completedDrivers'] || 0
+          h['total_drivers'] = stats['totalDrivers'] || 0
+          h['elapsed_time'] = stats['elapsedTime'] || '0.0m'
+          h['create_time'] = stats['createTime']
+          h['running_time'] = stats['endTime'] || Time.now.utc.iso8601(3) # end_time ?
           #if(h['state'] == "FAILED")
           #	h['errorCode'] = find(h['query_id'])['errorCode'] || {}
           #end

data/lib/presto/metrics/version.rb

@@ -1,5 +1,5 @@
 module Presto
   module Metrics
-    VERSION = '0.3.11'
+    VERSION = '0.4.2'
   end
 end

data/presto-metrics.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "presto-client", '~> 0.4.4'
+  spec.add_development_dependency "presto-client", '~> 0.5.6'
   spec.add_development_dependency "httpclient"
 
   spec.add_runtime_dependency "httparty"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: presto-metrics
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.4.2
 platform: ruby
 authors:
 - Taro L. Saito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.6
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -135,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.2.25
 signing_key: 
 specification_version: 4
 summary: A library for collecting metrics of Presto, a distributed SQL engine