appsignal 1.1.0.beta.6 → 1.1.0.beta.7

data/spec/lib/appsignal/event_formatter/moped/query_formatter_spec.rb

@@ -22,12 +22,12 @@ describe Appsignal::EventFormatter::Moped::QueryFormatter do
       let(:op) do
         double(
           :full_collection_name => 'database.collection',
-          :selector             => {'_id' => 'abc'},
+          :selector             => {'query' => {'_id' => 'abc'}},
           :class                => double(:to_s => 'Moped::Protocol::Command')
         )
       end
 
-      it { should == ['Command', '{:database=>"database.collection", :selector=>{"_id"=>"?"}}'] }
+      it { should == ['Command', '{:database=>"database.collection", :selector=>{"query"=>"?"}}'] }
     end
 
     context "Moped::Protocol::Query" do
@@ -80,13 +80,13 @@ describe Appsignal::EventFormatter::Moped::QueryFormatter do
         double(
           :full_collection_name => 'database.collection',
           :selector             => {'_id' => 'abc'},
-          :update               => {'name' => 'James Bond'},
+          :update               => {'user.name' => 'James Bond'},
           :flags                => [],
           :class                => double(:to_s => 'Moped::Protocol::Update')
         )
       end
 
-      it { should == ['Update', '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :update=>{"name"=>"?"}, :flags=>[]}'] }
+      it { should == ['Update', '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :update=>{"user.?"=>"?"}, :flags=>[]}'] }
     end
 
     context "Moped::Protocol::KillCursors" do

data/spec/lib/appsignal/event_formatter/sequel/sql_formatter_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Appsignal::EventFormatter::Sequel::SqlFormatter do
+  let(:klass)     { Appsignal::EventFormatter::Sequel::SqlFormatter }
+  let(:formatter) { klass.new }
+
+  it "should register sql.sequel" do
+    Appsignal::EventFormatter.registered?('sql.sequel', klass).should be_true
+  end
+
+  describe "#format" do
+    let(:payload) do
+      {
+        sql: 'SELECT * FROM users'
+      }
+    end
+
+    subject { formatter.format(payload) }
+
+    it { should == [nil, 'SELECT * FROM users', 1] }
+  end
+end

data/spec/lib/appsignal/extension_spec.rb

@@ -46,7 +46,7 @@ describe "extension loading and operation" do
       end
 
       it "should have a finish_event method" do
-        subject.finish_event(1, 'name', 'title', 'body')
+        subject.finish_event(1, 'name', 'title', 'body', 0)
       end
 
       it "should have a set_transaction_error method" do

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

@@ -15,7 +15,7 @@ describe "Sequel integration", if: sequel_present? do
         .at_least(:once)
       expect( Appsignal::Extension ).to receive(:finish_event)
         .at_least(:once)
-        .with(kind_of(Integer), "sql.sequel", "", "")
+        .with(kind_of(Integer), "sql.sequel", "", kind_of(String), 1)
 
       db['SELECT 1'].all
     end

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

@@ -11,13 +11,15 @@ describe Appsignal::Hooks::MongoMonitorSubscriber do
     describe "#started" do
       let(:event) do
         double(
-          :request_id => 1,
-          :command    => {'foo' => 'bar'}
+          :request_id   => 1,
+          :command_name => 'find',
+          :command      => {'foo' => 'bar'}
         )
       end
 
       it "should sanitize command" do
-        Appsignal::Utils.should receive(:sanitize).with({'foo' => 'bar'} )
+        Appsignal::EventFormatter::MongoRubyDriver::QueryFormatter
+          .should receive(:format).with('find', {'foo' => 'bar'})
 
         subscriber.started(event)
       end
@@ -81,8 +83,9 @@ describe Appsignal::Hooks::MongoMonitorSubscriber do
         Appsignal::Extension.should receive(:finish_event).with(
           transaction.transaction_index,
           'query.mongodb',
-          'find',
-          "test | SUCCEEDED | {\"foo\"=>\"?\"}"
+          'find | test | SUCCEEDED',
+          "{\"foo\":\"?\"}",
+          0
         )
 
         subscriber.finish('SUCCEEDED', event)

data/spec/lib/appsignal/subscriber_spec.rb

@@ -98,10 +98,10 @@ describe Appsignal::Subscriber do
 
       it "should call native start and finish event for every event" do
         Appsignal::Extension.should_receive(:start_event).exactly(4).times
-        Appsignal::Extension.should_receive(:finish_event).with(kind_of(Integer), 'one', '', '').once
-        Appsignal::Extension.should_receive(:finish_event).with(kind_of(Integer), 'two', '', '').once
-        Appsignal::Extension.should_receive(:finish_event).with(kind_of(Integer), 'two.three', '', '').once
-        Appsignal::Extension.should_receive(:finish_event).with(kind_of(Integer), 'one.three', '', '').once
+        Appsignal::Extension.should_receive(:finish_event).with(kind_of(Integer), 'one', '', '', 0).once
+        Appsignal::Extension.should_receive(:finish_event).with(kind_of(Integer), 'two', '', '', 0).once
+        Appsignal::Extension.should_receive(:finish_event).with(kind_of(Integer), 'two.three', '', '', 0).once
+        Appsignal::Extension.should_receive(:finish_event).with(kind_of(Integer), 'one.three', '', '', 0).once
 
         ActiveSupport::Notifications.instrument('one') do
           ActiveSupport::Notifications.instrument('two') do
@@ -119,7 +119,8 @@ describe Appsignal::Subscriber do
           kind_of(Integer),
           'request.net_http',
           'GET http://www.google.com',
-          ''
+          '',
+          0
         ).once
 
         ActiveSupport::Notifications.instrument(
@@ -130,6 +131,23 @@ describe Appsignal::Subscriber do
         )
       end
 
+      it "should call finish with title, body and body format if there is a formatter that returns it" do
+        Appsignal::Extension.should_receive(:start_event).once
+        Appsignal::Extension.should_receive(:finish_event).with(
+          kind_of(Integer),
+          'sql.active_record',
+          'Something load',
+          'SELECT * FROM something',
+          1
+        ).once
+
+        ActiveSupport::Notifications.instrument(
+          'sql.active_record',
+          :name => 'Something load',
+          :sql  => 'SELECT * FROM something'
+        )
+      end
+
       context "when paused" do
         before { transaction.pause! }
 

data/spec/lib/appsignal/transaction_spec.rb

@@ -331,6 +331,11 @@ describe Appsignal::Transaction do
           'params',
           '{"controller":"blog_posts","action":"show","id":"1"}'
         ).once
+        Appsignal::Extension.should_receive(:set_transaction_sample_data).with(
+          kind_of(Integer),
+          'metadata',
+          '{"key":"value"}'
+        ).once
         Appsignal::Extension.should_receive(:set_transaction_sample_data).with(
           kind_of(Integer),
           'tags',
@@ -616,6 +621,22 @@ describe Appsignal::Transaction do
       end
     end
 
+    describe "#metadata" do
+      subject { transaction.send(:metadata) }
+
+      context "when env is nil" do
+        before { transaction.request.stub(:env => nil) }
+
+        it { should be_nil }
+      end
+
+      context "when env is present" do
+        let(:env) { {:metadata => {:key => 'value'}} }
+
+        it { should == env[:metadata] }
+      end
+    end
+
     describe '#sanitized_tags' do
       before do
         transaction.set_tags(

data/spec/lib/appsignal/utils_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'spec_helper'
 
 describe Appsignal::Utils do
@@ -33,4 +35,50 @@ describe Appsignal::Utils do
       end
     end
   end
+
+  describe ".sanitize_key" do
+    it "should not sanitize key when no key_sanitizer is given" do
+      expect( Appsignal::Utils.sanitize_key('foo', nil) ).to eql('foo')
+    end
+
+    context "with mongodb sanitizer" do
+      it "should not sanitize key when no dots are in the key" do
+        expect( Appsignal::Utils.sanitize_key('foo', :mongodb) ).to eql('foo')
+      end
+
+      it "should sanitize key when dots are in the key" do
+        expect( Appsignal::Utils.sanitize_key('foo.bar', :mongodb) ).to eql('foo.?')
+      end
+
+      it "should sanitize a symbol" do
+        expect( Appsignal::Utils.sanitize_key(:ismaster, :mongodb) ).to eql('ismaster')
+      end
+    end
+  end
+
+  describe ".json_generate" do
+    subject { Appsignal::Utils.json_generate(body) }
+
+    context "with a valid body" do
+      let(:body) { {'the' => 'payload'} }
+
+      it { should == "{\"the\":\"payload\"}" }
+    end
+
+    context "with a body that contains strings with invalid utf-8 content" do
+      let(:string_with_invalid_utf8) { [0x61, 0x61, 0x85].pack('c*') }
+      let(:body) { {
+        'field_one' => [0x61, 0x61].pack('c*'),
+        'field_two' => string_with_invalid_utf8,
+        'field_three' => [
+          'one', string_with_invalid_utf8
+        ],
+        'field_four' => {
+          'one' => string_with_invalid_utf8
+        }
+      } }
+
+      it { should == "{\"field_one\":\"aa\",\"field_two\":\"aa�\",\"field_three\":[\"one\",\"aa�\"],\"field_four\":{\"one\":\"aa�\"}}" }
+    end
+  end
 end

data/spec/support/helpers/env_helpers.rb

@@ -15,6 +15,7 @@ module EnvHelpers
       :status => '200',
       :view_runtime => 500,
       :db_runtime => 500,
+      :metadata => {:key => 'value'}
     ).merge(args)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta.6
+  version: 1.1.0.beta.7
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -156,8 +156,10 @@ files:
 - lib/appsignal/event_formatter/active_record/instantiation_formatter.rb
 - lib/appsignal/event_formatter/active_record/sql_formatter.rb
 - lib/appsignal/event_formatter/elastic_search/search_formatter.rb
+- lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter.rb
 - lib/appsignal/event_formatter/moped/query_formatter.rb
 - lib/appsignal/event_formatter/net_http/request_formatter.rb
+- lib/appsignal/event_formatter/sequel/sql_formatter.rb
 - lib/appsignal/extension.rb
 - lib/appsignal/hooks.rb
 - lib/appsignal/hooks/celluloid.rb
@@ -214,8 +216,10 @@ files:
 - spec/lib/appsignal/event_formatter/active_record/instantiation_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/active_record/sql_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/elastic_search/search_formatter_spec.rb
+- spec/lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/moped/query_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/net_http/request_formatter_spec.rb
+- spec/lib/appsignal/event_formatter/sequel/sql_formatter_spec.rb
 - spec/lib/appsignal/event_formatter_spec.rb
 - spec/lib/appsignal/extension_spec.rb
 - spec/lib/appsignal/hooks/celluloid_spec.rb
@@ -300,8 +304,10 @@ test_files:
 - spec/lib/appsignal/event_formatter/active_record/instantiation_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/active_record/sql_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/elastic_search/search_formatter_spec.rb
+- spec/lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/moped/query_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/net_http/request_formatter_spec.rb
+- spec/lib/appsignal/event_formatter/sequel/sql_formatter_spec.rb
 - spec/lib/appsignal/event_formatter_spec.rb
 - spec/lib/appsignal/extension_spec.rb
 - spec/lib/appsignal/hooks/celluloid_spec.rb