appsignal 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5af9c6943591c44c841e99c1e8b9f14d40e1c8e
-  data.tar.gz: 54532725587a4ffeaeb4a9f09fbc32cc65785c80
+  metadata.gz: 9f601749cf77425917a239f3bff1b9911ce82c7b
+  data.tar.gz: 1453a4ac204b7dba73a9df72c1a3364e7a8f052c
 SHA512:
-  metadata.gz: 30cfc725282a8da8974425a8d2da61cf397509d9096f2a87b221e8f6dea3dca3580eb823210c69ba65d1894e3c0cb748db644b9fa899b9d61248734c146728ca
-  data.tar.gz: 93a4d1bfdbd1bb7f5eeff536a72f662576c5f6e790c0e46c71ddec4d356df9a1af624950be92d2e66bd70b9fe0c53b2e99bacfd468e532fbd5ca56b597302a1c
+  metadata.gz: 01822ca7349b66f623263eafcc56c0dc7544e7a09bfdfd6ebdfaf3516ecd6ced1f5a5bccfd00cf6c6fa80ed463600ef1dba72121be7728c324560e131401fa49
+  data.tar.gz: 1e24a6931e772c24eafd6c7d6d7368533c676458ff7f13d9e79a765e4f14f5eec56f7d26335e42799c4ce12b96d80e0487b993b2fb259787655f0743a81afb42

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.0.2
+* Fix Sequel instrumentation overriding existing logic from extensions. PR #209
+
 # 2.0.1
 * Fix configuration load order regression for the `APPSIGNAL_PUSH_API_KEY`
   environment variable's activation behavior. PR #208

data/lib/appsignal/hooks/sequel.rb

@@ -9,7 +9,7 @@ module Appsignal
           sql,
           Appsignal::EventFormatter::SQL_BODY_FORMAT
         ) do
-          yield
+          super
         end
       end
     end
@@ -23,7 +23,7 @@ module Appsignal
           sql,
           Appsignal::EventFormatter::SQL_BODY_FORMAT
         ) do
-          yield
+          super
         end
       end
     end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

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

@@ -9,15 +9,21 @@ describe Appsignal::Hooks::SequelHook do
     its(:dependencies_present?) { should be_true }
 
     context "with a transaction" do
+      let(:transaction) { Appsignal::Transaction.current }
+      before do
+        Appsignal::Transaction.create("uuid", Appsignal::Transaction::HTTP_REQUEST, "test")
+        db.logger = Logger.new($stdout) # To test #log_duration call
+      end
+
       it "should instrument queries" do
-        Appsignal::Transaction.create('uuid', Appsignal::Transaction::HTTP_REQUEST, 'test')
-        expect( Appsignal::Transaction.current ).to receive(:start_event)
-          .at_least(:once)
-        expect( Appsignal::Transaction.current ).to receive(:finish_event)
+        expect(transaction).to receive(:start_event).at_least(:once)
+        expect(transaction).to receive(:finish_event)
           .at_least(:once)
           .with("sql.sequel", nil, kind_of(String), 1)
 
-        db['SELECT 1'].all.to_a
+        expect(db).to receive(:log_duration).at_least(:once)
+
+        db["SELECT 1"].all.to_a
       end
     end
   else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack