appsignal 3.0.2-java → 3.0.6-java

data/spec/lib/appsignal/hooks_spec.rb

@@ -68,7 +68,10 @@ describe Appsignal::Hooks do
     expect(Appsignal::Hooks.hooks[:mock_error_hook].installed?).to be_falsy
 
     expect(Appsignal.logger).to receive(:error).with("Error while installing mock_error_hook hook: error").once
-    expect(Appsignal.logger).to receive(:debug).once do |message|
+    expect(Appsignal.logger).to receive(:debug).ordered do |message|
+      expect(message).to eq("Installing mock_error_hook hook")
+    end
+    expect(Appsignal.logger).to receive(:debug).ordered do |message|
       # Start of the error backtrace as debug log
       expect(message).to start_with(File.expand_path("../../../../", __FILE__))
     end

data/spec/lib/appsignal/transaction_spec.rb

@@ -246,6 +246,23 @@ describe Appsignal::Transaction do
         expect(transaction.ext).to_not be_nil
       end
 
+      context "when extension is not loaded", :extension_installation_failure do
+        around do |example|
+          Appsignal::Testing.without_testing { example.run }
+        end
+
+        it "does not error on missing extension method calls" do
+          expect(transaction.ext).to be_kind_of(Appsignal::Extension::MockTransaction)
+          transaction.start_event
+          transaction.finish_event(
+            "name",
+            "title",
+            "body",
+            Appsignal::EventFormatter::DEFAULT
+          )
+        end
+      end
+
       it "sets the transaction id" do
         expect(transaction.transaction_id).to eq "1"
       end

data/spec/lib/appsignal/utils/data_spec.rb

@@ -4,110 +4,156 @@ describe Appsignal::Utils::Data do
   describe ".generate" do
     subject { Appsignal::Utils::Data.generate(body) }
 
-    context "with a valid hash body" do
-      let(:body) do
-        {
-          "the" => "payload",
-          "int" => 1, # Fixnum
-          "int61" => 1 << 61, # Fixnum
-          "int62" => 1 << 62, # Bignum, this one still works
-          "int63" => 1 << 63, # Bignum, turnover point for C, too big for long
-          "int64" => 1 << 64, # Bignum
-          "float" => 1.0,
-          1 => true,
-          nil => "test",
-          :foo => [1, 2, "three", { "foo" => "bar" }],
-          "bar" => nil,
-          "baz" => { "foo" => "bʊr", "arr" => [1, 2] }
-        }
+    context "when extension is not loaded", :extension_installation_failure do
+      around do |example|
+        Appsignal::Testing.without_testing { example.run }
       end
 
-      it { is_expected.to eq Appsignal::Utils::Data.generate(body) }
-      it { is_expected.to_not eq Appsignal::Utils::Data.generate({}) }
-
-      describe "#to_s" do
-        it "returns a serialized hash" do
-          expect(subject.to_s).to eq %({"":"test",) +
-            %("1":true,) +
-            %("bar":null,) +
-            %("baz":{"arr":[1,2],"foo":"bʊr"},) +
-            %("float":1.0,) +
-            %("foo":[1,2,"three",{"foo":"bar"}],) +
-            %("int":1,) +
-            %("int61":#{1 << 61},) +
-            %("int62":#{1 << 62},) +
-            %("int63":"bigint:#{1 << 63}",) +
-            %("int64":"bigint:#{1 << 64}",) +
-            %("the":"payload"})
+      context "with valid hash body" do
+        let(:body) { hash_body }
+
+        it "does not error and returns MockData class" do
+          expect(subject).to be_kind_of(Appsignal::Extension::MockData)
+          expect(subject.to_s).to eql("{}")
         end
       end
-    end
 
-    context "with a valid array body" do
-      let(:body) do
-        [
-          nil,
-          true,
-          false,
-          "string",
-          1, # Fixnum
-          1.0, # Float
-          1 << 61, # Fixnum
-          1 << 62, # Bignum, this one still works
-          1 << 63, # Bignum, turnover point for C, too big for long
-          1 << 64, # Bignum
-          { "arr" => [1, 2, "three"], "foo" => "bʊr" }
-        ]
+      context "with valid array body" do
+        let(:body) { array_body }
+
+        it "does not error and returns MockData class" do
+          expect(subject).to be_kind_of(Appsignal::Extension::MockData)
+          expect(subject.to_s).to eql("{}")
+        end
       end
 
-      it { is_expected.to eq Appsignal::Utils::Data.generate(body) }
-      it { is_expected.to_not eq Appsignal::Utils::Data.generate({}) }
-
-      describe "#to_s" do
-        it "returns a serialized array" do
-          expect(subject.to_s).to eq %([null,) +
-            %(true,) +
-            %(false,) +
-            %(\"string\",) +
-            %(1,) +
-            %(1.0,) +
-            %(#{1 << 61},) +
-            %(#{1 << 62},) +
-            %("bigint:#{1 << 63}",) +
-            %("bigint:#{1 << 64}",) +
-            %({\"arr\":[1,2,\"three\"],\"foo\":\"bʊr\"}])
+      context "with an invalid body" do
+        let(:body) { "body" }
+
+        it "raise a type error" do
+          expect do
+            subject
+          end.to raise_error TypeError
         end
       end
     end
 
-    context "with a body that contains strings with invalid utf-8 content" do
-      let(:string_with_invalid_utf8) { [0x61, 0x61, 0x85].pack("c*") }
-      let(:body) do
-        {
-          "field_one" => [0x61, 0x61].pack("c*"),
-          :field_two => string_with_invalid_utf8,
-          "field_three" => [
-            "one", string_with_invalid_utf8
-          ],
-          "field_four" => {
-            "one" => string_with_invalid_utf8
-          }
-        }
+    context "when extension is loaded" do
+      context "with a valid hash body" do
+        let(:body) { hash_body }
+
+        it "returns a valid Data object" do
+          is_expected.to eq Appsignal::Utils::Data.generate(body)
+          is_expected.to_not eq Appsignal::Utils::Data.generate({})
+        end
+
+        describe "#to_s" do
+          it "returns a serialized hash" do
+            expect(subject.to_s).to eq %({"":"test",) +
+              %("1":true,) +
+              %("bar":null,) +
+              %("baz":{"arr":[1,2],"foo":"bʊr"},) +
+              %("float":1.0,) +
+              %("foo":[1,2,"three",{"foo":"bar"}],) +
+              %("int":1,) +
+              %("int61":#{1 << 61},) +
+              %("int62":#{1 << 62},) +
+              %("int63":"bigint:#{1 << 63}",) +
+              %("int64":"bigint:#{1 << 64}",) +
+              %("the":"payload"})
+          end
+        end
+      end
+
+      context "with a valid array body" do
+        let(:body) { array_body }
+
+        it "returns a valid Data object" do
+          is_expected.to eq Appsignal::Utils::Data.generate(body)
+          is_expected.to_not eq Appsignal::Utils::Data.generate({})
+        end
+
+        describe "#to_s" do
+          it "returns a serialized array" do
+            expect(subject.to_s).to eq %([null,) +
+              %(true,) +
+              %(false,) +
+              %(\"string\",) +
+              %(1,) +
+              %(1.0,) +
+              %(#{1 << 61},) +
+              %(#{1 << 62},) +
+              %("bigint:#{1 << 63}",) +
+              %("bigint:#{1 << 64}",) +
+              %({\"arr\":[1,2,\"three\"],\"foo\":\"bʊr\"}])
+          end
+        end
       end
 
-      describe "#to_s" do
-        it { expect(subject.to_s).to eq %({"field_four":{"one":"aa�"},"field_one":"aa","field_three":["one","aa�"],"field_two":"aa�"}) }
+      context "with a body that contains strings with invalid utf-8 content" do
+        let(:string_with_invalid_utf8) { [0x61, 0x61, 0x85].pack("c*") }
+        let(:body) do
+          {
+            "field_one" => [0x61, 0x61].pack("c*"),
+            :field_two => string_with_invalid_utf8,
+            "field_three" => [
+              "one", string_with_invalid_utf8
+            ],
+            "field_four" => {
+              "one" => string_with_invalid_utf8
+            }
+          }
+        end
+
+        describe "#to_s" do
+          it "returns a JSON representation in a String" do
+            expect(subject.to_s).to eq %({"field_four":{"one":"aa�"},"field_one":"aa","field_three":["one","aa�"],"field_two":"aa�"})
+          end
+        end
       end
-    end
 
-    context "with an invalid body" do
-      let(:body) { "body" }
+      context "with an invalid body" do
+        let(:body) { "body" }
 
-      it "should raise a type error" do
-        expect do
-          subject
-        end.to raise_error TypeError
+        it "raises a type error" do
+          expect do
+            subject
+          end.to raise_error TypeError
+        end
       end
     end
   end
+
+  def hash_body
+    {
+      "the" => "payload",
+      "int" => 1, # Fixnum
+      "int61" => 1 << 61, # Fixnum
+      "int62" => 1 << 62, # Bignum, this one still works
+      "int63" => 1 << 63, # Bignum, turnover point for C, too big for long
+      "int64" => 1 << 64, # Bignum
+      "float" => 1.0,
+      1 => true,
+      nil => "test",
+      :foo => [1, 2, "three", { "foo" => "bar" }],
+      "bar" => nil,
+      "baz" => { "foo" => "bʊr", "arr" => [1, 2] }
+    }
+  end
+
+  def array_body
+    [
+      nil,
+      true,
+      false,
+      "string",
+      1, # Fixnum
+      1.0, # Float
+      1 << 61, # Fixnum
+      1 << 62, # Bignum, this one still works
+      1 << 63, # Bignum, turnover point for C, too big for long
+      1 << 64, # Bignum
+      { "arr" => [1, 2, "three"], "foo" => "bʊr" }
+    ]
+  end
 end

data/spec/lib/appsignal_spec.rb

@@ -770,7 +770,7 @@ describe Appsignal do
           message = "The namespace argument for `Appsignal.send_error` is deprecated. " \
             "Please use the block method to set the namespace instead.\n\n" \
             "  Appsignal.send_error(error) do |transaction|\n" \
-            "    transaction.namespace(#{namespace.inspect})\n" \
+            "    transaction.set_namespace(#{namespace.inspect})\n" \
             "  end\n\n" \
             "Appsignal.send_error called on location: #{__FILE__}:"
           expect(stderr).to include("appsignal WARNING: #{message}")
@@ -949,7 +949,7 @@ describe Appsignal do
             message = "The namespace argument for `Appsignal.set_error` is deprecated. " \
               "Please use the block method to set the namespace instead.\n\n" \
               "  Appsignal.set_error(error) do |transaction|\n" \
-              "    transaction.namespace(#{namespace.inspect})\n" \
+              "    transaction.set_namespace(#{namespace.inspect})\n" \
               "  end\n\n" \
               "Appsignal.set_error called on location: #{__FILE__}:"
             expect(stderr).to include("appsignal WARNING: #{message}")

data/spec/lib/puma/appsignal_spec.rb

@@ -89,7 +89,7 @@ RSpec.describe "Puma plugin" do
     wait_for("enough probe calls") { probe.calls >= 2 }
   end
 
-  it "marks the PumaProbe thread as fork-safe", :not_ruby19 do
+  it "marks the PumaProbe thread as fork-safe" do
     out_stream = std_stream
     capture_stdout(out_stream) { Puma.run }
 

data/spec/spec_helper.rb

@@ -117,6 +117,28 @@ RSpec.configure do |config|
     allow(Appsignal::Config).to receive(:system_tmp_dir).and_return(spec_system_tmp_dir)
   end
 
+  # These tests are not run by default. They require a failed extension
+  # installation. See the `rake test:failure` task. If a test with this tag was
+  # run, run `rake extension:install` again to fix the extension installation
+  # before running other tests.
+  config.before :extension_installation_failure => true do
+    next unless Appsignal.extension_loaded?
+
+    raise "Extension is loaded, please run the following task and rerun the test." \
+      "\n\n    rake test:prepare_failure"
+  end
+
+  # Check to see if the extension is loaded before running the specs. If the
+  # extension is not loaded it can result in unexpected behavior.
+  config.before do |example|
+    next if Appsignal.extension_loaded?
+    next if example.metadata[:extension_installation_failure]
+
+    puts "\nWARNING: The AppSignal extension is not loaded, please run the "\
+      "following task and rerun the test." \
+      "\n\n    rake extension:install\n"
+  end
+
   config.after do
     Appsignal::Testing.clear!
     clear_current_transaction!

data/spec/support/testing.rb

@@ -1,16 +1,26 @@
 module Appsignal
   class << self
+    attr_writer :testing
     remove_method :testing?
 
     # @api private
     def testing?
-      true
+      @testing = true unless defined?(@testing)
+      @testing
     end
   end
 
   # @api private
   module Testing
     class << self
+      def without_testing
+        original_testing = Appsignal.testing?
+        Appsignal.testing = false
+        yield
+      ensure
+        Appsignal.testing = original_testing
+      end
+
       def transactions
         @transactions ||= []
       end

data/support/install_deps

@@ -2,25 +2,26 @@
 
 set -eu
 
-gem_args="--no-verbose"
-if [[ $(ruby --version) != "ruby 1.9.3"* ]]; then
-  gem_args+=" --no-document"
-fi
+gem_args="--no-verbose --no-document"
 
 case "${_RUBYGEMS_VERSION-"latest"}" in
   "latest")
-    gem update $gem_args --system
+    echo "Updating rubygems"
+    retry --times 5 --sleep 5 gem update $gem_args --system
   ;;
   *)
-    gem update $gem_args --system $_RUBYGEMS_VERSION
+    echo "Updating rubygems to $_RUBYGEMS_VERSION}"
+    retry --times 5 --sleep 5 gem update $gem_args --system $_RUBYGEMS_VERSION
   ;;
 esac
 
 case "${_BUNDLER_VERSION-"latest"}" in
   "latest")
-    gem update bundler $gem_args
+    echo "Updating bundler"
+    retry --times 5 --sleep 5 gem update bundler $gem_args
   ;;
   *)
-    gem install bundler $gem_args --version $_BUNDLER_VERSION
+    echo "Updating bundler to $_BUNDLER_VERSION"
+    retry --times 5 --sleep 5 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: 3.0.2
+  version: 3.0.6
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -179,8 +179,6 @@ files:
 - gemfiles/que.gemfile
 - gemfiles/que_beta.gemfile
 - gemfiles/rails-3.2.gemfile
-- gemfiles/rails-4.0.gemfile
-- gemfiles/rails-4.1.gemfile
 - gemfiles/rails-4.2.gemfile
 - gemfiles/rails-5.0.gemfile
 - gemfiles/rails-5.1.gemfile
@@ -226,6 +224,7 @@ files:
 - lib/appsignal/hooks/celluloid.rb
 - lib/appsignal/hooks/data_mapper.rb
 - lib/appsignal/hooks/delayed_job.rb
+- lib/appsignal/hooks/excon.rb
 - lib/appsignal/hooks/mongo_ruby_driver.rb
 - lib/appsignal/hooks/net_http.rb
 - lib/appsignal/hooks/passenger.rb
@@ -245,6 +244,7 @@ files:
 - lib/appsignal/integrations/capistrano/capistrano_2_tasks.rb
 - lib/appsignal/integrations/data_mapper.rb
 - lib/appsignal/integrations/delayed_job_plugin.rb
+- lib/appsignal/integrations/excon.rb
 - lib/appsignal/integrations/grape.rb
 - lib/appsignal/integrations/mongo_ruby_driver.rb
 - lib/appsignal/integrations/net_http.rb
@@ -282,6 +282,7 @@ files:
 - lib/appsignal/version.rb
 - lib/puma/plugin/appsignal.rb
 - lib/sequel/extensions/appsignal_integration.rb
+- mono.yml
 - resources/appsignal.yml.erb
 - resources/cacert.pem
 - spec/.rubocop.yml
@@ -320,6 +321,7 @@ files:
 - spec/lib/appsignal/hooks/celluloid_spec.rb
 - spec/lib/appsignal/hooks/data_mapper_spec.rb
 - spec/lib/appsignal/hooks/delayed_job_spec.rb
+- spec/lib/appsignal/hooks/excon_spec.rb
 - spec/lib/appsignal/hooks/mongo_ruby_driver_spec.rb
 - spec/lib/appsignal/hooks/net_http_spec.rb
 - spec/lib/appsignal/hooks/passenger_spec.rb
@@ -427,7 +429,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.8
+rubygems_version: 3.2.17
 signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
@@ -468,6 +470,7 @@ test_files:
 - spec/lib/appsignal/hooks/celluloid_spec.rb
 - spec/lib/appsignal/hooks/data_mapper_spec.rb
 - spec/lib/appsignal/hooks/delayed_job_spec.rb
+- spec/lib/appsignal/hooks/excon_spec.rb
 - spec/lib/appsignal/hooks/mongo_ruby_driver_spec.rb
 - spec/lib/appsignal/hooks/net_http_spec.rb
 - spec/lib/appsignal/hooks/passenger_spec.rb