appsignal 2.9.1 → 2.9.2.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e14d49f3fd48de8a3b38d1449eeeb354b1f456969a5fc7e334a665b05ab507f5
-  data.tar.gz: 67b70d4c98557c77bd6865b91eb65ac2b3b4af2b26878e4a1b28a01359217d7f
+  metadata.gz: 749a1f48e14049b38ae5c5805a0078c69ded583b6ceebf749d212eda9fc7fb67
+  data.tar.gz: 2e72598376c98aa3d0332b994df2f855a7370644163eff1da88b3a0f2cbec1ca
 SHA512:
-  metadata.gz: ee391474526350b9b9a92f65f248da755508eb4c5eebee827cd08fe05973cdaf3e5ba3c42b4f63f0518ca6a7ae40f46151ff0109aa36500ad237205046f8e762
-  data.tar.gz: 6baaff9298a9c678b881d8de5e9e88be782c04f43e0e11e879de5b44ab94255abd987e7e6e16f6b05f44ea3a17d43245f25e425daeb12fd3c8f3d875529978ba
+  metadata.gz: 36bf7ce33ba3bd6b883091e5481e2d5a339c492225f37fc38db36fb68cf73d2a99f2d6fa18696b8f813c984a3ffca605667d969cc7a198b045b3dc93c19a6365
+  data.tar.gz: 804884d285fe46eb4e1db31f693ceeeceea03de6925eee37897ee89e91a6b4f74b7c01645bddf3173ea7c5246970842c9d1f177972ec0b04c53b7e0eb58a298a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.9.2 Alpha 1
+- Fix Puma.stats calls. PR #496
+- Only send Puma metrics if available. PR #497
+- Track memory metrics of the current process. PR #499
+
 # 2.9.1
 - Fix memory leak in custom metrics key names.
   Commit 9064e2ccfd19ee05c333d0ecda4deafdd743629e

data/ext/agent.yml

@@ -1,67 +1,67 @@
 ---
-version: 108f833
+version: 4019bf9
 triples:
   x86_64-darwin:
     static:
-      checksum: fbdb72f3b0ac326de267c157c58259444b8bb44ef998225e042d63a4ef8e0fac
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/108f833/appsignal-x86_64-darwin-all-static.tar.gz
+      checksum: ab5d75d7d1554b53d83b9181fc1b3d05220d5bd86cd6d5a0b91ef4a262e1c571
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: c76f44004ed1c1f74842fd0b3bcce591ee776ab17b9d8f70b569d71aa64609ac
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/108f833/appsignal-x86_64-darwin-all-dynamic.tar.gz
+      checksum: 19fb47d063aa02f665868220568095996c6616b61d58f9a86980a7ace60ed7f9
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: fbdb72f3b0ac326de267c157c58259444b8bb44ef998225e042d63a4ef8e0fac
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/108f833/appsignal-x86_64-darwin-all-static.tar.gz
+      checksum: ab5d75d7d1554b53d83b9181fc1b3d05220d5bd86cd6d5a0b91ef4a262e1c571
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: c76f44004ed1c1f74842fd0b3bcce591ee776ab17b9d8f70b569d71aa64609ac
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/108f833/appsignal-x86_64-darwin-all-dynamic.tar.gz
+      checksum: 19fb47d063aa02f665868220568095996c6616b61d58f9a86980a7ace60ed7f9
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-darwin-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: 7b336011798d6c9a5777ff2bc6cb51e954bf55e5218d9201e285326bbbae18b1
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/108f833/appsignal-i686-linux-all-static.tar.gz
+      checksum: 6ab48834486b380edf22aa85ea858763046e98952ff3afcad8cb61589be802ff
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 7cd1aacf601735fa046b34d66b0c8b05d07d981d9493e0b5e40ea52ad09e3755
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/108f833/appsignal-i686-linux-all-dynamic.tar.gz
+      checksum: 6e4c3b0f62ee688938ad35842452ff9ac54f35da07959d90f6aa43269effdbe9
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: 7b336011798d6c9a5777ff2bc6cb51e954bf55e5218d9201e285326bbbae18b1
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/108f833/appsignal-i686-linux-all-static.tar.gz
+      checksum: 6ab48834486b380edf22aa85ea858763046e98952ff3afcad8cb61589be802ff
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 7cd1aacf601735fa046b34d66b0c8b05d07d981d9493e0b5e40ea52ad09e3755
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/108f833/appsignal-i686-linux-all-dynamic.tar.gz
+      checksum: 6e4c3b0f62ee688938ad35842452ff9ac54f35da07959d90f6aa43269effdbe9
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-i686-linux-all-dynamic.tar.gz
   i686-linux-musl:
     static:
-      checksum: 5670adfd22815350f2e6a04b0602429b04fbf98b7ffeda89a5cfcf0dd670ccc0
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/108f833/appsignal-i686-linux-musl-all-static.tar.gz
+      checksum: cf6e2d45978d32ad0330bdad035f536df931a9e5e647cc4eadfb5982dfb76818
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-i686-linux-musl-all-static.tar.gz
   x86-linux-musl:
     static:
-      checksum: 5670adfd22815350f2e6a04b0602429b04fbf98b7ffeda89a5cfcf0dd670ccc0
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/108f833/appsignal-i686-linux-musl-all-static.tar.gz
+      checksum: cf6e2d45978d32ad0330bdad035f536df931a9e5e647cc4eadfb5982dfb76818
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-i686-linux-musl-all-static.tar.gz
   x86_64-linux:
     static:
-      checksum: e740815301dfb09b4e8dc3e8dd904c16794f56b576ea715877652874561eb20d
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/108f833/appsignal-x86_64-linux-all-static.tar.gz
+      checksum: c7f4383ec3a896fe8652d28a96f272763e9a7c81372520bf082eabd0ed34bdbd
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: '0522504536924224968bba9fe277b4ed80f8eb841a89047b4862c54c34150ce6'
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/108f833/appsignal-x86_64-linux-all-dynamic.tar.gz
+      checksum: fe0f3a0fcfe48aa29a88fa8fe97c9c3f16210e53ea1fc741845bf2addab5fce5
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: 6c797166fd077a360790d257c971c24603a89d507a933b97fcac1120b35ae5b5
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/108f833/appsignal-x86_64-linux-musl-all-static.tar.gz
+      checksum: d110e32589041d03f2787982591557aa934172392a4ff9d63b5823fc624232c7
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: 0ad96d3602df50f0f0a7fb146c3e6c194af0d8d89eb8f2de321792aa1cbef2e5
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/108f833/appsignal-x86_64-linux-musl-all-dynamic.tar.gz
+      checksum: 7230a12b448cdec33a72ad4abfb405ade8a02e0c47a7302a40267b87039533d2
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: 2581f58e6ce63975cb2100242adda96f4710c1e51731e66b6ab668203b338c14
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/108f833/appsignal-x86_64-freebsd-all-static.tar.gz
+      checksum: 203c49fabed6a375d691e8d62c2b3f0e82bef806765fa1cd718bd5c04658c629
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: c89064315f859f12ae7a66279a41ae4616f3e9005508a92c09bdec587456e1fc
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/108f833/appsignal-x86_64-freebsd-all-dynamic.tar.gz
+      checksum: 4d5df3da68e7961f5b6a779f63db5d8a458472700ae8cc729932c606dea84b71
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: 2581f58e6ce63975cb2100242adda96f4710c1e51731e66b6ab668203b338c14
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/108f833/appsignal-x86_64-freebsd-all-static.tar.gz
+      checksum: 203c49fabed6a375d691e8d62c2b3f0e82bef806765fa1cd718bd5c04658c629
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: c89064315f859f12ae7a66279a41ae4616f3e9005508a92c09bdec587456e1fc
-      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/108f833/appsignal-x86_64-freebsd-all-dynamic.tar.gz
+      checksum: 4d5df3da68e7961f5b6a779f63db5d8a458472700ae8cc729932c606dea84b71
+      download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4019bf9/appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/lib/appsignal/hooks/puma.rb

@@ -44,41 +44,34 @@ module Appsignal
       end
 
       def call
-        return unless ::Puma.stats
+        puma_stats = fetch_puma_stats
+        return unless puma_stats
 
-        stats = JSON.parse Puma.stats, :symbolize_names => true
-        counts = {
-          :backlog => 0,
-          :running => 0,
-          :pool_capacity => 0,
-          :max_threads => 0
-        }
+        stats = JSON.parse puma_stats, :symbolize_names => true
+        counts = {}
+        count_keys = [:backlog, :running, :pool_capacity, :max_threads]
 
         if stats[:worker_status] # Multiple workers
           stats[:worker_status].each do |worker|
             stat = worker[:last_status]
-
-            counts[:backlog] += stat[:backlog]
-            counts[:running] += stat[:running]
-            counts[:pool_capacity] += stat[:pool_capacity]
-            counts[:max_threads] += stat[:max_threads]
+            count_keys.each do |key|
+              count_if_present counts, key, stat
+            end
           end
 
           gauge(:workers, stats[:workers], :type => :count)
           gauge(:workers, stats[:booted_workers], :type => :booted)
           gauge(:workers, stats[:old_workers], :type => :old)
-
         else # Single worker
-          counts[:backlog] += stats[:backlog]
-          counts[:running] += stats[:running]
-          counts[:pool_capacity] += stats[:pool_capacity]
-          counts[:max_threads] += stats[:max_threads]
+          count_keys.each do |key|
+            count_if_present counts, key, stats
+          end
         end
 
-        gauge(:connection_backlog, counts[:backlog])
-        gauge(:pool_capacity, counts[:pool_capacity])
-        gauge(:threads, counts[:running], :type => :running)
-        gauge(:threads, counts[:max_threads], :type => :max)
+        gauge(:connection_backlog, counts[:backlog]) if counts[:backlog]
+        gauge(:pool_capacity, counts[:pool_capacity]) if counts[:pool_capacity]
+        gauge(:threads, counts[:running], :type => :running) if counts[:running]
+        gauge(:threads, counts[:max_threads], :type => :max) if counts[:max_threads]
       end
 
       private
@@ -88,6 +81,18 @@ module Appsignal
       def gauge(field, count, tags = {})
         Appsignal.set_gauge("puma_#{field}", count, tags.merge(:hostname => hostname))
       end
+
+      def count_if_present(counts, key, stats)
+        stat_value = stats[key]
+        return unless stat_value
+        counts[key] ||= 0
+        counts[key] += stat_value
+      end
+
+      def fetch_puma_stats
+        ::Puma.stats
+      rescue NoMethodError # rubocop:disable Lint/HandleExceptions
+      end
     end
   end
 end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "2.9.1".freeze
+  VERSION = "2.9.2.alpha.1".freeze
 end

data/spec/lib/appsignal/hooks/puma_spec.rb

@@ -158,6 +158,8 @@ describe Appsignal::Hooks::PumaProbe do
         expect_gauge(:pool_capacity, 10)
         expect_gauge(:threads, 10, :type => :running)
         expect_gauge(:threads, 10, :type => :max)
+
+        probe.call
       end
     end
 
@@ -181,6 +183,7 @@ describe Appsignal::Hooks::PumaProbe do
         expect_gauge(:pool_capacity, 5)
         expect_gauge(:threads, 5, :type => :running)
         expect_gauge(:threads, 5, :type => :max)
+        probe.call
       end
     end
 
@@ -193,17 +196,72 @@ describe Appsignal::Hooks::PumaProbe do
       end
       after(:context) { Object.send(:remove_const, :Puma) }
 
-      it "does not track metrics" do
-        expect(probe).to_not receive(:puma_gauge)
+      context "when it returns nil" do
+        it "does not track metrics" do
+          expect(probe).to_not receive(:puma_gauge)
+          probe.call
+        end
       end
-    end
 
-    after { probe.call }
+      # Puma.stats raises a NoMethodError on a nil object on the first call.
+      context "when it returns a NoMethodError on the first call" do
+        let(:log) { StringIO.new }
+
+        it "ignores the first call and tracks the second call" do
+          use_logger_with log do
+            expect(Puma).to receive(:stats)
+              .and_raise(NoMethodError.new("undefined method `stats' for nil:NilClass"))
+            probe.call
+
+            expect(Puma).to receive(:stats).and_return({
+              "backlog" => 1,
+              "running" => 5,
+              "pool_capacity" => 4,
+              "max_threads" => 6
+            }.to_json)
+
+            expect_gauge(:connection_backlog, 1)
+            expect_gauge(:pool_capacity, 4)
+            expect_gauge(:threads, 5, :type => :running)
+            expect_gauge(:threads, 6, :type => :max)
+            probe.call
+          end
+
+          expect(log_contents(log)).to_not contains_log(:error, "Error in minutely probe 'puma'")
+        end
+      end
+
+      context "when it does not have a complete stats payload" do
+        let(:log) { StringIO.new }
+
+        it "tracks whatever metrics we do have" do
+          use_logger_with log do
+            expect(Puma).to receive(:stats).and_return({
+              "backlog" => 1,
+              "running" => 5
+            }.to_json)
+
+            expect_gauge(:connection_backlog, 1)
+            expect_no_gauge(:pool_capacity)
+            expect_gauge(:threads, 5, :type => :running)
+            expect_no_gauge(:threads, :type => :max)
+            probe.call
+          end
+
+          expect(log_contents(log)).to_not contains_log(:error, "Error in minutely probe 'puma'")
+        end
+      end
+    end
 
     def expect_gauge(key, value, tags = {})
       expect(Appsignal).to receive(:set_gauge)
         .with("puma_#{key}", value, expected_default_tags.merge(tags))
         .and_call_original
     end
+
+    def expect_no_gauge(key, tags = {})
+      expect(Appsignal).to_not receive(:set_gauge)
+        .with("puma_#{key}", anything, tags)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.9.2.alpha.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-27 00:00:00.000000000 Z
+date: 2019-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -375,9 +375,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.2
 signing_key: