appsignal 2.11.6-java → 3.0.0.rc.1-java

data/spec/lib/puma/appsignal_spec.rb

@@ -23,6 +23,27 @@ RSpec.describe "Puma plugin" do
       def self.stats
       end
 
+      def self.run
+        # Capture threads running before application is preloaded
+        before = Thread.list.reject { |t| t.thread_variable_get(:fork_safe) }
+
+        # An abbreviated version of what happens in Puma::Cluster#run
+        launcher = MockPumaLauncher.new
+        plugin = Plugin.plugin.new
+        plugin.start(launcher)
+        launcher.events.on_booted.call
+
+        # Wait for minutely probe thread to finish starting
+        sleep 0.005
+
+        # Capture any new threads running after application is preloaded.
+        # Any threads created during the preloading phase will not be
+        # carried over into the forked workers. Puma warns about these
+        # but the minutely probe thread should only exist in the main process.
+        after = Thread.list.reject { |t| t.thread_variable_get(:fork_safe) }
+        $stdout.puts "! WARNING: Detected #{after.size - before.size} Thread(s) started in app boot" if after.size > before.size
+      end
+
       class Plugin
         class << self
           attr_reader :plugin
@@ -68,6 +89,13 @@ RSpec.describe "Puma plugin" do
     wait_for("enough probe calls") { probe.calls >= 2 }
   end
 
+  it "marks the PumaProbe thread as fork-safe", :not_ruby19 do
+    out_stream = std_stream
+    capture_stdout(out_stream) { Puma.run }
+
+    expect(out_stream.read).not_to include("WARNING: Detected 1 Thread")
+  end
+
   context "without Puma.stats" do
     before { Puma.singleton_class.send(:remove_method, :stats) }
 

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ ENV["RAILS_ENV"] ||= "test"
 ENV["RACK_ENV"] ||= "test"
 ENV["PADRINO_ENV"] ||= "test"
 
-APPSIGNAL_SPEC_DIR = File.expand_path(File.dirname(__FILE__))
+APPSIGNAL_SPEC_DIR = File.expand_path(__dir__)
 $LOAD_PATH.unshift(File.join(APPSIGNAL_SPEC_DIR, "support/stubs"))
 
 Bundler.require :default
@@ -85,20 +85,6 @@ RSpec.configure do |config|
     FileUtils.mkdir_p(spec_system_tmp_dir)
   end
 
-  config.before :each, :only_ruby19 => true do
-    is_ruby19 = Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.0.0")
-    next if is_ruby19
-
-    skip "Skipping spec. Only for Ruby 1.9"
-  end
-
-  config.before :each, :not_ruby19 => true do
-    is_ruby19 = Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.0.0")
-    next unless is_ruby19
-
-    skip "Skipping spec for Ruby 1.9"
-  end
-
   config.before do
     stop_minutely_probes
     ENV["RAILS_ENV"] ||= "test"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.11.6
+  version: 3.0.0.rc.1
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -202,7 +202,6 @@ files:
 - lib/appsignal/cli/diagnose/utils.rb
 - lib/appsignal/cli/helpers.rb
 - lib/appsignal/cli/install.rb
-- lib/appsignal/cli/notify_of_deploy.rb
 - lib/appsignal/config.rb
 - lib/appsignal/demo.rb
 - lib/appsignal/environment.rb
@@ -240,24 +239,26 @@ files:
 - lib/appsignal/hooks/sidekiq.rb
 - lib/appsignal/hooks/unicorn.rb
 - lib/appsignal/hooks/webmachine.rb
+- lib/appsignal/integrations/action_cable.rb
+- lib/appsignal/integrations/active_support_notifications.rb
 - lib/appsignal/integrations/capistrano/appsignal.cap
 - lib/appsignal/integrations/capistrano/capistrano_2_tasks.rb
 - lib/appsignal/integrations/data_mapper.rb
 - lib/appsignal/integrations/delayed_job_plugin.rb
 - lib/appsignal/integrations/grape.rb
 - lib/appsignal/integrations/mongo_ruby_driver.rb
+- lib/appsignal/integrations/net_http.rb
 - lib/appsignal/integrations/object.rb
-- lib/appsignal/integrations/object_ruby_19.rb
-- lib/appsignal/integrations/object_ruby_modern.rb
 - lib/appsignal/integrations/padrino.rb
 - lib/appsignal/integrations/que.rb
 - lib/appsignal/integrations/railtie.rb
 - lib/appsignal/integrations/rake.rb
+- lib/appsignal/integrations/redis.rb
 - lib/appsignal/integrations/resque.rb
-- lib/appsignal/integrations/resque_active_job.rb
+- lib/appsignal/integrations/sidekiq.rb
 - lib/appsignal/integrations/sinatra.rb
+- lib/appsignal/integrations/unicorn.rb
 - lib/appsignal/integrations/webmachine.rb
-- lib/appsignal/js_exception_transaction.rb
 - lib/appsignal/logger.rb
 - lib/appsignal/marker.rb
 - lib/appsignal/minutely.rb
@@ -265,7 +266,6 @@ files:
 - lib/appsignal/probes/puma.rb
 - lib/appsignal/probes/sidekiq.rb
 - lib/appsignal/rack/generic_instrumentation.rb
-- lib/appsignal/rack/js_exception_catcher.rb
 - lib/appsignal/rack/rails_instrumentation.rb
 - lib/appsignal/rack/sinatra_instrumentation.rb
 - lib/appsignal/rack/streaming_listener.rb
@@ -294,7 +294,6 @@ files:
 - spec/lib/appsignal/cli/diagnose_spec.rb
 - spec/lib/appsignal/cli/helpers_spec.rb
 - spec/lib/appsignal/cli/install_spec.rb
-- spec/lib/appsignal/cli/notify_of_deploy_spec.rb
 - spec/lib/appsignal/cli_spec.rb
 - spec/lib/appsignal/config_spec.rb
 - spec/lib/appsignal/demo_spec.rb
@@ -338,23 +337,19 @@ files:
 - spec/lib/appsignal/integrations/data_mapper_spec.rb
 - spec/lib/appsignal/integrations/grape_spec.rb
 - spec/lib/appsignal/integrations/mongo_ruby_driver_spec.rb
-- spec/lib/appsignal/integrations/object_19_spec.rb
 - spec/lib/appsignal/integrations/object_spec.rb
 - 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/resque_active_job_spec.rb
-- spec/lib/appsignal/integrations/resque_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/js_exception_transaction_spec.rb
 - spec/lib/appsignal/logger_spec.rb
 - spec/lib/appsignal/marker_spec.rb
 - spec/lib/appsignal/minutely_spec.rb
 - spec/lib/appsignal/probes/puma_spec.rb
 - spec/lib/appsignal/probes/sidekiq_spec.rb
 - spec/lib/appsignal/rack/generic_instrumentation_spec.rb
-- spec/lib/appsignal/rack/js_exception_catcher_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
@@ -425,14 +420,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.6
+rubygems_version: 3.2.8
 signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
@@ -447,7 +442,6 @@ test_files:
 - spec/lib/appsignal/cli/diagnose_spec.rb
 - spec/lib/appsignal/cli/helpers_spec.rb
 - spec/lib/appsignal/cli/install_spec.rb
-- spec/lib/appsignal/cli/notify_of_deploy_spec.rb
 - spec/lib/appsignal/cli_spec.rb
 - spec/lib/appsignal/config_spec.rb
 - spec/lib/appsignal/demo_spec.rb
@@ -491,23 +485,19 @@ test_files:
 - spec/lib/appsignal/integrations/data_mapper_spec.rb
 - spec/lib/appsignal/integrations/grape_spec.rb
 - spec/lib/appsignal/integrations/mongo_ruby_driver_spec.rb
-- spec/lib/appsignal/integrations/object_19_spec.rb
 - spec/lib/appsignal/integrations/object_spec.rb
 - 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/resque_active_job_spec.rb
-- spec/lib/appsignal/integrations/resque_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/js_exception_transaction_spec.rb
 - spec/lib/appsignal/logger_spec.rb
 - spec/lib/appsignal/marker_spec.rb
 - spec/lib/appsignal/minutely_spec.rb
 - spec/lib/appsignal/probes/puma_spec.rb
 - spec/lib/appsignal/probes/sidekiq_spec.rb
 - spec/lib/appsignal/rack/generic_instrumentation_spec.rb
-- spec/lib/appsignal/rack/js_exception_catcher_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

data/lib/appsignal/cli/notify_of_deploy.rb

@@ -1,131 +0,0 @@
-# frozen_string_literal: true
-
-module Appsignal
-  class CLI
-    # Command line tool to send a "Deploy Marker" for an application to
-    # AppSignal.
-    #
-    # Deploy markers are used on AppSignal.com to indicate changes in an
-    # application, "Deploy markers" indicate a deploy of an application.
-    #
-    # Incidents for exceptions and performance issues will be closed and
-    # reopened if they occur again in the new deploy.
-    #
-    # @note The same logic is used in the Capistrano integration. A deploy
-    #   marker is created on each deploy.
-    #
-    # ## Options
-    #
-    # - `--environment` required. The environment of the application being
-    #   deployed.
-    # - `--user` required. User that triggered the deploy.
-    # - `--revision` required. Git commit SHA or other identifiable revision id.
-    # - `--name` If no "name" config can be found in a `config/appsignal.yml`
-    #   file or based on the `APPSIGNAL_APP_NAME` environment variable, this
-    #   option is required.
-    #
-    # ## Exit codes
-    #
-    # - Exits with status code `0` if the deploy marker is sent.
-    # - Exits with status code `1` if the configuration is not valid and active.
-    # - Exits with status code `1` if the required options aren't present.
-    #
-    # @example basic example
-    #   appsignal notify_of_deploy \
-    #     --user=tom \
-    #     --environment=production \
-    #     --revision=abc1234
-    #
-    # @example using a custom app name
-    #   appsignal notify_of_deploy \
-    #     --user=tom \
-    #     --environment=production \
-    #     --revision=abc1234 \
-    #     --name="My app"
-    #
-    # @example help command
-    #   appsignal notify_of_deploy --help
-    #
-    # @deprecated This method of sending AppSignal deploy markers is
-    #   deprecated. Use the [`revision` config option]
-    #   (https://docs.appsignal.com/ruby/configuration/options.html#app_revision-revision)
-    #   instead. For more information, please read the [deploy markers]
-    #   (https://docs.appsignal.com/application/markers/deploy-markers.html)
-    #   documentation.
-    # @since 0.2.5
-    # @see Appsignal::Marker Appsignal::Marker
-    # @see http://docs.appsignal.com/ruby/command-line/notify_of_deploy.html
-    #   AppSignal notify_of_deploy documentation
-    # @see http://docs.appsignal.com/appsignal/terminology.html#markers
-    #   Terminology: Deploy marker
-    class NotifyOfDeploy
-      class << self
-        include Appsignal::Utils::DeprecationMessage
-
-        # @param options [Hash]
-        # @option options :environment [String] environment to load
-        #   configuration for.
-        # @option options :name [String] custom name of the application.
-        # @option options :user [String] user who triggered the deploy.
-        # @option options :revision [String] the revision that has been
-        #   deployed. E.g. a git commit SHA.
-        # @return [void]
-        def run(options)
-          config = config_for(options[:environment])
-          config[:name] = options[:name] if options[:name]
-
-          validate_active_config(config)
-          required_config = [:revision, :user]
-          required_config << :environment if config.env.empty?
-          required_config << :name if !config[:name] || config[:name].empty?
-          validate_required_options(options, required_config)
-
-          Appsignal::Marker.new(
-            {
-              :revision => options[:revision],
-              :user => options[:user]
-            },
-            config
-          ).transmit
-
-          puts
-          message = "This command (appsignal notify_of_deploy) has been " \
-            "deprecated in favor of the `revision` config option. Please " \
-            "see our documentation for more information on the recommended " \
-            "method: " \
-            "https://docs.appsignal.com/application/markers/deploy-markers.html"
-          deprecation_message message
-        end
-
-        private
-
-        def validate_required_options(options, required_options)
-          missing = required_options.select do |required_option|
-            val = options[required_option]
-            val.nil? || (val.respond_to?(:empty?) && val.empty?)
-          end
-          return unless missing.any?
-
-          puts "Error: Missing options: #{missing.join(", ")}"
-          exit 1
-        end
-
-        def validate_active_config(config)
-          return if config.active?
-
-          puts "Error: No valid config found."
-          exit 1
-        end
-
-        def config_for(environment)
-          Appsignal::Config.new(
-            Dir.pwd,
-            environment,
-            {},
-            Logger.new(StringIO.new)
-          )
-        end
-      end
-    end
-  end
-end

data/lib/appsignal/integrations/object_ruby_19.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-class Object
-  def self.appsignal_instrument_class_method(method_name, options = {})
-    singleton_class.send \
-      :alias_method, "appsignal_uninstrumented_#{method_name}", method_name
-    singleton_class.send(:define_method, method_name) do |*args, &block|
-      name = options.fetch(:name) do
-        "#{method_name}.class_method.#{appsignal_reverse_class_name}.other"
-      end
-      Appsignal.instrument name do
-        send "appsignal_uninstrumented_#{method_name}", *args, &block
-      end
-    end
-  end
-
-  def self.appsignal_instrument_method(method_name, options = {})
-    alias_method "appsignal_uninstrumented_#{method_name}", method_name
-    define_method method_name do |*args, &block|
-      name = options.fetch(:name) do
-        "#{method_name}.#{appsignal_reverse_class_name}.other"
-      end
-      Appsignal.instrument name do
-        send "appsignal_uninstrumented_#{method_name}", *args, &block
-      end
-    end
-  end
-
-  def self.appsignal_reverse_class_name
-    return "AnonymousClass" unless name
-    name.split("::").reverse.join(".")
-  end
-
-  def appsignal_reverse_class_name
-    self.class.appsignal_reverse_class_name
-  end
-end

data/lib/appsignal/integrations/object_ruby_modern.rb

@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-class Object
-  if Appsignal::System.ruby_2_7_or_newer?
-    def self.appsignal_instrument_class_method(method_name, options = {})
-      singleton_class.send \
-        :alias_method, "appsignal_uninstrumented_#{method_name}", method_name
-      singleton_class.send(:define_method, method_name) do |*args, **kwargs, &block|
-        name = options.fetch(:name) do
-          "#{method_name}.class_method.#{appsignal_reverse_class_name}.other"
-        end
-        Appsignal.instrument name do
-          send "appsignal_uninstrumented_#{method_name}", *args, **kwargs, &block
-        end
-      end
-    end
-
-    def self.appsignal_instrument_method(method_name, options = {})
-      alias_method "appsignal_uninstrumented_#{method_name}", method_name
-      define_method method_name do |*args, **kwargs, &block|
-        name = options.fetch(:name) do
-          "#{method_name}.#{appsignal_reverse_class_name}.other"
-        end
-        Appsignal.instrument name do
-          send "appsignal_uninstrumented_#{method_name}", *args, **kwargs, &block
-        end
-      end
-    end
-  else
-    def self.appsignal_instrument_class_method(method_name, options = {})
-      singleton_class.send \
-        :alias_method, "appsignal_uninstrumented_#{method_name}", method_name
-      singleton_class.send(:define_method, method_name) do |*args, &block|
-        name = options.fetch(:name) do
-          "#{method_name}.class_method.#{appsignal_reverse_class_name}.other"
-        end
-        Appsignal.instrument name do
-          send "appsignal_uninstrumented_#{method_name}", *args, &block
-        end
-      end
-    end
-
-    def self.appsignal_instrument_method(method_name, options = {})
-      alias_method "appsignal_uninstrumented_#{method_name}", method_name
-      define_method method_name do |*args, &block|
-        name = options.fetch(:name) do
-          "#{method_name}.#{appsignal_reverse_class_name}.other"
-        end
-        Appsignal.instrument name do
-          send "appsignal_uninstrumented_#{method_name}", *args, &block
-        end
-      end
-    end
-  end
-
-  def self.appsignal_reverse_class_name
-    return "AnonymousClass" unless name
-    name.split("::").reverse.join(".")
-  end
-
-  def appsignal_reverse_class_name
-    self.class.appsignal_reverse_class_name
-  end
-end