appsignal 0.12.beta.27 → 0.12.beta.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d054cbb23d1f6f7651694ca0f977750c1acb6c42
-  data.tar.gz: 77eafebe1d5f886af5b0c56a0ee9e8dfbd2017b0
+  metadata.gz: 4b75976d688e1bcc018a9ff67eb4a9e8e077f2ed
+  data.tar.gz: 9abe6a6341d43db08c129532f41d7f9f790e6e54
 SHA512:
-  metadata.gz: 781a0870b049a9249abaa3d84690665f9dc690e991fcef94eb41d71a5da06686581b6bbb2b1948b7a1a99de9b869224478095a39ff1a337ab209db2117421e07
-  data.tar.gz: 3d237d5fa981075f978d7734dfd0a3d4420d8e2304ebc713d99716b205cbb915c732bf85651e78b9cb49500d6e4e31517ea6d9efc3deb0809c050e3c97ce257a
+  metadata.gz: 9907f3b3b77ba7b755e25e5a927a60db029794da307bc6e3a71d311c3afd31b9bbc321e25d839d244ed775784a925d1ea318d32e1409cf3ad8350890eac5c0a6
+  data.tar.gz: 27084e35e9f1054bce5a062ede800e2d885b731a70c72d36ad5164ceb63c8c21f0e18f95a57e609b172d6abe886acdfbf8ab5a199c0891dc6784684f181379bf

data/ext/appsignal_extension.c

@@ -7,8 +7,14 @@ static VALUE start(VALUE self) {
   return Qnil;
 }
 
-static VALUE stop(VALUE self) {
-  appsignal_stop();
+static VALUE stop_agent(VALUE self) {
+  appsignal_stop_agent();
+
+  return Qnil;
+}
+
+static VALUE stop_extension(VALUE self) {
+  appsignal_stop_extension();
 
   return Qnil;
 }
@@ -209,7 +215,8 @@ void Init_appsignal_extension(void) {
 
   // Transaction monitoring
   rb_define_singleton_method(Extension, "start",                      start,                      0);
-  rb_define_singleton_method(Extension, "stop",                       stop,                       0);
+  rb_define_singleton_method(Extension, "stop_agent",                 stop_agent,                 0);
+  rb_define_singleton_method(Extension, "stop_extension",             stop_extension,             0);
   rb_define_singleton_method(Extension, "start_transaction",          start_transaction,          1);
   rb_define_singleton_method(Extension, "start_event",                start_event,                1);
   rb_define_singleton_method(Extension, "finish_event",               finish_event,               4);

data/lib/appsignal.rb

@@ -13,6 +13,7 @@ module Appsignal
     attr_accessor :config, :subscriber, :logger, :agent, :in_memory_log
 
     def load_integrations
+      require 'appsignal/integrations/celluloid'
       require 'appsignal/integrations/delayed_job'
       require 'appsignal/integrations/sidekiq'
       require 'appsignal/integrations/resque'
@@ -59,10 +60,15 @@ module Appsignal
       end
     end
 
-    def stop
-      Appsignal::Extension.stop
+    def stop_agent
+      Appsignal::Extension.stop_agent
     end
 
+    def stop_extension
+      Appsignal::Extension.stop_extension
+    end
+
+
     def monitor_transaction(name, payload={})
       unless active?
         yield

data/lib/appsignal/integrations/celluloid.rb

@@ -0,0 +1,18 @@
+if defined?(::Celluloid)
+  Appsignal.logger.info('Loading Celluloid integration')
+
+  # Some versions of Celluloid have race conditions while exiting
+  # that can result in a dead lock. We stop appsignal before shutting
+  # down Celluloid so we're sure our thread does not aggravate this situation.
+
+  ::Celluloid.class_eval do
+    class << self
+      alias shutdown_without_appsignal shutdown
+
+      def shutdown
+        Appsignal.stop_extension
+        shutdown_without_appsignal
+      end
+    end
+  end
+end

data/lib/appsignal/version.rb

@@ -1,4 +1,4 @@
 module Appsignal
-  VERSION       = '0.12.beta.27'
-  AGENT_VERSION = 'c2587ec'
+  VERSION       = '0.12.beta.28'
+  AGENT_VERSION = 'de3c9a4'
 end

data/spec/lib/appsignal/integrations/celluloid_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe "Celluloid integration" do
+  let(:file) { File.expand_path('lib/appsignal/integrations/celluloid.rb') }
+
+  context "with celluloid" do
+    before(:all) do
+      module Celluloid
+        def self.shutdown
+        end
+      end
+    end
+
+    before do
+      load file
+    end
+
+    specify { expect(Appsignal).to receive(:stop_extension) }
+
+    specify { expect(Celluloid).to receive(:shutdown_without_appsignal) }
+    after do
+      Celluloid.shutdown
+    end
+  end
+
+  context "without celluloid" do
+    before(:all) { Object.send(:remove_const, :Celluloid) }
+
+    specify { expect { ::Celluloid }.to raise_error(NameError) }
+    specify { expect { load file }.to_not raise_error }
+  end
+end

data/spec/lib/appsignal_spec.rb

@@ -135,10 +135,18 @@ describe Appsignal do
     end
   end
 
-  describe ".stop" do
-    it "should call stop on the extension" do
-      Appsignal::Extension.should_receive(:stop)
-      Appsignal.stop
+  describe ".stop_agent" do
+    it "should call stop_agent on the extension" do
+      Appsignal::Extension.should_receive(:stop_agent)
+      Appsignal.stop_agent
+      Appsignal.active?.should be_false
+    end
+  end
+
+  describe ".stop_extension" do
+    it "should call stop_extension on the extension" do
+      Appsignal::Extension.should_receive(:stop_extension)
+      Appsignal.stop_extension
       Appsignal.active?.should be_false
     end
   end
@@ -409,7 +417,7 @@ describe Appsignal do
       it "should format a log line" do
         Process.stub(:pid => 100)
         subject.call('Debug', Time.parse('2015-07-08'), nil, 'log line').should ==
-          '[2015-07-08T00:00:00 (process) #100][Debug] log line'
+          "[2015-07-08T00:00:00 (process) #100][Debug] log line\n"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.12.beta.27
+  version: 0.12.beta.28
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -159,6 +159,7 @@ files:
 - lib/appsignal/integrations/capistrano/appsignal.cap
 - lib/appsignal/integrations/capistrano/capistrano_2_tasks.rb
 - lib/appsignal/integrations/capistrano/careful_logger.rb
+- lib/appsignal/integrations/celluloid.rb
 - lib/appsignal/integrations/delayed_job.rb
 - lib/appsignal/integrations/rails.rb
 - lib/appsignal/integrations/resque.rb
@@ -197,6 +198,7 @@ files:
 - spec/lib/appsignal/instrumentations/net_http_spec.rb
 - spec/lib/appsignal/integrations/capistrano2_spec.rb
 - spec/lib/appsignal/integrations/capistrano3_spec.rb
+- spec/lib/appsignal/integrations/celluloid_spec.rb
 - spec/lib/appsignal/integrations/delayed_job_spec.rb
 - spec/lib/appsignal/integrations/rails_spec.rb
 - spec/lib/appsignal/integrations/resque_spec.rb
@@ -266,6 +268,7 @@ test_files:
 - spec/lib/appsignal/instrumentations/net_http_spec.rb
 - spec/lib/appsignal/integrations/capistrano2_spec.rb
 - spec/lib/appsignal/integrations/capistrano3_spec.rb
+- spec/lib/appsignal/integrations/celluloid_spec.rb
 - spec/lib/appsignal/integrations/delayed_job_spec.rb
 - spec/lib/appsignal/integrations/rails_spec.rb
 - spec/lib/appsignal/integrations/resque_spec.rb