tunemygc 1.0.42 → 1.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73d49396c67651f5cecef3a6b79315783398b227
-  data.tar.gz: 66721034ee44fade67542ce8ea968d9e5dcb84e6
+  metadata.gz: f66238f6398dc9b02f0f12ba5ab8a38196167cf1
+  data.tar.gz: 8777657a4b0c208f8d7a863bec45644eab0ba4d0
 SHA512:
-  metadata.gz: 95bace0c923c3e394aa41afa243553732a85be607c248d906a4554995b3c596b862a036329932c63d5dead9c705d1a67885c225326b860e404547144708e1ec4
-  data.tar.gz: 17e80dd232f5e89b9a2c1bf781758b984419df16542e9179fa4cf7ecdaf7092019e9530293843cf9a9dd8a260550e15974da3016c952d2d0f714ff8864711b7e
+  metadata.gz: 186f1b4955e0c59a2f7e265a18094a548e0cfde95800c2bc8c7e9e3b7069846c539c23a9364e70031fa085ece2e5363c6c4bf7f701b82f7dd9e61ae615dc7194
+  data.tar.gz: b2a9349344ece06752c89c637dcf88a72b91db5525e3a2fe46bb7205bdb6ff605b0fff2e8f02b8100d4d09e290783029d96a760d6b30b19fa01642a3902033ba

data/.travis.yml

@@ -6,16 +6,15 @@ rvm:
   - 2.1.2
   - 2.1.5
   - 2.2.0
+  - 2.2.1
   - ruby-head
 script: "bundle exec rake"
-env: RUBY_GC_TUNE=1 RUBY_GC_TUNE_DEBUG=1 RUBY_GC_SYNC_ALWAYS=1
+env: RUBY_GC_TUNE=200 RUBY_GC_TUNE_DEBUG=1 RUBY_GC_SYNC_ALWAYS=1
 gemfile:
   - Gemfile
 notifications:
   recipients:
-    - lourens@methodmissing.com
+    - info@bearmetal.eu
 branches:
   only:
     - master
-    - compact-samples
-    - minitest

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tunemygc (1.0.42)
+    tunemygc (1.0.43)
 
 GEM
   remote: https://rubygems.org/

data/lib/tunemygc/syncer.rb

@@ -14,16 +14,41 @@ module TuneMyGc
 
     def sync(snapshotter)
       if sync_required?(snapshotter)
-        response = nil
-        timeout do
-          response = sync_with_tuner(snapshotter)
+        snapshots = snapshotter.size
+        TuneMyGc.log "Syncing #{snapshots} snapshots"
+        payload = [environment(snapshotter)]
+        debug = ENV["RUBY_GC_TUNE_DEBUG"]
+        TuneMyGc.log "=== Snapshots ===" if debug
+        while !snapshotter.empty?
+          snapshot = snapshotter.deq
+          TuneMyGc.log(snapshot) if debug
+          payload << snapshot
+        end
+        data = ActiveSupport::JSON.encode(payload)
+        begin
+          3.times do |retries|
+            Timeout.timeout(NETWORK_TIMEOUT + 1) do
+              response = sync_with_tuner(data, snapshots)
+              if response
+                if response == :retryable
+                  TuneMyGc.log "Retrying in #{retries} seconds ..."
+                  sleep(retries)
+                else
+                  process_config_callback(response)
+                  break
+                end
+              else
+                break
+              end
+            end
+          end
+          true
+        ensure
+          payload.clear
         end
-        timeout do
-          process_config_callback(response)
-        end if response
       else
         TuneMyGc.log "Nothing to sync, discarding #{snapshotter.size} snapshots"
-        snapshotter.clear
+        false
       end
     end
 
@@ -37,26 +62,8 @@ module TuneMyGc
     end
 
     private
-    def timeout(&block)
-      Timeout.timeout(NETWORK_TIMEOUT + 1){ block.call }
-    end
-
-    def sync_with_tuner(snapshotter)
-      snapshots = 0
-      # Fallback to Timeout if Net::HTTP read timeout fails
-      snapshots = snapshotter.size
-      TuneMyGc.log "Syncing #{snapshots} snapshots"
-      payload = [environment(snapshotter)]
-      debug = ENV["RUBY_GC_TUNE_DEBUG"]
-      TuneMyGc.log "=== Snapshots ===" if debug
-      while !snapshotter.empty?
-        snapshot = snapshotter.deq
-        TuneMyGc.log(snapshot) if debug
-        payload << snapshot
-      end
-      data = ActiveSupport::JSON.encode(payload)
+    def sync_with_tuner(data, snapshots)
       response = client.post('/ruby', data, TuneMyGc::HEADERS)
-      snapshotter.unit_of_work = false
       if Net::HTTPNotFound === response
         TuneMyGc.log "Invalid application token. Please generate one with 'bundle exec tunemygc <a_valid_email_address>' and set the RUBY_GC_TOKEN environment variable"
         return false
@@ -73,20 +80,18 @@ module TuneMyGc
         TuneMyGc.log "Invalid payload (#{response.body}). Failed to sync #{snapshots} snapshots"
         return false
       elsif Net::HTTPInternalServerError === response
-        TuneMyGc.log "An internal error occurred (#{response.body}). Failed to sync #{snapshots} snapshots"
-        return false
+        TuneMyGc.log "An internal error occurred (#{response.body}). Failed to sync #{snapshots} snapshots."
+        return :retryable
       elsif Net::HTTPSuccess === response
         response
       else
         TuneMyGc.log "Unknown error: #{response.body}"
         return false
       end
-    rescue Exception => e
+    rescue Timeout::Error, Errno::ETIMEDOUT, Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED,
+           EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError, IOError => e
       TuneMyGc.log "Failed to sync #{snapshots} snapshots (error: #{e})"
-      return false
-    ensure
-      # Prefer to loose data points than accumulate buffers indefinitely on error or other conditions
-      snapshotter.clear
+      return :retryable
     end
 
     def process_config_callback(response)

data/lib/tunemygc/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module TuneMyGc
-  VERSION = "1.0.42"
+  VERSION = "1.0.43"
 end

data/test/test_syncer.rb

@@ -46,7 +46,7 @@ class TestSyncer < TuneMyGcTestCase
 
     out, err = capture_io do
       TuneMyGc.logger = Logger.new($stdout)
-      assert_nil syncer.sync(snapshots)
+      assert syncer.sync(snapshots)
     end
     assert_match(/Ruby version/, out)
     assert_match(/Rails version/, out)
@@ -65,7 +65,7 @@ class TestSyncer < TuneMyGcTestCase
 
     out, err = capture_io do
       TuneMyGc.logger = Logger.new($stdout)
-      assert_nil syncer.sync(snapshots)
+      assert syncer.sync(snapshots)
     end
     assert_match(/The GC is already tuned by environment variables/, out)
     assert_match(/Failed to sync 1 snapshots/, out)
@@ -82,7 +82,7 @@ class TestSyncer < TuneMyGcTestCase
 
     out, err = capture_io do
       TuneMyGc.logger = Logger.new($stdout)
-      assert_nil syncer.sync(snapshots)
+      assert syncer.sync(snapshots)
     end
     assert_match(/Invalid payload/, out)
     assert_match(/snapshot timestamp/, out)
@@ -100,7 +100,7 @@ class TestSyncer < TuneMyGcTestCase
 
     out, err = capture_io do
       TuneMyGc.logger = Logger.new($stdout)
-      assert_nil syncer.sync(snapshots)
+      assert syncer.sync(snapshots)
     end
     assert_match(/Invalid application token/, out)
   end
@@ -116,7 +116,7 @@ class TestSyncer < TuneMyGcTestCase
 
     out, err = capture_io do
       TuneMyGc.logger = Logger.new($stdout)
-      assert_nil syncer.sync(snapshots)
+      assert syncer.sync(snapshots)
     end
     assert_match(/Agent version 2 required/, out)
     assert_match(/Failed to sync 1 snapshots/, out)
@@ -132,7 +132,7 @@ class TestSyncer < TuneMyGcTestCase
 
     out, err = capture_io do
       TuneMyGc.logger = Logger.new($stdout)
-      assert_nil syncer.sync(snapshots)
+      assert syncer.sync(snapshots)
     end
     assert_match(/Failed to sync 1 snapshots/, out)
     assert_match(/dang/, out)

data/tunemygc.gemspec

@@ -21,26 +21,6 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files test`.split($/)
   s.require_paths = ["lib"]
   s.required_ruby_version = '>= 2.1.0'
-  s.post_install_message = <<-eos
-  [TuneMyGC] Getting started:
-
-  Run this setup command from your application root to register your application with the `https://tunemygc.com` service:
-
-  $ bundle exec tunemygc -r your@email.address
-
-  You should get back a token reference to identify this Rails app:
-
-  Application registered. Use RUBY_GC_TOKEN=08de9e8822c847244b31290cedfc1d32 in your environment.
-
-  Then sample your Rails app for tuning:
-
-  $ RUBY_GC_TOKEN=08de9e8822c847244b31290cedfc1d32 RUBY_GC_TUNE=200 bundle exec rails s
-
-  We require a valid email address as a canonical reference for tuner tokens for your applications.
-
-  Happy hacking,
-  - the Bear Metal cubs
-eos
 
   s.add_development_dependency('activesupport', '~> 4.1')
   s.add_development_dependency('rake', '~> 10.3')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tunemygc
 version: !ruby/object:Gem::Version
-  version: 1.0.42
+  version: 1.0.43
 platform: ruby
 authors:
 - Bear Metal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -148,25 +148,7 @@ homepage: https://tunemygc.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2
-    [TuneMyGC] Getting started:
-
-    Run this setup command from your application root to register your application with the `https://tunemygc.com` service:
-
-    $ bundle exec tunemygc -r your@email.address
-
-    You should get back a token reference to identify this Rails app:
-
-    Application registered. Use RUBY_GC_TOKEN=08de9e8822c847244b31290cedfc1d32 in your environment.
-
-    Then sample your Rails app for tuning:
-
-    $ RUBY_GC_TOKEN=08de9e8822c847244b31290cedfc1d32 RUBY_GC_TUNE=200 bundle exec rails s
-
-    We require a valid email address as a canonical reference for tuner tokens for your applications.
-
-    Happy hacking,
-    - the Bear Metal cubs
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib