appsignal 1.3.0.beta.2 → 1.3.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b276d2585236d4d72a0c53a1da223be380146aaf
-  data.tar.gz: 44741c7c13c439ce8014cea0bdb4ab87f7da783e
+  metadata.gz: e73535489669f40b80aa41c5f757e02779f0156f
+  data.tar.gz: 24d7abe5c05024103e5654b59a2a056625e131be
 SHA512:
-  metadata.gz: adc49f118d2b5db67c689a54e84cae302cddc6af3e8fe67f3505ccf6eb9a8b65feb4e3bda838f6acc5b3185bc063945adb605237b1522adbb4259cb2d978b4f4
-  data.tar.gz: 56e23266468429ef29cca3252b27ed371a6a3780964bc3f059f05629c884b3ecdfdd2730709e7b8d7f4fe7b8cf53c66cc544650907e2636bcdca707285fc78b8
+  metadata.gz: c48a0f36c7ba4bc2481e215b7a60b363528bfafa10c7e1a07094ac147319fca0a7ca2dcaac49b44258021baaa26cc2816fe13a59b2c40b9b232b104bbad851cc
+  data.tar.gz: 3edface3054bd2eaf48fd5d9b9fed014b68e4c3cb61ebd0423c44619f723f3a2858cb6d09b0a807c13655dd05bf72177af165e66d035491f1c496e823f2331a6

data/CHANGELOG.md

@@ -11,6 +11,7 @@
 * `Appsignal.instrument` helper to easily instrument blocks of code
 * `record_event` method to instrument events without a start hook
 * `send_params` is now configurable via the environment
+* Add DataMapper integration
 
 # 1.2.5
 * Bugfix in CPU utilization calculation for host metrics

data/Rakefile

@@ -53,10 +53,8 @@ task :publish do
       puts `git commit -am 'Bump to #{version} [ci skip]'`
       puts "# Creating tag #{version}"
       puts `git tag #{version}`
-      puts `git push public #{version}`
-      puts `git push private #{version}`
-      puts `git push public #{branch}`
-      puts `git push private #{branch}`
+      puts `git push origin #{version}`
+      puts `git push origin #{branch}`
     rescue
       raise "Tag: '#{version}' already exists"
     end

data/lib/appsignal/hooks.rb

@@ -97,3 +97,4 @@ require 'appsignal/hooks/shoryuken'
 require 'appsignal/hooks/sidekiq'
 require 'appsignal/hooks/unicorn'
 require 'appsignal/hooks/mongo_ruby_driver'
+require 'appsignal/hooks/data_mapper'

data/lib/appsignal/hooks/data_mapper.rb

@@ -0,0 +1,17 @@
+module Appsignal
+  class Hooks
+    class DataMapperHook < Appsignal::Hooks::Hook
+      register :data_mapper
+
+      def dependencies_present?
+        defined?(::DataMapper) &&
+        defined?(::DataObjects::Connection)
+      end
+
+      def install
+        require 'appsignal/integrations/data_mapper'
+        ::DataObjects::Connection.send(:include, Appsignal::Hooks::DataMapperLogListener)
+      end
+    end
+  end
+end

data/lib/appsignal/integrations/capistrano/appsignal.cap

@@ -1,6 +1,6 @@
 namespace :appsignal do
   task :deploy do
-    env = fetch(:stage, fetch(:rails_env, fetch(:rack_env, 'production')))
+    env = fetch(:appsignal_env, fetch(:stage, fetch(:rails_env, fetch(:rack_env, 'production'))))
     user = ENV['USER'] || ENV['USERNAME']
     revision = fetch(:appsignal_revision, fetch(:current_revision))
 

data/lib/appsignal/integrations/data_mapper.rb

@@ -0,0 +1,31 @@
+module Appsignal
+  class Hooks
+    module DataMapperLogListener
+
+      def log(message)
+        # Attempt to find the scheme used for this message
+        scheme = instance_variable_get(:@uri).scheme
+
+        # If scheme is SQL-like, try to sanitize it, otherwise clear the body
+        if %w(sqlite sqlite3 mysql postgres).include?(scheme)
+          body_content = message.query
+          body_format = Appsignal::EventFormatter::SQL_BODY_FORMAT
+        else
+          body_content = ""
+          body_format = Appsignal::EventFormatter::DEFAULT
+        end
+
+        # Record event
+        Appsignal::Transaction.current.record_event(
+          'query.data_mapper',
+          'DataMapper Query',
+          body_content,
+          message.duration,
+          body_format
+        )
+        super
+      end
+
+    end
+  end
+end

data/lib/appsignal/version.rb

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

data/spec/lib/appsignal/capistrano3_spec.rb

@@ -68,13 +68,13 @@ if capistrano3_present?
             )
           end
 
-          context "when rack_env is used instead of rails_env" do
+          context "when rack_env is the only env set" do
             before do
               @capistrano_config.delete(:rails_env)
               @capistrano_config.set(:rack_env, 'rack_production')
             end
 
-            it "should be instantiated with the right params" do
+            it "should be instantiated with the rack env" do
               Appsignal::Config.should_receive(:new).with(
                 project_fixture_path,
                 'rack_production',
@@ -84,13 +84,13 @@ if capistrano3_present?
             end
           end
 
-          context "when stage is used instead of rack_env / rails_env" do
+          context "when stage is set" do
             before do
-              @capistrano_config.delete(:rails_env)
+              @capistrano_config.set(:rack_env, 'rack_production')
               @capistrano_config.set(:stage, 'stage_production')
             end
 
-            it "should be instantiated with the right params" do
+            it "should prefer the stage rather than rails_env and rack_env" do
               Appsignal::Config.should_receive(:new).with(
                 project_fixture_path,
                 'stage_production',
@@ -99,12 +99,30 @@ if capistrano3_present?
               )
             end
           end
+
+          context "when appsignal_env is set" do
+            before do
+              @capistrano_config.set(:rack_env, 'rack_production')
+              @capistrano_config.set(:stage, 'stage_production')
+              @capistrano_config.set(:appsignal_env, 'appsignal_production')
+            end
+
+            it "should prefer the appsignal_env rather than stage, rails_env and rack_env" do
+              Appsignal::Config.should_receive(:new).with(
+                project_fixture_path,
+                'appsignal_production',
+                {:name => 'AppName'},
+                kind_of(Logger)
+              )
+            end
+          end
         end
 
         after do
           invoke('appsignal:deploy')
           @capistrano_config.delete(:stage)
           @capistrano_config.delete(:rack_env)
+          @capistrano_config.delete(:appsignal_env)
         end
       end
 

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

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Appsignal::Hooks::DataMapperHook do
+  context "with datamapper" do
+    before :all do
+      module DataMapper
+      end
+      module DataObjects
+        class Connection
+        end
+      end
+      Appsignal::Hooks::DataMapperHook.new.install
+    end
+
+    after :all do
+      Object.send(:remove_const, :DataMapper)
+      Object.send(:remove_const, :DataObjects)
+    end
+
+    its(:dependencies_present?) { should be_true }
+
+    it "should install the listener" do
+      expect(::DataObjects::Connection).to receive(:include)
+        .with(Appsignal::Hooks::DataMapperLogListener)
+
+      Appsignal::Hooks::DataMapperHook.new.install
+    end
+  end
+
+  context "without datamapper" do
+    its(:dependencies_present?) { should be_false }
+  end
+end

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

@@ -0,0 +1,61 @@
+require 'spec_helper'
+require 'appsignal/integrations/data_mapper'
+
+describe Appsignal::Hooks::DataMapperLogListener do
+
+  module DataMapperLog
+    def log(message)
+    end
+  end
+
+  class DataMapperTestClass
+    include DataMapperLog
+    include Appsignal::Hooks::DataMapperLogListener
+
+    def initialize(uri)
+      @uri = uri
+    end
+  end
+
+  describe "#log" do
+    let!(:data_mapper_class) { DataMapperTestClass.new(uri) }
+    let(:uri)                { double(:scheme => 'mysql') }
+    let(:transaction)        { double }
+    let(:message) do
+      double(
+        :query    => "SELECT * from users",
+        :duration => 100
+      )
+    end
+
+    before do
+      Appsignal::Transaction.stub(:current) { transaction }
+    end
+
+    it "should record the log entry in an event" do
+      expect( transaction ).to receive(:record_event).with(
+        'query.data_mapper',
+        'DataMapper Query',
+        "SELECT * from users",
+        100,
+        Appsignal::EventFormatter::SQL_BODY_FORMAT
+      )
+    end
+
+    context "when scheme is not sql-like" do
+      let(:uri) { double(:scheme => 'mongodb') }
+
+      it "should record the log entry in an event without body" do
+        expect( transaction ).to receive(:record_event).with(
+          'query.data_mapper',
+          'DataMapper Query',
+          "",
+          100,
+          Appsignal::EventFormatter::DEFAULT
+        )
+      end
+    end
+
+    after { data_mapper_class.log(message) }
+  end
+end

data/spec/lib/appsignal/minutely_spec.rb

@@ -43,9 +43,7 @@ describe Appsignal::Minutely do
   describe Appsignal::Minutely::GCProbe do
     describe "#call" do
       it "should collect GC metrics" do
-        expect(Appsignal).to receive(:set_process_gauge).with('gc.count', kind_of(Integer)).once
-        expect(Appsignal).to receive(:set_process_gauge).with('gc.heap_allocated_pages', kind_of(Integer)).once
-        expect(Appsignal).to receive(:set_process_gauge).at_least(10).times
+        expect(Appsignal).to receive(:set_process_gauge).at_least(8).times
 
         Appsignal::Minutely::GCProbe.new.call
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.3.0.beta.2
+  version: 1.3.0.beta.3
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -166,6 +166,7 @@ files:
 - lib/appsignal/extension.rb
 - lib/appsignal/hooks.rb
 - lib/appsignal/hooks/celluloid.rb
+- lib/appsignal/hooks/data_mapper.rb
 - lib/appsignal/hooks/delayed_job.rb
 - lib/appsignal/hooks/mongo_ruby_driver.rb
 - lib/appsignal/hooks/net_http.rb
@@ -179,6 +180,7 @@ files:
 - lib/appsignal/hooks/unicorn.rb
 - lib/appsignal/integrations/capistrano/appsignal.cap
 - lib/appsignal/integrations/capistrano/capistrano_2_tasks.rb
+- lib/appsignal/integrations/data_mapper.rb
 - lib/appsignal/integrations/delayed_job_plugin.rb
 - lib/appsignal/integrations/grape.rb
 - lib/appsignal/integrations/mongo_ruby_driver.rb
@@ -232,6 +234,7 @@ files:
 - spec/lib/appsignal/event_formatter_spec.rb
 - spec/lib/appsignal/extension_spec.rb
 - spec/lib/appsignal/hooks/celluloid_spec.rb
+- spec/lib/appsignal/hooks/data_mapper_spec.rb
 - spec/lib/appsignal/hooks/delayed_job_spec.rb
 - spec/lib/appsignal/hooks/mongo_ruby_driver_spec.rb
 - spec/lib/appsignal/hooks/net_http_spec.rb
@@ -244,6 +247,7 @@ files:
 - spec/lib/appsignal/hooks/sidekiq_spec.rb
 - spec/lib/appsignal/hooks/unicorn_spec.rb
 - spec/lib/appsignal/hooks_spec.rb
+- spec/lib/appsignal/integrations/data_mapper_spec.rb
 - spec/lib/appsignal/integrations/grape_spec.rb
 - spec/lib/appsignal/integrations/mongo_ruby_driver_spec.rb
 - spec/lib/appsignal/integrations/object_spec.rb
@@ -308,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
@@ -331,6 +335,7 @@ test_files:
 - spec/lib/appsignal/event_formatter_spec.rb
 - spec/lib/appsignal/extension_spec.rb
 - spec/lib/appsignal/hooks/celluloid_spec.rb
+- spec/lib/appsignal/hooks/data_mapper_spec.rb
 - spec/lib/appsignal/hooks/delayed_job_spec.rb
 - spec/lib/appsignal/hooks/mongo_ruby_driver_spec.rb
 - spec/lib/appsignal/hooks/net_http_spec.rb
@@ -343,6 +348,7 @@ test_files:
 - spec/lib/appsignal/hooks/sidekiq_spec.rb
 - spec/lib/appsignal/hooks/unicorn_spec.rb
 - spec/lib/appsignal/hooks_spec.rb
+- spec/lib/appsignal/integrations/data_mapper_spec.rb
 - spec/lib/appsignal/integrations/grape_spec.rb
 - spec/lib/appsignal/integrations/mongo_ruby_driver_spec.rb
 - spec/lib/appsignal/integrations/object_spec.rb
@@ -386,4 +392,3 @@ test_files:
 - spec/support/project_fixture/log/.gitkeep
 - spec/support/rails/my_app.rb
 - spec/support/stubs/delayed_job.rb
-has_rdoc: