appsignal 2.11.2 → 2.11.7

data/spec/lib/appsignal/integrations/object_19_spec.rb

@@ -0,0 +1,266 @@
+require "appsignal/integrations/object"
+
+def is_ruby_19
+  RUBY_VERSION < "2.0"
+end
+
+describe Object do
+  describe "#instrument_method" do
+    context "with instance method" do
+      let(:klass) do
+        Class.new do
+          def foo(param1, options = {})
+            [param1, options]
+          end
+          appsignal_instrument_method :foo
+        end
+      end
+      let(:instance) { klass.new }
+
+      def call_with_arguments
+        instance.foo(
+          "abc",
+          :foo => "bar"
+        )
+      end
+
+      context "when active" do
+        let(:transaction) { http_request_transaction }
+        before do
+          Appsignal.config = project_fixture_config
+          expect(Appsignal::Transaction).to receive(:current).at_least(:once).and_return(transaction)
+        end
+        after { Appsignal.config = nil }
+
+        context "with anonymous class" do
+          it "instruments the method and calls it" do
+            expect(Appsignal.active?).to be_truthy
+            expect(transaction).to receive(:start_event)
+            expect(transaction).to receive(:finish_event).with \
+              "foo.AnonymousClass.other", nil, nil, Appsignal::EventFormatter::DEFAULT
+            expect(call_with_arguments).to eq(["abc", { :foo => "bar" }])
+          end
+        end
+
+        context "with named class" do
+          before do
+            class NamedClass
+              def foo
+                1
+              end
+              appsignal_instrument_method :foo
+            end
+          end
+          after { Object.send(:remove_const, :NamedClass) }
+          let(:klass) { NamedClass }
+
+          it "instruments the method and calls it" do
+            expect(Appsignal.active?).to be_truthy
+            expect(transaction).to receive(:start_event)
+            expect(transaction).to receive(:finish_event).with \
+              "foo.NamedClass.other", nil, nil, Appsignal::EventFormatter::DEFAULT
+            expect(instance.foo).to eq(1)
+          end
+        end
+
+        context "with nested named class" do
+          before do
+            module MyModule
+              module NestedModule
+                class NamedClass
+                  def bar
+                    2
+                  end
+                  appsignal_instrument_method :bar
+                end
+              end
+            end
+          end
+          after { Object.send(:remove_const, :MyModule) }
+          let(:klass) { MyModule::NestedModule::NamedClass }
+
+          it "instruments the method and calls it" do
+            expect(Appsignal.active?).to be_truthy
+            expect(transaction).to receive(:start_event)
+            expect(transaction).to receive(:finish_event).with \
+              "bar.NamedClass.NestedModule.MyModule.other", nil, nil,
+              Appsignal::EventFormatter::DEFAULT
+            expect(instance.bar).to eq(2)
+          end
+        end
+
+        context "with custom name" do
+          let(:klass) do
+            Class.new do
+              def foo
+                1
+              end
+              appsignal_instrument_method :foo, :name => "my_method.group"
+            end
+          end
+
+          it "instruments with custom name" do
+            expect(Appsignal.active?).to be_truthy
+            expect(transaction).to receive(:start_event)
+            expect(transaction).to receive(:finish_event).with \
+              "my_method.group", nil, nil, Appsignal::EventFormatter::DEFAULT
+            expect(instance.foo).to eq(1)
+          end
+        end
+
+        context "with a method given a block" do
+          let(:klass) do
+            Class.new do
+              def foo
+                yield
+              end
+              appsignal_instrument_method :foo
+            end
+          end
+
+          it "should yield the block" do
+            expect(instance.foo { 42 }).to eq(42)
+          end
+        end
+      end
+
+      context "when not active" do
+        let(:transaction) { Appsignal::Transaction.current }
+
+        it "does not instrument, but still calls the method" do
+          expect(Appsignal.active?).to be_falsy
+          expect(transaction).to_not receive(:start_event)
+          expect(call_with_arguments).to eq(["abc", { :foo => "bar" }])
+        end
+      end
+    end
+
+    context "with class method" do
+      let(:klass) do
+        Class.new do
+          def self.bar(param1, options = {})
+            [param1, options]
+          end
+          appsignal_instrument_class_method :bar
+        end
+      end
+      def call_with_arguments
+        klass.bar(
+          "abc",
+          :foo => "bar"
+        )
+      end
+
+      context "when active" do
+        let(:transaction) { http_request_transaction }
+        before do
+          Appsignal.config = project_fixture_config
+          expect(Appsignal::Transaction).to receive(:current).at_least(:once)
+            .and_return(transaction)
+        end
+        after { Appsignal.config = nil }
+
+        context "with anonymous class" do
+          it "instruments the method and calls it" do
+            expect(Appsignal.active?).to be_truthy
+            expect(transaction).to receive(:start_event)
+            expect(transaction).to receive(:finish_event).with \
+              "bar.class_method.AnonymousClass.other", nil, nil, Appsignal::EventFormatter::DEFAULT
+            expect(call_with_arguments).to eq(["abc", { :foo => "bar" }])
+          end
+        end
+
+        context "with named class" do
+          before do
+            class NamedClass
+              def self.bar
+                2
+              end
+              appsignal_instrument_class_method :bar
+            end
+          end
+          after { Object.send(:remove_const, :NamedClass) }
+          let(:klass) { NamedClass }
+
+          it "instruments the method and calls it" do
+            expect(Appsignal.active?).to be_truthy
+            expect(transaction).to receive(:start_event)
+            expect(transaction).to receive(:finish_event).with \
+              "bar.class_method.NamedClass.other", nil, nil, Appsignal::EventFormatter::DEFAULT
+            expect(klass.bar).to eq(2)
+          end
+
+          context "with nested named class" do
+            before do
+              module MyModule
+                module NestedModule
+                  class NamedClass
+                    def self.bar
+                      2
+                    end
+                    appsignal_instrument_class_method :bar
+                  end
+                end
+              end
+            end
+            after { Object.send(:remove_const, :MyModule) }
+            let(:klass) { MyModule::NestedModule::NamedClass }
+
+            it "instruments the method and calls it" do
+              expect(Appsignal.active?).to be_truthy
+              expect(transaction).to receive(:start_event)
+              expect(transaction).to receive(:finish_event).with \
+                "bar.class_method.NamedClass.NestedModule.MyModule.other", nil, nil,
+                Appsignal::EventFormatter::DEFAULT
+              expect(klass.bar).to eq(2)
+            end
+          end
+        end
+
+        context "with custom name" do
+          let(:klass) do
+            Class.new do
+              def self.bar
+                2
+              end
+              appsignal_instrument_class_method :bar, :name => "my_method.group"
+            end
+          end
+
+          it "instruments with custom name" do
+            expect(Appsignal.active?).to be_truthy
+            expect(transaction).to receive(:start_event)
+            expect(transaction).to receive(:finish_event).with \
+              "my_method.group", nil, nil, Appsignal::EventFormatter::DEFAULT
+            expect(klass.bar).to eq(2)
+          end
+        end
+
+        context "with a method given a block" do
+          let(:klass) do
+            Class.new do
+              def self.bar
+                yield
+              end
+              appsignal_instrument_class_method :bar
+            end
+          end
+
+          it "should yield the block" do
+            expect(klass.bar { 42 }).to eq(42)
+          end
+        end
+      end
+
+      context "when not active" do
+        let(:transaction) { Appsignal::Transaction.current }
+
+        it "does not instrument, but still call the method" do
+          expect(Appsignal.active?).to be_falsy
+          expect(transaction).to_not receive(:start_event)
+          expect(call_with_arguments).to eq(["abc", { :foo => "bar" }])
+        end
+      end
+    end
+  end
+end

data/spec/lib/appsignal/integrations/object_spec.rb

@@ -1,18 +1,30 @@
 require "appsignal/integrations/object"
 
+def is_ruby_19
+  RUBY_VERSION < "2.0"
+end
+
 describe Object do
   describe "#instrument_method" do
     context "with instance method" do
       let(:klass) do
         Class.new do
-          def foo
-            1
+          def foo(param1, options = {}, keyword_param: 1)
+            [param1, options, keyword_param]
           end
           appsignal_instrument_method :foo
         end
       end
       let(:instance) { klass.new }
 
+      def call_with_arguments
+        instance.foo(
+          "abc",
+          { :foo => "bar" },
+          :keyword_param => 2
+        )
+      end
+
       context "when active" do
         let(:transaction) { http_request_transaction }
         before do
@@ -27,7 +39,7 @@ describe Object do
             expect(transaction).to receive(:start_event)
             expect(transaction).to receive(:finish_event).with \
               "foo.AnonymousClass.other", nil, nil, Appsignal::EventFormatter::DEFAULT
-            expect(instance.foo).to eq(1)
+            expect(call_with_arguments).to eq(["abc", { :foo => "bar" }, 2])
           end
         end
 
@@ -116,10 +128,10 @@ describe Object do
       context "when not active" do
         let(:transaction) { Appsignal::Transaction.current }
 
-        it "should not instrument, but still call the method" do
+        it "does not instrument, but still calls the method" do
           expect(Appsignal.active?).to be_falsy
           expect(transaction).to_not receive(:start_event)
-          expect(instance.foo).to eq(1)
+          expect(call_with_arguments).to eq(["abc", { :foo => "bar" }, 2])
         end
       end
     end
@@ -127,12 +139,19 @@ describe Object do
     context "with class method" do
       let(:klass) do
         Class.new do
-          def self.bar
-            2
+          def self.bar(param1, options = {}, keyword_param: 1)
+            [param1, options, keyword_param]
           end
           appsignal_instrument_class_method :bar
         end
       end
+      def call_with_arguments
+        klass.bar(
+          "abc",
+          { :foo => "bar" },
+          :keyword_param => 2
+        )
+      end
 
       context "when active" do
         let(:transaction) { http_request_transaction }
@@ -149,7 +168,7 @@ describe Object do
             expect(transaction).to receive(:start_event)
             expect(transaction).to receive(:finish_event).with \
               "bar.class_method.AnonymousClass.other", nil, nil, Appsignal::EventFormatter::DEFAULT
-            expect(klass.bar).to eq(2)
+            expect(call_with_arguments).to eq(["abc", { :foo => "bar" }, 2])
           end
         end
 
@@ -238,10 +257,10 @@ describe Object do
       context "when not active" do
         let(:transaction) { Appsignal::Transaction.current }
 
-        it "should not instrument, but still call the method" do
+        it "does not instrument, but still call the method" do
           expect(Appsignal.active?).to be_falsy
           expect(transaction).to_not receive(:start_event)
-          expect(klass.bar).to eq(2)
+          expect(call_with_arguments).to eq(["abc", { :foo => "bar" }, 2])
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.11.2
+  version: 2.11.7
 platform: ruby
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -233,6 +233,8 @@ files:
 - lib/appsignal/integrations/grape.rb
 - lib/appsignal/integrations/mongo_ruby_driver.rb
 - lib/appsignal/integrations/object.rb
+- lib/appsignal/integrations/object_ruby_19.rb
+- lib/appsignal/integrations/object_ruby_modern.rb
 - lib/appsignal/integrations/padrino.rb
 - lib/appsignal/integrations/que.rb
 - lib/appsignal/integrations/railtie.rb
@@ -322,6 +324,7 @@ files:
 - spec/lib/appsignal/integrations/data_mapper_spec.rb
 - spec/lib/appsignal/integrations/grape_spec.rb
 - spec/lib/appsignal/integrations/mongo_ruby_driver_spec.rb
+- spec/lib/appsignal/integrations/object_19_spec.rb
 - spec/lib/appsignal/integrations/object_spec.rb
 - spec/lib/appsignal/integrations/padrino_spec.rb
 - spec/lib/appsignal/integrations/que_spec.rb
@@ -415,7 +418,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.8
 signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
@@ -474,6 +477,7 @@ test_files:
 - spec/lib/appsignal/integrations/data_mapper_spec.rb
 - spec/lib/appsignal/integrations/grape_spec.rb
 - spec/lib/appsignal/integrations/mongo_ruby_driver_spec.rb
+- spec/lib/appsignal/integrations/object_19_spec.rb
 - spec/lib/appsignal/integrations/object_spec.rb
 - spec/lib/appsignal/integrations/padrino_spec.rb
 - spec/lib/appsignal/integrations/que_spec.rb