appsignal 2.1.0 → 2.1.1.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c21c84f210750178cad52383cb8945c759e3ef7
-  data.tar.gz: bd2d8b11d9f0dca396b846f5cfcad4cd834b7adc
+  metadata.gz: 30574286398091fc000951898cc7854c3703dbe0
+  data.tar.gz: 1c769b7da29ede2b1c83d794490f23d546313cf7
 SHA512:
-  metadata.gz: 0a7d8cfc7c177f158b0da831dd35ce72efccd0f6ebfff7fd36a9ac6053a906db0959c49b6eb6a13ac72da855d4e0344095100c5597daa4e286e2004c047b41b6
-  data.tar.gz: af5c20d7e786bdd702008f942c951da08bfe8d196f2d12b44eac04c51c0a3ebbc85850bafe6c13a6fc8ef78b83ec086adda7d4dfb0c71e531a9d20a7c74cd07f
+  metadata.gz: 8b09ac555516fd6ce7f02b539a48762cc2f78e142f3691506580ed133dfb1e1f6bc16f1d03d87586755751ecf82c9880d443ca0a4f9091299291dd05d68506c3
+  data.tar.gz: a1d743e8a75d8480457aa8a8bd42f3252e7e2a34946f216e9ce584e66c2dcb2eed3ab586e21f2c2f099b551865a5f098d26e37f00e795b0789601dddc97371cc

data/.gitignore

@@ -25,6 +25,7 @@ bundle_and_spec_all_rvm
 ext/libappsignal.*
 ext/appsignal-agent
 ext/appsignal.h
+ext/appsignal.version
 ext/Makefile
 ext/*.bundle
 ext/*.o

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.1.1 (beta)
+* Fix DNS issue related to musl build.
+  Commit 732c877de8faceabe8a977bf80a82a6a89065c4d
+* Update benchmark and add load test. PR #248
+* Fix configuring instrument redis and sequel from env. PR #257
+
 # 2.1.0
 * Add support for musl based libc (Alpine Linux). PR #229
 * Implement `Appsignal.is_ignored_error?` and `Appsignal.is_ignored_action?`

data/benchmark.rake

@@ -1,4 +1,3 @@
-require 'active_support'
 require 'appsignal'
 require 'benchmark'
 
@@ -7,8 +6,7 @@ GC.disable
 task :default => :'benchmark:all'
 
 namespace :benchmark do
-  task :all => [:run_inactive, :run_active] do
-  end
+  task :all => [:run_inactive, :run_active]
 
   task :run_inactive do
     puts 'Running with appsignal off'
@@ -24,7 +22,8 @@ namespace :benchmark do
 end
 
 def run_benchmark
-  no_transactions = 10_000
+  no_transactions = (ENV['NO_TRANSACTIONS'] || 100_000).to_i
+  no_threads = (ENV['NO_THREADS'] || 1).to_i
 
   total_objects = ObjectSpace.count_objects[:TOTAL]
   puts "Initializing, currently #{total_objects} objects"
@@ -33,35 +32,44 @@ def run_benchmark
   Appsignal.start
   puts "Appsignal #{Appsignal.active? ? 'active' : 'not active'}"
 
-  puts "Running #{no_transactions} normal transactions"
+  threads = []
+  puts "Running #{no_transactions} normal transactions in #{no_threads} threads"
   puts(Benchmark.measure do
-    no_transactions.times do |i|
-      request = Appsignal::Transaction::GenericRequest.new(
-        :controller => 'HomeController',
-        :action     => 'show',
-        :params     => {:id => 1}
-      )
-      Appsignal::Transaction.create("transaction_#{i}", Appsignal::Transaction::HTTP_REQUEST, request)
+    no_threads.times do
+      thread = Thread.new do
+        no_transactions.times do |i|
+          request = Appsignal::Transaction::GenericRequest.new(
+            :controller => 'HomeController',
+            :action     => 'show',
+            :params     => {:id => 1}
+          )
+          Appsignal::Transaction.create("transaction_#{i}", Appsignal::Transaction::HTTP_REQUEST, request)
 
-      Appsignal.instrument('process_action.action_controller') do
-        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
+          Appsignal.instrument('process_action.action_controller') do
+            Appsignal.instrument_sql('sql.active_record', nil, 'SELECT `users`.* FROM `users` WHERE `users`.`id` = ?')
+            10.times do
+              Appsignal.instrument_sql('sql.active_record', nil, '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')
+            Appsignal.instrument('render_template.action_view', 'app/views/home/show.html.erb') do
+              5.times do
+                Appsignal.instrument('render_partial.action_view', 'app/views/home/_piece.html.erb') do
+                  3.times do
+                    Appsignal.instrument('cache.read')
+                  end
+                end
               end
             end
           end
+
+          Appsignal::Transaction.complete_current!
         end
       end
-
-      Appsignal::Transaction.complete_current!
+      thread.abort_on_exception = true
+      threads << thread
     end
+
+    threads.each(&:join)
     puts 'Finished'
   end)
 

data/ext/agent.yml

@@ -1,18 +1,18 @@
 ---
-version: 5f0c552
+version: '5464697'
 triples:
   x86_64-linux:
-    checksum: ded20da060a8c05c7551e9d86067ce7eecefca4ee3f8ddf286f79146d0895fd1
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/5f0c552/appsignal-x86_64-linux-all-static.tar.gz
+    checksum: a70f22af18f50ea1a02adf4ef88f68047b353a185fd100e8a61bc7ade87095bc
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/5464697/appsignal-x86_64-linux-all-static.tar.gz
   i686-linux:
-    checksum: 0332a1d256612b6230212ab5c503b53cf7e4121ff14c9df481d5a08545da89ba
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/5f0c552/appsignal-i686-linux-all-static.tar.gz
+    checksum: 2101667a3c56dfe78436c4f25b763a1db2028dd6ebe247b64d3c616066269879
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/5464697/appsignal-i686-linux-all-static.tar.gz
   x86-linux:
-    checksum: 0332a1d256612b6230212ab5c503b53cf7e4121ff14c9df481d5a08545da89ba
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/5f0c552/appsignal-i686-linux-all-static.tar.gz
+    checksum: 2101667a3c56dfe78436c4f25b763a1db2028dd6ebe247b64d3c616066269879
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/5464697/appsignal-i686-linux-all-static.tar.gz
   x86_64-darwin:
-    checksum: f4eaf9ef17f0c95adcc3b853f00134b28e1a50e33db48677dc3adfcbe48b14b4
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/5f0c552/appsignal-x86_64-darwin-all-static.tar.gz
+    checksum: 496f3348ae0e957b2610bb82ae23ab3c9878483a01e447a9f27537c99bd9f69d
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/5464697/appsignal-x86_64-darwin-all-static.tar.gz
   universal-darwin:
-    checksum: f4eaf9ef17f0c95adcc3b853f00134b28e1a50e33db48677dc3adfcbe48b14b4
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/5f0c552/appsignal-x86_64-darwin-all-static.tar.gz
+    checksum: 496f3348ae0e957b2610bb82ae23ab3c9878483a01e447a9f27537c99bd9f69d
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/5464697/appsignal-x86_64-darwin-all-static.tar.gz

data/lib/appsignal.rb

@@ -186,7 +186,7 @@ module Appsignal
 
     def instrument(name, title = nil, body = nil, body_format = Appsignal::EventFormatter::DEFAULT)
       Appsignal::Transaction.current.start_event
-      return_value = yield
+      return_value = yield if block_given?
       Appsignal::Transaction.current.finish_event(name, title, body, body_format)
       return_value
     end

data/lib/appsignal/config.rb

@@ -196,6 +196,7 @@ module Appsignal
 
       # Configuration with boolean type
       %w(APPSIGNAL_ACTIVE APPSIGNAL_DEBUG APPSIGNAL_INSTRUMENT_NET_HTTP
+         APPSIGNAL_INSTRUMENT_REDIS APPSIGNAL_INSTRUMENT_SEQUEL
          APPSIGNAL_SKIP_SESSION_DATA APPSIGNAL_ENABLE_FRONTEND_ERROR_CATCHING
          APPSIGNAL_ENABLE_ALLOCATION_TRACKING APPSIGNAL_ENABLE_GC_INSTRUMENTATION
          APPSIGNAL_RUNNING_IN_CONTAINER APPSIGNAL_ENABLE_HOST_METRICS

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require "yaml"
 
 module Appsignal
-  VERSION = "2.1.0"
+  VERSION = "2.1.1.beta.1"
 end

data/spec/lib/appsignal/config_spec.rb

@@ -311,6 +311,9 @@ describe Appsignal::Config do
       ENV["APPSIGNAL_APP_NAME"]             = "App name"
       ENV["APPSIGNAL_DEBUG"]                = "true"
       ENV["APPSIGNAL_IGNORE_ACTIONS"]       = "action1,action2"
+      ENV["APPSIGNAL_INSTRUMENT_NET_HTTP"]  = "false"
+      ENV["APPSIGNAL_INSTRUMENT_REDIS"]     = "false"
+      ENV["APPSIGNAL_INSTRUMENT_SEQUEL"]    = "false"
     end
     around { |example| recognize_as_container(:none) { example.run } }
 
@@ -324,6 +327,9 @@ describe Appsignal::Config do
       expect(config[:name]).to eq "App name"
       expect(config[:debug]).to be_truthy
       expect(config[:ignore_actions]).to eq ["action1", "action2"]
+      expect(config[:instrument_net_http]).to be_falsey
+      expect(config[:instrument_redis]).to be_falsey
+      expect(config[:instrument_sequel]).to be_falsey
     end
   end
 

data/spec/lib/appsignal_spec.rb

@@ -807,6 +807,15 @@ describe Appsignal do
         end
         expect(result).to eq "return value"
       end
+
+      it "should instrument without a block given" do
+        expect(transaction).to receive(:start_event)
+        expect(transaction).to receive(:finish_event)
+          .with("name", "title", "body", Appsignal::EventFormatter::DEFAULT)
+
+        result = Appsignal.instrument "name", "title", "body"
+        expect(result).to be_nil
+      end
     end
 
     describe ".instrument_sql" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1.beta.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -342,12 +342,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com