appsignal 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d41abe0ea106adaa95e6273e1187136769252aaf
-  data.tar.gz: 3c1e7c0345cdd1e32eff0d33493025ac13b4e24f
+  metadata.gz: 690d32a5f831ef2de09053cbbc8c0a1168562934
+  data.tar.gz: f48dd5a3f29d4a1c274a45ade89ca40a45718885
 SHA512:
-  metadata.gz: 1d3dc0a5722caa2109cd7b15ef2bf9929df3e1927b6d2e16f17de79d27d01724d62f8266e4274a6dc8d4b9ea0d8bbf55786ad12f1d19dceaa4ebfde5d852f80f
-  data.tar.gz: 28001d15fced01dd048fd66dada12216ed8044cae66b0d7354964a1fcf6a467341a37003edb03b216af13a505052590d8842d1c3419eb24fec7870cf5fb8adfb
+  metadata.gz: 4001537ce6a8090f5f0c5793b04d494b1ecaee02a2ce46d7672e430cf3e3dc3efe4755865fc0e790c0ec1d7ac6f0e1180a950ddecaf74e68b5d58735fe1d7ff4
+  data.tar.gz: c57f68c79f10dd3cbdf9ab98028dd288dda2503f4412f15c3c0353f62cce606992672170368998e6ffde58d19099a7d37b4e0b9a45d3b57fea835f01acb8adfa

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.11.2
+* If APP_REVISION environment variable is set, send it with the log entry.
+
 # 0.11.1
 * Allow a custom request_class and params_method on  Rack instrumentation
 * Loop through env methods instead of env

data/benchmark.rake

@@ -0,0 +1,75 @@
+require 'appsignal'
+require 'benchmark'
+
+class ::Appsignal::Event::ActiveRecordEvent
+  def connection_config; {:adapter => 'mysql'}; end
+end
+
+namespace :benchmark do
+  task :all => [:run_inactive, :run_active] do
+  end
+
+  task :run_inactive do
+    puts 'Running with appsignal off'
+    ENV['APPSIGNAL_PUSH_API_KEY'] = nil
+    subscriber = ActiveSupport::Notifications.subscribe do |*args|
+      # Add a subscriber so we can track the overhead of just appsignal
+    end
+    run_benchmark
+    ActiveSupport::Notifications.unsubscribe(subscriber)
+  end
+
+  task :run_active do
+    puts 'Running with appsignal on'
+    ENV['APPSIGNAL_PUSH_API_KEY'] = 'something'
+    run_benchmark
+  end
+end
+
+def run_benchmark
+  total_objects = ObjectSpace.count_objects[:TOTAL]
+  puts "Initializing, currently #{total_objects} objects"
+  Appsignal.config = Appsignal::Config.new('', 'production')
+  Appsignal.start
+  puts "Appsignal #{Appsignal.active? ? 'active' : 'not active'}"
+
+  puts 'Running 10_000 normal transactions'
+  puts(Benchmark.measure do
+    10_000.times do |i|
+      Appsignal::Transaction.create("transaction_#{i}", {})
+
+      ActiveSupport::Notifications.instrument('sql.active_record', :sql => 'SELECT `users`.* FROM `users` WHERE `users`.`id` = ?')
+      10.times do
+        ActiveSupport::Notifications.instrument('sql.active_record', :sql => 'SELECT `todos`.* FROM `todos` WHERE `todos`.`id` = ?')
+      end
+
+      ActiveSupport::Notifications.instrument('render_template.action_view', :identifier => 'app/views/home/show.html.erb') do
+        5.times do
+          ActiveSupport::Notifications.instrument('render_partial.action_view', :identifier => 'app/views/home/_piece.html.erb') do
+            3.times do
+              ActiveSupport::Notifications.instrument('cache.read')
+            end
+          end
+        end
+      end
+
+      ActiveSupport::Notifications.instrument(
+        'process_action.action_controller',
+        :controller => 'HomeController',
+        :action     => 'show',
+        :params     => {:id => 1}
+      )
+
+      Appsignal::Transaction.complete_current!
+    end
+  end)
+
+  if Appsignal.active?
+    puts "Running aggregator post_processed_queue! for #{Appsignal.agent.aggregator.queue.length} transactions"
+    puts(Benchmark.measure do
+      Appsignal.agent.aggregator.post_processed_queue!.to_json
+    end)
+  end
+
+  puts "Done, currently #{ObjectSpace.count_objects[:TOTAL] - total_objects} objects created"
+end

data/lib/appsignal/agent.rb

@@ -4,7 +4,7 @@ module Appsignal
     AGGREGATOR_LIMIT = 5 # Five minutes with a sleep time of 60 seconds
 
     attr_accessor :aggregator, :thread, :master_pid, :pid, :active, :sleep_time,
-                  :transmitter, :subscriber, :paused, :aggregator_queue
+                  :transmitter, :subscriber, :paused, :aggregator_queue, :revision
 
     def initialize
       return unless Appsignal.config.active?
@@ -31,7 +31,8 @@ module Appsignal
 
     def start_thread
       Appsignal.logger.debug('Starting agent thread')
-      @thread = Thread.new do
+      @revision = ENV['APP_REVISION']
+      @thread   = Thread.new do
         begin
           sleep(rand(sleep_time))
           loop do

data/lib/appsignal/transaction/formatter.rb

@@ -28,7 +28,8 @@ module Appsignal
             :kind => kind,
             :time => time,
             :environment => sanitized_environment,
-            :session_data => sanitized_session_data
+            :session_data => sanitized_session_data,
+            :revision => Appsignal.agent.revision
           },
           :failed => exception?
         }

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.11.1'
+  VERSION = '0.11.2'
 end

data/spec/lib/appsignal/agent_spec.rb

@@ -98,6 +98,19 @@ describe Appsignal::Agent do
         sleep 1
       end
     end
+
+    context "with revision" do
+      around do |sample|
+        ENV['APP_REVISION'] = 'abc'
+        sample.run
+        ENV['APP_REVISION'] = nil
+      end
+
+      it "should set the revision" do
+        subject.start_thread
+        expect( subject.revision ).to eql 'abc'
+      end
+    end
   end
 
   describe "#restart_thread" do

data/spec/lib/appsignal/transaction/formatter_spec.rb

@@ -27,6 +27,7 @@ describe Appsignal::Transaction::Formatter do
           :kind => "http_request",
           :path => "/foo",
           :session_data => {},
+          :revision => nil,
           :time => 1389783600.0,
       } }
       its([:events]) { should be_nil }
@@ -44,6 +45,17 @@ describe Appsignal::Transaction::Formatter do
       end
     end
 
+    context "when the APP_REVISION environment variable is present" do
+      let(:transaction) { regular_transaction }
+      before do
+        Appsignal.agent.stub(:revision => 'foo')
+      end
+
+      it "should store the APP_REVISION" do
+        subject.to_hash[:log_entry][:revision].should == 'foo'
+      end
+    end
+
     context "with an exception request" do
       let(:transaction) { transaction_with_exception }
 
@@ -107,6 +119,7 @@ describe Appsignal::Transaction::Formatter do
           :kind => "http_request",
           :path => "/blog",
           :session_data => {},
+          :revision => nil,
           :time => 1389783600.0,
           :db_runtime => 500,
           :view_runtime => 500,
@@ -171,6 +184,7 @@ describe Appsignal::Transaction::Formatter do
         :kind => "background_job",
         :path => "/foo",
         :session_data => {},
+        :revision => nil,
         :time => 1389783600.0,
       } }
       its([:failed]) { should be_false }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -129,6 +129,7 @@ files:
 - README.md
 - Rakefile
 - appsignal.gemspec
+- benchmark.rake
 - bin/appsignal
 - gemfiles/capistrano2.gemfile
 - gemfiles/capistrano3.gemfile