appsignal 3.9.1-java → 3.9.3-java

data/spec/support/hanami/hanami_app.rb

@@ -21,11 +21,9 @@ module HanamiApp
 
       class Error < Hanami::Action
         def handle(_request, _response)
-          raise ExampleError
+          raise ExampleException, "exception message"
         end
       end
     end
   end
-
-  class ExampleError < StandardError; end
 end

data/spec/support/helpers/dependency_helper.rb

@@ -1,4 +1,4 @@
-module DependencyHelper # rubocop:disable Metrics/ModuleLength
+module DependencyHelper
   module_function
 
   def ruby_version
@@ -123,6 +123,11 @@ module DependencyHelper # rubocop:disable Metrics/ModuleLength
     dependency_present? "hanami"
   end
 
+  def hanami2_1_present?
+    hanami_present? &&
+      Gem::Version.new(::Hanami::VERSION) >= Gem::Version.new("2.1.0")
+  end
+
   def dry_monitor_present?
     dependency_present? "dry-monitor"
   end

data/spec/support/helpers/std_streams_helper.rb

@@ -89,6 +89,6 @@ module StdStreamsHelper
         end
       end
       reject
-    end.join(",")
+    end.join
   end
 end

data/spec/support/helpers/transaction_helpers.rb

@@ -44,6 +44,14 @@ module TransactionHelpers
     created_transactions.last
   end
 
+  def current_transaction?
+    Appsignal::Transaction.current?
+  end
+
+  def current_transaction
+    Appsignal::Transaction.current
+  end
+
   # Set current transaction manually.
   # Cleared by {clear_current_transaction!}
   #

data/spec/support/matchers/transaction.rb

@@ -0,0 +1,185 @@
+def define_transaction_metadata_matcher_for(matcher_key, value_key = matcher_key)
+  value_key = value_key.to_s
+
+  RSpec::Matchers.define "have_#{matcher_key}" do |expected_value|
+    match(:notify_expectation_failures => true) do |transaction|
+      actual_value = transaction.to_h[value_key]
+      if expected_value
+        expect(actual_value).to eq(expected_value)
+      else
+        expect(actual_value).to_not be_nil
+      end
+    end
+
+    match_when_negated(:notify_expectation_failures => true) do |transaction|
+      actual_value = transaction.to_h[value_key]
+      if expected_value
+        expect(actual_value).to_not eq(expected_value)
+      else
+        expect(actual_value).to be_nil
+      end
+    end
+  end
+end
+
+define_transaction_metadata_matcher_for(:id)
+define_transaction_metadata_matcher_for(:namespace)
+define_transaction_metadata_matcher_for(:action)
+
+def define_transaction_sample_matcher_for(matcher_key, value_key = matcher_key)
+  value_key = value_key.to_s
+
+  RSpec::Matchers.define "include_#{matcher_key}" do |expected_value|
+    match(:notify_expectation_failures => true) do |transaction|
+      sample_data = transaction.to_h.dig("sample_data", value_key) || {}
+
+      if expected_value
+        expected_value = hash_including(expected_value) if expected_value.is_a?(Hash)
+        expect(sample_data).to match(expected_value)
+      else
+        expect(sample_data).to be_present
+      end
+    end
+
+    match_when_negated(:notify_expectation_failures => true) do |transaction|
+      sample_data = transaction.to_h.dig("sample_data", value_key) || {}
+
+      if expected_value
+        expect(sample_data).to_not include(expected_value)
+      else
+        expect(sample_data).to be_empty
+      end
+    end
+  end
+end
+
+define_transaction_sample_matcher_for(:sample_metadata, :metadata)
+define_transaction_sample_matcher_for(:params)
+define_transaction_sample_matcher_for(:environment)
+define_transaction_sample_matcher_for(:session_data)
+define_transaction_sample_matcher_for(:tags)
+define_transaction_sample_matcher_for(:custom_data)
+
+RSpec::Matchers.define :be_completed do
+  match(:notify_expectation_failures => true) do |transaction|
+    values_match? transaction.ext._completed?, true
+  end
+end
+
+RSpec::Matchers.define :have_error do |error_class, error_message|
+  match(:notify_expectation_failures => true) do |transaction|
+    transaction_error = transaction.to_h["error"]
+    if error_class && error_message
+      expect(transaction_error).to include(
+        "name" => error_class,
+        "message" => error_message,
+        "backtrace" => kind_of(String)
+      )
+    else
+      expect(transaction_error).to be_any
+    end
+  end
+
+  match_when_negated(:notify_expectation_failures => true) do |transaction|
+    transaction_error = transaction.to_h["error"]
+    if error_class && error_message
+      expect(transaction_error).to_not include(
+        "name" => error_class,
+        "message" => error_message,
+        "backtrace" => kind_of(String)
+      )
+    else
+      expect(transaction_error).to be_nil
+    end
+  end
+end
+
+RSpec::Matchers.define :include_event do |event|
+  match(:notify_expectation_failures => true) do |transaction|
+    events = transaction.to_h["events"]
+    if event
+      expect(events).to include(format_event(event))
+    else
+      expect(events).to be_any
+    end
+  end
+
+  match_when_negated(:notify_expectation_failures => true) do |transaction|
+    events = transaction.to_h["events"]
+    if event
+      expect(events).to_not include(format_event(event))
+    else
+      expect(events).to be_empty
+    end
+  end
+
+  def format_event(event)
+    hash_including({
+      "body" => "",
+      "body_format" => Appsignal::EventFormatter::DEFAULT,
+      "count" => 1,
+      "name" => kind_of(String),
+      "title" => ""
+    }.merge(event.transform_keys(&:to_s)))
+  end
+end
+RSpec::Matchers.alias_matcher :include_events, :include_event
+
+RSpec::Matchers.define :include_metadata do |metadata|
+  match(:notify_expectation_failures => true) do |transaction|
+    actual_metadata = transaction.to_h["metadata"]
+    if metadata
+      expect(actual_metadata).to include(metadata)
+    else
+      expect(actual_metadata).to be_any
+    end
+  end
+
+  match_when_negated(:notify_expectation_failures => true) do |transaction|
+    actual_metadata = transaction.to_h["metadata"]
+    if metadata
+      expect(actual_metadata).to_not include(metadata)
+    else
+      expect(actual_metadata).to be_empty
+    end
+  end
+end
+
+RSpec::Matchers.define :include_breadcrumb do |action, category, message, metadata, time|
+  match(:notify_expectation_failures => true) do |transaction|
+    breadcrumbs = transaction.to_h.dig("sample_data", "breadcrumbs")
+    if action
+      breadcrumb = format_breadcrumb(action, category, message, metadata, time)
+      expect(breadcrumbs).to include(breadcrumb)
+    else
+      expect(transaction.to_h.dig("sample_data", "breadcrumbs")).to be_any
+    end
+  end
+
+  match_when_negated(:notify_expectation_failures => true) do |transaction|
+    breadcrumbs = transaction.to_h.dig("sample_data", "breadcrumbs")
+    if action
+      breadcrumb = format_breadcrumb(action, category, message, metadata, time)
+      expect(breadcrumbs).to_not include(breadcrumb)
+    else
+      expect(breadcrumbs).to_not be_any
+    end
+  end
+
+  def format_breadcrumb(action, category, message, metadata, time)
+    {
+      "action" => action,
+      "category" => category,
+      "message" => message,
+      "metadata" => metadata,
+      "time" => time
+    }
+  end
+end
+RSpec::Matchers.alias_matcher :include_breadcrumbs, :include_breadcrumb
+
+RSpec::Matchers.define :have_queue_start do |queue_start_time|
+  match(:notify_expectation_failures => true) do |transaction|
+    expect(transaction.ext.queue_start).to eq(queue_start_time)
+  end
+end

data/spec/support/mocks/dummy_app.rb

@@ -0,0 +1,20 @@
+class DummyApp
+  def initialize(&app)
+    @app = app
+    @called = false
+  end
+
+  def call(env)
+    if @app
+      @app&.call(env)
+    else
+      [200, {}, "body"]
+    end
+  ensure
+    @called = true
+  end
+
+  def called?
+    @called
+  end
+end

data/spec/support/shared_examples/instrument.rb

@@ -1,22 +1,14 @@
 RSpec.shared_examples "instrument helper" do
-  let(:stub) { double }
-  before do
-    expect(stub).to receive(:method_call).and_return("return value")
-
-    expect(transaction).to receive(:start_event)
-    expect(transaction).to receive(:finish_event).with(
-      "name",
-      "title",
-      "body",
-      0
-    )
-  end
+  around { |example| keep_transactions { example.run } }
+  let(:stub) { double(:method_call => "return value") }
 
   it "records an event around the given block" do
     return_value = instrumenter.instrument "name", "title", "body" do
       stub.method_call
     end
     expect(return_value).to eq "return value"
+
+    expect_transaction_to_have_event
   end
 
   context "with an error raised in the passed block" do
@@ -27,6 +19,8 @@ RSpec.shared_examples "instrument helper" do
           raise ExampleException, "foo"
         end
       end.to raise_error(ExampleException, "foo")
+
+      expect_transaction_to_have_event
     end
   end
 
@@ -38,6 +32,17 @@ RSpec.shared_examples "instrument helper" do
           throw :foo
         end
       end.to throw_symbol(:foo)
+
+      expect_transaction_to_have_event
     end
   end
+
+  def expect_transaction_to_have_event
+    expect(transaction).to include_event(
+      "name" => "name",
+      "title" => "title",
+      "body" => "body",
+      "body_format" => Appsignal::EventFormatter::DEFAULT
+    )
+  end
 end

data/spec/support/testing.rb

@@ -120,16 +120,25 @@ end
 
 module AppsignalTest
   module Transaction
-    # Override the {Appsignal::Transaction.new} method so we can track which
-    # transactions are created on the {Appsignal::Testing.transactions} list.
-    #
-    # @see TransactionHelpers#last_transaction
-    def new(*_args)
-      transaction = super
-      Appsignal::Testing.transactions << transaction
-      transaction
+    module ClassMethods
+      # Override the {Appsignal::Transaction.new} method so we can track which
+      # transactions are created on the {Appsignal::Testing.transactions} list.
+      #
+      # @see TransactionHelpers#last_transaction
+      def new(*_args)
+        transaction = super
+        Appsignal::Testing.transactions << transaction
+        transaction
+      end
+    end
+
+    module InstanceMethods
+      def _sample
+        sample_data
+      end
     end
   end
 end
 
-Appsignal::Transaction.extend(AppsignalTest::Transaction)
+Appsignal::Transaction.extend(AppsignalTest::Transaction::ClassMethods)
+Appsignal::Transaction.prepend(AppsignalTest::Transaction::InstanceMethods)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.9.1
+  version: 3.9.3
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-24 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.50.0
+        version: 1.64.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.50.0
+        version: 1.64.1
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -149,13 +149,13 @@ extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/chore.md"
+- ".github/workflows/ci.yml"
 - ".github/workflows/create_release_from_tag.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".semaphore/semaphore.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -177,7 +177,8 @@ files:
 - gemfiles/capistrano3.gemfile
 - gemfiles/dry-monitor.gemfile
 - gemfiles/grape.gemfile
-- gemfiles/hanami.gemfile
+- gemfiles/hanami-2.0.gemfile
+- gemfiles/hanami-2.1.gemfile
 - gemfiles/http5.gemfile
 - gemfiles/no_dependencies.gemfile
 - gemfiles/padrino.gemfile
@@ -288,6 +289,8 @@ files:
 - lib/appsignal/rack/abstract_middleware.rb
 - lib/appsignal/rack/event_handler.rb
 - lib/appsignal/rack/generic_instrumentation.rb
+- lib/appsignal/rack/grape_middleware.rb
+- lib/appsignal/rack/hanami_middleware.rb
 - lib/appsignal/rack/rails_instrumentation.rb
 - lib/appsignal/rack/sinatra_instrumentation.rb
 - lib/appsignal/rack/streaming_listener.rb
@@ -299,6 +302,7 @@ files:
 - lib/appsignal/utils/data.rb
 - lib/appsignal/utils/hash_sanitizer.rb
 - lib/appsignal/utils/integration_logger.rb
+- lib/appsignal/utils/integration_memory_logger.rb
 - lib/appsignal/utils/json.rb
 - lib/appsignal/utils/query_params_sanitizer.rb
 - lib/appsignal/utils/rails_helper.rb
@@ -309,7 +313,6 @@ files:
 - mono.yml
 - resources/appsignal.yml.erb
 - resources/cacert.pem
-- script/lint_git
 - spec/.rubocop.yml
 - spec/lib/appsignal/auth_check_spec.rb
 - spec/lib/appsignal/capistrano2_spec.rb
@@ -370,10 +373,10 @@ files:
 - spec/lib/appsignal/hooks/webmachine_spec.rb
 - 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/net_http_spec.rb
 - spec/lib/appsignal/integrations/object_spec.rb
 - spec/lib/appsignal/integrations/padrino_spec.rb
 - spec/lib/appsignal/integrations/que_spec.rb
@@ -390,6 +393,8 @@ files:
 - spec/lib/appsignal/rack/abstract_middleware_spec.rb
 - spec/lib/appsignal/rack/event_handler_spec.rb
 - spec/lib/appsignal/rack/generic_instrumentation_spec.rb
+- spec/lib/appsignal/rack/grape_middleware_spec.rb
+- spec/lib/appsignal/rack/hanami_middleware_spec.rb
 - spec/lib/appsignal/rack/rails_instrumentation_spec.rb
 - spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb
 - spec/lib/appsignal/rack/streaming_listener_spec.rb
@@ -400,6 +405,7 @@ files:
 - spec/lib/appsignal/utils/data_spec.rb
 - spec/lib/appsignal/utils/hash_sanitizer_spec.rb
 - spec/lib/appsignal/utils/integration_logger_spec.rb
+- spec/lib/appsignal/utils/integration_memory_logger_spec.rb
 - spec/lib/appsignal/utils/json_spec.rb
 - spec/lib/appsignal/utils/query_params_sanitizer_spec.rb
 - spec/lib/appsignal_spec.rb
@@ -433,10 +439,11 @@ files:
 - spec/support/helpers/time_helpers.rb
 - spec/support/helpers/transaction_helpers.rb
 - spec/support/helpers/wait_for_helper.rb
-- spec/support/matchers/be_completed.rb
 - spec/support/matchers/contains_log.rb
 - spec/support/matchers/have_colorized_text.rb
+- spec/support/matchers/transaction.rb
 - spec/support/mocks/appsignal_mock.rb
+- spec/support/mocks/dummy_app.rb
 - spec/support/mocks/fake_gc_profiler.rb
 - spec/support/mocks/fake_gvl_tools.rb
 - spec/support/mocks/mock_probe.rb
@@ -474,7 +481,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com