appsignal 1.0.2.beta.2 → 1.0.2.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f36d616a5d3b8b733ddd15d216456e50601f930
-  data.tar.gz: 761c684ee8233971e4fccfee5c78bd1b33a2dc76
+  metadata.gz: 4a01467c85c347db2cbbc1eb55f4524d7b3538dd
+  data.tar.gz: 9f95f2f8bacb616e584576aa3040e4f2bd0965ac
 SHA512:
-  metadata.gz: e7e49663cb6de6be789523707bef779237d26a80e0a95c55461bfc1acf633b50fbee580fa74a0d60faba384d1adda69fa2aa0d91a4d20479c0a71c7743bf38e3
-  data.tar.gz: 44afacf18a4f27aaf381d0882f62ff0cc0cf4233e2fe3618bd48e0290cfee4d769fd5502b68468b8164a84d73dc7c82b4484fd28504e622efd4c2090ec877161
+  metadata.gz: ada7231ed4c993cf94202aaab459bfca8fca6e0c4e50fdfcc77ccb8e50204e1e71648d77fed727fcccfdc57c848c925b099865de1892829972e160834911aaee
+  data.tar.gz: 9bbbbf3c540af6645e0cca554d51e0f62e1fc2b3382f63c0a11c8fb22ff12a231b669ff25593bb601b91f03c588a3f1fb583188591be482d48913871783efbc0

data/CHANGELOG.md

@@ -2,6 +2,8 @@
 * Bug fix in format of process memory measurements
 * Event formatter for `instantiation.active_record`
 * Rake integration file for backwards compatibility
+* Don't instrument mongo-ruby-driver when transaction is not present
+* Accept method calls on extension if it's not loaded
 
 # 1.0.1
 * Fix for bug in gem initialization when using `safe_yaml` gem

data/README.md

@@ -30,3 +30,10 @@ BUNDLE_GEMFILE=gemfiles/sinatra.gemfile bundle exec rspec
 Or run `rake generate_bundle_and_spec_all` to generate a script that runs specs for all
 Ruby versions and gem combinations we support.
 You need Rvm or Rbenv to do this. Travis will run specs for these combinations as well.
+
+## Branches and versions
+
+The `master` branch corresponds to the current release of the gem. The
+`develop` branch is used for development of features that will end up in
+the next minor release. If you fix a bug open a pull request on `master`, if
+it's a new feature on `develop`.

data/lib/appsignal/extension.rb

@@ -13,14 +13,20 @@ end
 
 module Appsignal
   class Extension
-    def self.agent_config
-      @agent_config ||= YAML.load(
-        File.read(File.join(File.dirname(__FILE__), '../../ext/agent.yml'))
-      )
-    end
+    class << self
+      def agent_config
+        @agent_config ||= YAML.load(
+          File.read(File.join(File.dirname(__FILE__), '../../ext/agent.yml'))
+        )
+      end
+
+      def agent_version
+        agent_config['version']
+      end
 
-    def self.agent_version
-      agent_config['version']
+      def method_missing(m, *args, &block)
+        # Do nothing if the extension methods are not loaded
+      end
     end
   end
 end

data/lib/appsignal/integrations/mongo_ruby_driver.rb

@@ -4,7 +4,8 @@ module Appsignal
 
       # Called by Mongo::Monitor when query starts
       def started(event)
-        return unless transaction = Appsignal::Transaction.current
+        transaction = Appsignal::Transaction.current
+        return if transaction.nil_transaction?
         return if transaction.paused?
 
         # Store the query on the transaction, we need it when the event finishes
@@ -29,7 +30,8 @@ module Appsignal
 
       # Finishes the event in the AppSignal extension
       def finish(result, event)
-        return unless transaction = Appsignal::Transaction.current
+        transaction = Appsignal::Transaction.current
+        return if transaction.nil_transaction?
         return if transaction.paused?
 
         # Get the query from the transaction store

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.0.2.beta.2'
+  VERSION = '1.0.2.beta.3'
 end

data/spec/lib/appsignal/extension_spec.rb

@@ -18,7 +18,7 @@ describe "extension loading and operation" do
   context "when the extension library can be loaded" do
     subject { Appsignal::Extension }
 
-    it "should load the extension" do
+    it "should indicate that the extension is loaded" do
       Appsignal.extension_loaded?.should be_true
     end
 
@@ -74,16 +74,37 @@ describe "extension loading and operation" do
       end
 
       it "should have a set_gauge method" do
-        Appsignal.set_gauge('key', 1.0)
+        subject.set_gauge('key', 1.0)
       end
 
       it "should have a increment_counter method" do
-        Appsignal.increment_counter('key', 1)
+        subject.increment_counter('key', 1)
       end
 
       it "should have a add_distribution_value method" do
-        Appsignal.add_distribution_value('key', 1.0)
+        subject.add_distribution_value('key', 1.0)
       end
     end
   end
+
+  context "when the extension library cannot be loaded" do
+    subject { Appsignal::Extension }
+
+    before :all do
+      Appsignal.extension_loaded = false
+    end
+    after :all do
+      Appsignal.extension_loaded = true
+    end
+
+    it "should indicate that the extension is not loaded" do
+      Appsignal.extension_loaded?.should be_false
+    end
+
+    it "should not raise errors when methods are called" do
+      expect {
+        subject.something
+      }.not_to raise_error
+    end
+  end
 end

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

@@ -91,7 +91,11 @@ describe Appsignal::Hooks::MongoMonitorSubscriber do
   end
 
   context "without transaction" do
-    before { Appsignal::Transaction.stub(:current => nil) }
+    before do
+      Appsignal::Transaction.stub(
+        :current => Appsignal::Transaction::NilTransaction.new
+      )
+    end
 
     it "should not attempt to start an event" do
       Appsignal::Extension.should_not receive(:start_event)
@@ -107,7 +111,7 @@ describe Appsignal::Hooks::MongoMonitorSubscriber do
   end
 
   context "when appsignal is paused" do
-    let(:transaction) { double(:paused? => true) }
+    let(:transaction) { double(:paused? => true, :nil_transaction? => false) }
     before { Appsignal::Transaction.stub(:current => transaction) }
 
     it "should not attempt to start an event" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.0.2.beta.2
+  version: 1.0.2.beta.3
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack