appsignal 3.2.2-java → 3.3.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e5d7f78d66ed928ba1db81131758cdc05d7b728776c4216358d9729d2e3619e
-  data.tar.gz: 24fcedd7b116b6a017e247c1e049b1ad575d789372894504aaa80270b6cabfd0
+  metadata.gz: c476ef9ec4fbb906a3c3013484975806c87fd7c1efbaef938ee49c9c1cb04081
+  data.tar.gz: 9b7eebe7a6a535445a6baed7ddffe8f779d373d6936fb7de4bb000c7a0bd3c3d
 SHA512:
-  metadata.gz: 668b7e9baeaead3edca6c3738699370e3d97061a602e41bc915da49597047474165bc22099924dd3d98894cd2f34d52086e1c6fc7f1e8ac5a7360f69b129fa1e
-  data.tar.gz: ceeac6a2e2b545b64e6f820b1acc34e0d9465500f2abf7d050c004120c3845bead373bbfcf777f725d488ec589e57791f059879e64b5f8e6af35581d96b06811
+  metadata.gz: 7cdd3926c3db35c5566e7d2fc1e80b7f948f26ebcb19d8fad3374db139d6962b016412a243b7ea1df8b8f47302923c321cf46676a98cd98c83e39d26f2a9d5bc
+  data.tar.gz: 44ea1982e6b2319c0a469d128cecaf1ab91bc21ebbaabd50d6a3c9eb082dbafea62145e204e419ca4f0180367788ae3bddb019f00411d7bb83f87f022de901b5

data/.rubocop_todo.yml

@@ -88,6 +88,7 @@ Style/Alias:
 Style/ClassAndModuleChildren:
   Exclude:
     - 'lib/appsignal/integrations/padrino.rb'
+    - 'lib/appsignal/integrations/hanami.rb'
 
 # Offense count: 1
 Style/DoubleNegation:

data/.semaphore/semaphore.yml

@@ -24,12 +24,6 @@ global_job_config:
     commands:
     - checkout
     - rm -f $HOME/.rbenv/plugins/rbenv-gem-rehash/etc/rbenv.d/exec/~gem-rehash.bash
-    - |
-      if [ -n "$_LIBYAML" ]; then
-        install-package --update libyaml-dev
-      else
-        echo Skipping libyaml-dev install
-      fi
     - |
       if [ -n "$_C_VERSION" ]; then
         sem-version c $_C_VERSION
@@ -349,9 +343,9 @@ blocks:
       - name: BUNDLE_GEMFILE
         value: gemfiles/no_dependencies.gemfile
       - name: _RUBYGEMS_VERSION
-        value: latest
+        value: 3.3.26
       - name: _BUNDLER_VERSION
-        value: latest
+        value: 2.3.26
       commands:
       - "./support/bundler_wrapper exec rake test"
       - "./support/bundler_wrapper exec rake test:failure"
@@ -1368,6 +1362,24 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 3.0.4 for hanami
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.0.4
+      - name: GEMSET
+        value: hanami
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/hanami.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
     - name: Ruby 3.0.4 for http5
       env_vars:
       - *2
@@ -1707,6 +1719,24 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 3.1.2 for hanami
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.1.2
+      - name: GEMSET
+        value: hanami
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/hanami.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
     - name: Ruby 3.1.2 for http5
       env_vars:
       - *2
@@ -1923,7 +1953,7 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-- name: Ruby 3.2.0-preview3
+- name: Ruby 3.2.0
   dependencies:
   - Validation
   task:
@@ -1939,14 +1969,14 @@ blocks:
       - "./support/bundler_wrapper exec rake extension:install"
     epilogue: *1
     jobs:
-    - name: Ruby 3.2.0-preview3 for no_dependencies
+    - name: Ruby 3.2.0 for no_dependencies
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-preview3
+        value: 3.2.0
       - name: GEMSET
         value: no_dependencies
       - name: BUNDLE_GEMFILE
@@ -1955,15 +1985,12 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - &6
-        name: _LIBYAML
-        value: '1'
       commands:
       - "./support/bundler_wrapper exec rake test"
       - "./support/bundler_wrapper exec rake test:failure"
-- name: Ruby 3.2.0-preview3 - Gems
+- name: Ruby 3.2.0 - Gems
   dependencies:
-  - Ruby 3.2.0-preview3
+  - Ruby 3.2.0
   task:
     prologue:
       commands:
@@ -1977,14 +2004,14 @@ blocks:
       - "./support/bundler_wrapper exec rake extension:install"
     epilogue: *1
     jobs:
-    - name: Ruby 3.2.0-preview3 for capistrano2
+    - name: Ruby 3.2.0 for capistrano2
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-preview3
+        value: 3.2.0
       - name: GEMSET
         value: capistrano2
       - name: BUNDLE_GEMFILE
@@ -1993,17 +2020,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-preview3 for capistrano3
+    - name: Ruby 3.2.0 for capistrano3
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-preview3
+        value: 3.2.0
       - name: GEMSET
         value: capistrano3
       - name: BUNDLE_GEMFILE
@@ -2012,17 +2038,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-preview3 for grape
+    - name: Ruby 3.2.0 for grape
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-preview3
+        value: 3.2.0
       - name: GEMSET
         value: grape
       - name: BUNDLE_GEMFILE
@@ -2031,17 +2056,34 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-preview3 for http5
+    - name: Ruby 3.2.0 for hanami
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.2.0
+      - name: GEMSET
+        value: hanami
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/hanami.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 3.2.0 for http5
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-preview3
+        value: 3.2.0
       - name: GEMSET
         value: http5
       - name: BUNDLE_GEMFILE
@@ -2050,17 +2092,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-preview3 for padrino
+    - name: Ruby 3.2.0 for padrino
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-preview3
+        value: 3.2.0
       - name: GEMSET
         value: padrino
       - name: BUNDLE_GEMFILE
@@ -2069,17 +2110,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-preview3 for psych-3
+    - name: Ruby 3.2.0 for psych-3
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-preview3
+        value: 3.2.0
       - name: GEMSET
         value: psych-3
       - name: BUNDLE_GEMFILE
@@ -2088,17 +2128,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-preview3 for psych-4
+    - name: Ruby 3.2.0 for psych-4
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-preview3
+        value: 3.2.0
       - name: GEMSET
         value: psych-4
       - name: BUNDLE_GEMFILE
@@ -2107,17 +2146,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-preview3 for que
+    - name: Ruby 3.2.0 for que
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-preview3
+        value: 3.2.0
       - name: GEMSET
         value: que
       - name: BUNDLE_GEMFILE
@@ -2126,17 +2164,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-preview3 for que_beta
+    - name: Ruby 3.2.0 for que_beta
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-preview3
+        value: 3.2.0
       - name: GEMSET
         value: que_beta
       - name: BUNDLE_GEMFILE
@@ -2145,17 +2182,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-preview3 for rails-6.1
+    - name: Ruby 3.2.0 for rails-6.1
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-preview3
+        value: 3.2.0
       - name: GEMSET
         value: rails-6.1
       - name: BUNDLE_GEMFILE
@@ -2164,17 +2200,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-preview3 for rails-7.0
+    - name: Ruby 3.2.0 for rails-7.0
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-preview3
+        value: 3.2.0
       - name: GEMSET
         value: rails-7.0
       - name: BUNDLE_GEMFILE
@@ -2183,17 +2218,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-preview3 for resque-2
+    - name: Ruby 3.2.0 for resque-2
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-preview3
+        value: 3.2.0
       - name: GEMSET
         value: resque-2
       - name: BUNDLE_GEMFILE
@@ -2202,17 +2236,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-preview3 for sequel
+    - name: Ruby 3.2.0 for sequel
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-preview3
+        value: 3.2.0
       - name: GEMSET
         value: sequel
       - name: BUNDLE_GEMFILE
@@ -2221,17 +2254,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-preview3 for sinatra
+    - name: Ruby 3.2.0 for sinatra
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-preview3
+        value: 3.2.0
       - name: GEMSET
         value: sinatra
       - name: BUNDLE_GEMFILE
@@ -2240,17 +2272,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-preview3 for webmachine
+    - name: Ruby 3.2.0 for webmachine
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-preview3
+        value: 3.2.0
       - name: GEMSET
         value: webmachine
       - name: BUNDLE_GEMFILE
@@ -2259,7 +2290,6 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
       commands:
       - "./support/bundler_wrapper exec rake test"
 - name: Ruby jruby-9.3.9.0

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.3.1
+
+### Added
+
+- [7f62ada8](https://github.com/appsignal/appsignal-ruby/commit/7f62ada8deb67a2b7d355ec0c1bc2ad1d1e2d8d1) patch - Track the Operating System release/distro in the diagnose report. This helps us with debugging what exact version of Linux an app is running on, for example.
+
+### Fixed
+
+- [1443e05f](https://github.com/appsignal/appsignal-ruby/commit/1443e05f0fa5bf6af69c40753b2d135f082871de) patch - Attempt to load C extension from lib/ directory. Fixes an issue where JRuby would fail to load
+  the extension from the ext/ directory, as the directory is cleaned after installation when using
+  RubyGems 3.4.0.
+
+## 3.3.0
+
+### Added
+
+- [e4314b5b](https://github.com/appsignal/appsignal-ruby/commit/e4314b5b2d3fdf7865555535b2324094ec620349) minor - Hanami 2 is now supported. Requests will now appear as performance measurements.
+
 ## 3.2.2
 
 ### Changed

data/README.md

@@ -232,6 +232,7 @@ configurations you need to run the spec suite with a specific Gemfile.
 BUNDLE_GEMFILE=gemfiles/capistrano2.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/capistrano3.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/grape.gemfile bundle exec rspec
+BUNDLE_GEMFILE=gemfiles/hanami.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/http5.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/no_dependencies.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/padrino.gemfile bundle exec rspec

data/build_matrix.yml

@@ -25,12 +25,6 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
       commands:
         - checkout
         - rm -f $HOME/.rbenv/plugins/rbenv-gem-rehash/etc/rbenv.d/exec/~gem-rehash.bash
-        - |
-          if [ -n "$_LIBYAML" ]; then
-            install-package --update libyaml-dev
-          else
-            echo Skipping libyaml-dev install
-          fi
         - |
           if [ -n "$_C_VERSION" ]; then
             sem-version c $_C_VERSION
@@ -197,6 +191,8 @@ matrix:
       gems: "none"
     - ruby: "2.3.8"
       gems: "none"
+      rubygems: "3.3.26"
+      bundler: "2.3.26"
     - ruby: "2.4.10"
       gems: "none"
     - ruby: "2.5.8"
@@ -205,10 +201,7 @@ matrix:
     - ruby: "2.7.7"
     - ruby: "3.0.4"
     - ruby: "3.1.2"
-    - ruby: "3.2.0-preview3"
-      env_vars:
-        - name: "_LIBYAML"
-          value: "1"
+    - ruby: "3.2.0"
     - ruby: "jruby-9.3.9.0"
       gems: "minimal"
     - ruby: "jruby-9.4.0.0"
@@ -218,6 +211,12 @@ matrix:
     - gem: "capistrano2"
     - gem: "capistrano3"
     - gem: "grape"
+    - gem: "hanami"
+      only:
+        ruby:
+          - "3.0.4"
+          - "3.1.2"
+          - "3.2.0"
     - gem: "http5"
     - gem: "padrino"
     - gem: "psych-3"
@@ -225,13 +224,13 @@ matrix:
         ruby:
           - "3.0.4"
           - "3.1.2"
-          - "3.2.0-preview3"
+          - "3.2.0"
     - gem: "psych-4"
       only:
         ruby:
           - "3.0.4"
           - "3.1.2"
-          - "3.2.0-preview3"
+          - "3.2.0"
     - gem: "que"
     - gem: "que_beta"
     - gem: "rails-3.2"
@@ -304,7 +303,7 @@ matrix:
           - "2.7.7"
           - "3.0.4"
           - "3.1.2"
-          - "3.2.0-preview3"
+          - "3.2.0"
           - "jruby-9.4.0.0"
     - gem: "rails-7.0"
       only:
@@ -312,7 +311,7 @@ matrix:
           - "2.7.7"
           - "3.0.4"
           - "3.1.2"
-          - "3.2.0-preview3"
+          - "3.2.0"
           - "jruby-9.4.0.0"
     - gem: "resque-1"
       bundler: "1.17.3"

data/gemfiles/hanami.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem "hanami", "~> 2.0.0"
+gem "hanami-router", "~> 2.0.0"
+gem "hanami-controller", "~> 2.0.0"
+
+gemspec :path => '../'

data/lib/appsignal/cli/diagnose.rb

@@ -443,6 +443,9 @@ module Appsignal
             save :os, os
             puts_value "Operating System", os_label
 
+            distribution_file = "/etc/os-release"
+            save :os_distribution, File.exist?(distribution_file) ? File.read(distribution_file) : ""
+
             language_version = "#{rbconfig["RUBY_PROGRAM_VERSION"]}-p#{rbconfig["PATCHLEVEL"]}"
             save :language_version, language_version
             puts_format "Ruby version", language_version

data/lib/appsignal/cli/install.rb

@@ -61,6 +61,8 @@ module Appsignal
             install_for_padrino(config)
           elsif installed_frameworks.include?(:grape)
             install_for_grape(config)
+          elsif installed_frameworks.include?(:hanami)
+            install_for_hanami(config)
           elsif installed_frameworks.include?(:sinatra)
             install_for_sinatra(config)
           else
@@ -162,6 +164,24 @@ module Appsignal
           done_notice
         end
 
+        def install_for_hanami(config)
+          puts "Installing for Hanami"
+          config[:name] = required_input("  Enter application name: ")
+          puts
+          configure(config, %w[development production staging], true)
+
+          puts "Finish Hanami installation"
+          puts "  Hanami requires some manual configuration."
+          puts "  After installing the gem, add the following line to config.ru:"
+          puts
+          puts "  require 'appsignal/integrations/hanami'"
+          puts
+          puts "  You can find more information in the documentation:"
+          puts "  http://docs.appsignal.com/ruby/integrations/hanami.html"
+          press_any_key
+          done_notice
+        end
+
         def install_for_capistrano
           capfile = File.join(Dir.pwd, "Capfile")
           return unless File.exist?(capfile)
@@ -256,6 +276,7 @@ module Appsignal
             out << :sinatra if framework_available? "sinatra"
             out << :padrino if framework_available? "padrino"
             out << :grape if framework_available? "grape"
+            out << :hanami if framework_available? "hanami"
           end
         end
 

data/lib/appsignal/extension/jruby.rb

@@ -50,7 +50,12 @@ module Appsignal
       end
 
       begin
-        ffi_lib File.join(File.dirname(__FILE__), "../../../ext/libappsignal.#{lib_extension}")
+        begin
+          # RubyGems will install the extension in the gem's lib directory.
+          ffi_lib File.join(File.dirname(__FILE__), "../../../lib/libappsignal.#{lib_extension}")
+        rescue LoadError
+          ffi_lib File.join(File.dirname(__FILE__), "../../../ext/libappsignal.#{lib_extension}")
+        end
         typedef AppsignalString.by_value, :appsignal_string
 
         attach_function :appsignal_start, [], :void

data/lib/appsignal/integrations/hanami.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require "appsignal"
+
+module Appsignal
+  module Integrations
+    module HanamiPlugin
+      def self.init
+        Appsignal.logger.debug("Loading Hanami integration")
+
+        hanami_app_config = ::Hanami.app.config
+        Appsignal.config = Appsignal::Config.new(
+          hanami_app_config.root || Dir.pwd,
+          hanami_app_config.env
+        )
+
+        Appsignal.start_logger
+        Appsignal.start
+
+        ::Hanami::Action.send(:prepend, Appsignal::Integrations::HanamiIntegration) if Appsignal.active?
+      end
+    end
+  end
+end
+
+module Appsignal::Integrations::HanamiIntegration
+  def call(env)
+    params = ::Hanami::Action::BaseParams.new(env)
+    request = ::Hanami::Action::Request.new(
+      :env => env,
+      :params => params,
+      :sessions_enabled => true
+    )
+
+    transaction = Appsignal::Transaction.create(
+      SecureRandom.uuid,
+      Appsignal::Transaction::HTTP_REQUEST,
+      request
+    )
+
+    begin
+      Appsignal.instrument("process_action.hanami") do
+        super.tap do |response|
+          transaction.set_metadata("status", response.status.to_s)
+        end
+      end
+    rescue Exception => error # rubocop:disable Lint/RescueException
+      transaction.set_error(error)
+      transaction.set_metadata("status", "500")
+      raise error
+    ensure
+      transaction.params = request.params.to_h
+      transaction.set_action_if_nil(self.class.name)
+      transaction.set_metadata("path", request.path)
+      transaction.set_metadata("method", request.request_method)
+      transaction.set_http_or_background_queue_start
+      Appsignal::Transaction.complete_current!
+    end
+  end
+end
+
+Appsignal::Integrations::HanamiPlugin.init

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "3.2.2".freeze
+  VERSION = "3.3.1".freeze
 end

data/spec/lib/appsignal/cli/diagnose_spec.rb

@@ -636,9 +636,12 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
         run
         host_report = received_report["host"]
         host_report.delete("running_in_container") # Tested elsewhere
+        distribution_file = "/etc/os-release"
+        os_distribution = File.exist?(distribution_file) ? File.read(distribution_file) : ""
         expect(host_report).to eq(
           "architecture" => rbconfig["host_cpu"],
           "os" => rbconfig["host_os"],
+          "os_distribution" => os_distribution,
           "language_version" => language_version,
           "heroku" => false,
           "root" => false

data/spec/lib/appsignal/cli/install_spec.rb

@@ -660,7 +660,73 @@ describe Appsignal::CLI::Install do
     end
   end
 
-  if !rails_present? && !sinatra_present? && !padrino_present? && !grape_present?
+  if hanami2_present?
+    context "with hanami" do
+      it_behaves_like "push_api_key validation"
+      it_behaves_like "requires an application name"
+
+      describe "hanami specific tests" do
+        let(:installation_instructions) do
+          [
+            "Installing for Hanami",
+            "Hanami requires some manual configuration.",
+            "http://docs.appsignal.com/ruby/integrations/hanami.html"
+          ]
+        end
+        let(:app_name) { "Test app" }
+        before { enter_app_name app_name }
+
+        describe "configuration with environment variables" do
+          before { choose_environment_config }
+
+          it_behaves_like "windows installation"
+          it_behaves_like "capistrano install"
+          it_behaves_like "demo data"
+
+          it "prints environment variables" do
+            run
+
+            expect(output).to include_env_push_api_key(push_api_key)
+            expect(output).to include_env_app_name(app_name)
+          end
+
+          it "completes the installation" do
+            run
+
+            expect(output).to include(*installation_instructions)
+            expect(output).to include_complete_install
+          end
+        end
+
+        describe "configure with a configuration file" do
+          before { choose_config_file }
+
+          it_behaves_like "windows installation"
+          it_behaves_like "capistrano install"
+          it_behaves_like "demo data"
+
+          it "writes configuration to file" do
+            run
+            expect(output).to include_file_config
+            expect(config_file).to configure_app_name(app_name)
+            expect(config_file).to configure_push_api_key(push_api_key)
+            expect(config_file).to configure_environment("development")
+            expect(config_file).to configure_environment("staging")
+            expect(config_file).to configure_environment("production")
+          end
+
+          it "completes the installation" do
+            run
+
+            expect(output).to include(*installation_instructions)
+            expect(output).to include_complete_install
+          end
+        end
+      end
+    end
+  end
+
+  if !rails_present? && !sinatra_present? && !padrino_present? && !grape_present? && !hanami2_present?
     context "with unknown framework" do
       let(:push_api_key) { "my_key" }
 

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/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,6 +9,10 @@ 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
@@ -115,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.1
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-13 00:00:00.000000000 Z
+date: 2023-01-12 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
@@ -448,7 +452,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.2
 signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
@@ -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