appsignal 3.2.1-java → 3.3.0-java

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

@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+
+if DependencyHelper.hanami2_present?
+  describe "Hanami integration" do
+    require "appsignal/integrations/hanami"
+
+    before do
+      allow(Appsignal).to receive(:active?).and_return(true)
+      allow(Appsignal).to receive(:start).and_return(true)
+      allow(Appsignal).to receive(:start_logger).and_return(true)
+    end
+
+    describe Appsignal::Integrations::HanamiPlugin do
+      it "starts AppSignal on init" do
+        expect(Appsignal).to receive(:start)
+      end
+
+      it "starts the logger on init" do
+        expect(Appsignal).to receive(:start_logger)
+      end
+
+      it "prepends the integration to Hanami" do
+        expect(::Hanami::Action).to receive(:send).with(:prepend, Appsignal::Integrations::HanamiIntegration)
+      end
+
+      context "when not active" do
+        before { allow(Appsignal).to receive(:active?).and_return(false) }
+
+        it "does not prepend the integration" do
+          expect(::Hanami::Action).to_not receive(:send).with(:prepend, Appsignal::Integrations::HanamiIntegration)
+        end
+      end
+
+      context "when APPSIGNAL_APP_ENV ENV var is provided" do
+        it "uses this as the environment" do
+          ENV["APPSIGNAL_APP_ENV"] = "custom"
+
+          # Reset the plugin to pull down the latest data
+          Appsignal::Integrations::HanamiPlugin.init
+
+          expect(Appsignal.config.env).to eq("custom")
+        end
+      end
+
+      context "when APPSIGNAL_APP_ENV ENV var is not provided" do
+        it "uses the Hanami environment" do
+          # Reset the plugin to pull down the latest data
+          Appsignal::Integrations::HanamiPlugin.init
+
+          expect(Appsignal.config.env).to eq("test")
+        end
+      end
+
+      after { Appsignal::Integrations::HanamiPlugin.init }
+    end
+
+    describe "Hanami Actions" do
+      let(:env) do
+        Rack::MockRequest.env_for(
+          "/books",
+          "router.params" => router_params,
+          :method => "GET"
+        )
+      end
+
+      let(:router_params) { { :foo => "bar", :baz => "qux" } }
+
+      describe "#call", :error => false do
+        it "sets params" do
+          expect_any_instance_of(Appsignal::Transaction).to receive(:params=).with(router_params)
+        end
+
+        it "sets the action name" do
+          expect_any_instance_of(Appsignal::Transaction).to receive(:set_action_if_nil).with("HanamiApp::Actions::Books::Index")
+        end
+
+        it "sets the metadata" do
+          expect_any_instance_of(Appsignal::Transaction).to receive(:set_metadata).with("status", "200")
+          expect_any_instance_of(Appsignal::Transaction).to receive(:set_metadata).with("path", "/books")
+          expect_any_instance_of(Appsignal::Transaction).to receive(:set_metadata).with("method", "GET")
+        end
+
+        it "sets the queue start" do
+          expect_any_instance_of(Appsignal::Transaction).to receive(:set_http_or_background_queue_start)
+        end
+
+        context "with error", :error => true do
+          let(:error) { HanamiApp::ExampleError }
+
+          it "records the exception" do
+            expect_any_instance_of(Appsignal::Transaction).to receive(:set_error).with(error)
+          end
+
+          it "sets the status to 500" do
+            expect_any_instance_of(Appsignal::Transaction).to receive(:set_metadata).with("status", "500")
+            expect_any_instance_of(Appsignal::Transaction).to receive(:set_metadata).twice
+          end
+        end
+
+        after(:error => false) do
+          Appsignal::Integrations::HanamiPlugin.init
+
+          action = HanamiApp::Actions::Books::Index.new
+          action.call(env)
+        end
+
+        after(:error => true) do
+          Appsignal::Integrations::HanamiPlugin.init
+
+          action = HanamiApp::Actions::Books::Error.new
+          expect { action.call(env) }.to raise_error(error)
+        end
+      end
+    end
+  end
+end

data/spec/lib/appsignal/logger_spec.rb

@@ -42,6 +42,20 @@ describe Appsignal::Logger do
         logger.add(::Logger::DEBUG, "Log message")
       end
     end
+
+    context "with a formatter set" do
+      before do
+        logger.formatter = proc do |_level, _timestamp, _appname, message|
+          "formatted: '#{message}'"
+        end
+      end
+
+      it "should log with a level, message and group" do
+        expect(Appsignal::Extension).to receive(:log)
+          .with("other_group", 3, "formatted: 'Log message'", instance_of(Appsignal::Extension::Data))
+        logger.add(::Logger::INFO, "Log message", "other_group")
+      end
+    end
   end
 
   [
@@ -89,6 +103,20 @@ describe Appsignal::Logger do
           end
         end
       end
+
+      context "with a formatter set" do
+        before do
+          logger.formatter = proc do |_level, _timestamp, _appname, message|
+            "formatted: '#{message}'"
+          end
+        end
+
+        it "should log with a level, message and group" do
+          expect(Appsignal::Extension).to receive(:log)
+            .with("group", method[1], "formatted: 'Log message'", instance_of(Appsignal::Extension::Data))
+          logger.send(method[0], "Log message")
+        end
+      end
     end
   end
 end

data/spec/lib/appsignal/probes/mri_spec.rb

@@ -42,10 +42,15 @@ describe Appsignal::Probes::MriProbe do
         allow(GC::Profiler).to receive(:enabled?).and_return(true)
       end
 
-      it "should track vm metrics" do
+      it "should track vm cache metrics" do
         probe.call
-        expect_gauge_value("ruby_vm", :tags => { :metric => :class_serial })
-        expect_gauge_value("ruby_vm", :tags => { :metric => :global_constant_state })
+        if DependencyHelper.ruby_3_2_or_newer?
+          expect_gauge_value("ruby_vm", :tags => { :metric => :constant_cache_invalidations })
+          expect_gauge_value("ruby_vm", :tags => { :metric => :constant_cache_misses })
+        else
+          expect_gauge_value("ruby_vm", :tags => { :metric => :class_serial })
+          expect_gauge_value("ruby_vm", :tags => { :metric => :global_constant_state })
+        end
       end
 
       it "tracks thread counts" do

data/spec/spec_helper.rb

@@ -29,6 +29,11 @@ if DependencyHelper.rails_present?
     require f
   end
 end
+if DependencyHelper.hanami2_present?
+  Dir[File.join(DirectoryHelper.support_dir, "hanami", "*.rb")].each do |f|
+    require f
+  end
+end
 require "pry" if DependencyHelper.dependency_present?("pry")
 require "appsignal"
 # Include patches of AppSignal modules and classes to make test helpers

data/spec/support/hanami/hanami_app.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "hanami"
+require "hanami/action"
+
+module HanamiApp
+  class App < Hanami::App
+  end
+
+  class Routes < Hanami::Routes
+    get "/books", :to => "books.index"
+  end
+
+  module Actions
+    module Books
+      class Index < Hanami::Action
+        def handle(_request, response)
+          response.body = "YOU REQUESTED BOOKS!"
+        end
+      end
+
+      class Error < Hanami::Action
+        def handle(_request, _response)
+          raise ExampleError
+        end
+      end
+    end
+  end
+
+  class ExampleError < StandardError; end
+end

data/spec/support/helpers/dependency_helper.rb

@@ -9,10 +9,18 @@ module DependencyHelper
     ruby_version.segments.take(2) == [2, 0]
   end
 
+  def ruby_3_0_or_newer?
+    ruby_version >= Gem::Version.new("3.0.0")
+  end
+
   def ruby_3_1_or_newer?
     ruby_version >= Gem::Version.new("3.1.0")
   end
 
+  def ruby_3_2_or_newer?
+    ruby_version >= Gem::Version.new("3.2.0")
+  end
+
   def running_jruby?
     Appsignal::System.jruby?
   end
@@ -111,6 +119,14 @@ module DependencyHelper
     dependency_present? "que"
   end
 
+  def hanami_present?
+    dependency_present? "hanami"
+  end
+
+  def hanami2_present?
+    ruby_3_0_or_newer? && hanami_present? && Gem.loaded_specs["hanami"].version >= Gem::Version.new("2.0")
+  end
+
   def dependency_present?(dependency_file)
     Gem.loaded_specs.key? dependency_file
   end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: java
 authors:
 - Robert Beekman
 - Thijs Cadier
 - Tom de Bruijn
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2022-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -175,6 +175,7 @@ files:
 - gemfiles/capistrano2.gemfile
 - gemfiles/capistrano3.gemfile
 - gemfiles/grape.gemfile
+- gemfiles/hanami.gemfile
 - gemfiles/http5.gemfile
 - gemfiles/no_dependencies.gemfile
 - gemfiles/padrino.gemfile
@@ -254,6 +255,7 @@ files:
 - lib/appsignal/integrations/delayed_job_plugin.rb
 - lib/appsignal/integrations/excon.rb
 - lib/appsignal/integrations/grape.rb
+- lib/appsignal/integrations/hanami.rb
 - lib/appsignal/integrations/http.rb
 - lib/appsignal/integrations/mongo_ruby_driver.rb
 - lib/appsignal/integrations/net_http.rb
@@ -353,6 +355,7 @@ files:
 - spec/lib/appsignal/hooks_spec.rb
 - spec/lib/appsignal/integrations/data_mapper_spec.rb
 - spec/lib/appsignal/integrations/grape_spec.rb
+- spec/lib/appsignal/integrations/hanami_spec.rb
 - spec/lib/appsignal/integrations/http_spec.rb
 - spec/lib/appsignal/integrations/mongo_ruby_driver_spec.rb
 - spec/lib/appsignal/integrations/object_spec.rb
@@ -392,6 +395,7 @@ files:
 - spec/support/fixtures/projects/valid/config/environments/test.rb
 - spec/support/fixtures/projects/valid/log/.gitkeep
 - spec/support/fixtures/uploaded_file.txt
+- spec/support/hanami/hanami_app.rb
 - spec/support/helpers/action_mailer_helpers.rb
 - spec/support/helpers/activejob_helpers.rb
 - spec/support/helpers/api_request_helper.rb
@@ -432,7 +436,7 @@ metadata:
   documentation_uri: https://docs.appsignal.com/ruby/
   homepage_uri: https://docs.appsignal.com/ruby/
   source_code_uri: https://github.com/appsignal/appsignal-ruby
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -448,8 +452,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
 test_files:
@@ -508,6 +512,7 @@ test_files:
 - spec/lib/appsignal/hooks_spec.rb
 - spec/lib/appsignal/integrations/data_mapper_spec.rb
 - spec/lib/appsignal/integrations/grape_spec.rb
+- spec/lib/appsignal/integrations/hanami_spec.rb
 - spec/lib/appsignal/integrations/http_spec.rb
 - spec/lib/appsignal/integrations/mongo_ruby_driver_spec.rb
 - spec/lib/appsignal/integrations/object_spec.rb
@@ -547,6 +552,7 @@ test_files:
 - spec/support/fixtures/projects/valid/config/environments/test.rb
 - spec/support/fixtures/projects/valid/log/.gitkeep
 - spec/support/fixtures/uploaded_file.txt
+- spec/support/hanami/hanami_app.rb
 - spec/support/helpers/action_mailer_helpers.rb
 - spec/support/helpers/activejob_helpers.rb
 - spec/support/helpers/api_request_helper.rb