appsignal 2.10.3 → 2.10.5

data/gemfiles/rails-3.2.gemfile

@@ -2,10 +2,5 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 3.2.14'
 gem 'test-unit'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/rails-4.0.gemfile

@@ -2,10 +2,5 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 4.0.0'
 gem 'mime-types', '~> 2.6'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/rails-4.1.gemfile

@@ -2,10 +2,5 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 4.1.0'
 gem 'mime-types', '~> 2.6'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/rails-4.2.gemfile

@@ -8,8 +8,3 @@ gemspec :path => '../'
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1.0")
   gem 'nokogiri', '~> 1.6.0'
 end
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end

data/gemfiles/resque.gemfile

@@ -9,8 +9,3 @@ gemspec :path => '../'
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1.0")
   gem 'nokogiri', '~> 1.6.0'
 end
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end

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

@@ -218,7 +218,7 @@ module Appsignal
         from[:controller] || from[:class],
         from[:action] || from[:method]
       ]
-      set_action(group_and_action.compact.join("#"))
+      set_action_if_nil(group_and_action.compact.join("#"))
     end
 
     def set_queue_start(start)
@@ -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.3".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

@@ -441,30 +441,36 @@ describe Appsignal::Transaction do
 
     describe "#set_http_or_background_action" do
       context "for a hash with controller and action" do
-        let(:from) { { :controller => "HomeController", :action => "show" } }
-
-        it "should set the action" do
-          expect(transaction).to receive(:set_action).with("HomeController#show")
+        it "sets the action" do
+          transaction.set_http_or_background_action(
+            :controller => "HomeController",
+            :action => "show"
+          )
+          expect(transaction.to_h["action"]).to eql("HomeController#show")
         end
       end
 
       context "for a hash with just action" do
-        let(:from) { { :action => "show" } }
-
-        it "should set the action" do
-          expect(transaction).to receive(:set_action).with("show")
+        it "sets the action" do
+          transaction.set_http_or_background_action(:action => "show")
+          expect(transaction.to_h["action"]).to eql("show")
         end
       end
 
       context "for a hash with class and method" do
-        let(:from) { { :class => "Worker", :method => "perform" } }
-
-        it "should set the action" do
-          expect(transaction).to receive(:set_action).with("Worker#perform")
+        it "sets the action" do
+          transaction.set_http_or_background_action(:class => "Worker", :method => "perform")
+          expect(transaction.to_h["action"]).to eql("Worker#perform")
         end
       end
 
-      after { transaction.set_http_or_background_action(from) }
+      context "when action is already set" do
+        it "does not overwrite the set action" do
+          transaction.set_action("MyCustomAction#perform")
+          transaction.set_http_or_background_action(:class => "Worker", :method => "perform")
+          expect(transaction.to_h["action"]).to eql("MyCustomAction#perform")
+        end
+      end
     end
 
     describe "set_queue_start" do
@@ -568,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
@@ -580,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/check_versions

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -eu
+
+actual_ruby_version=$(ruby --version)
+if [[ "$actual_ruby_version" == *"jruby"* ]]; then
+  # Replace "-" from specified RUBY_VERSION string. Semaphore/rbenv version uses
+  # a dash, where `jruby --version` uses a space.
+  sanitized_ruby_version="${RUBY_VERSION//-/ }"
+else
+  # Strip "-" from specified RUBY_VERSION string. Semaphore/rbenv version uses
+  # a dash, where `ruby --version` does not.
+  sanitized_ruby_version="${RUBY_VERSION//-}"
+fi
+if [[ "$actual_ruby_version" == *"$sanitized_ruby_version"* ]]; then
+  echo "Ruby version is $RUBY_VERSION"
+  exit 0
+else
+  echo "Ruby version is:        $actual_ruby_version"
+  echo "Ruby version should be: $sanitized_ruby_version"
+  exit 1
+fi

data/support/install_deps

@@ -2,20 +2,25 @@
 
 set -eu
 
+gem_args="--no-verbose"
+if [[ $(ruby --version) != "ruby 1.9.3"* ]]; then
+  gem_args+=" --no-document"
+fi
+
 case "${_RUBYGEMS_VERSION-"latest"}" in
   "latest")
-    gem update --no-document --system
+    gem update $gem_args --system
   ;;
   *)
-    gem update --no-document --system $_RUBYGEMS_VERSION
+    gem update $gem_args --system $_RUBYGEMS_VERSION
   ;;
 esac
 
 case "${_BUNDLER_VERSION-"latest"}" in
   "latest")
-    gem update bundler --no-document
+    gem update bundler $gem_args
   ;;
   *)
-    gem install bundler --no-document --version $_BUNDLER_VERSION
+    gem install bundler $gem_args --version $_BUNDLER_VERSION
   ;;
 esac

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.10.3
+  version: 2.10.5
 platform: ruby
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-21 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
@@ -139,7 +139,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
+- ".semaphore/semaphore.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -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
@@ -368,6 +369,7 @@ files:
 - spec/support/stubs/sidekiq/api.rb
 - spec/support/testing.rb
 - support/bundler_wrapper
+- support/check_versions
 - support/install_deps
 homepage: https://github.com/appsignal/appsignal-ruby
 licenses: