appsignal 3.0.18-java → 3.0.21-java

data/spec/lib/appsignal_spec.rb

@@ -5,7 +5,6 @@ describe Appsignal do
     # Make sure we have a clean state because we want to test
     # initialization here.
     Appsignal.config = nil
-    Appsignal.extensions.clear
   end
 
   let(:transaction) { http_request_transaction }
@@ -20,14 +19,6 @@ describe Appsignal do
     end
   end
 
-  describe ".extensions" do
-    it "should keep a list of extensions" do
-      expect(Appsignal.extensions).to be_empty
-      Appsignal.extensions << Appsignal::MockExtension
-      expect(Appsignal.extensions.size).to eq(1)
-    end
-  end
-
   describe ".start" do
     context "with no config set beforehand" do
       it "should do nothing when config is not set and there is no valid config in the env" do
@@ -63,15 +54,6 @@ describe Appsignal do
         Appsignal.start
       end
 
-      context "with an extension" do
-        before { Appsignal.extensions << Appsignal::MockExtension }
-
-        it "should call the extension's initializer" do
-          expect(Appsignal::MockExtension).to receive(:initializer)
-          Appsignal.start
-        end
-      end
-
       context "when allocation tracking and gc instrumentation have been enabled" do
         before do
           allow(GC::Profiler).to receive(:enable)
@@ -86,8 +68,7 @@ describe Appsignal do
           expect_environment_metadata("ruby_gc_instrumentation_enabled", "true")
         end
 
-        unless Appsignal::System.jruby?
-
+        unless DependencyHelper.running_jruby?
           it "installs the allocation event hook" do
             expect(Appsignal::Extension).to receive(:install_allocation_event_hook)
               .and_call_original
@@ -428,49 +409,89 @@ describe Appsignal do
     end
 
     describe ".monitor_single_transaction" do
+      around { |example| keep_transactions { example.run } }
+
       context "with a successful call" do
-        it "should call monitor_transaction and stop" do
-          expect(Appsignal).to receive(:monitor_transaction).with(
-            "perform_job.something",
-            :key => :value
-          ).and_yield
+        it "calls monitor_transaction and Appsignal.stop" do
           expect(Appsignal).to receive(:stop)
 
-          Appsignal.monitor_single_transaction("perform_job.something", :key => :value) do
+          Appsignal.monitor_single_transaction(
+            "perform_job.something",
+            :controller => :my_controller,
+            :action => :my_action
+          ) do
             # nothing
           end
+
+          transaction = last_transaction
+          transaction_hash = transaction.to_h
+          expect(transaction_hash).to include(
+            "action" => "my_controller#my_action"
+          )
+          expect(transaction_hash["events"]).to match([
+            hash_including(
+              "name" => "perform_job.something",
+              "title" => "",
+              "body" => "",
+              "body_format" => Appsignal::EventFormatter::DEFAULT
+            )
+          ])
         end
       end
 
       context "with an erroring call" do
         let(:error) { ExampleException.new }
 
-        it "should call monitor_transaction and stop and then raise the error" do
-          expect(Appsignal).to receive(:monitor_transaction).with(
-            "perform_job.something",
-            :key => :value
-          ).and_yield
+        it "calls monitor_transaction and stop and re-raises the error" do
           expect(Appsignal).to receive(:stop)
 
           expect do
-            Appsignal.monitor_single_transaction("perform_job.something", :key => :value) do
+            Appsignal.monitor_single_transaction(
+              "perform_job.something",
+              :controller => :my_controller,
+              :action => :my_action
+            ) do
               raise error
             end
           end.to raise_error(error)
+
+          transaction = last_transaction
+          transaction_hash = transaction.to_h
+          expect(transaction_hash).to include(
+            "action" => "my_controller#my_action"
+          )
+          expect(transaction_hash["events"]).to match([
+            hash_including(
+              "name" => "perform_job.something",
+              "title" => "",
+              "body" => "",
+              "body_format" => Appsignal::EventFormatter::DEFAULT
+            )
+          ])
         end
       end
     end
 
     describe ".tag_request" do
-      before { allow(Appsignal::Transaction).to receive(:current).and_return(transaction) }
+      let(:transaction) { http_request_transaction }
+      around do |example|
+        start_agent
+        with_current_transaction transaction do
+          keep_transactions { example.run }
+        end
+      end
 
       context "with transaction" do
-        let(:transaction) { double }
-        it "should call set_tags on transaction" do
-          expect(transaction).to receive(:set_tags).with("a" => "b")
-        end
+        it "calls set_tags on the current transaction" do
+          Appsignal.tag_request("a" => "b")
+          transaction.complete # Manually trigger transaction sampling
 
-        after { Appsignal.tag_request("a" => "b") }
+          expect(transaction.to_h).to include(
+            "sample_data" => hash_including(
+              "tags" => { "a" => "b" }
+            )
+          )
+        end
       end
 
       context "without transaction" do

data/spec/support/helpers/activejob_helpers.rb

@@ -0,0 +1,27 @@
+module ActiveJobHelpers
+  def active_job_args_wrapper(args: [], params: nil)
+    if (DependencyHelper.rails6_1_present? && DependencyHelper.ruby_3_1_or_newer?) || DependencyHelper.rails7_present?
+      wrapped_args = {}
+
+      if params
+        if DependencyHelper.rails7_present?
+          wrapped_args["_aj_ruby2_keywords"] = ["params", "args"]
+          wrapped_args["args"] = []
+          wrapped_args["params"] = {
+            "_aj_symbol_keys" => ["foo"]
+          }.merge(params)
+        else
+          wrapped_args["_aj_symbol_keys"] = ["foo"]
+          wrapped_args.merge!(params)
+        end
+      else
+        wrapped_args["_aj_ruby2_keywords"] = ["args"]
+        wrapped_args["args"] = args
+      end
+
+      [wrapped_args]
+    else
+      params.nil? ? args : args + [params]
+    end
+  end
+end

data/spec/support/helpers/dependency_helper.rb

@@ -9,8 +9,12 @@ module DependencyHelper
     ruby_version.segments.take(2) == [2, 0]
   end
 
+  def ruby_3_1_or_newer?
+    ruby_version >= Gem::Version.new("3.1.0")
+  end
+
   def running_jruby?
-    defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
+    Appsignal::System.jruby?
   end
 
   def rails_present?
@@ -21,6 +25,14 @@ module DependencyHelper
     rails_present? && rails_version >= Gem::Version.new("6.0.0")
   end
 
+  def rails6_1_present?
+    rails_present? && rails_version >= Gem::Version.new("6.1.0")
+  end
+
+  def rails7_present?
+    rails_present? && rails_version >= Gem::Version.new("7.0.0")
+  end
+
   def rails_version
     Gem.loaded_specs["rails"].version
   end

data/spec/support/helpers/transaction_helpers.rb

@@ -56,6 +56,16 @@ module TransactionHelpers
     Thread.current[:appsignal_transaction] = nil
   end
 
+  # Set the current for the duration of the given block.
+  #
+  # Helper for {set_current_transaction} and {clear_current_transaction!}
+  def with_current_transaction(transaction)
+    set_current_transaction transaction
+    yield
+  ensure
+    clear_current_transaction!
+  end
+
   # Track the AppSignal transaction JSON when a transaction gets completed
   # ({Appsignal::Transaction.complete}).
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.0.18
+  version: 3.0.21
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -185,6 +185,7 @@ files:
 - gemfiles/rails-5.1.gemfile
 - gemfiles/rails-5.2.gemfile
 - gemfiles/rails-6.0.gemfile
+- gemfiles/rails-6.1.gemfile
 - gemfiles/rails-7.0.gemfile
 - gemfiles/resque-1.gemfile
 - gemfiles/resque-2.gemfile
@@ -213,6 +214,7 @@ files:
 - lib/appsignal/event_formatter/faraday/request_formatter.rb
 - lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter.rb
 - lib/appsignal/event_formatter/moped/query_formatter.rb
+- lib/appsignal/event_formatter/sequel/sql_formatter.rb
 - lib/appsignal/extension.rb
 - lib/appsignal/extension/jruby.rb
 - lib/appsignal/garbage_collection_profiler.rb
@@ -311,6 +313,7 @@ files:
 - spec/lib/appsignal/event_formatter/faraday/request_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/moped/query_formatter_spec.rb
+- spec/lib/appsignal/event_formatter/sequel/sql_formatter_spec.rb
 - spec/lib/appsignal/event_formatter_spec.rb
 - spec/lib/appsignal/extension/jruby_spec.rb
 - spec/lib/appsignal/extension_install_failure_spec.rb
@@ -382,6 +385,7 @@ files:
 - spec/support/fixtures/projects/valid/log/.gitkeep
 - spec/support/fixtures/uploaded_file.txt
 - spec/support/helpers/action_mailer_helpers.rb
+- spec/support/helpers/activejob_helpers.rb
 - spec/support/helpers/api_request_helper.rb
 - spec/support/helpers/cli_helpers.rb
 - spec/support/helpers/config_helpers.rb
@@ -401,7 +405,6 @@ files:
 - spec/support/matchers/contains_log.rb
 - spec/support/matchers/have_colorized_text.rb
 - spec/support/mocks/fake_gc_profiler.rb
-- spec/support/mocks/mock_extension.rb
 - spec/support/mocks/mock_probe.rb
 - spec/support/rails/my_app.rb
 - spec/support/shared_examples/instrument.rb
@@ -415,6 +418,7 @@ homepage: https://github.com/appsignal/appsignal-ruby
 licenses:
 - MIT
 metadata:
+  rubygems_mfa_required: 'true'
   bug_tracker_uri: https://github.com/appsignal/appsignal-ruby/issues
   changelog_uri: https://github.com/appsignal/appsignal-ruby/blob/main/CHANGELOG.md
   documentation_uri: https://docs.appsignal.com/ruby/
@@ -436,7 +440,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
@@ -462,6 +466,7 @@ test_files:
 - spec/lib/appsignal/event_formatter/faraday/request_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/moped/query_formatter_spec.rb
+- spec/lib/appsignal/event_formatter/sequel/sql_formatter_spec.rb
 - spec/lib/appsignal/event_formatter_spec.rb
 - spec/lib/appsignal/extension/jruby_spec.rb
 - spec/lib/appsignal/extension_install_failure_spec.rb
@@ -533,6 +538,7 @@ test_files:
 - spec/support/fixtures/projects/valid/log/.gitkeep
 - spec/support/fixtures/uploaded_file.txt
 - spec/support/helpers/action_mailer_helpers.rb
+- spec/support/helpers/activejob_helpers.rb
 - spec/support/helpers/api_request_helper.rb
 - spec/support/helpers/cli_helpers.rb
 - spec/support/helpers/config_helpers.rb
@@ -552,7 +558,6 @@ test_files:
 - spec/support/matchers/contains_log.rb
 - spec/support/matchers/have_colorized_text.rb
 - spec/support/mocks/fake_gc_profiler.rb
-- spec/support/mocks/mock_extension.rb
 - spec/support/mocks/mock_probe.rb
 - spec/support/rails/my_app.rb
 - spec/support/shared_examples/instrument.rb

data/spec/support/mocks/mock_extension.rb

@@ -1,6 +0,0 @@
-module Appsignal
-  module MockExtension
-    def self.initializer
-    end
-  end
-end