appsignal 2.8.4.beta.1 → 2.9.18.beta.1

data/spec/lib/puma/appsignal_spec.rb

@@ -0,0 +1,91 @@
+RSpec.describe "Puma plugin" do
+  include WaitForHelper
+
+  class MockPumaLauncher
+    def events
+      return @events if defined?(@events)
+
+      @events = MockPumaEvents.new
+    end
+  end
+
+  class MockPumaEvents
+    def on_booted(&block)
+      @on_booted = block if block_given?
+      @on_booted if defined?(@on_booted)
+    end
+  end
+
+  let(:probe) { MockProbe.new }
+  let(:launcher) { MockPumaLauncher.new }
+  before do
+    module Puma
+      def self.stats
+      end
+
+      class Plugin
+        class << self
+          attr_reader :plugin
+
+          def create(&block)
+            @plugin = Class.new(::Puma::Plugin)
+            @plugin.class_eval(&block)
+          end
+        end
+      end
+    end
+
+    Appsignal::Minutely.probes.clear
+    ENV["APPSIGNAL_ENABLE_MINUTELY_PROBES"] = "true"
+    Appsignal.config = project_fixture_config
+    # Speed up test time
+    allow(Appsignal::Minutely).to receive(:initial_wait_time).and_return(0.001)
+    allow(Appsignal::Minutely).to receive(:wait_time).and_return(0.001)
+
+    Appsignal::Minutely.probes.register :my_probe, probe
+    load File.expand_path("../lib/puma/plugin/appsignal.rb", APPSIGNAL_SPEC_DIR)
+  end
+  after do
+    Appsignal.config = nil
+    Object.send :remove_const, :Puma
+    Object.send :remove_const, :APPSIGNAL_PUMA_PLUGIN_LOADED
+  end
+
+  it "registers the PumaProbe" do
+    expect(Appsignal::Minutely.probes[:my_probe]).to eql(probe)
+    expect(Appsignal::Minutely.probes[:puma]).to be_nil
+    plugin = Puma::Plugin.plugin.new
+    expect(launcher.events.on_booted).to be_nil
+
+    plugin.start(launcher)
+    expect(Appsignal::Minutely.probes[:puma]).to be_nil
+    expect(launcher.events.on_booted).to_not be_nil
+
+    launcher.events.on_booted.call
+    expect(Appsignal::Minutely.probes[:puma]).to eql(Appsignal::Hooks::PumaProbe)
+
+    # Minutely probes started and called
+    wait_for("enough probe calls") { probe.calls >= 2 }
+  end
+
+  context "without Puma.stats" do
+    before { Puma.singleton_class.send(:remove_method, :stats) }
+
+    it "does not register the PumaProbe" do
+      expect(Appsignal::Minutely.probes[:my_probe]).to eql(probe)
+      expect(Appsignal::Minutely.probes[:puma]).to be_nil
+      plugin = Puma::Plugin.plugin.new
+      expect(launcher.events.on_booted).to be_nil
+
+      plugin.start(launcher)
+      expect(Appsignal::Minutely.probes[:puma]).to be_nil
+      expect(launcher.events.on_booted).to_not be_nil
+
+      launcher.events.on_booted.call
+      expect(Appsignal::Minutely.probes[:puma]).to be_nil
+
+      # Minutely probes started and called
+      wait_for("enough probe calls") { probe.calls >= 2 }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -83,6 +83,7 @@ RSpec.configure do |config|
   end
 
   config.before do
+    stop_minutely_probes
     ENV["RAILS_ENV"] ||= "test"
     ENV["RACK_ENV"] ||= "test"
     ENV["PADRINO_ENV"] ||= "test"
@@ -114,6 +115,7 @@ RSpec.configure do |config|
 
   config.after do
     Thread.current[:appsignal_transaction] = nil
+    stop_minutely_probes
   end
 
   config.after :context do
@@ -121,4 +123,15 @@ RSpec.configure do |config|
     Appsignal.config = nil
     Appsignal.logger = nil
   end
+
+  def stop_minutely_probes
+    thread =
+      begin
+        Appsignal::Minutely.class_variable_get(:@@thread) # Fetch old thread
+      rescue NameError
+        nil
+      end
+    Appsignal::Minutely.stop
+    thread && thread.join # Wait for old thread to exit
+  end
 end

data/spec/support/{project_fixture → fixtures/projects/valid}/config/appsignal.yml

@@ -8,6 +8,7 @@ default: &defaults
     "REQUEST_METHOD", "REQUEST_URI", "SERVER_NAME", "SERVER_PORT",
     "SERVER_PROTOCOL", "HTTP_USER_AGENT"
   ]
+  enable_minutely_probes: false
 
 production:
   <<: *defaults

data/spec/support/helpers/config_helpers.rb

@@ -1,7 +1,7 @@
 module ConfigHelpers
   def project_fixture_path
     File.expand_path(
-      File.join(File.dirname(__FILE__), "../project_fixture")
+      File.join(File.dirname(__FILE__), "../fixtures/projects/valid")
     )
   end
 

data/spec/support/helpers/log_helpers.rb

@@ -1,4 +1,10 @@
 module LogHelpers
+  def capture_logs(&block)
+    log = std_stream
+    use_logger_with(log, &block)
+    log_contents(log)
+  end
+
   def use_logger_with(log)
     Appsignal.logger = test_logger(log)
     yield

data/spec/support/helpers/wait_for_helper.rb

@@ -0,0 +1,28 @@
+module WaitForHelper
+  # Wait for a condition to be met
+  #
+  # @example
+  #   # Perform threaded operation
+  #   wait_for("enough probe calls") { probe.calls >= 2 }
+  #   # Assert on result
+  #
+  # @param name [String] The name of the condition to check. Used in the
+  #   error when it fails.
+  # @yield Assertion to check.
+  # @yieldreturn [Boolean] True/False value that indicates if the condition
+  #   is met.
+  # @raise [StandardError] Raises error if the condition is not met after 5
+  #   seconds, 5_000 tries.
+  def wait_for(name)
+    max_wait = 5_000
+    i = 0
+    while i <= max_wait
+      break if yield
+      i += 1
+      sleep 0.001
+    end
+
+    return unless i == max_wait
+    raise "Waited 5 seconds for #{name} condition, but was not met."
+  end
+end

data/spec/support/mocks/mock_probe.rb

@@ -0,0 +1,11 @@
+class MockProbe
+  attr_reader :calls
+
+  def initialize
+    @calls = 0
+  end
+
+  def call
+    @calls += 1
+  end
+end

data/spec/support/stubs/sidekiq/api.rb

@@ -0,0 +1,4 @@
+class Sidekiq
+  class API
+  end
+end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.8.4.beta.1
+  version: 2.9.18.beta.1
 platform: ruby
 authors:
 - Robert Beekman
 - Thijs Cadier
+- Tom de Bruijn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -45,14 +46,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -115,14 +116,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.20
 description: The official appsignal.com gem
 email:
 - support@appsignal.com
@@ -132,6 +133,8 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/chore.md"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -144,6 +147,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- SUPPORT.md
 - appsignal.gemspec
 - benchmark.rake
 - bin/appsignal
@@ -159,6 +163,7 @@ files:
 - gemfiles/no_dependencies.gemfile
 - gemfiles/padrino.gemfile
 - gemfiles/que.gemfile
+- gemfiles/que_beta.gemfile
 - gemfiles/rails-3.2.gemfile
 - gemfiles/rails-4.0.gemfile
 - gemfiles/rails-4.1.gemfile
@@ -166,6 +171,7 @@ files:
 - gemfiles/rails-5.0.gemfile
 - gemfiles/rails-5.1.gemfile
 - gemfiles/rails-5.2.gemfile
+- gemfiles/rails-6.0.gemfile
 - gemfiles/resque.gemfile
 - gemfiles/sequel-435.gemfile
 - gemfiles/sequel.gemfile
@@ -195,6 +201,8 @@ files:
 - lib/appsignal/extension.rb
 - lib/appsignal/extension/jruby.rb
 - lib/appsignal/garbage_collection_profiler.rb
+- lib/appsignal/helpers/instrumentation.rb
+- lib/appsignal/helpers/metrics.rb
 - lib/appsignal/hooks.rb
 - lib/appsignal/hooks/action_cable.rb
 - lib/appsignal/hooks/active_support_notifications.rb
@@ -245,7 +253,9 @@ files:
 - lib/appsignal/utils/hash_sanitizer.rb
 - lib/appsignal/utils/json.rb
 - lib/appsignal/utils/query_params_sanitizer.rb
+- lib/appsignal/utils/rails_helper.rb
 - lib/appsignal/version.rb
+- lib/puma/plugin/appsignal.rb
 - lib/sequel/extensions/appsignal_integration.rb
 - resources/appsignal.yml.erb
 - resources/cacert.pem
@@ -319,13 +329,15 @@ files:
 - spec/lib/appsignal/utils/json_spec.rb
 - spec/lib/appsignal/utils/query_params_sanitizer_spec.rb
 - spec/lib/appsignal_spec.rb
+- spec/lib/puma/appsignal_spec.rb
 - spec/spec_helper.rb
-- spec/support/fixtures/containers/cgroups/docker
-- spec/support/fixtures/containers/cgroups/docker_systemd
-- spec/support/fixtures/containers/cgroups/lxc
-- spec/support/fixtures/containers/cgroups/no_permission
-- spec/support/fixtures/containers/cgroups/none
 - spec/support/fixtures/generated_config.yml
+- spec/support/fixtures/projects/valid/config/application.rb
+- spec/support/fixtures/projects/valid/config/appsignal.yml
+- spec/support/fixtures/projects/valid/config/environments/development.rb
+- spec/support/fixtures/projects/valid/config/environments/production.rb
+- spec/support/fixtures/projects/valid/config/environments/test.rb
+- spec/support/fixtures/projects/valid/log/.gitkeep
 - spec/support/fixtures/uploaded_file.txt
 - spec/support/helpers/api_request_helper.rb
 - spec/support/helpers/cli_helpers.rb
@@ -340,24 +352,26 @@ files:
 - spec/support/helpers/system_helpers.rb
 - spec/support/helpers/time_helpers.rb
 - spec/support/helpers/transaction_helpers.rb
+- spec/support/helpers/wait_for_helper.rb
 - spec/support/matchers/contains_log.rb
 - spec/support/mocks/fake_gc_profiler.rb
 - spec/support/mocks/mock_extension.rb
-- spec/support/project_fixture/config/application.rb
-- spec/support/project_fixture/config/appsignal.yml
-- spec/support/project_fixture/config/environments/development.rb
-- spec/support/project_fixture/config/environments/production.rb
-- spec/support/project_fixture/config/environments/test.rb
-- spec/support/project_fixture/log/.gitkeep
+- spec/support/mocks/mock_probe.rb
 - spec/support/rails/my_app.rb
 - spec/support/shared_examples/instrument.rb
 - spec/support/stubs/delayed_job.rb
+- spec/support/stubs/sidekiq/api.rb
 - support/bundler_wrapper
 - support/install_deps
 homepage: https://github.com/appsignal/appsignal-ruby
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/appsignal/appsignal-ruby/issues
+  changelog_uri: https://github.com/appsignal/appsignal-ruby/blob/master/CHANGELOG.md
+  documentation_uri: https://docs.appsignal.com/ruby/
+  homepage_uri: https://docs.appsignal.com/ruby/
+  source_code_uri: https://github.com/appsignal/appsignal-ruby
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -374,8 +388,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
@@ -450,13 +463,15 @@ test_files:
 - spec/lib/appsignal/utils/json_spec.rb
 - spec/lib/appsignal/utils/query_params_sanitizer_spec.rb
 - spec/lib/appsignal_spec.rb
+- spec/lib/puma/appsignal_spec.rb
 - spec/spec_helper.rb
-- spec/support/fixtures/containers/cgroups/docker
-- spec/support/fixtures/containers/cgroups/docker_systemd
-- spec/support/fixtures/containers/cgroups/lxc
-- spec/support/fixtures/containers/cgroups/no_permission
-- spec/support/fixtures/containers/cgroups/none
 - spec/support/fixtures/generated_config.yml
+- spec/support/fixtures/projects/valid/config/application.rb
+- spec/support/fixtures/projects/valid/config/appsignal.yml
+- spec/support/fixtures/projects/valid/config/environments/development.rb
+- spec/support/fixtures/projects/valid/config/environments/production.rb
+- spec/support/fixtures/projects/valid/config/environments/test.rb
+- spec/support/fixtures/projects/valid/log/.gitkeep
 - spec/support/fixtures/uploaded_file.txt
 - spec/support/helpers/api_request_helper.rb
 - spec/support/helpers/cli_helpers.rb
@@ -471,15 +486,12 @@ test_files:
 - spec/support/helpers/system_helpers.rb
 - spec/support/helpers/time_helpers.rb
 - spec/support/helpers/transaction_helpers.rb
+- spec/support/helpers/wait_for_helper.rb
 - spec/support/matchers/contains_log.rb
 - spec/support/mocks/fake_gc_profiler.rb
 - spec/support/mocks/mock_extension.rb
-- spec/support/project_fixture/config/application.rb
-- spec/support/project_fixture/config/appsignal.yml
-- spec/support/project_fixture/config/environments/development.rb
-- spec/support/project_fixture/config/environments/production.rb
-- spec/support/project_fixture/config/environments/test.rb
-- spec/support/project_fixture/log/.gitkeep
+- spec/support/mocks/mock_probe.rb
 - spec/support/rails/my_app.rb
 - spec/support/shared_examples/instrument.rb
 - spec/support/stubs/delayed_job.rb
+- spec/support/stubs/sidekiq/api.rb

data/spec/support/fixtures/containers/cgroups/docker

@@ -1,14 +0,0 @@
-14:name=systemd:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
-13:pids:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
-12:hugetlb:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
-11:net_prio:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
-10:perf_event:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
-9:net_cls:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
-8:freezer:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
-7:devices:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
-6:memory:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
-5:blkio:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
-4:cpuacct:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
-3:cpu:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
-2:cpuset:/docker/0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575
-1:name=openrc:/docker

data/spec/support/fixtures/containers/cgroups/docker_systemd

@@ -1,8 +0,0 @@
-8:net_cls:/system.slice/docker-09f1c4d420025670a3633edbc9b31450f1d6b2ff87b5912a10c320ad398c7215.scope
-7:freezer:/system.slice/docker-09f1c4d420025670a3633edbc9b31450f1d6b2ff87b5912a10c320ad398c7215.scope
-6:devices:/system.slice/docker-09f1c4d420025670a3633edbc9b31450f1d6b2ff87b5912a10c320ad398c7215.scope
-5:memory:/system.slice/docker-09f1c4d420025670a3633edbc9b31450f1d6b2ff87b5912a10c320ad398c7215.scope
-4:blkio:/system.slice/docker-09f1c4d420025670a3633edbc9b31450f1d6b2ff87b5912a10c320ad398c7215.scope
-3:cpu,cpuacct:/system.slice/docker-09f1c4d420025670a3633edbc9b31450f1d6b2ff87b5912a10c320ad398c7215.scope
-2:cpuset:/system.slice/docker-09f1c4d420025670a3633edbc9b31450f1d6b2ff87b5912a10c320ad398c7215.scope
-1:name=openrc:/system.slice/docker-09f1c4d420025670a3633edbc9b31450f1d6b2ff87b5912a10c320ad398c7215.scope

data/spec/support/fixtures/containers/cgroups/lxc

@@ -1,10 +0,0 @@
-11:name=systemd:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
-10:hugetlb:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
-9:perf_event:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
-8:blkio:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
-7:freezer:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
-6:devices:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
-5:memory:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
-4:cpuacct:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
-3:cpu:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648
-2:cpuset:/lxc/1a2e485e-3947-4bb6-8c24-8774f0859648