appsignal 2.11.0.alpha.1 → 2.11.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 250f9ca7d702af9daaafbbced86a9122fea07296841c65c41d64a2a9a594fded
-  data.tar.gz: 1753bb37eaeadc98397573098a3b9cf1d718c072074ff3a2d45d3251e75db5f2
+  metadata.gz: 1c88daf539fd30d108a70041339bea3d9b4fbc893f091f1b7b9b6792bd7977f4
+  data.tar.gz: d7195e855b5a2ea44db9cfdd9c132dfb2afda1994bc4c7c8aba08181f47081d8
 SHA512:
-  metadata.gz: 2bd72bf03e824a48fff4be825ce0ecab592f10f77a0163505a7c3f71bde0f8fbafd12642fc232f0528036416ac890ca3d29a44e84efce12a086959a6dcf1178a
-  data.tar.gz: e82a5e2dee87442a90ab2a67b0627f4d4d787243bde54d0ee78420f8286c97f53ca97c97e0283f6991ad123180ab6303564a610159d862e2a1ffbd5921d534f8
+  metadata.gz: c1dda62fbb16b7cc30233a23a3d440c462bbbc1a060cfefd1207cdd7c1574d09de82e07661e9c0e3bf0dae078a8ff8c1f3990c5768dee43501b7c6fb0254a668
+  data.tar.gz: 9eb9618c8cb83f87db2b183573e64313a6fe01651bf2f5e93b748347de38e64716053ba7dcf42ce9a2954caa1c3e2096153acb37543a49cfe4c069afe7e8c705

data/.semaphore/semaphore.yml

@@ -33,8 +33,8 @@ global_job_config:
     - checkout
     - sem-version ruby $RUBY_VERSION
     - "./support/check_versions"
-    - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE),$_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET,$_BUNDLER_CACHE-bundler-$RUBY_VERSION
-    - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE),$_GEMS_CACHE-gems-$RUBY_VERSION
+    - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)
+    - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE)
     - "./support/install_deps"
     - bundle config set clean 'true'
     - "./support/bundler_wrapper install --jobs=3 --retry=3"
@@ -172,20 +172,6 @@ blocks:
         value: 1.17.3
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.0.0-p648 for padrino
-      env_vars:
-      - name: RUBY_VERSION
-        value: 2.0.0-p648
-      - name: GEMSET
-        value: padrino
-      - name: BUNDLE_GEMFILE
-        value: gemfiles/padrino.gemfile
-      - name: _RUBYGEMS_VERSION
-        value: 2.7.8
-      - name: _BUNDLER_VERSION
-        value: 1.17.3
-      commands:
-      - "./support/bundler_wrapper exec rake test"
     - name: Ruby 2.0.0-p648 for que
       env_vars:
       - name: RUBY_VERSION
@@ -527,7 +513,7 @@ blocks:
       - name: _RUBYGEMS_VERSION
         value: latest
       - name: _BUNDLER_VERSION
-        value: 1.17.3
+        value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
     - name: Ruby 2.6.5 for que
@@ -684,7 +670,7 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-- name: Ruby 2.7.0
+- name: Ruby 2.7.1
   dependencies:
   - Validation
   task:
@@ -692,10 +678,10 @@ blocks:
       commands:
       - "./support/bundler_wrapper exec rake extension:install"
     jobs:
-    - name: Ruby 2.7.0 for no_dependencies
+    - name: Ruby 2.7.1 for no_dependencies
       env_vars:
       - name: RUBY_VERSION
-        value: 2.7.0
+        value: 2.7.1
       - name: GEMSET
         value: no_dependencies
       - name: BUNDLE_GEMFILE
@@ -706,18 +692,18 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-- name: Ruby 2.7.0 - Gems
+- name: Ruby 2.7.1 - Gems
   dependencies:
-  - Ruby 2.7.0
+  - Ruby 2.7.1
   task:
     prologue:
       commands:
       - "./support/bundler_wrapper exec rake extension:install"
     jobs:
-    - name: Ruby 2.7.0 for capistrano2
+    - name: Ruby 2.7.1 for capistrano2
       env_vars:
       - name: RUBY_VERSION
-        value: 2.7.0
+        value: 2.7.1
       - name: GEMSET
         value: capistrano2
       - name: BUNDLE_GEMFILE
@@ -728,10 +714,10 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.7.0 for capistrano3
+    - name: Ruby 2.7.1 for capistrano3
       env_vars:
       - name: RUBY_VERSION
-        value: 2.7.0
+        value: 2.7.1
       - name: GEMSET
         value: capistrano3
       - name: BUNDLE_GEMFILE
@@ -742,10 +728,10 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.7.0 for grape
+    - name: Ruby 2.7.1 for grape
       env_vars:
       - name: RUBY_VERSION
-        value: 2.7.0
+        value: 2.7.1
       - name: GEMSET
         value: grape
       - name: BUNDLE_GEMFILE
@@ -756,10 +742,10 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.7.0 for padrino
+    - name: Ruby 2.7.1 for padrino
       env_vars:
       - name: RUBY_VERSION
-        value: 2.7.0
+        value: 2.7.1
       - name: GEMSET
         value: padrino
       - name: BUNDLE_GEMFILE
@@ -767,13 +753,13 @@ blocks:
       - name: _RUBYGEMS_VERSION
         value: latest
       - name: _BUNDLER_VERSION
-        value: 1.17.3
+        value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.7.0 for que
+    - name: Ruby 2.7.1 for que
       env_vars:
       - name: RUBY_VERSION
-        value: 2.7.0
+        value: 2.7.1
       - name: GEMSET
         value: que
       - name: BUNDLE_GEMFILE
@@ -784,10 +770,10 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.7.0 for que_beta
+    - name: Ruby 2.7.1 for que_beta
       env_vars:
       - name: RUBY_VERSION
-        value: 2.7.0
+        value: 2.7.1
       - name: GEMSET
         value: que_beta
       - name: BUNDLE_GEMFILE
@@ -798,10 +784,10 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.7.0 for rails-5.0
+    - name: Ruby 2.7.1 for rails-5.0
       env_vars:
       - name: RUBY_VERSION
-        value: 2.7.0
+        value: 2.7.1
       - name: GEMSET
         value: rails-5.0
       - name: BUNDLE_GEMFILE
@@ -812,10 +798,10 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.7.0 for rails-5.1
+    - name: Ruby 2.7.1 for rails-5.1
       env_vars:
       - name: RUBY_VERSION
-        value: 2.7.0
+        value: 2.7.1
       - name: GEMSET
         value: rails-5.1
       - name: BUNDLE_GEMFILE
@@ -826,10 +812,10 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.7.0 for rails-5.2
+    - name: Ruby 2.7.1 for rails-5.2
       env_vars:
       - name: RUBY_VERSION
-        value: 2.7.0
+        value: 2.7.1
       - name: GEMSET
         value: rails-5.2
       - name: BUNDLE_GEMFILE
@@ -840,10 +826,10 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.7.0 for rails-6.0
+    - name: Ruby 2.7.1 for rails-6.0
       env_vars:
       - name: RUBY_VERSION
-        value: 2.7.0
+        value: 2.7.1
       - name: GEMSET
         value: rails-6.0
       - name: BUNDLE_GEMFILE
@@ -854,10 +840,10 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.7.0 for resque
+    - name: Ruby 2.7.1 for resque
       env_vars:
       - name: RUBY_VERSION
-        value: 2.7.0
+        value: 2.7.1
       - name: GEMSET
         value: resque
       - name: BUNDLE_GEMFILE
@@ -868,10 +854,10 @@ blocks:
         value: 1.17.3
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.7.0 for sequel
+    - name: Ruby 2.7.1 for sequel
       env_vars:
       - name: RUBY_VERSION
-        value: 2.7.0
+        value: 2.7.1
       - name: GEMSET
         value: sequel
       - name: BUNDLE_GEMFILE
@@ -882,10 +868,10 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.7.0 for sequel-435
+    - name: Ruby 2.7.1 for sequel-435
       env_vars:
       - name: RUBY_VERSION
-        value: 2.7.0
+        value: 2.7.1
       - name: GEMSET
         value: sequel-435
       - name: BUNDLE_GEMFILE
@@ -896,10 +882,10 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.7.0 for sinatra
+    - name: Ruby 2.7.1 for sinatra
       env_vars:
       - name: RUBY_VERSION
-        value: 2.7.0
+        value: 2.7.1
       - name: GEMSET
         value: sinatra
       - name: BUNDLE_GEMFILE
@@ -910,10 +896,10 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.7.0 for webmachine
+    - name: Ruby 2.7.1 for webmachine
       env_vars:
       - name: RUBY_VERSION
-        value: 2.7.0
+        value: 2.7.1
       - name: GEMSET
         value: webmachine
       - name: BUNDLE_GEMFILE

data/CHANGELOG.md

@@ -2,7 +2,9 @@
 
 # 2.11.0
 - Track queue time regardless of namespace. Support custom namespaces. PR #602
-- Report Ruby environment metadata. PR #621
+- Improve deprecation message from frontend error middleware. PR #620
+- Report Ruby environment metadata. PR #621, #627
+- Refactor: Move minutely probes to their own files and modules. PR #623
 
 # 2.10.9
 - Use http proxy if configured when downloading agent. PR #606

data/build_matrix.yml

@@ -34,8 +34,8 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
         - checkout
         - sem-version ruby $RUBY_VERSION
         - ./support/check_versions
-        - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE),$_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET,$_BUNDLER_CACHE-bundler-$RUBY_VERSION
-        - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE),$_GEMS_CACHE-gems-$RUBY_VERSION
+        - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)
+        - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE)
         - ./support/install_deps
         - bundle config set clean 'true'
         - ./support/bundler_wrapper install --jobs=3 --retry=3
@@ -115,7 +115,7 @@ matrix:
     - ruby: "2.5.7"
       gems: "minimal"
     - ruby: "2.6.5"
-    - ruby: "2.7.0"
+    - ruby: "2.7.1"
     - ruby: "jruby-9.1.17.0"
       gems: "minimal"
   gems:
@@ -124,7 +124,9 @@ matrix:
     - gem: "capistrano3"
     - gem: "grape"
     - gem: "padrino"
-      bundler: "1.17.3"
+      exclude:
+        ruby:
+          - "2.0.0-p648"
     - gem: "que"
     - gem: "que_beta"
       exclude:
@@ -135,13 +137,13 @@ matrix:
       exclude:
         ruby:
           - "2.6.5"
-          - "2.7.0"
+          - "2.7.1"
     - gem: "rails-4.2"
       bundler: "1.17.3"
       exclude:
         ruby:
           - "2.6.5"
-          - "2.7.0"
+          - "2.7.1"
     - gem: "rails-5.0"
       exclude:
         ruby:

data/ext/agent.yml

@@ -1,70 +1,70 @@
 ---
-version: 38a8a6f
+version: 710d341
 mirrors:
 - https://appsignal-agent-releases.global.ssl.fastly.net
 - https://d135dj0rjqvssy.cloudfront.net
 triples:
   x86_64-darwin:
     static:
-      checksum: 47f24cd09ab00fe3419a313c52d97170c9555d3ea85c8bd98cbb295df29456dd
+      checksum: 47f53b67d5e28e23859ed7bbcc6cde7ba3c142bf0f7c32ffa0d89c628178d4cc
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: a26437fbd4c97ff0b69bf42e83d968647532648313227224df1bbbd0ed105104
+      checksum: 0b2b1533cf5c6f400fbe367fd6a3200c60ecfe6cd8b44a6707bc2a57ef78fe4d
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: 47f24cd09ab00fe3419a313c52d97170c9555d3ea85c8bd98cbb295df29456dd
+      checksum: 47f53b67d5e28e23859ed7bbcc6cde7ba3c142bf0f7c32ffa0d89c628178d4cc
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: a26437fbd4c97ff0b69bf42e83d968647532648313227224df1bbbd0ed105104
+      checksum: 0b2b1533cf5c6f400fbe367fd6a3200c60ecfe6cd8b44a6707bc2a57ef78fe4d
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: ae37b329907cead537cf2a87a562ee92120add6c8874bc2e9235e5c537bca692
+      checksum: d815dd40495175a83d1bed0facfb97a472a74bdfe7aafbe6f72192e66b45a559
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: ee5da14c7b5d2cc2dc2ae345d19c33a08c7e4861975e34878c1c295e57b2d8bc
+      checksum: 2e785cf04d500eaad577c3391d236c38d850fed9b541a0e79803ee9bf66852aa
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: ae37b329907cead537cf2a87a562ee92120add6c8874bc2e9235e5c537bca692
+      checksum: d815dd40495175a83d1bed0facfb97a472a74bdfe7aafbe6f72192e66b45a559
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: ee5da14c7b5d2cc2dc2ae345d19c33a08c7e4861975e34878c1c295e57b2d8bc
+      checksum: 2e785cf04d500eaad577c3391d236c38d850fed9b541a0e79803ee9bf66852aa
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   i686-linux-musl:
     static:
-      checksum: d2d6dfd5d86b229449c73c74ac6b922eeff981f451dd599cbc8b9f2b7a715931
+      checksum: 4c66f26fb7925445ba0bb353cbf753f00572ffdae16a28220f6306bcb34a686b
       filename: appsignal-i686-linux-musl-all-static.tar.gz
   x86-linux-musl:
     static:
-      checksum: d2d6dfd5d86b229449c73c74ac6b922eeff981f451dd599cbc8b9f2b7a715931
+      checksum: 4c66f26fb7925445ba0bb353cbf753f00572ffdae16a28220f6306bcb34a686b
       filename: appsignal-i686-linux-musl-all-static.tar.gz
   x86_64-linux:
     static:
-      checksum: 6b05c04df7de65be742942926c79e4d322a02dd3b18552b4eb42b420b67df214
+      checksum: d59929c9b2075eb93f0b66a8f9ea4d7d90a897b996a4ff054fd68610282ed616
       filename: appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: de2f7325d2d7d01632abe9eb135f51376ed3769167e0675b7e7c6de9702c057c
+      checksum: b1d22b323fdf9d8dbce17194ae42d3f7ddb252342db70428aea1c6baab5e6959
       filename: appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: 2a852991c740f93d83dbd3b34daaef45f2ebb02a921200734a6f715790d44968
+      checksum: 7b8cd90260f6bc31ed2aa61dac8889a79a8c5b35f453b2f9d47d1e74133d2c2f
       filename: appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: 03fc01d09698b95a5686fc08e4cd1f35913a53413e0ae8ced877c0e7f8ca260e
+      checksum: 8922f1e3a845ea869a1553aeb87681346c709dbab96636f703dfc3bc855621d8
       filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: 3a26b9a4a1c7e412f6602f4bbae8dd95ad248b41e033b967163bae2f6fac0e96
+      checksum: bb15ae46b7df4f2851982bcd8b079cd6b5ea384c19eaed9f20cdf152e435c4ea
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 4eda2bdb88670854abb07ad716e2d46de298dd8549835468c4a778f74c6a7b0e
+      checksum: 0be60faf18df3eddedd5d85e34fdbcccb3ce6aae52ef6faeebe881c3e0fe2022
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: 3a26b9a4a1c7e412f6602f4bbae8dd95ad248b41e033b967163bae2f6fac0e96
+      checksum: bb15ae46b7df4f2851982bcd8b079cd6b5ea384c19eaed9f20cdf152e435c4ea
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 4eda2bdb88670854abb07ad716e2d46de298dd8549835468c4a778f74c6a7b0e
+      checksum: 0be60faf18df3eddedd5d85e34fdbcccb3ce6aae52ef6faeebe881c3e0fe2022
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/gemfiles/padrino.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'padrino', '~> 0.13.0'
-gem 'rack', '~> 1.6'
+gem 'padrino', "~> 0.15"
+gem 'rack'
 
 gemspec :path => '../'

data/lib/appsignal/hooks/puma.rb

@@ -24,7 +24,8 @@ module Appsignal
           # runs in the Puma main process.
           # For more information:
           # https://docs.appsignal.com/ruby/integrations/puma.html
-          Appsignal::Minutely.probes.register :puma, PumaProbe
+          require "appsignal/probes/puma"
+          Appsignal::Minutely.probes.register :puma, ::Appsignal::Probes::PumaProbe
         end
 
         return unless defined?(::Puma::Cluster)
@@ -39,62 +40,5 @@ module Appsignal
         end
       end
     end
-
-    class PumaProbe
-      def initialize
-        @hostname = Appsignal.config[:hostname] || Socket.gethostname
-      end
-
-      def call
-        puma_stats = fetch_puma_stats
-        return unless puma_stats
-
-        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]
-            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
-          count_keys.each do |key|
-            count_if_present counts, key, stats
-          end
-        end
-
-        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
-
-      attr_reader :hostname
-
-      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