barnes 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6cb33851e3d78680af4ac681b92eacc508b2b265fa6a2ea263e711b6676d5e6
-  data.tar.gz: e0d7596baff290abae04eeae0a10e4ac61a3843a145251ea26b7e22050de8f48
+  metadata.gz: d9d005157afd63f9b202ee0db19fd7ab296f5bf514cf63af3177baadc9d4cca5
+  data.tar.gz: 8c7a6e7d399eb0cbb5c58fdbc7fed8a8c8af3a11858123a8c70c94e83b3435e7
 SHA512:
-  metadata.gz: 11565b5d7196d00ba28d8d616ba5c3417f6b68851fd20b567432578e14779cf8c99af4a27f816fff708f192999330ede8ee18020af0ba57137e641cf878c7bda
-  data.tar.gz: 6d18ba6866a60f201bce1074a2bd5ce5486d697efd195e8191cce518169541484c9fa2806a389691c6894baaf223376bfb9f6811a8462513a6407b9c0f0df104
+  metadata.gz: 0fdc30f4f1a66582e0a9e13633973a2e14bd20debccd4820efb3608a26a3f3a8eeccc7d0277c361ad7f5da24642cc16c1a291c5b08a35a132f9241fd947d065f
+  data.tar.gz: 407602084efa4533005a61041648c6d4148e5bbc9014b601e5e128c088fff9ed6630c87495811e40e422d4ffd20c3c4283a703020d4fa848f1dac92e1fed2db9

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## HEAD (unreleased)
 
+## 1.0.1
+
+- Fix: Previously calling `Barnes.start` would result in duplicate reporting threads. Now when this method is called, old threads are stopped before a new thread is started.
+
 ## 1.0.0
 
 - **Breaking**: Replace StatsD with direct HTTP reporting to HEROKU_METRICS_URL

data/lib/barnes/periodic.rb

@@ -26,11 +26,14 @@ require 'json'
 
 module Barnes
   class Periodic
+    attr_reader :thread
+
     def initialize(reporter:, interval: 10, debug: false, panels: [])
       @reporter = reporter
       @debug = debug
       @interval = interval
       @panels = panels
+      @stopping = false
 
       @thread = Thread.new {
         Thread.current[:barnes_state] = {}
@@ -40,31 +43,31 @@ module Barnes
         end
 
         loop do
-          begin
-            sleep @interval
-
-            env = {
-              STATE    => Thread.current[:barnes_state],
-              COUNTERS => {},
-              GAUGES   => {}
-            }
+          sleep @interval
+          break if @stopping
 
-            @panels.each do |panel|
-              panel.instrument! env[STATE], env[COUNTERS], env[GAUGES]
-            end
+          env = {
+            STATE    => Thread.current[:barnes_state],
+            COUNTERS => {},
+            GAUGES   => {}
+          }
 
-            puts env.to_json if @debug
-            @reporter.report env
-          rescue => e
-            $stderr.puts "barnes: error during metrics collection: #{e.class}: #{e.message}"
+          @panels.each do |panel|
+            panel.instrument! env[STATE], env[COUNTERS], env[GAUGES]
           end
+
+          puts env.to_json if @debug
+          @reporter.report env
+        rescue => e
+          $stderr.puts "barnes: error during metrics collection: #{e.class}: #{e.message}"
         end
       }
-      @thread.abort_on_exception = true
     end
 
-    def stop
-      @thread.exit
+    def stop(wait: )
+      @stopping = true
+      @thread.wakeup if @thread.alive?
+      @thread.join if wait
     end
   end
 end

data/lib/barnes/version.rb

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

data/lib/barnes.rb

@@ -24,6 +24,9 @@
 module Barnes
   DEFAULT_INTERVAL = 10
   DEFAULT_PANELS   = [].freeze
+  @caller = nil
+  @periodic = nil
+  @mutex = Mutex.new
 
   # Starts the metrics reporting client.
   #
@@ -41,19 +44,34 @@ module Barnes
     url = ENV["HEROKU_METRICS_URL"]
     return unless url
 
-    reporter = Barnes::Reporter.new(url: url)
+    @mutex.synchronize do
+      reporter = Barnes::Reporter.new(url: url)
 
-    panels = panels.dup
-    if panels.empty?
-      panels << Barnes::ResourceUsage.new
+      panels = panels.dup
+      if panels.empty?
+        panels << Barnes::ResourceUsage.new
+      end
+
+      if @periodic
+        debug("Restarting Barnes. Previously started by caller:")
+        debug(@caller.join("\n"))
+        @periodic.stop(wait: false)
+      end
+
+      @caller = caller
+      @periodic = Periodic.new(
+        reporter: reporter,
+        interval: interval,
+        panels:   panels,
+        debug:    ENV['BARNES_DEBUG']
+      )
     end
+  end
 
-    Periodic.new(
-      reporter: reporter,
-      interval: interval,
-      panels:   panels,
-      debug:    ENV['BARNES_DEBUG']
-    )
+  def self.debug(message)
+    if ENV["BARNES_DEBUG"]
+      puts "Barnes: #{message}"
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barnes
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - schneems