Merge pull request #3 from Watson1978/fix

Support ruby-prof 1.x API

Author: kenhys

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'monthly'

.github/workflows/test.yml

@@ -0,0 +1,35 @@
+name: test
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+  schedule:
+    - cron: '0 0 1 * *'
+jobs:
+  ruby-versions:
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby
+      min_version: 2.7
+  build:
+    needs: ruby-versions
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
+        exclude:
+          - ruby: head
+        os:
+          - ubuntu-latest
+    name: Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v6
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: unit testing
+      run: |
+        bundle install --jobs 4 --retry 3
+        bundle exec rake spec

fluent-rubyprof.gemspec

@@ -17,7 +17,7 @@ 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.5"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

lib/fluent/rubyprof.rb

@@ -69,7 +69,7 @@ def parse_options(argv = ARGV)
         raise OptionParser::InvalidOption.new("`start` or `stop` must be specified as the 1st argument")
       end
 
-      measure_modes = %w[PROCESS_TIME WALL_TIME CPU_TIME ALLOCATIONS MEMORY GC_RUNS GC_TIME] 
+      measure_modes = %w[PROCESS_TIME WALL_TIME CPU_TIME ALLOCATIONS MEMORY GC_RUNS GC_TIME]
       unless measure_modes.include?(opts[:measure_mode])
         raise OptionParser::InvalidOption.new("-m allows one of #{measure_modes.join(', ')}")
       end
@@ -96,15 +96,19 @@ def run
       when 'start'
         remote_code = <<-CODE
         require 'ruby-prof'
-        RubyProf.measure_mode = eval("RubyProf::#{opts[:measure_mode]}")
-        RubyProf.start
+        $fluent_rubyprof_instance = RubyProf::Profile.new(measure_mode: RubyProf::#{opts[:measure_mode]})
+        $fluent_rubyprof_instance.start
         CODE
       when 'stop'
         remote_code = <<-"CODE"
-        result = RubyProf.stop
-        File.open('#{opts[:output]}', 'w') {|f|
-          RubyProf::#{PRINTERS[opts[:printer]]}.new(result).print(f)
-        }
+        require 'ruby-prof'
+        if defined?($fluent_rubyprof_instance) && $fluent_rubyprof_instance
+          result = $fluent_rubyprof_instance.stop
+          File.open('#{opts[:output]}', 'w') {|f|
+            RubyProf::#{PRINTERS[opts[:printer]]}.new(result).print(f)
+          }
+          $fluent_rubyprof_instance = nil
+        end
         CODE
       end