appsignal 3.10.0-java → 3.12.0-java

data/spec/lib/puma/appsignal_spec.rb

@@ -76,9 +76,6 @@ RSpec.describe "Puma plugin" do
   let(:hostname) { Socket.gethostname }
   let(:expected_default_tags) { { "hostname" => hostname } }
   let(:stats_data) { { :backlog => 1 } }
-  before :context do
-    Appsignal.stop
-  end
   before do
     module Puma
       def self.stats

data/spec/spec_helper.rb

@@ -66,6 +66,7 @@ RSpec.configure do |config|
   config.include ApiRequestHelper
   config.include SystemHelpers
   config.include LogHelpers
+  config.include LoaderHelper
   config.extend DependencyHelper
 
   config.example_status_persistence_file_path = "spec/examples.txt"
@@ -92,6 +93,10 @@ RSpec.configure do |config|
   end
 
   config.before do
+    Appsignal.clear!
+    Appsignal::Testing.clear!
+    Appsignal::Loaders.clear!
+    clear_current_transaction!
     stop_minutely_probes
     ENV["RAILS_ENV"] ||= "test"
     ENV["RACK_ENV"] ||= "test"
@@ -157,15 +162,11 @@ RSpec.configure do |config|
   end
 
   config.after do
-    Appsignal::Testing.clear!
-    clear_current_transaction!
     stop_minutely_probes
   end
 
   config.after :context do
     FileUtils.rm_f(File.join(project_fixture_path, "log/appsignal.log"))
-    Appsignal.config = nil
-    Appsignal.internal_logger = nil
   end
 
   def stop_minutely_probes

data/spec/support/helpers/config_helpers.rb

@@ -4,6 +4,7 @@ module ConfigHelpers
       File.join(File.dirname(__FILE__), "../fixtures/projects/valid")
     )
   end
+  module_function :project_fixture_path
 
   def project_fixture_config( # rubocop:disable Metrics/ParameterLists
     env = "production",
@@ -22,7 +23,7 @@ module ConfigHelpers
   module_function :project_fixture_config, :project_fixture_path
 
   def start_agent(env = "production")
-    Appsignal.config = project_fixture_config(env)
+    Appsignal._config = project_fixture_config(env)
     Appsignal.start
   end
 end

data/spec/support/helpers/loader_helper.rb

@@ -0,0 +1,21 @@
+module LoaderHelper
+  def load_loader(name)
+    Appsignal.load(name)
+  end
+
+  def start_loader(name)
+    Appsignal::Loaders.instances.fetch(name).on_start
+  end
+
+  def unregister_loader(name)
+    Appsignal::Loaders.unregister(name)
+  end
+
+  def define_loader(name, &block)
+    Appsignal::Testing.registered_loaders << name
+    Class.new(Appsignal::Loaders::Loader) do
+      register name
+      class_eval(&block) if block_given?
+    end
+  end
+end

data/spec/support/helpers/transaction_helpers.rb

@@ -7,26 +7,50 @@ module TransactionHelpers
     end
   end
 
-  def background_job_transaction(args = {})
-    Appsignal::Transaction.new(
-      "1",
-      Appsignal::Transaction::BACKGROUND_JOB,
-      Appsignal::Transaction::GenericRequest.new({
-        "SERVER_NAME" => "localhost",
-        "action_dispatch.routes" => "not_available"
-      }.merge(args))
-    )
-  end
-
-  def http_request_transaction(args = {})
-    Appsignal::Transaction.new(
-      "1",
-      Appsignal::Transaction::HTTP_REQUEST,
-      Appsignal::Transaction::GenericRequest.new({
-        "SERVER_NAME" => "localhost",
-        "action_dispatch.routes" => "not_available"
-      }.merge(args))
-    )
+  def default_namespace
+    Appsignal::Transaction::HTTP_REQUEST
+  end
+
+  def create_transaction(namespace = default_namespace)
+    Appsignal::Transaction.create(namespace)
+  end
+
+  def new_transaction(namespace = default_namespace)
+    Appsignal::Transaction.new(SecureRandom.uuid, namespace)
+  end
+
+  def legacy_create_transaction(
+    id: "mock_transaction_id",
+    namespace: "mock_namespace",
+    request: legacy_request,
+    options: {}
+  )
+    Appsignal::Transaction.create(id, namespace, request, options)
+  end
+
+  def legacy_new_transaction(
+    id: "mock_transaction_id",
+    namespace: "mock_namespace",
+    request: legacy_request,
+    options: {}
+  )
+    Appsignal::Transaction.new(id, namespace, request, options)
+  end
+
+  def legacy_request(env = {})
+    Appsignal::Transaction::InternalGenericRequest.new(env)
+  end
+
+  def rack_request(env)
+    Rack::Request.new(env)
+  end
+
+  def background_job_transaction
+    new_transaction(Appsignal::Transaction::BACKGROUND_JOB)
+  end
+
+  def http_request_transaction
+    new_transaction(Appsignal::Transaction::HTTP_REQUEST)
   end
 
   # Returns the all {Appsignal::Transaction} objects created during this test

data/spec/support/matchers/transaction.rb

@@ -180,6 +180,20 @@ 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)
+    actual_start = transaction.ext.queue_start
+    if queue_start_time
+      expect(actual_start).to eq(queue_start_time)
+    else
+      expect(actual_start).to_not be_nil
+    end
+  end
+
+  match_when_negated(:notify_expectation_failures => true) do |transaction|
+    actual_start = transaction.ext.queue_start
+    if queue_start_time
+      expect(actual_start).to_not eq(queue_start_time)
+    else
+      expect(actual_start).to be_nil
+    end
   end
 end

data/spec/support/stubs/appsignal/loaders/loader_stub.rb

@@ -0,0 +1,7 @@
+module Appsignal
+  module Loaders
+    class LoaderStub < Loader
+      register :loader_stub
+    end
+  end
+end

data/spec/support/testing.rb

@@ -9,11 +9,55 @@ module Appsignal
       @testing = true unless defined?(@testing)
       @testing
     end
+
+    # @api private
+    def clear_started!
+      return unless instance_variable_defined?(:@started)
+
+      remove_instance_variable(:@started)
+    end
+
+    # @api private
+    def clear_config!
+      @config = nil
+    end
+
+    # @api private
+    def clear!
+      Appsignal.internal_logger = nil
+
+      clear_started!
+      clear_config!
+    end
+  end
+
+  class Config
+    def self.clear_loader_defaults!
+      @loader_defaults = nil
+    end
+  end
+
+  module Loaders
+    def self.clear!
+      Appsignal::Config.clear_loader_defaults!
+      loaders.reject! do |key, _value|
+        Appsignal::Testing.registered_loaders.include?(key)
+      end
+      @instances = nil
+    end
   end
 
   # @api private
   module Testing
     class << self
+      def store
+        @store ||= {}
+      end
+
+      def registered_loaders
+        @registered_loaders ||= Set.new
+      end
+
       def without_testing
         original_testing = Appsignal.testing?
         Appsignal.testing = false
@@ -27,7 +71,9 @@ module Appsignal
       end
 
       def clear!
+        store.clear
         transactions.clear
+        registered_loaders.clear
       end
 
       attr_writer :keep_transactions, :sample_transactions
@@ -134,7 +180,7 @@ module AppsignalTest
 
     module InstanceMethods
       def _sample
-        sample_data
+        _sample_data
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.12.0
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -275,10 +275,16 @@ files:
 - lib/appsignal/integrations/redis.rb
 - lib/appsignal/integrations/redis_client.rb
 - lib/appsignal/integrations/resque.rb
+- lib/appsignal/integrations/shoryuken.rb
 - lib/appsignal/integrations/sidekiq.rb
 - lib/appsignal/integrations/sinatra.rb
 - lib/appsignal/integrations/unicorn.rb
 - lib/appsignal/integrations/webmachine.rb
+- lib/appsignal/loaders.rb
+- lib/appsignal/loaders/grape.rb
+- lib/appsignal/loaders/hanami.rb
+- lib/appsignal/loaders/padrino.rb
+- lib/appsignal/loaders/sinatra.rb
 - lib/appsignal/logger.rb
 - lib/appsignal/marker.rb
 - lib/appsignal/probes.rb
@@ -376,6 +382,8 @@ 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/delayed_job_plugin_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
@@ -384,9 +392,15 @@ files:
 - spec/lib/appsignal/integrations/padrino_spec.rb
 - spec/lib/appsignal/integrations/que_spec.rb
 - spec/lib/appsignal/integrations/railtie_spec.rb
+- spec/lib/appsignal/integrations/shoryuken_spec.rb
 - spec/lib/appsignal/integrations/sidekiq_spec.rb
 - spec/lib/appsignal/integrations/sinatra_spec.rb
 - spec/lib/appsignal/integrations/webmachine_spec.rb
+- spec/lib/appsignal/loaders/grape_spec.rb
+- spec/lib/appsignal/loaders/hanami_spec.rb
+- spec/lib/appsignal/loaders/padrino_spec.rb
+- spec/lib/appsignal/loaders/sinatra_spec.rb
+- spec/lib/appsignal/loaders_spec.rb
 - spec/lib/appsignal/logger_spec.rb
 - spec/lib/appsignal/marker_spec.rb
 - spec/lib/appsignal/probes/gvl_spec.rb
@@ -403,6 +417,7 @@ files:
 - spec/lib/appsignal/rack/rails_instrumentation_spec.rb
 - spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb
 - spec/lib/appsignal/rack/streaming_listener_spec.rb
+- spec/lib/appsignal/rack_spec.rb
 - spec/lib/appsignal/span_spec.rb
 - spec/lib/appsignal/system_spec.rb
 - spec/lib/appsignal/transaction_spec.rb
@@ -437,6 +452,7 @@ files:
 - spec/support/helpers/environment_metdata_helper.rb
 - spec/support/helpers/example_exception.rb
 - spec/support/helpers/example_standard_error.rb
+- spec/support/helpers/loader_helper.rb
 - spec/support/helpers/log_helpers.rb
 - spec/support/helpers/rails_helper.rb
 - spec/support/helpers/std_streams_helper.rb
@@ -454,6 +470,7 @@ files:
 - spec/support/mocks/mock_probe.rb
 - spec/support/rails/my_app.rb
 - spec/support/shared_examples/instrument.rb
+- spec/support/stubs/appsignal/loaders/loader_stub.rb
 - spec/support/stubs/delayed_job.rb
 - spec/support/stubs/sidekiq/api.rb
 - spec/support/testing.rb