appsignal 2.10.4 → 2.10.6

data/spec/lib/appsignal/config_spec.rb

@@ -323,11 +323,11 @@ describe Appsignal::Config do
     end
 
     describe "support for old config keys" do
-      let(:out_stream) { std_stream }
-      let(:output) { out_stream.read }
+      let(:err_stream) { std_stream }
+      let(:stderr) { err_stream.read }
       let(:config) { project_fixture_config(env, {}, test_logger(log)) }
       let(:log) { StringIO.new }
-      before { capture_stdout(out_stream) { config } }
+      before { capture_std_streams(std_stream, err_stream) { config } }
 
       describe ":api_key" do
         context "without :push_api_key" do
@@ -338,7 +338,7 @@ describe Appsignal::Config do
             expect(config.config_hash).to_not have_key :api_key
 
             message = "Old configuration key found. Please update the 'api_key' to 'push_api_key'"
-            expect(output).to include "appsignal WARNING: #{message}"
+            expect(stderr).to include "appsignal WARNING: #{message}"
             expect(log_contents(log)).to contains_log :warn, message
           end
         end
@@ -351,7 +351,7 @@ describe Appsignal::Config do
             expect(config.config_hash).to_not have_key :api_key
 
             message = "Old configuration key found. Please update the 'api_key' to 'push_api_key'"
-            expect(output).to include "appsignal WARNING: #{message}"
+            expect(stderr).to include "appsignal WARNING: #{message}"
             expect(log_contents(log)).to contains_log :warn, message
           end
         end
@@ -366,7 +366,7 @@ describe Appsignal::Config do
             expect(config.config_hash).to_not have_key :ignore_exceptions
 
             message = "Old configuration key found. Please update the 'ignore_exceptions' to 'ignore_errors'"
-            expect(output).to include "appsignal WARNING: #{message}"
+            expect(stderr).to include "appsignal WARNING: #{message}"
             expect(log_contents(log)).to contains_log :warn, message
           end
         end
@@ -379,7 +379,7 @@ describe Appsignal::Config do
             expect(config.config_hash).to_not have_key :ignore_exceptions
 
             message = "Old configuration key found. Please update the 'ignore_exceptions' to 'ignore_errors'"
-            expect(output).to include "appsignal WARNING: #{message}"
+            expect(stderr).to include "appsignal WARNING: #{message}"
             expect(log_contents(log)).to contains_log :warn, message
           end
         end

data/spec/lib/appsignal/event_formatter_spec.rb

@@ -116,7 +116,8 @@ describe Appsignal::EventFormatter do
     end
 
     context "when registering deprecated formatters" do
-      let(:stdout_stream) { std_stream }
+      let(:err_stream) { std_stream }
+      let(:stderr) { err_stream.read }
       let(:deprecated_formatter) do
         Class.new(Appsignal::EventFormatter) do
           register "mock.deprecated"
@@ -133,16 +134,16 @@ describe Appsignal::EventFormatter do
           "https://docs.appsignal.com/ruby/instrumentation/event-formatters.html"
 
         logs = capture_logs do
-          capture_stdout(stdout_stream) { deprecated_formatter }
+          capture_std_streams(std_stream, err_stream) { deprecated_formatter }
         end
         expect(logs).to contains_log :warn, message
-        expect(stdout_stream.read).to include "appsignal WARNING: #{message}"
+        expect(stderr).to include "appsignal WARNING: #{message}"
 
         expect(klass.deprecated_formatter_classes.keys).to include("mock.deprecated")
       end
 
       it "initializes deprecated formatters" do
-        capture_stdout(stdout_stream) { deprecated_formatter }
+        capture_std_streams(std_stream, err_stream) { deprecated_formatter }
         klass.initialize_deprecated_formatters
 
         expect(klass.registered?("mock.deprecated")).to be_truthy

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/minutely_spec.rb

@@ -285,19 +285,19 @@ describe Appsignal::Minutely do
     end
 
     describe "#<<" do
-      let(:out_stream) { std_stream }
-      let(:output) { out_stream.read }
+      let(:err_stream) { std_stream }
+      let(:stderr) { err_stream.read }
       let(:log_stream) { std_stream }
       let(:log) { log_contents(log_stream) }
       before { Appsignal.logger = test_logger(log_stream) }
 
       it "adds the probe, but prints a deprecation warning" do
         probe = lambda {}
-        capture_stdout(out_stream) { collection << probe }
+        capture_std_streams(std_stream, err_stream) { collection << probe }
         deprecation_message = "Deprecated " \
           "`Appsignal::Minute.probes <<` call. Please use " \
           "`Appsignal::Minutely.probes.register` instead."
-        expect(output).to include "appsignal WARNING: #{deprecation_message}"
+        expect(stderr).to include "appsignal WARNING: #{deprecation_message}"
         expect(log).to contains_log :warn, deprecation_message
         expect(collection[probe.object_id]).to eql(probe)
       end

data/spec/lib/appsignal/rack/js_exception_catcher_spec.rb

@@ -11,18 +11,22 @@ describe Appsignal::Rack::JSExceptionCatcher do
   before { Appsignal.config = config }
 
   describe "#initialize" do
+    let(:out_stream) { std_stream }
+    let(:err_stream) { std_stream }
+    let(:output) { out_stream.read }
+    let(:stderr) { err_stream.read }
+
     it "logs to the logger" do
-      stdout = std_stream
-      stderr = std_stream
       log = capture_logs do
-        capture_std_streams(stdout, stderr) do
+        capture_std_streams(out_stream, err_stream) do
           Appsignal::Rack::JSExceptionCatcher.new(app, options)
         end
       end
       expect(log).to contains_log(:warn, deprecation_message)
       expect(log).to contains_log(:debug, "Initializing Appsignal::Rack::JSExceptionCatcher")
-      expect(stdout.read).to include "appsignal WARNING: #{deprecation_message}"
-      expect(stderr.read).to_not include("appsignal:")
+      expect(stderr).to include "appsignal WARNING: #{deprecation_message}"
+      expect(stderr).to_not include("appsignal:")
+      expect(output).to be_empty
     end
   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/lib/appsignal_spec.rb

@@ -949,7 +949,7 @@ describe Appsignal do
 
       it "outputs deprecated warning" do
         subject
-        expect(stderr).to include("Appsignal.is_ignored_error? is deprecated with no replacement.")
+        expect(stderr).to include("Appsignal.is_ignored_error? is deprecated with no replacement")
       end
 
       context "when error is not in the ignored list" do
@@ -981,7 +981,7 @@ describe Appsignal do
 
       it "outputs deprecated warning" do
         subject
-        expect(stderr).to include("Appsignal.is_ignored_action? is deprecated with no replacement.")
+        expect(stderr).to include("Appsignal.is_ignored_action? is deprecated with no replacement")
       end
 
       context "when action is not in the ingore list" do

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.6
 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-29 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