appsignal 2.10.4 → 2.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9e1a6f829e50e1c9706ef6872584fe2da02ca902b100347f112d05aa93cb33b
-  data.tar.gz: 17d31a17a342c78fe3f545363e062b1800b040acd24cc94027f04ed5cc9ea6e2
+  metadata.gz: 56c9d7f0b5b452a0bb42cd53fdc6f447964547741b392754a7084bea42661a59
+  data.tar.gz: 80397f1d4de60177e02fb171a3cc8db21b902a6e9f47e5fc2c5e8ec33bb24db5
 SHA512:
-  metadata.gz: 7c471c51c489a9c0f85ba2cef7ab075ff8fa99a0501ff45d4fa0386271c251a502f932fe38a511ee040ccd9733afe397c1d3e437e8f49cbe4afdcc67e802c8b4
-  data.tar.gz: d6b5b6a56fdba0ab05521331346fd69018ffa9fa7f2f1fa84bdd6ca3bde391a9a8388f6b0bb5e4ff6efffe784b71392fa5bfe7e2dbd4775e057af17b0386120e
+  metadata.gz: bb3e7c9da02b713fd17f8eea16a381da4442792a2ccda7b9b72ea59b5b70e938ed771a6f2506c79173bea63ad101ae3f3f6cd4217d7cb71c19801e06df4cf673
+  data.tar.gz: e14a05c638b9d3ed4a9adbe6d4bb0715bd4f1e2123c0872bbc782826e3234c69c8a6643da1ec82642530a31139994d6ae99624694ae49bc66375004bebe00f60

data/.semaphore/semaphore.yml

@@ -33,14 +33,14 @@ global_job_config:
     - 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)
+      - 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:
@@ -52,6 +52,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.6.5
+      - name: GEMSET
+        value: no_dependencies
       - name: BUNDLE_GEMFILE
         value: gemfiles/no_dependencies.gemfile
       commands:
@@ -64,10 +66,34 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.6.5
+      - name: GEMSET
+        value: no_dependencies
       - name: BUNDLE_GEMFILE
         value: gemfiles/no_dependencies.gemfile
       commands:
       - "./support/bundler_wrapper exec rubocop"
+- name: Ruby 1.9.3-p551
+  dependencies:
+  - Validation
+  task:
+    prologue:
+      commands:
+      - "./support/bundler_wrapper exec rake extension:install"
+    jobs:
+    - name: Ruby 1.9.3-p551 for no_dependencies
+      env_vars:
+      - name: RUBY_VERSION
+        value: 1.9.3-p551
+      - name: GEMSET
+        value: no_dependencies
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/no_dependencies.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
   dependencies:
   - Validation
@@ -80,6 +106,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.0.0-p648
+      - name: GEMSET
+        value: no_dependencies
       - name: BUNDLE_GEMFILE
         value: gemfiles/no_dependencies.gemfile
       - name: _RUBYGEMS_VERSION
@@ -100,6 +128,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.0.0-p648
+      - name: GEMSET
+        value: capistrano2
       - name: BUNDLE_GEMFILE
         value: gemfiles/capistrano2.gemfile
       - name: _RUBYGEMS_VERSION
@@ -112,6 +142,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.0.0-p648
+      - name: GEMSET
+        value: capistrano3
       - name: BUNDLE_GEMFILE
         value: gemfiles/capistrano3.gemfile
       - name: _RUBYGEMS_VERSION
@@ -124,6 +156,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.0.0-p648
+      - name: GEMSET
+        value: grape
       - name: BUNDLE_GEMFILE
         value: gemfiles/grape.gemfile
       - name: _RUBYGEMS_VERSION
@@ -136,6 +170,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.0.0-p648
+      - name: GEMSET
+        value: padrino
       - name: BUNDLE_GEMFILE
         value: gemfiles/padrino.gemfile
       - name: _RUBYGEMS_VERSION
@@ -148,6 +184,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.0.0-p648
+      - name: GEMSET
+        value: que
       - name: BUNDLE_GEMFILE
         value: gemfiles/que.gemfile
       - name: _RUBYGEMS_VERSION
@@ -160,6 +198,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.0.0-p648
+      - name: GEMSET
+        value: rails-3.2
       - name: BUNDLE_GEMFILE
         value: gemfiles/rails-3.2.gemfile
       - name: _RUBYGEMS_VERSION
@@ -172,6 +212,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.0.0-p648
+      - name: GEMSET
+        value: rails-4.2
       - name: BUNDLE_GEMFILE
         value: gemfiles/rails-4.2.gemfile
       - name: _RUBYGEMS_VERSION
@@ -184,6 +226,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.0.0-p648
+      - name: GEMSET
+        value: resque
       - name: BUNDLE_GEMFILE
         value: gemfiles/resque.gemfile
       - name: _RUBYGEMS_VERSION
@@ -196,6 +240,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.0.0-p648
+      - name: GEMSET
+        value: sequel
       - name: BUNDLE_GEMFILE
         value: gemfiles/sequel.gemfile
       - name: _RUBYGEMS_VERSION
@@ -208,6 +254,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.0.0-p648
+      - name: GEMSET
+        value: sequel-435
       - name: BUNDLE_GEMFILE
         value: gemfiles/sequel-435.gemfile
       - name: _RUBYGEMS_VERSION
@@ -220,6 +268,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.0.0-p648
+      - name: GEMSET
+        value: sinatra
       - name: BUNDLE_GEMFILE
         value: gemfiles/sinatra.gemfile
       - name: _RUBYGEMS_VERSION
@@ -232,6 +282,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.0.0-p648
+      - name: GEMSET
+        value: webmachine
       - name: BUNDLE_GEMFILE
         value: gemfiles/webmachine.gemfile
       - name: _RUBYGEMS_VERSION
@@ -252,6 +304,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.1.10
+      - name: GEMSET
+        value: no_dependencies
       - name: BUNDLE_GEMFILE
         value: gemfiles/no_dependencies.gemfile
       - name: _RUBYGEMS_VERSION
@@ -272,6 +326,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.2.10
+      - name: GEMSET
+        value: no_dependencies
       - name: BUNDLE_GEMFILE
         value: gemfiles/no_dependencies.gemfile
       - name: _RUBYGEMS_VERSION
@@ -292,6 +348,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.3.8
+      - name: GEMSET
+        value: no_dependencies
       - name: BUNDLE_GEMFILE
         value: gemfiles/no_dependencies.gemfile
       - name: _RUBYGEMS_VERSION
@@ -312,6 +370,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.4.9
+      - name: GEMSET
+        value: no_dependencies
       - name: BUNDLE_GEMFILE
         value: gemfiles/no_dependencies.gemfile
       - name: _RUBYGEMS_VERSION
@@ -332,6 +392,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.5.7
+      - name: GEMSET
+        value: no_dependencies
       - name: BUNDLE_GEMFILE
         value: gemfiles/no_dependencies.gemfile
       - name: _RUBYGEMS_VERSION
@@ -352,6 +414,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.5.7
+      - name: GEMSET
+        value: rails-5.2
       - name: BUNDLE_GEMFILE
         value: gemfiles/rails-5.2.gemfile
       - name: _RUBYGEMS_VERSION
@@ -360,6 +424,20 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 2.5.7 for rails-6.0
+      env_vars:
+      - name: RUBY_VERSION
+        value: 2.5.7
+      - name: GEMSET
+        value: rails-6.0
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/rails-6.0.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
 - name: Ruby 2.6.5
   dependencies:
   - Validation
@@ -372,6 +450,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.6.5
+      - name: GEMSET
+        value: no_dependencies
       - name: BUNDLE_GEMFILE
         value: gemfiles/no_dependencies.gemfile
       - name: _RUBYGEMS_VERSION
@@ -392,6 +472,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.6.5
+      - name: GEMSET
+        value: capistrano2
       - name: BUNDLE_GEMFILE
         value: gemfiles/capistrano2.gemfile
       - name: _RUBYGEMS_VERSION
@@ -404,6 +486,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.6.5
+      - name: GEMSET
+        value: capistrano3
       - name: BUNDLE_GEMFILE
         value: gemfiles/capistrano3.gemfile
       - name: _RUBYGEMS_VERSION
@@ -416,6 +500,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.6.5
+      - name: GEMSET
+        value: grape
       - name: BUNDLE_GEMFILE
         value: gemfiles/grape.gemfile
       - name: _RUBYGEMS_VERSION
@@ -428,6 +514,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.6.5
+      - name: GEMSET
+        value: padrino
       - name: BUNDLE_GEMFILE
         value: gemfiles/padrino.gemfile
       - name: _RUBYGEMS_VERSION
@@ -440,6 +528,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.6.5
+      - name: GEMSET
+        value: que
       - name: BUNDLE_GEMFILE
         value: gemfiles/que.gemfile
       - name: _RUBYGEMS_VERSION
@@ -452,6 +542,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.6.5
+      - name: GEMSET
+        value: que_beta
       - name: BUNDLE_GEMFILE
         value: gemfiles/que_beta.gemfile
       - name: _RUBYGEMS_VERSION
@@ -464,6 +556,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.6.5
+      - name: GEMSET
+        value: rails-5.0
       - name: BUNDLE_GEMFILE
         value: gemfiles/rails-5.0.gemfile
       - name: _RUBYGEMS_VERSION
@@ -476,6 +570,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.6.5
+      - name: GEMSET
+        value: rails-5.1
       - name: BUNDLE_GEMFILE
         value: gemfiles/rails-5.1.gemfile
       - name: _RUBYGEMS_VERSION
@@ -488,6 +584,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.6.5
+      - name: GEMSET
+        value: rails-5.2
       - name: BUNDLE_GEMFILE
         value: gemfiles/rails-5.2.gemfile
       - name: _RUBYGEMS_VERSION
@@ -500,6 +598,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.6.5
+      - name: GEMSET
+        value: rails-6.0
       - name: BUNDLE_GEMFILE
         value: gemfiles/rails-6.0.gemfile
       - name: _RUBYGEMS_VERSION
@@ -512,6 +612,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.6.5
+      - name: GEMSET
+        value: resque
       - name: BUNDLE_GEMFILE
         value: gemfiles/resque.gemfile
       - name: _RUBYGEMS_VERSION
@@ -524,6 +626,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.6.5
+      - name: GEMSET
+        value: sequel
       - name: BUNDLE_GEMFILE
         value: gemfiles/sequel.gemfile
       - name: _RUBYGEMS_VERSION
@@ -536,6 +640,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.6.5
+      - name: GEMSET
+        value: sequel-435
       - name: BUNDLE_GEMFILE
         value: gemfiles/sequel-435.gemfile
       - name: _RUBYGEMS_VERSION
@@ -548,6 +654,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.6.5
+      - name: GEMSET
+        value: sinatra
       - name: BUNDLE_GEMFILE
         value: gemfiles/sinatra.gemfile
       - name: _RUBYGEMS_VERSION
@@ -560,6 +668,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.6.5
+      - name: GEMSET
+        value: webmachine
       - name: BUNDLE_GEMFILE
         value: gemfiles/webmachine.gemfile
       - name: _RUBYGEMS_VERSION
@@ -580,6 +690,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.7.0
+      - name: GEMSET
+        value: no_dependencies
       - name: BUNDLE_GEMFILE
         value: gemfiles/no_dependencies.gemfile
       - name: _RUBYGEMS_VERSION
@@ -600,6 +712,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.7.0
+      - name: GEMSET
+        value: capistrano2
       - name: BUNDLE_GEMFILE
         value: gemfiles/capistrano2.gemfile
       - name: _RUBYGEMS_VERSION
@@ -612,6 +726,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.7.0
+      - name: GEMSET
+        value: capistrano3
       - name: BUNDLE_GEMFILE
         value: gemfiles/capistrano3.gemfile
       - name: _RUBYGEMS_VERSION
@@ -624,6 +740,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.7.0
+      - name: GEMSET
+        value: grape
       - name: BUNDLE_GEMFILE
         value: gemfiles/grape.gemfile
       - name: _RUBYGEMS_VERSION
@@ -636,6 +754,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.7.0
+      - name: GEMSET
+        value: padrino
       - name: BUNDLE_GEMFILE
         value: gemfiles/padrino.gemfile
       - name: _RUBYGEMS_VERSION
@@ -648,6 +768,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.7.0
+      - name: GEMSET
+        value: que
       - name: BUNDLE_GEMFILE
         value: gemfiles/que.gemfile
       - name: _RUBYGEMS_VERSION
@@ -660,6 +782,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.7.0
+      - name: GEMSET
+        value: que_beta
       - name: BUNDLE_GEMFILE
         value: gemfiles/que_beta.gemfile
       - name: _RUBYGEMS_VERSION
@@ -672,6 +796,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.7.0
+      - name: GEMSET
+        value: rails-5.0
       - name: BUNDLE_GEMFILE
         value: gemfiles/rails-5.0.gemfile
       - name: _RUBYGEMS_VERSION
@@ -684,6 +810,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.7.0
+      - name: GEMSET
+        value: rails-5.1
       - name: BUNDLE_GEMFILE
         value: gemfiles/rails-5.1.gemfile
       - name: _RUBYGEMS_VERSION
@@ -696,6 +824,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.7.0
+      - name: GEMSET
+        value: rails-5.2
       - name: BUNDLE_GEMFILE
         value: gemfiles/rails-5.2.gemfile
       - name: _RUBYGEMS_VERSION
@@ -708,6 +838,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.7.0
+      - name: GEMSET
+        value: rails-6.0
       - name: BUNDLE_GEMFILE
         value: gemfiles/rails-6.0.gemfile
       - name: _RUBYGEMS_VERSION
@@ -720,6 +852,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.7.0
+      - name: GEMSET
+        value: resque
       - name: BUNDLE_GEMFILE
         value: gemfiles/resque.gemfile
       - name: _RUBYGEMS_VERSION
@@ -732,6 +866,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.7.0
+      - name: GEMSET
+        value: sequel
       - name: BUNDLE_GEMFILE
         value: gemfiles/sequel.gemfile
       - name: _RUBYGEMS_VERSION
@@ -744,6 +880,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.7.0
+      - name: GEMSET
+        value: sequel-435
       - name: BUNDLE_GEMFILE
         value: gemfiles/sequel-435.gemfile
       - name: _RUBYGEMS_VERSION
@@ -756,6 +894,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.7.0
+      - name: GEMSET
+        value: sinatra
       - name: BUNDLE_GEMFILE
         value: gemfiles/sinatra.gemfile
       - name: _RUBYGEMS_VERSION
@@ -768,6 +908,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: 2.7.0
+      - name: GEMSET
+        value: webmachine
       - name: BUNDLE_GEMFILE
         value: gemfiles/webmachine.gemfile
       - name: _RUBYGEMS_VERSION
@@ -788,6 +930,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: jruby-9.1.17.0
+      - name: GEMSET
+        value: no_dependencies
       - name: BUNDLE_GEMFILE
         value: gemfiles/no_dependencies.gemfile
       - name: _RUBYGEMS_VERSION
@@ -808,6 +952,8 @@ blocks:
       env_vars:
       - name: RUBY_VERSION
         value: jruby-9.1.17.0
+      - name: GEMSET
+        value: rails-5.2
       - name: BUNDLE_GEMFILE
         value: gemfiles/rails-5.2.gemfile
       - name: _RUBYGEMS_VERSION

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 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/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/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/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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "2.10.4".freeze
+  VERSION = "2.10.5".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/integrations/grape_spec.rb

@@ -93,6 +93,16 @@ if DependencyHelper.grape_present?
             expect(transaction).to receive(:set_error).with(kind_of(ExampleException))
           end
 
+          context "with env['grape.skip_appsignal_error'] = true" do
+            before do
+              env["grape.skip_appsignal_error"] = true
+            end
+
+            it "does not add the error" do
+              expect(transaction).to_not receive(:set_error)
+            end
+          end
+
           after do
             expect { middleware.call(env) }.to raise_error ExampleException
           end

data/spec/lib/appsignal/system_spec.rb

@@ -93,4 +93,40 @@ describe Appsignal::System do
       end
     end
   end
+
+  describe ".ruby_2_or_up?" do
+    around do |example|
+      original_ruby_version = RUBY_VERSION
+      Object.send(:remove_const, "RUBY_VERSION")
+      Object.const_set("RUBY_VERSION", ruby_version)
+      example.run
+      Object.send(:remove_const, "RUBY_VERSION")
+      Object.const_set("RUBY_VERSION", original_ruby_version)
+    end
+    subject { described_class.ruby_2_or_up? }
+
+    context "when on Ruby 1.9" do
+      let(:ruby_version) { "1.9.3-p533" }
+
+      it "returns false" do
+        is_expected.to be(false)
+      end
+    end
+
+    context "when on Ruby 2.0" do
+      let(:ruby_version) { "2.0.0" }
+
+      it "returns true" do
+        is_expected.to be(true)
+      end
+    end
+
+    context "when on Ruby 2.x" do
+      let(:ruby_version) { "2.1.0" }
+
+      it "returns true" do
+        is_expected.to be(true)
+      end
+    end
+  end
 end

data/spec/lib/appsignal/transaction_spec.rb

@@ -574,7 +574,7 @@ describe Appsignal::Transaction do
       end
 
       context "when the data cannot be converted to JSON" do
-        it "does not update the sample data on the transaction" do
+        it "does not update the sample data on the transaction", :not_ruby19 do
           klass = Class.new do
             def to_s
               raise "foo" # Cause a deliberate error
@@ -586,6 +586,19 @@ describe Appsignal::Transaction do
           expect(log_contents(log)).to contains_log :error,
             "Error generating data (RuntimeError: foo) for"
         end
+
+        it "does not update the sample data on the transaction", :only_ruby19 do
+          klass = Class.new do
+            def to_s
+              raise "foo" # Cause a deliberate error
+            end
+          end
+          transaction.set_sample_data("params", klass.new => 1)
+
+          expect(transaction.to_h["sample_data"]).to eq({})
+          expect(log_contents(log)).to contains_log :error,
+            "Error generating data (RuntimeError: foo). Can't inspect data."
+        end
       end
     end
 

data/spec/lib/appsignal/transmitter_spec.rb

@@ -143,7 +143,9 @@ describe Appsignal::Transmitter do
     context "with a proxy" do
       let(:config) { project_fixture_config("production", :http_proxy => "http://localhost:8080") }
 
-      it { expect(subject).to be_instance_of(Net::HTTP) }
+      it "is of Net::HTTP class", :not_ruby19 do
+        expect(subject).to be_instance_of(Net::HTTP)
+      end
       it { expect(subject.proxy?).to be_truthy }
       it { expect(subject.proxy_address).to eq "localhost" }
       it { expect(subject.proxy_port).to eq 8080 }

data/spec/spec_helper.rb

@@ -9,7 +9,6 @@ Bundler.require :default
 require "cgi"
 require "rack"
 require "rspec"
-require "pry"
 require "timecop"
 require "webmock/rspec"
 
@@ -30,6 +29,7 @@ if DependencyHelper.rails_present?
     require f
   end
 end
+require "pry" if DependencyHelper.dependency_present?("pry")
 require "appsignal"
 # Include patches of AppSignal modules and classes to make test helpers
 # available.
@@ -81,6 +81,20 @@ RSpec.configure do |config|
     FileUtils.mkdir_p(spec_system_tmp_dir)
   end
 
+  config.before :each, :only_ruby19 => true do
+    is_ruby19 = Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.0.0")
+    next if is_ruby19
+
+    skip "Skipping spec. Only for Ruby 1.9"
+  end
+
+  config.before :each, :not_ruby19 => true do
+    is_ruby19 = Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.0.0")
+    next unless is_ruby19
+
+    skip "Skipping spec for Ruby 1.9"
+  end
+
   config.before do
     stop_minutely_probes
     ENV["RAILS_ENV"] ||= "test"

data/support/install_deps

@@ -2,7 +2,10 @@
 
 set -eu
 
-gem_args="--no-document --no-verbose"
+gem_args="--no-verbose"
+if [[ $(ruby --version) != "ruby 1.9.3"* ]]; then
+  gem_args+=" --no-document"
+fi
 
 case "${_RUBYGEMS_VERSION-"latest"}" in
   "latest")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.10.4
+  version: 2.10.5
 platform: ruby
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2020-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -55,7 +55,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -69,7 +69,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,47 +83,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.20
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: 0.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: 0.50.0
 description: The official appsignal.com gem
 email:
 - support@appsignal.com
@@ -227,6 +227,7 @@ files:
 - lib/appsignal/integrations/delayed_job_plugin.rb
 - lib/appsignal/integrations/grape.rb
 - lib/appsignal/integrations/mongo_ruby_driver.rb
+- lib/appsignal/integrations/net_http.rb
 - lib/appsignal/integrations/object.rb
 - lib/appsignal/integrations/padrino.rb
 - lib/appsignal/integrations/que.rb