presto-metrics 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07b09253d19db63f7192abd07f217eed522201929bf985a6aff036893221d267
-  data.tar.gz: 5379697b19af0934adf5a2540586f026ff1569bc1ae96d334e7fc1a10f66e508
+  metadata.gz: 7ddd2ac6fba10dc22c7b487a2483825de5b0e55657ed95e05d988687f5a12b05
+  data.tar.gz: 0e9f357e4b5ef9a920585d1c1e9b129278ad75ac1f8fa511c48a8bb067183295
 SHA512:
-  metadata.gz: 2c85e271f8320a2341f442d4e541d0f1a7cd145e1cb6449c95f72e69b4912c6bd5009282551af65ea618454d231baf5f6b03717feb2b4ed975ca7fef18b8b54e
-  data.tar.gz: 3e43ca2218aed00a262663460da3c6ed84324b0abb5f56b02fbd4c62994eab550e2e924f329d5bd709a003facc71b1af66d8daf364f5dc275e1496b791a9a665
+  metadata.gz: 5cd23ef810b52f3178ec9a4da91a04602f46ae65d8642fb7a2948491e73e6ae206388f13d1efd701ce429f384156786ceeeb4bfbb2e40264ff73741bbf3dfa0f
+  data.tar.gz: 45ae9be662268d7a2acc0b53f54b2ec2e2ca09611c0533c3cb85a08f6f746842875046bc0c3411accf09112ceade5acd6ff2b2f151755aafdb98f5c9192f91cb

data/.github/dependabot.yaml

@@ -0,0 +1,9 @@
+---
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    commit-message:
+      prefix: "chore"

data/.github/release-drafter.yml

@@ -13,13 +13,13 @@ categories:
     labels:
       - 'deprecation'
   - title: '⛓  Dependency Updates'
-    label:
+    labels:
       - 'library-update'
       - 'test-library-update'
       - 'sbt-plugin-update'
       - 'dependencies'
   - title: '🛠  Internal Updates'
-    label:
+    labels:
       - 'internal'
       - 'kaizen'
   - title: '📚 Docs'
@@ -36,11 +36,10 @@ autolabeler:
   - label: 'doc'
     files:
       - '*.md'
-      - '*.yaml'
   - label: 'bug'
     title:
       - '/fix/i'
   - label: 'deprecation'
     title:
       - '/deprecate/i'
-   
+

data/.github/workflows/publisher.yml

@@ -0,0 +1,29 @@
+---
+name: Publish to RubyGems
+
+on:
+  push:
+    tags:
+      - v*
+
+permissions:
+  id-token: write
+  contents: write
+
+# see: https://guides.rubygems.org/trusted-publishing/adding-a-publisher/
+jobs:
+  push:
+    name: Push gem to RubyGems.org
+    runs-on: ubuntu-latest
+    steps:
+      # Set up
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: 3.2
+      # Release
+      - uses: rubygems/release-gem@v1

data/.github/workflows/release-drafter.yml

@@ -23,6 +23,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "master"
-      - uses: release-drafter/release-drafter@v5
+      - uses: release-drafter/release-drafter@v7
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/ruby.yml

@@ -8,12 +8,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
-      max-parallel: 4
+      max-parallel: 3
       matrix:
-        ruby-version: ["2.6", "2.7", "3.0", "3.1"]
+        ruby-version:
+          - "3.2"
+          - "3.3"
+          - "3.4"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Set up Ruby ${{ matrix.ruby-version }}
         uses: ruby/setup-ruby@v1
         with:
@@ -24,6 +27,10 @@ jobs:
           bundle install --jobs 4 --retry 3
           bundle exec gem dependency -R
 
+      - name: Check coding style
+        run: |
+          bundle exec standardrb
+
       - name: test with Rake
         run: |
           bundle exec rake spec

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
@@ -14,4 +13,5 @@
 mkmf.log
 *.iml
 .idea
-.ruby-version
+.ruby-version
+Gemfile.lock

data/.standard.yml

@@ -0,0 +1,8 @@
+---
+fix: false
+format: progress # default: Standard::Formatter
+default_ignores: false # default: true
+
+ignore:
+  - "Rakefile"
+  - "presto-metrics.gemspec"

data/.standard_todo.yml

@@ -0,0 +1,25 @@
+---
+ignore:
+  - lib/presto/metrics/client.rb:
+      - Naming/VariableName
+      - Performance/RedundantSplitRegexpArgument
+      - Performance/StringReplacement
+      - Performance/UriDefaultParser
+      - Style/ClassCheck
+      - Style/ConditionalAssignment
+      - Style/EmptyLiteral
+      - Style/IfInsideElse
+      - Style/PercentLiteralDelimiters  # Keep
+      - Style/RedundantBegin
+      - Style/StringLiterals
+      - Style/TrailingCommaInHashLiteral  # Keep
+  - lib/presto/metrics/query.rb:
+      - Layout/ArgumentAlignment
+      - Layout/SpaceInsideArrayPercentLiteral  # Keep
+      - Layout/SpaceInsidePercentLiteralDelimiters  # Keep
+      - Naming/VariableName
+      - Style/ConditionalAssignment
+      - Style/MixinUsage
+      - Style/PercentLiteralDelimiters  # Keep
+      - Style/RedundantBegin
+      - Style/StringLiterals

data/Gemfile

@@ -1,5 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in presto-metrics.gemspec
 gemspec
-

data/lib/presto/metrics/client.rb

@@ -1,8 +1,7 @@
 module Presto
   module Metrics
-
     class Client
-      def initialize(opts={})
+      def initialize(opts = {})
         require 'httparty'
         require 'json'
         require 'set'
@@ -20,22 +19,22 @@ module Presto
       end
 
       @@MBEAN_ALIAS = {
-          'memory' => 'java.lang:type=Memory',
-          'gc_cms' => 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep',
-          'gc_parnew' => 'java.lang:type=GarbageCollector,name=ParNew',
-          'os' => 'java.lang:type=OperatingSystem',
-          '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',
+        'memory' => 'java.lang:type=Memory',
+        'gc_cms' => 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep',
+        'gc_parnew' => 'java.lang:type=GarbageCollector,name=ParNew',
+        'os' => 'java.lang:type=OperatingSystem',
+        '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)
@@ -64,9 +63,9 @@ module Presto
             value = json_obj.find { |e|
               e.is_a?(Hash) && e['key'] == path[depth]
             }
-            extract_path(value['value'], path, depth+1)
+            extract_path(value['value'], path, depth + 1)
           else
-            extract_path(json_obj[path[depth]], path, depth+1)
+            extract_path(json_obj[path[depth]], path, depth + 1)
           end
         end
       end
@@ -79,7 +78,7 @@ module Presto
         JSON.parse(get_mbean_json(mbean))
       end
 
-      def get(path, default='{}')
+      def get(path, default = '{}')
         parser = URI::Parser.new
         resp = HTTParty.get(parser.escape("#{@endpoint}#{path}"), headers: @headers)
         if resp.code == 200
@@ -93,7 +92,7 @@ module Presto
         get("#{@mbean_path}/#{mbean}")
       end
 
-      def get_query_json(path='', default='[]')
+      def get_query_json(path = '', default = '[]')
         get("#{@query_path}/#{path}", default)
       end
 
@@ -119,21 +118,21 @@ module Presto
       end
 
       def underscore(str)
-        str.gsub(/::/, '/').
-            gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
-            gsub(/([a-z\d])([A-Z])/, '\1_\2').
-            gsub(/ +/,'_').
-            tr('-', '_').
-            downcase
+        str.gsub(/::/, '/')
+          .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+          .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+          .gsub(/ +/, '_')
+          .tr('-', '_')
+          .downcase
       end
 
-      def get_metrics(mbean, target_attr=[])
+      def get_metrics(mbean, target_attr = [])
         kv = Hash.new
         arr = target_attr.kind_of?(Array) ? target_attr : [target_attr]
         c_target_attr = map_to_canonical_name(arr).to_set
         get_attributes(mbean)
-            .reject { |attr| attr['name'].nil? || attr['value'].nil? }
-            .each { |attr|
+          .reject { |attr| attr['name'].nil? || attr['value'].nil? }
+          .each { |attr|
           c_name = to_canonical_name(attr['name'])
           if c_target_attr.empty? || c_target_attr.include?(c_name)
             key = @caml_case ? attr['name'] : underscore(attr['name'])
@@ -150,24 +149,24 @@ module Presto
       def extract_value(v)
         if v.is_a?(Hash)
           if v.has_key?('key') && v.has_key?('value')
-            {sanitize_key(v['key']) => extract_value(v['value']) }
+            {sanitize_key(v['key']) => extract_value(v['value'])}
           else
-            v.each_with_object({}) {|(k1, v1), h2|
+            v.each_with_object({}) { |(k1, v1), h2|
               h2[sanitize_key(k1)] = extract_value(v1)
             }
           end
-        elsif v.is_a?(Array) && v.all?{|e| e.is_a?(Hash) }
-          v.each_with_object({}){|e, h| h.merge!(extract_value(e)) }
+        elsif v.is_a?(Array) && v.all? { |e| e.is_a?(Hash) }
+          v.each_with_object({}) { |e, h| h.merge!(extract_value(e)) }
         else
           v
         end
       end
 
-      def get_gc_metrics(mbean, target_attr=[])
+      def get_gc_metrics(mbean, target_attr = [])
         h = {}
         get_attributes(mbean)
-            .reject { |attr| attr['name'].nil? || attr['value'].nil? }
-            .each { |attr|
+          .reject { |attr| attr['name'].nil? || attr['value'].nil? }
+          .each { |attr|
           key = sanitize_key(attr['name'])
           v = attr['value']
           h[key] = extract_value(v)
@@ -175,74 +174,72 @@ module Presto
         h
       end
 
-
-      def memory_usage_metrics(target_attr=[])
+      def memory_usage_metrics(target_attr = [])
         get_metrics('java.lang:type=Memory', target_attr)
       end
 
-      def gc_cms_metrics(target_attr=[])
+      def gc_cms_metrics(target_attr = [])
         get_gc_metrics('java.lang:type=GarbageCollector,name=ConcurrentMarkSweep', target_attr)
       end
 
-      def gc_parnew_metrics(target_attr=[])
+      def gc_parnew_metrics(target_attr = [])
         get_gc_metrics('java.lang:type=GarbageCollector,name=ParNew', target_attr)
       end
 
-      def gc_g1_metrics(target_attr=[])
-        ['G1 Old Generation', 'G1 Young Generation'].each_with_object({}){|gen, h|
+      def gc_g1_metrics(target_attr = [])
+        ['G1 Old Generation', 'G1 Young Generation'].each_with_object({}) { |gen, h|
           h[sanitize_key(gen)] = get_gc_metrics("java.lang:type=GarbageCollector,name=#{gen}", target_attr)
         }
       end
 
-      def os_metrics(target_attr=[])
+      def os_metrics(target_attr = [])
         get_metrics('java.lang:type=OperatingSystem', target_attr)
       end
 
-      def query_manager_metrics(target_attr=[])
+      def query_manager_metrics(target_attr = [])
         get_metrics('presto.execution:name=QueryManager', target_attr)
       end
 
-      def query_execution_metrics(target_attr=[])
+      def query_execution_metrics(target_attr = [])
         get_metrics('presto.execution:name=QueryExecution', target_attr)
       end
 
-      def node_scheduler_metrics(target_attr=[])
+      def node_scheduler_metrics(target_attr = [])
         get_metrics('presto.execution:name=NodeScheduler', target_attr)
       end
 
-      def task_executor_metrics(target_attr=[])
+      def task_executor_metrics(target_attr = [])
         get_metrics('presto.execution:name=TaskExecutor', target_attr)
       end
 
-      def task_manager_metrics(target_attr=[])
+      def task_manager_metrics(target_attr = [])
         get_metrics('presto.execution:name=TaskManager', target_attr)
       end
 
-      def memory_pool_metrics(target_attr=[])
-        ['general', 'reserved'].each_with_object({}) {|type, hash|
+      def memory_pool_metrics(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'].each_with_object({}) {|type, hash|
+      def cluster_memory_pool_metrics(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=[])
+      def cluster_memory_manager_metrics(target_attr = [])
         get_metrics("presto.memory:name=ClusterMemoryManager", target_attr)
       end
 
-
-      def node_metrics(target_attr=[])
+      def node_metrics(target_attr = [])
         p = URI::Parser.new
         node_state = JSON.parse(get_node_json)
-        node_state.map{|n|
+        node_state.map { |n|
           uri = n['uri'] || ''
           m = {}
           m['host'] = p.parse(uri).host
-          n.each{|k, v|
+          n.each { |k, v|
             key = @caml_case ? k : underscore(k)
             m[key] = v
           }

data/lib/presto/metrics/query.rb

@@ -8,7 +8,6 @@ include Presto::Client::Models
 
 module Presto
   module Metrics
-
     class Query
       def initialize(client)
         @client = client
@@ -38,12 +37,12 @@ module Presto
             str = cell.to_s[0..col[i]]
             a = align[i] || 'l'
             case a
-              when 'r'
-                line << str.rjust(col[i])
-              when 'l'
-                line << str.ljust(col[i])
-              else
-                line << str.ljust(col[i])
+            when 'r'
+              line << str.rjust(col[i])
+            when 'l'
+              line << str.ljust(col[i])
+            else
+              line << str.ljust(col[i])
             end
           }
           puts line.join(sep)
@@ -62,8 +61,7 @@ module Presto
         format_table(tbl,
             %w|query time state r f t user catalog schema source sql|,
             %w|r     r    r     r r r l    l       r      l      l  |,
-            ' '
-        )
+            ' ')
       end
 
       def find(queryId)
@@ -92,11 +90,10 @@ module Presto
         format_table(stats,
             %w|task_id host    state processed_rows size|,
             %w|l       l       l     r          r|,
-            ' '
-        )
+            ' ')
       end
 
-      def query_list(path="")
+      def query_list(path = "")
         begin
           JSON.parse(@client.get_query_json(path))
         rescue
@@ -154,9 +151,9 @@ module Presto
           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")
+          # if(h['state'] == "FAILED")
           #	h['errorCode'] = find(h['query_id'])['errorCode'] || {}
-          #end
+          # end
           h
         }
       end
@@ -169,9 +166,8 @@ module Presto
           task_list << tl if tl
           task_list << find_tasks(ss['subStages'])
         }
-        task_list.flatten()
+        task_list.flatten
       end
-
     end
   end
 end

data/lib/presto/metrics/version.rb

@@ -1,5 +1,5 @@
 module Presto
   module Metrics
-    VERSION = '0.5.0'
+    VERSION = "0.6.1"
   end
 end

data/lib/presto/metrics.rb

@@ -1,3 +1,3 @@
-require 'presto/metrics/version'
-require 'presto/metrics/client'
-require 'presto/metrics/query'
+require "presto/metrics/version"
+require "presto/metrics/client"
+require "presto/metrics/query"

data/presto-metrics.gemspec

@@ -18,11 +18,17 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.required_ruby_version = ">= 3.2.0"
+
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "presto-client", '~> 0.5.6'
   spec.add_development_dependency "httpclient"
+  spec.add_development_dependency "standard", ["~> 1.16.0"]
+
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4")
+    spec.add_dependency("base64")
+  end
 
   spec.add_runtime_dependency "httparty"
 

data/spec/presto/metrics_spec.rb

@@ -1,11 +1,11 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Presto::Metrics do
-  it 'has a version number' do
+  it "has a version number" do
     expect(Presto::Metrics::VERSION).not_to be nil
   end
 
-  it 'does something useful' do
+  it "does something useful" do
     expect(true).to eq(true)
   end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,2 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'presto/metrics'
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+require "presto/metrics"

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: presto-metrics
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Taro L. Saito
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-28 00:00:00.000000000 Z
+date: 2026-06-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.16.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -102,11 +102,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yaml"
 - ".github/release-drafter.yml"
+- ".github/workflows/publisher.yml"
 - ".github/workflows/release-drafter.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
+- ".standard.yml"
+- ".standard_todo.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -130,14 +134,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: A library for collecting metrics of Presto, a distributed SQL engine