appsignal 2.10.4 → 2.10.6

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 2.10.6
+- Check if queued payloads are for correct app and not expired
+
+## 2.10.5
+- Improve Ruby 1.9 compatibility. PR #591
+- Add grape.skip_appsignal_error request env. PR #588
+  More information: https://docs.appsignal.com/ruby/integrations/grape.html
+- Fix compatibility with the `http_logger` gem. Fix `SystemStackError`. PR #597
+
 ## 2.10.4
 - Fix `Appsignal::Transaction#set_http_or_background_action` helper (used by
   `Appsignal.monitor_transaction`), to allow overwriting the action name of a

data/Rakefile

@@ -59,6 +59,7 @@ namespace :build_matrix do
 
           env = [
             env_map("RUBY_VERSION", ruby_version),
+            env_map("GEMSET", gem["gem"]),
             env_map("BUNDLE_GEMFILE", "gemfiles/#{gem["gem"]}.gemfile")
           ]
           rubygems = gem["rubygems"] || ruby["rubygems"] || defaults["rubygems"]
@@ -364,7 +365,12 @@ end
 begin
   require "rspec/core/rake_task"
   desc "Run the AppSignal gem test suite."
-  RSpec::Core::RakeTask.new :test
+  RSpec::Core::RakeTask.new :test do |t|
+    is_jruby = defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
+    unless is_jruby
+      t.rspec_opts = "--exclude-pattern=spec/lib/appsignal/extension/jruby_spec.rb"
+    end
+  end
 rescue LoadError # rubocop:disable Lint/HandleExceptions
   # When running rake install, there is no RSpec yet.
 end

data/appsignal.gemspec

@@ -39,9 +39,12 @@ Gem::Specification.new do |gem| # rubocop:disable Metrics/BlockLength
 
   gem.add_development_dependency "rake", "~> 11"
   gem.add_development_dependency "rspec", "~> 3.8"
-  gem.add_development_dependency "pry"
   gem.add_development_dependency "timecop"
   gem.add_development_dependency "webmock"
-  gem.add_development_dependency "rubocop", "0.50.0"
   gem.add_development_dependency "yard", ">= 0.9.20"
+  is_modern_ruby = Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.0.0")
+  if is_modern_ruby
+    gem.add_development_dependency "pry"
+    gem.add_development_dependency "rubocop", "0.50.0"
+  end
 end

data/build_matrix.yml

@@ -34,14 +34,14 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
         - checkout
         - sem-version ruby $RUBY_VERSION
         - ./support/check_versions
-        - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE),$_BUNDLER_CACHE-bundler-$RUBY_VERSION
+        - 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
         - ./support/install_deps
         - ./support/bundler_wrapper install --jobs=3 --retry=3
     epilogue:
       on_pass:
         commands:
-          - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE) .bundle
+          - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE) .bundle
           - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE) $HOME/.gem
 
   blocks:
@@ -53,6 +53,8 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
           env_vars:
             - name: RUBY_VERSION
               value: 2.6.5
+            - name: GEMSET
+              value: no_dependencies
             - name: BUNDLE_GEMFILE
               value: gemfiles/no_dependencies.gemfile
           commands:
@@ -65,6 +67,8 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
           env_vars:
             - name: RUBY_VERSION
               value: 2.6.5
+            - name: GEMSET
+              value: no_dependencies
             - name: BUNDLE_GEMFILE
               value: gemfiles/no_dependencies.gemfile
           commands:
@@ -81,8 +85,13 @@ matrix:
     minimal:
       - "no_dependencies"
       - "rails-5.2"
+      - "rails-6.0"
 
   ruby:
+    - ruby: "1.9.3-p551"
+      rubygems: "2.7.8"
+      bundler: "1.17.3"
+      gems: "none"
     - ruby: "2.0.0-p648"
       rubygems: "2.7.8"
       bundler: "1.17.3"
@@ -148,6 +157,7 @@ matrix:
           - "2.2.10"
           - "2.3.8"
           - "2.4.9"
+          - "jruby-9.1.17.0"
     - gem: "resque"
       bundler: "1.17.3"
     - gem: "sequel"

data/ext/agent.yml

@@ -1,70 +1,70 @@
 ---
-version: c348132
+version: 96b684b
 mirrors:
 - https://appsignal-agent-releases.global.ssl.fastly.net
 - https://d135dj0rjqvssy.cloudfront.net
 triples:
   x86_64-darwin:
     static:
-      checksum: cb287c8e2072fe5b8cf14449bd6892989c392d0c651ce339895ae0302cb69785
+      checksum: 6278d03abdcacde207e210374601b0a98eabace8cbc9fb74dffea3c18fc8a252
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: af1ed2e9d29859ffbfc8e6903e4c51764dee94d7b4877ca8d30270b6f133a10f
+      checksum: b0ad069bbff68acde7ef19de47938fa786771bae4821c757718f1894b9654a93
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: cb287c8e2072fe5b8cf14449bd6892989c392d0c651ce339895ae0302cb69785
+      checksum: 6278d03abdcacde207e210374601b0a98eabace8cbc9fb74dffea3c18fc8a252
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: af1ed2e9d29859ffbfc8e6903e4c51764dee94d7b4877ca8d30270b6f133a10f
+      checksum: b0ad069bbff68acde7ef19de47938fa786771bae4821c757718f1894b9654a93
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: 2c3bcd102592bf38fbdb27e7c70502dccbe54a0dc2739a9d54aaa694fcfb41fb
+      checksum: f3e79a575241a50d7968fe4743c4f4e5aebb840e0b8664d055383caf696d5d38
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 1c037b8370b755d706340e25d3e4b2f4acb279dd03873cc53bcf0a6ec0832653
+      checksum: 0df11c9fe85c9c94336dfb4df788032c78eda1ea648f98e8c1e4e213258816e1
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: 2c3bcd102592bf38fbdb27e7c70502dccbe54a0dc2739a9d54aaa694fcfb41fb
+      checksum: f3e79a575241a50d7968fe4743c4f4e5aebb840e0b8664d055383caf696d5d38
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 1c037b8370b755d706340e25d3e4b2f4acb279dd03873cc53bcf0a6ec0832653
+      checksum: 0df11c9fe85c9c94336dfb4df788032c78eda1ea648f98e8c1e4e213258816e1
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   i686-linux-musl:
     static:
-      checksum: 0add9eed4452feda7fc5e1bbd0acdff32c353e4ea0b5d527959df57deb1bdcb2
+      checksum: 07ab5749b532f1cc6cb45a3334fd950f6d15edacbe6d1bfe25af75b24df73cd1
       filename: appsignal-i686-linux-musl-all-static.tar.gz
   x86-linux-musl:
     static:
-      checksum: 0add9eed4452feda7fc5e1bbd0acdff32c353e4ea0b5d527959df57deb1bdcb2
+      checksum: 07ab5749b532f1cc6cb45a3334fd950f6d15edacbe6d1bfe25af75b24df73cd1
       filename: appsignal-i686-linux-musl-all-static.tar.gz
   x86_64-linux:
     static:
-      checksum: d11221c127c00128da16b419c503281407e429c0ea6f5bfe1691640b8e995e4e
+      checksum: d0e8f48973bca7d783d654404617bb5ab4f47756deb6805c4876bfcda83981cd
       filename: appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: 6869ab461fde55487d55805c396d55f36cb881998556f44236035b949939b0af
+      checksum: aff7569b04416cd40440d228c5b9881b860e1ecf597bc996ac02c2735f49d993
       filename: appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: 7ce44dc23c578933ca37a79d244bc367fdc2438408c2a61558adb92bcfebb1fa
+      checksum: 2e3db648d0883f2a7e72f1207ec0976b97d144cafe0a3e755df2d91ca93d113f
       filename: appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: 78d98f468e3a12cc09baff9e68bc4d9cd3b79f4a3bbe744036bff685415546a4
+      checksum: 5da62f954d761af47da16f34ab675b46fedd7b91b485574bf895b43896f61ce0
       filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: df5f8b61e6ecca40f349cf5c83d5f37f031850d367793dee90dc56f13974431d
+      checksum: 8dc226834ef39bac43dbc4a5c6a812c50c34669b0607036dd9494ac587e72d6a
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 30d0303e97386014640c5b8194b777a5741e08ab5497ba58a7d8229bd4890fc5
+      checksum: 0edfbaa450c89dba5750b306043efc00b82851dce2b75fa6ee62de07d30b4a3b
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: df5f8b61e6ecca40f349cf5c83d5f37f031850d367793dee90dc56f13974431d
+      checksum: 8dc226834ef39bac43dbc4a5c6a812c50c34669b0607036dd9494ac587e72d6a
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 30d0303e97386014640c5b8194b777a5741e08ab5497ba58a7d8229bd4890fc5
+      checksum: 0edfbaa450c89dba5750b306043efc00b82851dce2b75fa6ee62de07d30b4a3b
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/lib/appsignal.rb

@@ -6,6 +6,7 @@ require "securerandom"
 require "appsignal/logger"
 require "appsignal/helpers/instrumentation"
 require "appsignal/helpers/metrics"
+require "appsignal/utils/deprecation_message"
 
 # AppSignal for Ruby gem's main module.
 #
@@ -15,9 +16,9 @@ require "appsignal/helpers/metrics"
 # {Appsignal::Helpers::Metrics}) for ease of use.
 module Appsignal
   class << self
-    extend Gem::Deprecate
     include Helpers::Instrumentation
     include Helpers::Metrics
+    include Utils::DeprecationMessage
 
     # Accessor for the AppSignal configuration.
     # Return the current AppSignal configuration.
@@ -280,16 +281,18 @@ module Appsignal
 
     # @deprecated No replacement
     def is_ignored_error?(error) # rubocop:disable Naming/PredicateName
+      deprecation_message "Appsignal.is_ignored_error? is deprecated " \
+        "with no replacement and will be removed in version 3.0."
       Appsignal.config[:ignore_errors].include?(error.class.name)
     end
     alias :is_ignored_exception? :is_ignored_error?
-    deprecate :is_ignored_error?, :none, 2017, 3
 
     # @deprecated No replacement
     def is_ignored_action?(action) # rubocop:disable Naming/PredicateName
+      deprecation_message "Appsignal.is_ignored_action? is deprecated " \
+        "with no replacement and will be removed in version 3.0."
       Appsignal.config[:ignore_actions].include?(action)
     end
-    deprecate :is_ignored_action?, :none, 2017, 3
 
     private
 

data/lib/appsignal/cli/diagnose.rb

@@ -337,7 +337,7 @@ module Appsignal
           path = File.expand_path("../../../../ext/install.report", __FILE__)
           raw_report = File.read(path)
           Utils.parse_yaml(raw_report)
-        rescue => e
+        rescue StandardError, Psych::SyntaxError => e # rubocop:disable Lint/ShadowedException
           {
             "parsing_error" => {
               "error" => "#{e.class}: #{e}",

data/lib/appsignal/cli/notify_of_deploy.rb

@@ -94,7 +94,7 @@ module Appsignal
             "see our documentation for more information on the recommended " \
             "method: " \
             "https://docs.appsignal.com/application/markers/deploy-markers.html"
-          deprecation_message message, Appsignal.logger
+          deprecation_message message
         end
 
         private

data/lib/appsignal/event_formatter.rb

@@ -91,8 +91,7 @@ module Appsignal
           "Formatter for '#{name}' is using a deprecated registration " \
           "method. This event formatter will not be loaded. " \
           "Please update the formatter according to the documentation at: " \
-          "https://docs.appsignal.com/ruby/instrumentation/event-formatters.html",
-          logger
+          "https://docs.appsignal.com/ruby/instrumentation/event-formatters.html"
 
         EventFormatter.deprecated_formatter_classes[name] = self
       end

data/lib/appsignal/hooks/net_http.rb

@@ -13,15 +13,20 @@ module Appsignal
       end
 
       def install
-        Net::HTTP.class_eval do
-          alias request_without_appsignal request
+        if Appsignal::System.ruby_2_or_up?
+          require "appsignal/integrations/net_http"
+          Net::HTTP.send(:prepend, Appsignal::Integrations::NetHttpIntegration)
+        else
+          Net::HTTP.class_eval do
+            alias request_without_appsignal request
 
-          def request(request, body = nil, &block)
-            Appsignal.instrument(
-              "request.net_http",
-              "#{request.method} #{use_ssl? ? "https" : "http"}://#{request["host"] || address}"
-            ) do
-              request_without_appsignal(request, body, &block)
+            def request(request, body = nil, &block)
+              Appsignal.instrument(
+                "request.net_http",
+                "#{request.method} #{use_ssl? ? "https" : "http"}://#{request["host"] || address}"
+              ) do
+                request_without_appsignal(request, body, &block)
+              end
             end
           end
         end

data/lib/appsignal/integrations/grape.rb

@@ -23,7 +23,8 @@ module Appsignal
         begin
           app.call(env)
         rescue Exception => error # rubocop:disable Lint/RescueException
-          transaction.set_error(error)
+          # Do not set error if "grape.skip_appsignal_error" is set to `true`.
+          transaction.set_error(error) unless env["grape.skip_appsignal_error"]
           raise error
         ensure
           request_method = request.request_method.to_s.upcase

data/lib/appsignal/integrations/net_http.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Appsignal
+  module Integrations
+    module NetHttpIntegration
+      def request(request, body = nil, &block)
+        Appsignal.instrument(
+          "request.net_http",
+          "#{request.method} #{use_ssl? ? "https" : "http"}://#{request["host"] || address}"
+        ) do
+          super
+        end
+      end
+    end
+  end
+end

data/lib/appsignal/minutely.rb

@@ -33,8 +33,7 @@ module Appsignal
       # @return [void]
       def <<(probe)
         deprecation_message "Deprecated `Appsignal::Minute.probes <<` " \
-          "call. Please use `Appsignal::Minutely.probes.register` instead.",
-          logger
+          "call. Please use `Appsignal::Minutely.probes.register` instead."
         register probe.object_id, probe
       end
 

data/lib/appsignal/rack/js_exception_catcher.rb

@@ -28,10 +28,9 @@ module Appsignal
       def initialize(app, _options = nil)
         Appsignal.logger.debug \
           "Initializing Appsignal::Rack::JSExceptionCatcher"
-        message = "The Appsignal::Rack::JSExceptionCatcher is deprecated. " \
-          "Please use the official AppSignal JavaScript integration instead. " \
-          "https://docs.appsignal.com/front-end/"
-        deprecation_message message, Appsignal.logger
+        deprecation_message "The Appsignal::Rack::JSExceptionCatcher is " \
+          "deprecated. Please use the official AppSignal JavaScript " \
+          "integration instead. https://docs.appsignal.com/front-end/"
         @app = app
       end
 

data/lib/appsignal/system.rb

@@ -76,8 +76,14 @@ module Appsignal
       ldd_version && ldd_version[0]
     end
 
+    # @api private
     def self.jruby?
       RUBY_PLATFORM == "java"
     end
+
+    # @api private
+    def self.ruby_2_or_up?
+      versionify(RUBY_VERSION) >= versionify("2.0")
+    end
   end
 end

data/lib/appsignal/transaction.rb

@@ -248,7 +248,12 @@ module Appsignal
         Appsignal::Utils::Data.generate(data)
       )
     rescue RuntimeError => e
-      Appsignal.logger.error("Error generating data (#{e.class}: #{e.message}) for '#{data.inspect}'")
+      begin
+        inspected_data = data.inspect
+        Appsignal.logger.error("Error generating data (#{e.class}: #{e.message}) for '#{inspected_data}'")
+      rescue => e
+        Appsignal.logger.error("Error generating data (#{e.class}: #{e.message}). Can't inspect data.")
+      end
     end
 
     def sample_data

data/lib/appsignal/utils/deprecation_message.rb

@@ -1,8 +1,8 @@
 module Appsignal
   module Utils
     module DeprecationMessage
-      def deprecation_message(message, logger)
-        $stdout.puts "appsignal WARNING: #{message}"
+      def deprecation_message(message, logger = Appsignal.logger)
+        $stderr.puts "appsignal WARNING: #{message}"
         logger.warn message
       end
     end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "2.10.4".freeze
+  VERSION = "2.10.6".freeze
 end

data/spec/lib/appsignal/auth_check_spec.rb

@@ -39,7 +39,7 @@ describe Appsignal::AuthCheck do
       end
     end
 
-    context "when encountering an exception" do
+    context "when encountering an exception", :not_ruby19 do
       before { stubbed_request.to_timeout }
 
       it "raises an error" do

data/spec/lib/appsignal/cli/diagnose_spec.rb

@@ -38,7 +38,7 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
         # Because this is saved on the class rather than an instance of the
         # class we need to clear it like this in case a certain test doesn't
         # generate a report.
-        cli_class.remove_instance_variable :@data
+        cli_class.send :remove_instance_variable, :@data
       end
 
       if DependencyHelper.rails_present?

data/spec/lib/appsignal/cli/notify_of_deploy_spec.rb

@@ -5,6 +5,8 @@ describe Appsignal::CLI::NotifyOfDeploy do
 
   let(:out_stream) { std_stream }
   let(:output) { out_stream.read }
+  let(:err_stream) { std_stream }
+  let(:stderr) { err_stream.read }
 
   define :include_deploy_notification do
     match do |log|
@@ -32,7 +34,7 @@ describe Appsignal::CLI::NotifyOfDeploy do
   end
 
   def run
-    capture_stdout(out_stream) do
+    capture_std_streams(out_stream, err_stream) do
       run_cli("notify_of_deploy", options)
     end
   end
@@ -130,7 +132,7 @@ describe Appsignal::CLI::NotifyOfDeploy do
         it "prints a deprecation message" do
           run
           deprecation_message = "This command (appsignal notify_of_deploy) has been deprecated"
-          expect(output).to include("appsignal WARNING: #{deprecation_message}")
+          expect(stderr).to include("appsignal WARNING: #{deprecation_message}")
           expect(log).to contains_log :warn, deprecation_message
         end