barnes 0.0.9 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb1cb2f789371b7caa0a50293ea6c8d37c0b4c1aa2592534c57e755855c691d5
-  data.tar.gz: 14679f30d7d411d72e1abf22cf94549a3263455d0a220b2a4164f8f65f65cab9
+  metadata.gz: a6cb33851e3d78680af4ac681b92eacc508b2b265fa6a2ea263e711b6676d5e6
+  data.tar.gz: e0d7596baff290abae04eeae0a10e4ac61a3843a145251ea26b7e22050de8f48
 SHA512:
-  metadata.gz: 2e7a031bb6c3174cc480eefb58c6ca0a490056c81db1ed22cace24222ed98f232a6f5c3ae9f8ac7ee8bb988f6d8030612dcc41978308fea190d248bf90a00c9f
-  data.tar.gz: 598f97d4d7f4ea575bf4bc87b5398eab87aff4a4237ab11dbfa3955a86df75d1b1477a6c7089790b1a5f8d95417789439c8a977556d1a9fd18a51151eef88414
+  metadata.gz: 11565b5d7196d00ba28d8d616ba5c3417f6b68851fd20b567432578e14779cf8c99af4a27f816fff708f192999330ede8ee18020af0ba57137e641cf878c7bda
+  data.tar.gz: 6d18ba6866a60f201bce1074a2bd5ce5486d697efd195e8191cce518169541484c9fa2806a389691c6894baaf223376bfb9f6811a8462513a6407b9c0f0df104

data/.github/CODEOWNERS

@@ -1 +1,3 @@
+#ECCN:Open Source
+#GUSINFO:Heroku - Languages,Heroku Ruby Platform
 * @heroku/languages

data/.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    groups:
+      ruby-dependencies:
+        update-types:
+          - "minor"
+          - "patch"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"

data/.github/workflows/check_changelog.yml

@@ -1,14 +1,20 @@
 name: Check Changelog
 
 on:
- pull_request:
-  types: [opened, reopened, edited, synchronize]
+  pull_request:
+    types: [opened, reopened, labeled, unlabeled, synchronize]
+
+permissions:
+  contents: read
 
 jobs:
-  build:
+  check-changelog:
     runs-on: ubuntu-latest
+    if: (!contains(github.event.pull_request.labels.*.name, 'skip changelog'))
     steps:
-    - uses: actions/checkout@v1
-    - name: Check that CHANGELOG is touched
-      run: |
-        cat $GITHUB_EVENT_PATH | jq .pull_request.title |  grep -i '\[\(\(changelog skip\)\|\(ci skip\)\)\]' ||  git diff remotes/origin/${{ github.base_ref }} --name-only | grep CHANGELOG.md
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Check that CHANGELOG is touched
+        run: |
+          git fetch origin ${{ github.base_ref }} --depth 1 && \
+          git diff remotes/origin/${{ github.base_ref }} --name-only | grep CHANGELOG.md

data/.github/workflows/ci.yml

@@ -0,0 +1,16 @@
+name: CI
+on:
+  push:
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['4.0', '3.4', '3.3', '3.2', '3.1']
+    steps:
+    - uses: actions/checkout@v6
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - run: bundle exec rake

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## HEAD (unreleased)
 
+## 1.0.0
+
+- **Breaking**: Replace StatsD with direct HTTP reporting to HEROKU_METRICS_URL
+- **Breaking**: Remove `statsd:` and `aggregation_period:` parameters from `Barnes.start`
+- **Breaking**: Require Ruby >= 3.1
+- Remove `statsd-ruby` runtime dependency (zero runtime deps)
+- Remove `sample_rate` scaling from instruments
+- Barnes is a no-op when `HEROKU_METRICS_URL` is not set
+
+## 0.1.0
+
+- Add GitHub Actions to test against multiple Ruby versions
+- remove MultiJSON in favor of built-in JSON
+
 ## 0.0.9
 
 - Handle half-initialize Puma failure on boot (https://github.com/heroku/barnes/pull/37)

data/README.md

@@ -1,12 +1,14 @@
-## Barnes - GC Statsd Reporter
+## Barnes
 
-A fork of [trashed](https://github.com/basecamp/trashed) focused on Ruby metrics for Heroku.
+Ruby runtime metrics for [Heroku Runtime Metrics](https://devcenter.heroku.com/articles/language-runtime-metrics-ruby). Collects GC stats, ObjectSpace counts, and Puma thread/pool metrics and POSTs them directly to `HEROKU_METRICS_URL`.
+
+Originally a fork of [trashed](https://github.com/basecamp/trashed).
 
 ## Setup
 
-### Rails 3, 4, 5, and 6
+### Rails
 
-On Rails 6 (and Rails 3 and 4 and 5), add this to your Gemfile:
+Add this to your Gemfile:
 
 ```
 gem "barnes"
@@ -18,33 +20,46 @@ Then run:
 $ bundle install
 ```
 
-### Non-Rails
+Barnes will start automatically via a Railtie when `HEROKU_METRICS_URL` is set in the environment (this is provided automatically on Heroku dynos).
+
+### Non-Rails (Puma)
 
-Add the gem to the Gemfile
+Add the gem to your Gemfile:
 
 ```
 gem "barnes"
 ```
 
-Then run:
+Then in your `puma.rb`:
 
-```
-$ bundle install
+```ruby
+require 'barnes'
+
+before_fork do
+  Barnes.start
+end
 ```
 
-In your puma.rb file:
+## How it works
 
+Barnes starts a background thread that collects metrics at a configurable interval (default: 10 seconds) and POSTs them as JSON to the URL in `HEROKU_METRICS_URL`.
 
-```ruby
-require 'barnes'
-```
+Barnes is a **silent no-op** when:
+
+- `HEROKU_METRICS_URL` is not set (e.g. local development)
+- The dyno is a one-off `run.*` dyno
 
-Then you'll need to start the client with default values:
+No external dependencies or sidecar processes are required.
+
+## Configuration
 
 ```ruby
-before_fork do
-  # worker configuration
-  Barnes.start
-end
+Barnes.start(
+  interval: 10,   # seconds between reports (default: 10)
+  panels:   []    # custom instrumentation panels (default: built-in ResourceUsage)
+)
 ```
 
+## Requirements
+
+- Ruby >= 3.1

data/barnes.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["schneems"]
   spec.email         = ["richard.schneeman@gmail.com"]
 
-  spec.summary       = 'Ruby GC stats => StatsD'
-  spec.description   = 'Report GC usage data to StatsD.'
+  spec.summary       = 'Report Ruby runtime metrics to Heroku'
+  spec.description   = 'Collect Ruby GC, ObjectSpace, and Puma metrics and report them directly to Heroku Runtime Metrics via HTTP.'
   spec.homepage      = 'https://github.com/heroku/barnes'
   spec.license       = "MIT"
 
@@ -21,14 +21,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.2.0'
+  spec.required_ruby_version = '>= 3.1.0'
 
-  spec.add_runtime_dependency 'statsd-ruby', '~> 1.1'
-  spec.add_runtime_dependency 'multi_json', '~> 1'
+  spec.add_runtime_dependency 'json'
+  spec.add_runtime_dependency 'logger'
+  spec.add_runtime_dependency 'ostruct'
 
   spec.add_development_dependency 'rack',     '~> 2'
   spec.add_development_dependency 'rake',     '>= 10'
   spec.add_development_dependency 'minitest', '~> 5.3'
-  spec.add_development_dependency "puma",     '~> 3.12'
+  spec.add_development_dependency "puma",     '~> 5.6'
   spec.add_development_dependency "wait_for_it",     '~> 0.1'
 end

data/lib/barnes/instruments/puma_instrument.rb

@@ -16,12 +16,12 @@ module Barnes
       end
 
       def start!(state)
-        require 'multi_json'
+        require 'json'
       end
 
       def json_stats
         return {} unless @puma_has_stats
-        MultiJson.load(::Puma.stats || "{}")
+        JSON.load(::Puma.stats || "{}")
 
       # Puma loader has not been initialized yet
       rescue NoMethodError => e

data/lib/barnes/instruments/ruby_gc.rb

@@ -1,59 +1,20 @@
-# A note on GAUGE_COUNTERS.
-#
-# The sample_rate argument allows for the parameterization
-# of instruments that decide to report data as gauges, that
-# would typically be reported as counters.
-#
-# Aggregating counters is typically done simply with the `+`
-# operator, which doesn't preserve the number of unique
-# reporters that contributed to the count, or allow for one
-# to learn the *average* of the counts posted.
-#
-# A gauge is typically aggregated by simply *replacing* the
-# previous value, however, some systems do *more* with gauges
-# when aggregating across multiple sources of that gauge, like,
-# average, or compute stdev.
-#
-# This is problematic, however, when a gauge is being used as
-# a counter, to preserve the average / stdev computational
-# properties from above, because the interval that the gauge
-# is being read it, affects the derivative of the increasing
-# count. Instead of the derivative over 60s, the derivative is
-# taken every 10s, giving us a derivative value that's approximately
-# 1/6th of the actual derivative over 60s.
-#
-# We compensate for this by allowing Instruments to correct for
-# this, and ensure that, even though it's an estimate, the data
-# is scaled appropriately to the target aggregation interval, not
-# just the collection interval.
-
 module Barnes
   module Instruments
     class RubyGC
+      # Both sets are delta-computed (cur - last), but they land in
+      # different reporting buckets.  COUNTERS go to `counters` (accumulated
+      # totals the receiver can sum).  GAUGE_COUNTERS go to `gauges` so each
+      # sample is a standalone per-interval value.  Keeping them separate also
+      # excludes them from the raw-value gauge loop below.
       COUNTERS = {
         :count => :'GC.count',
         :major_gc_count => :'GC.major_count',
         :minor_gc_count => :'GC.minor_gc_count' }
 
-      GAUGE_COUNTERS = {}
-
-      # Detect Ruby 2.1 vs 2.2 GC.stat naming
-      begin
-        GC.stat :total_allocated_objects
-      rescue ArgumentError
-        GAUGE_COUNTERS.update \
-          :total_allocated_object => :'GC.total_allocated_objects',
-          :total_freed_object => :'GC.total_freed_objects'
-      else
-        GAUGE_COUNTERS.update \
-          :total_allocated_objects => :'GC.total_allocated_objects',
-          :total_freed_objects => :'GC.total_freed_objects'
-      end
-
-      def initialize(sample_rate)
-        # see header for an explanation of how this sample_rate is used
-        @sample_rate = sample_rate
-      end
+      GAUGE_COUNTERS = {
+        :total_allocated_objects => :'GC.total_allocated_objects',
+        :total_freed_objects => :'GC.total_freed_objects'
+      }
 
       def start!(state)
         state[:ruby_gc] = GC.stat
@@ -67,15 +28,10 @@ module Barnes
           counters[metric] = cur[stat] - last[stat] if cur.include? stat
         end
 
-        # special treatment gauges
         GAUGE_COUNTERS.each do |stat, metric|
-          if cur.include? stat
-            val = cur[stat] - last[stat] if cur.include? stat
-            gauges[metric] = val * (1/@sample_rate)
-          end
+          gauges[metric] = cur[stat] - last[stat] if cur.include? stat
         end
 
-        # the rest of the gauges
         cur.each do |k, v|
           unless GAUGE_COUNTERS.include? k
             gauges[:"GC.#{k}"] = v

data/lib/barnes/instruments/stopwatch.rb

@@ -26,7 +26,6 @@ module Barnes
     class Stopwatch
       def initialize(timepiece = Timepiece)
         @timepiece = timepiece
-        @has_cpu_time = timepiece.respond_to?(:cpu)
       end
 
       def start!(state)
@@ -36,33 +35,29 @@ module Barnes
       def instrument!(state, counters, gauges)
         last = state[:stopwatch]
         wall_elapsed = @timepiece.wall - last[:wall]
-        counters[:'Time.wall'] = wall_elapsed
-
-        if @has_cpu_time
-          cpu_elapsed = @timepiece.cpu - last[:cpu]
-          idle_elapsed = wall_elapsed - cpu_elapsed
+        cpu_elapsed = @timepiece.cpu - last[:cpu]
+        idle_elapsed = wall_elapsed - cpu_elapsed
 
-          counters[:'Time.cpu']      = cpu_elapsed
-          counters[:'Time.idle']     = idle_elapsed
+        counters[:'Time.wall'] = wall_elapsed
+        counters[:'Time.cpu']      = cpu_elapsed
+        counters[:'Time.idle']     = idle_elapsed
 
-          if wall_elapsed == 0
-            counters[:'Time.pct.cpu']  = 0
-            counters[:'Time.pct.idle'] = 0
-          else
-            counters[:'Time.pct.cpu']  = 100.0 * cpu_elapsed  / wall_elapsed
-            counters[:'Time.pct.idle'] = 100.0 * idle_elapsed / wall_elapsed
-          end
+        if wall_elapsed == 0
+          counters[:'Time.pct.cpu']  = 0
+          counters[:'Time.pct.idle'] = 0
+        else
+          counters[:'Time.pct.cpu']  = 100.0 * cpu_elapsed  / wall_elapsed
+          counters[:'Time.pct.idle'] = 100.0 * idle_elapsed / wall_elapsed
         end
 
         state[:stopwatch] = current
       end
 
       private def current
-        state = {
+        {
           :wall => @timepiece.wall,
+          :cpu  => @timepiece.cpu,
         }
-        state[:cpu]  = @timepiece.cpu if @has_cpu_time
-        state
       end
     end
 
@@ -71,17 +66,8 @@ module Barnes
         ::Time.now.to_f * 1000
       end
 
-      # Ruby 2.1+
-      if Process.respond_to?(:clock_gettime)
-        def self.cpu
-          Process.clock_gettime Process::CLOCK_PROCESS_CPUTIME_ID, :float_millisecond
-        end
-
-      # ruby-prof installed
-      elsif defined? RubyProf::Measure::ProcessTime
-        def self.cpu
-          RubyProf::Measure::Process.measure * 1000
-        end
+      def self.cpu
+        Process.clock_gettime Process::CLOCK_PROCESS_CPUTIME_ID, :float_millisecond
       end
     end
   end

data/lib/barnes/periodic.rb

@@ -22,18 +22,14 @@
 #
 
 require 'barnes/consts'
+require 'json'
 
 module Barnes
-  # The periodic class is used to send occasional metrics
-  # to a reporting instance of `Barnes::Reporter` at a semi-regular
-  # rate.
   class Periodic
-    def initialize(reporter:, sample_rate: 1, debug: false, panels: [])
+    def initialize(reporter:, interval: 10, debug: false, panels: [])
       @reporter = reporter
-      @reporter.sample_rate = sample_rate
       @debug = debug
-      # compute interval based on a 60s reporting phase.
-      @interval = sample_rate * 60.0
+      @interval = interval
       @panels = panels
 
       @thread = Thread.new {
@@ -47,7 +43,6 @@ module Barnes
           begin
             sleep @interval
 
-            # read the current values
             env = {
               STATE    => Thread.current[:barnes_state],
               COUNTERS => {},
@@ -60,6 +55,8 @@ module Barnes
 
             puts env.to_json if @debug
             @reporter.report env
+          rescue => e
+            $stderr.puts "barnes: error during metrics collection: #{e.class}: #{e.message}"
           end
         end
       }

data/lib/barnes/railtie.rb

@@ -25,8 +25,8 @@ require 'rails/railtie'
 
 module Barnes
   # Automatically configures barnes to run with
-  # rails 3, 4, and 5. Configuration can be changed
-  # in the application.rb. For example
+  # rails. Configuration can be changed
+  # in the application.rb. For example:
   #
   #   module YourApp
   #     class Application < Rails::Application
@@ -34,10 +34,8 @@ module Barnes
   #
   class Railtie < ::Rails::Railtie
     config.barnes = {
-      interval:           DEFAULT_INTERVAL,
-      aggregation_period: DEFAULT_AGGREGATION_PERIOD,
-      statsd:             DEFAULT_STATSD,
-      panels:             DEFAULT_PANELS,
+      interval: DEFAULT_INTERVAL,
+      panels:   DEFAULT_PANELS,
     }
 
     initializer 'barnes' do |app|

data/lib/barnes/reporter.rb

@@ -21,42 +21,92 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
+require 'net/http'
+require 'json'
+require 'uri'
+
 module Barnes
-  # The reporter is used to send stats to the server.
-  #
-  # Example:
-  #
-  #   statsd   = Statsd.new('127.0.0.1', "8125")
-  #   reporter = Reporter.new(statsd: , sample_rate: 10)
-  #   reporter.report_statsd('barnes.counters' => {"hello" => 2})
   class Reporter
-    attr_accessor :statsd, :sample_rate
+    MAX_RETRIES = 3
+    HTTP_TIMEOUT = 5
 
-    def initialize(statsd: , sample_rate:)
-      @statsd      = statsd
-      @sample_rate = sample_rate.to_f
+    ServerError = Class.new(StandardError)
 
-      if @statsd.respond_to?(:easy)
-        @statsd_method = statsd.method(:easy)
-      else
-        @statsd_method = statsd.method(:batch)
-      end
+    def initialize(url:, backoff_sleep: ->(n) { sleep(n) })
+      @uri = URI.parse(url)
+      @backoff_sleep = backoff_sleep
+      @mutex = Mutex.new
+      @http = nil
     end
 
     def report(env)
-      report_statsd env if @statsd
+      counters = {}
+      env[Barnes::COUNTERS].each { |k, v| counters["Rack.Server.All.#{k}"] = v }
+
+      gauges = {}
+      env[Barnes::GAUGES].each { |k, v| gauges["Rack.Server.All.#{k}"] = v }
+
+      count = counters.size + gauges.size
+      return if count == 0
+
+      body = JSON.generate(counters: counters, gauges: gauges)
+      @mutex.synchronize { post(body, count) }
     end
 
-    def report_statsd(env)
-      @statsd_method.call do |statsd|
-        env[Barnes::COUNTERS].each do |metric, value|
-          statsd.count(:"Rack.Server.All.#{metric}", value, @sample_rate)
-        end
+    private
+
+    def connection
+      return @http if @http&.started?
 
-        # for :gauge, use sample rate of 1, since gauges in statsd have no sampling characteristics.
-        env[Barnes::GAUGES].each do |metric, value|
-          statsd.gauge(:"Rack.Server.All.#{metric}", value, 1.0)
+      @http = Net::HTTP.new(@uri.host, @uri.port)
+      @http.use_ssl = @uri.scheme == "https"
+      @http.open_timeout = HTTP_TIMEOUT
+      @http.read_timeout = HTTP_TIMEOUT
+      @http.write_timeout = HTTP_TIMEOUT
+      @http.keep_alive_timeout = 30
+      @http.start
+      @http
+    end
+
+    def post(body, count)
+      retries = 0
+      pause = 0.1
+      timestamp = Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
+
+      begin
+        request = Net::HTTP::Post.new(@uri)
+        request["Content-Type"] = "application/json"
+        request["Measurements-Count"] = count.to_s
+        request["Measurements-Time"] = timestamp
+        request.body = body
+
+        response = connection.request(request)
+
+        case response.code.to_i
+        when 200..299
+          # success
+        when 400..499
+          $stderr.puts "barnes: metrics POST rejected (#{response.code}): #{response.body}"
+        when 500..599
+          raise ServerError, "server error #{response.code}"
+        end
+      rescue ServerError, Net::OpenTimeout, Net::ReadTimeout, Net::WriteTimeout,
+             Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::EHOSTUNREACH,
+             Errno::EPIPE, SocketError, IOError => e
+        @http&.finish rescue nil
+        @http = nil
+        if retries < MAX_RETRIES
+          retries += 1
+          @backoff_sleep.call(pause)
+          pause *= 2
+          retry
+        else
+          $stderr.puts "barnes: failed to POST metrics after #{MAX_RETRIES} retries: #{e.class}: #{e.message}"
         end
+      rescue => e
+        @http&.finish rescue nil
+        @http = nil
+        $stderr.puts "barnes: unexpected error posting metrics: #{e.class}: #{e.message}"
       end
     end
   end

data/lib/barnes/resource_usage.rb

@@ -25,7 +25,7 @@ require 'barnes/panel'
 
 module Barnes
   class ResourceUsage < Panel
-    def initialize(sample_rate)
+    def initialize
       super()
 
       require 'barnes/instruments/puma_instrument'
@@ -38,28 +38,11 @@ module Barnes
       require 'barnes/instruments/stopwatch'
       instrument Barnes::Instruments::Stopwatch.new
 
-      if GC.respond_to? :enable_stats
-        require 'barnes/instruments/ree_gc'
-        instrument Barnes::Instruments::Ruby18GC.new
-      end
-
-      # Ruby 1.9+
-      if ObjectSpace.respond_to? :count_objects
-        require 'barnes/instruments/object_space_counter'
-        instrument Barnes::Instruments::ObjectSpaceCounter.new
-      end
+      require 'barnes/instruments/object_space_counter'
+      instrument Barnes::Instruments::ObjectSpaceCounter.new
 
-      # Ruby 1.9+
-      if GC.respond_to?(:stat)
-        require 'barnes/instruments/ruby_gc'
-        instrument Barnes::Instruments::RubyGC.new(sample_rate)
-      end
-
-      # Ruby 2.1+ with https://github.com/tmm1/gctools
-      if defined? GC::OOB
-        require 'barnes/instruments/gctools_oobgc'
-        instrument Barnes::Instruments::GctoolsOobgc.new
-      end
+      require 'barnes/instruments/ruby_gc'
+      instrument Barnes::Instruments::RubyGC.new
     end
   end
 end

data/lib/barnes/version.rb

@@ -22,5 +22,5 @@
 #
 
 module Barnes
-  VERSION = "0.0.9"
+  VERSION = "1.0.0"
 end

data/lib/barnes.rb

@@ -22,45 +22,38 @@
 #
 
 module Barnes
-  DEFAULT_INTERVAL           = 10
-  DEFAULT_AGGREGATION_PERIOD = 60
-  DEFAULT_STATSD             = :default
-  DEFAULT_PANELS             = []
+  DEFAULT_INTERVAL = 10
+  DEFAULT_PANELS   = [].freeze
 
-
-  # Starts the reporting client
+  # Starts the metrics reporting client.
+  #
+  # Collects Ruby runtime metrics (GC stats, ObjectSpace counts,
+  # Puma pool stats) and POSTs them to HEROKU_METRICS_URL.
   #
   # Arguments:
   #
-  #   - interval: How often, in seconds, to instrument and report
-  #   - aggregation_period: The minimal aggregation period in use, in seconds.
-  #   - statsd: The statsd reporter. This should be an instance of statsd-ruby
+  #   - interval: How often, in seconds, to instrument and report.
   #   - panels: The instrumentation "panels" in use. See `resource_usage.rb` for
   #     an example panel, which is the default if none are provided.
-  def self.start(interval: DEFAULT_INTERVAL, aggregation_period: DEFAULT_AGGREGATION_PERIOD, statsd: DEFAULT_STATSD, panels: DEFAULT_PANELS)
-    require 'statsd'
-    statsd_client = statsd
-    panels        = panels
-    sample_rate   = interval.to_f / aggregation_period.to_f
+  def self.start(interval: DEFAULT_INTERVAL, panels: DEFAULT_PANELS)
+    return if ENV["DYNO"]&.start_with?("run.")
 
-    if statsd_client == :default && ENV["PORT"]
-      statsd_client = Statsd.new('127.0.0.1', ENV["PORT"])
-    end
+    url = ENV["HEROKU_METRICS_URL"]
+    return unless url
 
-    if statsd_client && statsd_client != :default
-      reporter = Barnes::Reporter.new(statsd: statsd_client, sample_rate: sample_rate)
+    reporter = Barnes::Reporter.new(url: url)
 
-      unless panels.length > 0
-        panels << Barnes::ResourceUsage.new(sample_rate)
-      end
-
-      Periodic.new(
-        reporter:    reporter,
-        sample_rate: sample_rate,
-        panels:      panels,
-        debug:       ENV['BARNES_DEBUG']
-      )
+    panels = panels.dup
+    if panels.empty?
+      panels << Barnes::ResourceUsage.new
     end
+
+    Periodic.new(
+      reporter: reporter,
+      interval: interval,
+      panels:   panels,
+      debug:    ENV['BARNES_DEBUG']
+    )
   end
 end
 

metadata

@@ -1,43 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: barnes
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 1.0.0
 platform: ruby
 authors:
 - schneems
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: statsd-ruby
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  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: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '5.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '5.6'
 - !ruby/object:Gem::Dependency
   name: wait_for_it
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +121,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-description: Report GC usage data to StatsD.
+description: Collect Ruby GC, ObjectSpace, and Puma metrics and report them directly
+  to Heroku Runtime Metrics via HTTP.
 email:
 - richard.schneeman@gmail.com
 executables: []
@@ -117,9 +131,10 @@ extra_rdoc_files: []
 files:
 - ".codeclimate.yaml"
 - ".github/CODEOWNERS"
+- ".github/dependabot.yml"
 - ".github/workflows/check_changelog.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -132,11 +147,9 @@ files:
 - init.rb
 - lib/barnes.rb
 - lib/barnes/consts.rb
-- lib/barnes/instruments/gctools_oobgc.rb
 - lib/barnes/instruments/object_space_counter.rb
 - lib/barnes/instruments/puma_instrument.rb
 - lib/barnes/instruments/puma_stats_value.rb
-- lib/barnes/instruments/ree_gc.rb
 - lib/barnes/instruments/ruby_gc.rb
 - lib/barnes/instruments/stopwatch.rb
 - lib/barnes/panel.rb
@@ -149,7 +162,6 @@ homepage: https://github.com/heroku/barnes
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,15 +169,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
-summary: Ruby GC stats => StatsD
+summary: Report Ruby runtime metrics to Heroku
 test_files: []

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - 2.5.0
-before_install: gem install bundler -v 2.1.0

data/lib/barnes/instruments/gctools_oobgc.rb

@@ -1,53 +0,0 @@
-# Copyright (c) 2017 Salesforce
-# Copyright (c) 2009 37signals, LLC
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-#  CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-module Barnes
-  module Instruments
-    # Tracks out of band GCs that occurred *since* the last request.
-    class GctoolsOobgc
-      def start!(state)
-        state[:oobgc] = current
-      end
-
-      def instrument!(state, counters, gauges)
-        last = state[:oobgc]
-        cur = state[:oobgc] = current
-
-        counters.update \
-          :'OOBGC.count'        => cur[:count] - last[:count],
-          :'OOBGC.major_count'  => cur[:major] - last[:major],
-          :'OOBGC.minor_count'  => cur[:minor] - last[:minor],
-          :'OOBGC.sweep_count'  => cur[:sweep] - last[:sweep]
-      end
-
-      private def current
-        {
-          :count => GC::OOB.stat(:count).to_i,
-          :major => GC::OOB.stat(:major).to_i,
-          :minor => GC::OOB.stat(:minor).to_i,
-          :sweep => GC::OOB.stat(:sweep).to_i
-        }
-      end
-    end
-  end
-end

data/lib/barnes/instruments/ree_gc.rb

@@ -1,59 +0,0 @@
-# Copyright (c) 2017 Salesforce
-# Copyright (c) 2009 37signals, LLC
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-#  CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-module Barnes
-  module Instruments
-    class Ruby18GC
-      def initialize
-        GC.enable_stats
-      end
-
-      def start!(state)
-        state[:ruby18_gc] = current
-      end
-
-      def instrument!(state, counters, gauges)
-        last = state[:ruby18_gc]
-        cur = state[:ruby18_gc] = current
-
-        counters.update \
-          :'GC.count'             => cur[:gc_count] - before[:gc_count],
-          :'GC.time'              => cur[:gc_time] - before[:gc_time],
-          :'GC.memory'            => cur[:gc_memory] - before[:gc_memory],
-          :'GC.allocated_objects' => cur[:objects] - before[:objects]
-
-        gauges[:'Objects.live'] = ObjectSpace.live_objects
-        gauges[:'GC.growth'] = GC.growth
-      end
-
-      private def current
-        {
-          :objects   => ObjectSpace.allocated_objects,
-          :gc_count  => GC.collections,
-          :gc_time   => GC.time,
-          :gc_memory => GC.allocated_size
-        }
-      end
-    end
-  end
-end