appsignal 2.9.3-java → 2.9.4-java

data/lib/appsignal/event_formatter/action_view/render_formatter.rb

@@ -22,11 +22,13 @@ module Appsignal
   end
 end
 
-Appsignal::EventFormatter.register(
-  "render_partial.action_view",
-  Appsignal::EventFormatter::ActionView::RenderFormatter
-)
-Appsignal::EventFormatter.register(
-  "render_template.action_view",
-  Appsignal::EventFormatter::ActionView::RenderFormatter
-)
+if defined?(Rails)
+  Appsignal::EventFormatter.register(
+    "render_partial.action_view",
+    Appsignal::EventFormatter::ActionView::RenderFormatter
+  )
+  Appsignal::EventFormatter.register(
+    "render_template.action_view",
+    Appsignal::EventFormatter::ActionView::RenderFormatter
+  )
+end

data/lib/appsignal/hooks/puma.rb

@@ -27,6 +27,8 @@ module Appsignal
           end
         end
 
+        return unless defined?(::Puma::Cluster)
+        # For clustered mode with multiple workers
         ::Puma::Cluster.class_eval do
           alias stop_workers_without_appsignal stop_workers
 

data/lib/appsignal/hooks/sidekiq.rb

@@ -49,7 +49,8 @@ module Appsignal
 
         ::Sidekiq::Queue.all.each do |queue|
           gauge "queue_length", queue.size, :queue => queue.name
-          gauge "queue_latency", queue.latency, :queue => queue.name
+          # Convert latency from seconds to milliseconds
+          gauge "queue_latency", queue.latency * 1_000.0, :queue => queue.name
         end
       end
 

data/lib/appsignal/minutely.rb

@@ -145,7 +145,8 @@ module Appsignal
                 logger.debug("Gathering minutely metrics with '#{name}' probe")
                 probe.call
               rescue => ex
-                logger.error("Error in minutely probe '#{name}': #{ex}")
+                logger.error "Error in minutely probe '#{name}': #{ex}\n"
+                logger.debug ex.backtrace.join("\n")
               end
             end
             sleep(Appsignal::Minutely.wait_time)

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "2.9.3".freeze
+  VERSION = "2.9.4".freeze
 end

data/spec/lib/appsignal/event_formatter/action_view/render_formatter_spec.rb

@@ -1,43 +1,53 @@
-if DependencyHelper.rails_present?
-  require "action_view"
+describe Appsignal::EventFormatter::ActionView::RenderFormatter do
+  let(:klass) { Appsignal::EventFormatter::ActionView::RenderFormatter }
 
-  describe Appsignal::EventFormatter::ActionView::RenderFormatter do
-    before { allow(Rails.root).to receive(:to_s).and_return("/var/www/app/20130101") }
-    let(:klass) { Appsignal::EventFormatter::ActionView::RenderFormatter }
-    let(:formatter) { klass.new }
+  if DependencyHelper.rails_present?
+    require "action_view"
 
-    it "should register render_partial.action_view and render_template.action_view" do
-      expect(Appsignal::EventFormatter.registered?("render_partial.action_view", klass)).to be_truthy
-      expect(Appsignal::EventFormatter.registered?("render_template.action_view", klass)).to be_truthy
-    end
+    context "when in a Rails app" do
+      let(:formatter) { klass.new }
+      before { allow(Rails.root).to receive(:to_s).and_return("/var/www/app/20130101") }
+
+      it "registers render_partial.action_view and render_template.action_view" do
+        expect(Appsignal::EventFormatter.registered?("render_partial.action_view", klass)).to be_truthy
+        expect(Appsignal::EventFormatter.registered?("render_template.action_view", klass)).to be_truthy
+      end
 
-    describe "#root_path" do
-      subject { formatter.root_path }
+      describe "#root_path" do
+        subject { formatter.root_path }
 
-      it "returns Rails root path" do
-        is_expected.to eq "/var/www/app/20130101/"
+        it "returns Rails root path" do
+          is_expected.to eq "/var/www/app/20130101/"
+        end
       end
-    end
 
-    describe "#format" do
-      subject { formatter.format(payload) }
+      describe "#format" do
+        subject { formatter.format(payload) }
 
-      context "with an identifier" do
-        let(:payload) { { :identifier => "/var/www/app/20130101/app/views/home/index/html.erb" } }
+        context "with an identifier" do
+          let(:payload) { { :identifier => "/var/www/app/20130101/app/views/home/index/html.erb" } }
 
-        it { is_expected.to eq ["app/views/home/index/html.erb", nil] }
-      end
+          it { is_expected.to eq ["app/views/home/index/html.erb", nil] }
+        end
 
-      context "with a frozen identifier" do
-        let(:payload) { { :identifier => "/var/www/app/20130101/app/views/home/index/html.erb".freeze } }
+        context "with a frozen identifier" do
+          let(:payload) { { :identifier => "/var/www/app/20130101/app/views/home/index/html.erb".freeze } }
 
-        it { is_expected.to eq ["app/views/home/index/html.erb", nil] }
-      end
+          it { is_expected.to eq ["app/views/home/index/html.erb", nil] }
+        end
 
-      context "without an identifier" do
-        let(:payload) { {} }
+        context "without an identifier" do
+          let(:payload) { {} }
 
-        it { is_expected.to be_nil }
+          it { is_expected.to be_nil }
+        end
+      end
+    end
+  else
+    context "when not in a Rails app" do
+      it "does not register the event formatter" do
+        expect(Appsignal::EventFormatter.registered?("render_partial.action_view", klass)).to be_falsy
+        expect(Appsignal::EventFormatter.registered?("render_template.action_view", klass)).to be_falsy
       end
     end
   end

data/spec/lib/appsignal/hooks/puma_spec.rb

@@ -8,11 +8,6 @@ describe Appsignal::Hooks::PumaHook do
         def self.cli_config
           @cli_config ||= CliConfig.new
         end
-
-        class Cluster
-          def stop_workers
-          end
-        end
       end
 
       class CliConfig
@@ -31,23 +26,46 @@ describe Appsignal::Hooks::PumaHook do
       it { is_expected.to be_truthy }
     end
 
-    context "when installed" do
-      before do
-        Appsignal::Hooks::PumaHook.new.install
+    describe "installation" do
+      context "when not clustered mode" do
+        it "does not add AppSignal stop behavior Puma::Cluster" do
+          expect(defined?(::Puma::Cluster)).to be_falsy
+          # Does not error on call
+          Appsignal::Hooks::PumaHook.new.install
+        end
+
+        it "adds the Puma minutely probe" do
+          probe = Appsignal::Minutely.probes[:puma]
+          expect(probe).to eql(Appsignal::Hooks::PumaProbe)
+        end
       end
 
-      it "adds behavior to Unicorn::Worker#close" do
-        cluster = Puma::Cluster.new
+      context "when in clustered mode" do
+        before do
+          class Puma
+            class Cluster
+              def stop_workers
+                @called = true
+              end
+            end
+          end
+          Appsignal::Hooks::PumaHook.new.install
+        end
+        after { Puma.send(:remove_const, :Cluster) }
 
-        expect(Appsignal).to receive(:stop)
-        expect(cluster).to receive(:stop_workers_without_appsignal)
+        it "adds behavior to Puma::Cluster.stop_workers" do
+          cluster = Puma::Cluster.new
 
-        cluster.stop_workers
-      end
+          expect(cluster.instance_variable_defined?(:@called)).to be_falsy
+          expect(Appsignal).to receive(:stop).and_call_original
+          cluster.stop_workers
+          expect(cluster.instance_variable_get(:@called)).to be(true)
+        end
 
-      it "adds the Puma minutely probe" do
-        probe = Appsignal::Minutely.probes[:puma]
-        expect(probe).to eql(Appsignal::Hooks::PumaProbe)
+        it "adds the Puma minutely probe" do
+          probe = Appsignal::Minutely.probes[:puma]
+          expect(probe).to eql(Appsignal::Hooks::PumaProbe)
+        end
       end
     end
 

data/spec/lib/appsignal/hooks/sidekiq_spec.rb

@@ -684,9 +684,9 @@ describe Appsignal::Hooks::SidekiqProbe do
       expect_gauge("job_count", 14, :status => :scheduled).twice
       expect_gauge("job_count", 15, :status => :enqueued).twice
       expect_gauge("queue_length", 10, :queue => "default").twice
-      expect_gauge("queue_latency", 12, :queue => "default").twice
+      expect_gauge("queue_latency", 12_000, :queue => "default").twice
       expect_gauge("queue_length", 1, :queue => "critical").twice
-      expect_gauge("queue_latency", 2, :queue => "critical").twice
+      expect_gauge("queue_latency", 2_000, :queue => "critical").twice
       # Call probe twice so we can calculate the delta for some gauge values
       probe.call
       probe.call

data/spec/lib/appsignal/minutely_spec.rb

@@ -27,12 +27,9 @@ describe Appsignal::Minutely do
     end
 
     let(:log_stream) { StringIO.new }
-    let(:log) do
-      log_stream.rewind
-      log_stream.read
-    end
+    let(:log) { log_contents(log_stream) }
     before do
-      Appsignal.logger = Logger.new(log_stream)
+      Appsignal.logger = test_logger(log_stream)
       # Speed up test time
       allow(Appsignal::Minutely).to receive(:wait_time).and_return(0.001)
     end
@@ -44,8 +41,8 @@ describe Appsignal::Minutely do
         Appsignal::Minutely.start
 
         wait_for("enough probe calls") { probe.calls >= 2 }
-        expect(log).to include("Gathering minutely metrics with 1 probe")
-        expect(log).to include("Gathering minutely metrics with 'my_probe' probe")
+        expect(log).to contains_log(:debug, "Gathering minutely metrics with 1 probe")
+        expect(log).to contains_log(:debug, "Gathering minutely metrics with 'my_probe' probe")
       end
     end
 
@@ -58,8 +55,8 @@ describe Appsignal::Minutely do
         Appsignal::Minutely.start
 
         wait_for("enough probe calls") { probe_instance.calls >= 2 }
-        expect(log).to include("Gathering minutely metrics with 1 probe")
-        expect(log).to include("Gathering minutely metrics with 'my_probe' probe")
+        expect(log).to contains_log(:debug, "Gathering minutely metrics with 1 probe")
+        expect(log).to contains_log(:debug, "Gathering minutely metrics with 'my_probe' probe")
       end
     end
 
@@ -71,8 +68,8 @@ describe Appsignal::Minutely do
         Appsignal::Minutely.start
 
         wait_for("enough probe calls") { calls >= 2 }
-        expect(log).to include("Gathering minutely metrics with 1 probe")
-        expect(log).to include("Gathering minutely metrics with 'my_probe' probe")
+        expect(log).to contains_log(:debug, "Gathering minutely metrics with 1 probe")
+        expect(log).to contains_log(:debug, "Gathering minutely metrics with 'my_probe' probe")
       end
     end
 
@@ -87,10 +84,12 @@ describe Appsignal::Minutely do
         wait_for("enough probe calls") { probe.calls >= 2 }
         wait_for("enough broken_probe calls") { broken_probe.calls >= 2 }
 
-        expect(log).to include("Gathering minutely metrics with 2 probes")
-        expect(log).to include("Gathering minutely metrics with 'my_probe' probe")
-        expect(log).to include("Gathering minutely metrics with 'broken_probe' probe")
-        expect(log).to include("Error in minutely probe 'broken_probe': oh no!")
+        expect(log).to contains_log(:debug, "Gathering minutely metrics with 2 probes")
+        expect(log).to contains_log(:debug, "Gathering minutely metrics with 'my_probe' probe")
+        expect(log).to contains_log(:debug, "Gathering minutely metrics with 'broken_probe' probe")
+        expect(log).to contains_log(:error, "Error in minutely probe 'broken_probe': oh no!")
+        gem_path = File.expand_path("../../../../", __FILE__) # Start of backtrace
+        expect(log).to contains_log(:debug, gem_path)
       end
     end
 
@@ -103,8 +102,8 @@ describe Appsignal::Minutely do
       end.to change { alive_thread_counter.call }.by(1)
 
       wait_for("enough probe calls") { probe.calls >= 2 }
-      expect(log).to include("Gathering minutely metrics with 1 probe")
-      expect(log).to include("Gathering minutely metrics with 'my_probe' probe")
+      expect(log).to contains_log(:debug, "Gathering minutely metrics with 1 probe")
+      expect(log).to contains_log(:debug, "Gathering minutely metrics with 'my_probe' probe")
       expect do
         # Fetch old thread
         thread = Appsignal::Minutely.class_variable_get(:@@thread)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.9.3
+  version: 2.9.4
 platform: java
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-29 00:00:00.000000000 Z
+date: 2019-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack