appsignal 0.12.rc.9 → 0.12.rc.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17f4e46dd0c600079ccdb20831f64e73451749b4
-  data.tar.gz: 723ed8e27a02f660f8dc5135c8d4982a909c2bf6
+  metadata.gz: 693aa4f235ee31447feb2a8b1f33a70df69fee2c
+  data.tar.gz: d52a48f030ed7a0b816b315365e0a71a26a77436
 SHA512:
-  metadata.gz: 33d094d086f748d6932e93960bb1ebfd3cf1dcc3a77be03c68a3f32fca800caf35bb73551141c084702e6ecac3352cdad2f5d271dc083a74c9b3c8aca3fd16c7
-  data.tar.gz: ee504d004f15bab3e1786ef0b5241e8efa661d67883266559f81fc658b2e488c6d2904a53de91a01f54e0f72b0880577532002115d56411ca3b8c7b301e94daf
+  metadata.gz: 20ba8304f8ac2b8969b34f869e7cd0f9ea43c9ba007112dd6d1195e2bcbcfc9d1b0210acba9ceb529b4b7cc576ce4b34c3c5f5fd3737023ff8d8b086cd1ca74c
+  data.tar.gz: 8909aa17bfec6253d49c4ad7bdff01d57f8cc66c4c8b4a905ced96e5be942f918e8681788f209fbe8073d806288bc342954013eb89980eeb02cc46caa515f877

data/README.md

@@ -8,81 +8,22 @@ applications and sends it to [AppSignal](https://appsignal.com)
 [![Gem Version](https://badge.fury.io/rb/appsignal.svg)](http://badge.fury.io/rb/appsignal)
 [![Code Climate](https://codeclimate.com/github/appsignal/appsignal.png)](https://codeclimate.com/github/appsignal/appsignal)
 
-## Pull requests / issues
-
-New features should be made in an issue or pullrequest. Title format is as follows:
-
-    name [request_count]
-
-example
-
-    tagging [2]
-
-## Postprocessing middleware
-
-Appsignal sends Rails
-[ActiveSupport::Notification](http://api.rubyonrails.org/classes/ActiveSupport/Notifications.html)-events
-to AppSignal over SSL. These events contain basic metadata such as a name
-and timestamps, and additional 'payload' log data. Appsignal uses a postprocessing
-middleware stack to clean up events before they get sent to appsignal.com. You
-can add your own middleware to this stack in `config/environment/my_env.rb`.
-
-### Examples
-
-#### Minimal template
-
-```ruby
-class MiddlewareTemplate
-  def call(event)
-    # modify the event in place
-    yield # pass control to the next middleware
-    # modify the event some more
-  end
-end
-
-Appsignal.post_processing_middleware.add MiddlewareTemplate
-```
-
-#### Remove boring payloads
-
-```ruby
-class RemoveBoringPayload
-  def call(event)
-    event.payload.clear unless event.name == 'interesting'
-    yield
-  end
-end
-```
-
 ## Development
 
-Run rake bundle or, or run bundle install for all Gemfiles:
-
-```
-bundle --gemfile gemfiles/capistrano2.gemfile
-bundle --gemfile gemfiles/capistrano3.gemfile
-bundle --gemfile gemfiles/no_dependencies.gemfile
-bundle --gemfile gemfiles/rails-3.0.gemfile
-bundle --gemfile gemfiles/rails-3.1.gemfile
-bundle --gemfile gemfiles/rails-3.2.gemfile
-bundle --gemfile gemfiles/rails-4.0.gemfile
-bundle --gemfile gemfiles/rails-4.1.gemfile
-bundle --gemfile gemfiles/rails-4.2.gemfile
-bundle --gemfile gemfiles/sinatra.gemfile
-```
-
-To run the spec suite with a specific Gemfile:
+Run `rake install`, then run the spec suite with a specific Gemfile:
 
 ```
 BUNDLE_GEMFILE=gemfiles/capistrano2.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/capistrano3.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/no_dependencies.gemfile bundle exec rspec
+BUNDLE_GEMFILE=gemfiles/padrino.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/rails-3.0.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/rails-3.1.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/rails-3.2.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/rails-4.0.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/rails-4.1.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/rails-4.2.gemfile bundle exec rspec
+BUNDLE_GEMFILE=gemfiles/sequel.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/sinatra.gemfile bundle exec rspec
 ```
 

data/Rakefile

@@ -93,7 +93,8 @@ task :publish do
   end
 end
 
-task :bundle do
+task :install do
+  system 'cd ext && rm -f libappsignal.a && ruby extconf.rb && make clean && make && cd ..'
   GEMFILES.each do |gemfile|
     system "bundle --gemfile gemfiles/#{gemfile}.gemfile"
   end
@@ -119,7 +120,7 @@ task :generate_bundle_and_spec_all do
     RUBY_VERSIONS.each do |version|
       out << "echo 'Switching to #{version}'"
       out << "#{switch_command} #{version} || { echo 'Switching Ruby failed'; exit 1; }"
-      out << 'cd ext && ruby extconf.rb && make clean && make && cd ..'
+      out << 'cd ext && rm -f libappsignal.a && ruby extconf.rb && make clean && make && cd ..'
       GEMFILES.each do |gemfile|
         out << "echo 'Bundling #{gemfile} in #{version}'"
         out << "bundle --quiet --gemfile gemfiles/#{gemfile}.gemfile || { echo 'Bundling failed'; exit 1; }"

data/ext/agent.yml

@@ -1,15 +1,15 @@
 ---
-:version: 526bdf1
+:version: ae85df1
 :triples:
   x86_64-linux:
-    :checksum: d5d83c289af971b40f23dc41a41567e0d41e98d2754eeed4427b7b2473881818
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/526bdf1/appsignal-agent-x86_64-linux-static.tar.gz
+    :checksum: f5b31b2e487a9865bf660ef244142e38f18d90b7ff91d538fff9d3d9b386c044
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ae85df1/appsignal-agent-x86_64-linux-static.tar.gz
     :lib_filename: libappsignal.a
   i686-linux:
-    :checksum: b8b3bf1a5ae67e97ff623e1252c6f0299306951033e4fb93478aa76dc95218f1
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/526bdf1/appsignal-agent-i686-linux-static.tar.gz
+    :checksum: 6a053ed939a6f9c36271ac4b421674d01e2ea4d6b962914cec5fbb36f64675bd
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ae85df1/appsignal-agent-i686-linux-static.tar.gz
     :lib_filename: libappsignal.a
   x86_64-darwin:
-    :checksum: 4eab82317a874d4d3b7fc666ce562fa7e5f346cda22707d556a236894269a838
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/526bdf1/appsignal-agent-x86_64-darwin-static.tar.gz
+    :checksum: 91fe3a509541a9d18c1cc41821df21d3b09bf6e0bbcbd52e30b49674c348cd32
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ae85df1/appsignal-agent-x86_64-darwin-static.tar.gz
     :lib_filename: libappsignal.a

data/ext/appsignal_extension.c

@@ -41,25 +41,27 @@ static VALUE finish_event(VALUE self, VALUE transaction_index, VALUE name, VALUE
   return Qnil;
 }
 
-static VALUE set_transaction_error(VALUE self, VALUE transaction_index, VALUE name, VALUE message) {
+static VALUE set_transaction_error(VALUE self, VALUE transaction_index, VALUE name, VALUE message, VALUE backtrace) {
   Check_Type(transaction_index, T_FIXNUM);
   Check_Type(name, T_STRING);
   Check_Type(message, T_STRING);
+  Check_Type(backtrace, T_STRING);
 
   appsignal_set_transaction_error(
       FIX2INT(transaction_index),
       StringValueCStr(name),
-      StringValueCStr(message)
+      StringValueCStr(message),
+      StringValueCStr(backtrace)
   );
   return Qnil;
 }
 
-static VALUE set_transaction_error_data(VALUE self, VALUE transaction_index, VALUE key, VALUE payload) {
+static VALUE set_transaction_sample_data(VALUE self, VALUE transaction_index, VALUE key, VALUE payload) {
   Check_Type(transaction_index, T_FIXNUM);
   Check_Type(key, T_STRING);
   Check_Type(payload, T_STRING);
 
-  appsignal_set_transaction_error_data(
+  appsignal_set_transaction_sample_data(
       FIX2INT(transaction_index),
       StringValueCStr(key),
       StringValueCStr(payload)
@@ -105,7 +107,14 @@ static VALUE set_transaction_metadata(VALUE self, VALUE transaction_index, VALUE
 static VALUE finish_transaction(VALUE self, VALUE transaction_index) {
   Check_Type(transaction_index, T_FIXNUM);
 
-  appsignal_finish_transaction(FIX2INT(transaction_index));
+  int sample = appsignal_finish_transaction(FIX2INT(transaction_index));
+  return sample == 1 ? Qtrue : Qfalse;
+}
+
+static VALUE complete_transaction(VALUE self, VALUE transaction_index) {
+  Check_Type(transaction_index, T_FIXNUM);
+
+  appsignal_complete_transaction(FIX2INT(transaction_index));
   return Qnil;
 }
 
@@ -228,12 +237,13 @@ void Init_appsignal_extension(void) {
   rb_define_singleton_method(Extension, "start_transaction",           start_transaction,           2);
   rb_define_singleton_method(Extension, "start_event",                 start_event,                 1);
   rb_define_singleton_method(Extension, "finish_event",                finish_event,                4);
-  rb_define_singleton_method(Extension, "set_transaction_error",       set_transaction_error,       3);
-  rb_define_singleton_method(Extension, "set_transaction_error_data",  set_transaction_error_data,  3);
+  rb_define_singleton_method(Extension, "set_transaction_error",       set_transaction_error,       4);
+  rb_define_singleton_method(Extension, "set_transaction_sample_data", set_transaction_sample_data, 3);
   rb_define_singleton_method(Extension, "set_transaction_action",      set_transaction_action,      2);
   rb_define_singleton_method(Extension, "set_transaction_queue_start", set_transaction_queue_start, 2);
   rb_define_singleton_method(Extension, "set_transaction_metadata",    set_transaction_metadata,    3);
   rb_define_singleton_method(Extension, "finish_transaction",          finish_transaction,          1);
+  rb_define_singleton_method(Extension, "complete_transaction",        complete_transaction,        1);
 
   // Event hook installation
   rb_define_singleton_method(Extension, "install_allocation_event_hook", install_allocation_event_hook, 0);

data/lib/appsignal.rb

@@ -169,7 +169,7 @@ module Appsignal
       Appsignal::Extension.set_process_gauge(key, value.to_f)
     end
 
-    def increment_counter(key, value)
+    def increment_counter(key, value=1)
       Appsignal::Extension.increment_counter(key, value)
     end
 

data/lib/appsignal/config.rb

@@ -20,7 +20,8 @@ module Appsignal
       :enable_frontend_error_catching => false,
       :frontend_error_catching_path   => '/appsignal_error_catcher',
       :enable_allocation_tracking     => true,
-      :enable_gc_instrumentation      => true
+      :enable_gc_instrumentation      => true,
+      :running_in_container           => false
     }.freeze
 
     ENV_TO_KEY_MAPPING = {
@@ -40,7 +41,8 @@ module Appsignal
       'APPSIGNAL_IGNORE_ACTIONS'                 => :ignore_actions,
       'APPSIGNAL_HTTP_PROXY'                     => :http_proxy,
       'APPSIGNAL_ENABLE_ALLOCATION_TRACKING'     => :enable_allocation_tracking,
-      'APPSIGNAL_ENABLE_GC_INSTRUMENTATION'      => :enable_gc_instrumentation
+      'APPSIGNAL_ENABLE_GC_INSTRUMENTATION'      => :enable_gc_instrumentation,
+      'APPSIGNAL_RUNNING_IN_CONTAINER'           => :running_in_container
     }.freeze
 
     attr_reader :root_path, :env, :initial_config, :config_hash
@@ -75,8 +77,7 @@ module Appsignal
       path = config_hash[:log_path] || root_path
       File.join(File.realpath(path), 'appsignal.log')
     rescue Errno::ENOENT
-      puts "appsignal: WARNING: log file path '#{path}' does not exist or is not writable"
-      nil
+      '/tmp/appsignal.log'
     end
 
     def valid?
@@ -101,6 +102,7 @@ module Appsignal
       ENV['APPSIGNAL_APP_NAME']                     = config_hash[:name]
       ENV['APPSIGNAL_HTTP_PROXY']                   = config_hash[:http_proxy]
       ENV['APPSIGNAL_IGNORE_ACTIONS']               = config_hash[:ignore_actions].join(',')
+      ENV['APPSIGNAL_RUNNING_IN_CONTAINER']         = config_hash[:running_in_container].to_s
     end
 
     protected
@@ -151,7 +153,8 @@ module Appsignal
       # Configuration with boolean type
       %w(APPSIGNAL_ACTIVE APPSIGNAL_DEBUG APPSIGNAL_INSTRUMENT_NET_HTTP
          APPSIGNAL_SKIP_SESSION_DATA APPSIGNAL_ENABLE_FRONTEND_ERROR_CATCHING
-         APPSIGNAL_ENABLE_ALLOCATION_TRACKING APPSIGNAL_ENABLE_GC_INSTRUMENTATION).each do |var|
+         APPSIGNAL_ENABLE_ALLOCATION_TRACKING APPSIGNAL_ENABLE_GC_INSTRUMENTATION
+         APPSIGNAL_RUNNING_IN_CONTAINER).each do |var|
         if env_var = ENV[var]
           config[ENV_TO_KEY_MAPPING[var]] = env_var == 'true'
         end

data/lib/appsignal/hooks.rb

@@ -45,6 +45,44 @@ module Appsignal
         raise NotImplementedError
       end
     end
+
+    module Helpers
+
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        def truncate(text)
+          Appsignal::Hooks::Helpers.truncate(text)
+        end
+
+        def string_or_inspect(string_or_other)
+          Appsignal::Hooks::Helpers.string_or_inspect(string_or_other)
+        end
+      end
+
+      def string_or_inspect(string_or_other)
+        Appsignal::Hooks::Helpers.string_or_inspect(string_or_other)
+      end
+
+      def truncate(text)
+        Appsignal::Hooks::Helpers.truncate(text)
+      end
+
+      def self.string_or_inspect(string_or_other)
+        if string_or_other.is_a?(String)
+          string_or_other
+        else
+          string_or_other.inspect
+        end
+      end
+
+      def self.truncate(text)
+        text.size > 200 ? "#{text[0...197]}..." : text
+      end
+    end
+
   end
 end
 

data/lib/appsignal/hooks/sidekiq.rb

@@ -1,6 +1,8 @@
 module Appsignal
   class Hooks
     class SidekiqPlugin
+      include Appsignal::Hooks::Helpers
+
       def job_keys
         @job_keys ||= Set.new(%w(
             class args retried_at failed_at
@@ -30,23 +32,11 @@ module Appsignal
         end
       end
 
-      def string_or_inspect(string_or_other)
-        if string_or_other.is_a?(String)
-          string_or_other
-        else
-          string_or_other.inspect
-        end
-      end
-
       def format_args(args)
         args.map do |arg|
           truncate(string_or_inspect(arg))
         end
       end
-
-      def truncate(text)
-        text.size > 200 ? "#{text[0...197]}..." : text
-      end
     end
 
     class SidekiqHook < Appsignal::Hooks::Hook

data/lib/appsignal/integrations/delayed_job_plugin.rb

@@ -1,6 +1,8 @@
 module Appsignal
   class Hooks
     class DelayedJobPlugin < ::Delayed::Plugin
+      include Appsignal::Hooks::Helpers
+
       callbacks do |lifecycle|
         lifecycle.around(:invoke_job) do |job, &block|
           invoke_with_instrumentation(job, block)
@@ -29,11 +31,18 @@ module Appsignal
             :priority => job.priority || 0,
             :attempts => job.attempts || 0
           },
+          :params      => format_args(job.payload_object.args),
           :queue_start => job.created_at
         ) do
           block.call(job)
         end
       end
+
+      def self.format_args(args)
+        args.map do |arg|
+          self.truncate(self.string_or_inspect(arg))
+        end
+      end
     end
   end
 end

data/lib/appsignal/js_exception_transaction.rb

@@ -10,7 +10,7 @@ module Appsignal
       set_action
       set_metadata
       set_error
-      set_error_data
+      set_sample_data
     end
 
     def set_action
@@ -27,20 +27,20 @@ module Appsignal
       Appsignal::Extension.set_transaction_error(
         @transaction_index,
         @data['name'],
-        @data['message']
+        @data['message'],
+        JSON.generate(@data['backtrace'])
       )
     end
 
-    def set_error_data
+    def set_sample_data
       {
         :params       => @data['params'],
         :environment  => @data['environment'],
-        :backtrace    => @data['backtrace'],
         :tags         => @data['tags']
       }.each do |key, data|
         next unless data.is_a?(Array) || data.is_a?(Hash)
         begin
-          Appsignal::Extension.set_transaction_error_data(
+          Appsignal::Extension.set_transaction_sample_data(
             @transaction_index,
             key.to_s,
             JSON.generate(data)

data/lib/appsignal/transaction.rb

@@ -26,7 +26,7 @@ module Appsignal
 
       def complete_current!
         if current
-          Appsignal::Extension.finish_transaction(current.transaction_index)
+          current.complete
           Thread.current[:appsignal_transaction] = nil
         else
           Appsignal.logger.error('Trying to complete current, but no transaction present')
@@ -49,6 +49,13 @@ module Appsignal
       @transaction_index = Appsignal::Extension.start_transaction(@transaction_id, @namespace)
     end
 
+    def complete
+      if Appsignal::Extension.finish_transaction(transaction_index)
+        sample_data
+      end
+      Appsignal::Extension.complete_transaction(transaction_index)
+    end
+
     def pause!
       @paused = true
     end
@@ -97,36 +104,43 @@ module Appsignal
       Appsignal::Extension.set_transaction_metadata(transaction_index, key, value)
     end
 
-    def set_error(error)
-      return unless error
-      return if Appsignal.is_ignored_error?(error)
-
-      Appsignal.logger.debug("Adding #{error.class.name} to transaction: #{transaction_id}")
-      Appsignal::Extension.set_transaction_error(
+    def set_sample_data(key, data)
+      return unless key && data && (data.is_a?(Array) || data.is_a?(Hash))
+      Appsignal::Extension.set_transaction_sample_data(
         transaction_index,
-        error.class.name,
-        error.message
+        key.to_s,
+        JSON.generate(data)
       )
+    rescue JSON::GeneratorError=>e
+      Appsignal.logger.error("JSON generate error (#{e.message}) for '#{data.inspect}'")
+    end
 
+    def sample_data
       {
         :params       => sanitized_params,
         :environment  => sanitized_environment,
         :session_data => sanitized_session_data,
-        :backtrace    => cleaned_backtrace(error.backtrace),
         :tags         => sanitized_tags
       }.each do |key, data|
-        next unless data.is_a?(Array) || data.is_a?(Hash)
-        begin
-          Appsignal::Extension.set_transaction_error_data(
-            transaction_index,
-            key.to_s,
-            JSON.generate(data)
-          )
-        rescue JSON::GeneratorError=>e
-          Appsignal.logger.error("JSON generate error (#{e.message}) for '#{data.inspect}'")
-        end
+        set_sample_data(key, data)
       end
     end
+
+    def set_error(error)
+      return unless error
+      return if Appsignal.is_ignored_error?(error)
+
+      Appsignal.logger.debug("Adding #{error.class.name} to transaction: #{transaction_id}")
+      backtrace = cleaned_backtrace(error.backtrace)
+      Appsignal::Extension.set_transaction_error(
+        transaction_index,
+        error.class.name,
+        error.message,
+        backtrace ? JSON.generate(backtrace) : ''
+      )
+    rescue JSON::GeneratorError=>e
+      Appsignal.logger.error("JSON generate error (#{e.message}) for '#{backtrace.inspect}'")
+    end
     alias_method :add_exception, :set_error
 
     class GenericRequest
@@ -145,8 +159,7 @@ module Appsignal
 
     def background_queue_start
       return unless request.env
-      queue_start = request.env[:queue_start]
-      return unless queue_start
+      return unless queue_start = request.env[:queue_start]
       (queue_start.to_f * 1000.0).to_i
     end
 

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '0.12.rc.9'
+  VERSION = '0.12.rc.10'
 end

data/spec/lib/appsignal/config_spec.rb

@@ -32,7 +32,8 @@ describe Appsignal::Config do
         :enable_frontend_error_catching => false,
         :frontend_error_catching_path   => '/appsignal_error_catcher',
         :enable_allocation_tracking     => true,
-        :enable_gc_instrumentation      => true
+        :enable_gc_instrumentation      => true,
+        :running_in_container           => false
       }
     end
 
@@ -40,6 +41,12 @@ describe Appsignal::Config do
       let(:config) { project_fixture_config('production', :log_path => '/tmp') }
 
       its(:log_file_path) { should end_with('/tmp/appsignal.log') }
+
+      context "if it is not writable" do
+        let(:config) { project_fixture_config('production', :log_path => '/root') }
+
+        its(:log_file_path) { should == '/tmp/appsignal.log' }
+      end
     end
 
     context "when there is a pre 0.12 style endpoint" do
@@ -90,6 +97,7 @@ describe Appsignal::Config do
         ENV['APPSIGNAL_LANGUAGE_INTEGRATION_VERSION'].should == Appsignal::VERSION
         ENV['APPSIGNAL_HTTP_PROXY'].should                   == 'http://localhost'
         ENV['APPSIGNAL_IGNORE_ACTIONS'].should               == 'action1,action2'
+        ENV['APPSIGNAL_RUNNING_IN_CONTAINER'].should         == 'false'
       end
     end
 

data/spec/lib/appsignal/extension_spec.rb

@@ -50,11 +50,11 @@ describe "extension loading and operation" do
       end
 
       it "should have a set_transaction_error method" do
-        subject.set_transaction_error(1, 'name', 'message')
+        subject.set_transaction_error(1, 'name', 'message', '[backtrace]')
       end
 
-      it "should have a set_transaction_error_data method" do
-        subject.set_transaction_error_data(1, 'params', '{}')
+      it "should have a set_transaction_sample_data method" do
+        subject.set_transaction_sample_data(1, 'params', '{}')
       end
 
       it "should have a set_transaction_action method" do

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

@@ -36,7 +36,7 @@ describe Appsignal::Hooks::DelayedJobHook do
           :attempts       => 1,
           :queue          => 'default',
           :created_at     => time - 60_000,
-          :payload_object => double
+          :payload_object => double(:args => ['argument']),
         )
       end
       let(:invoked_block) { Proc.new { } }
@@ -54,6 +54,7 @@ describe Appsignal::Hooks::DelayedJobHook do
               :queue    => 'default',
               :id       => 123
             },
+            :params      => ['argument'],
             :queue_start => time - 60_000,
           )
 
@@ -66,14 +67,15 @@ describe Appsignal::Hooks::DelayedJobHook do
           let(:job) do
             double(
               :payload_object => double(
-                :appsignal_name => 'CustomClass#perform'
+                :appsignal_name => 'CustomClass#perform',
+                :args           => ['argument']
               ),
-              :id         => 123,
-              :name       => 'TestClass#perform',
-              :priority   => 1,
-              :attempts   => 1,
-              :queue      => 'default',
-              :created_at => time - 60_000
+              :id             => 123,
+              :name           => 'TestClass#perform',
+              :priority       => 1,
+              :attempts       => 1,
+              :queue          => 'default',
+              :created_at     => time - 60_000
             )
           end
           it "should wrap in a transaction with the correct params" do
@@ -87,6 +89,7 @@ describe Appsignal::Hooks::DelayedJobHook do
                 :queue    => 'default',
                 :id       => 123
               },
+              :params      => ['argument'],
               :queue_start => time - 60_000
             )
 

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

@@ -107,38 +107,6 @@ describe Appsignal::Hooks::SidekiqPlugin do
       plugin.format_args(args).should == ['Model', '1', object.inspect]
     end
   end
-
-  describe "#truncate" do
-    let(:very_long_text) do
-      "a" * 400
-    end
-
-    it "should truncate the text to 200 chars max" do
-      plugin.truncate(very_long_text).should == "#{'a' * 197}..."
-    end
-  end
-
-  describe "#string_or_inspect" do
-    context "when string" do
-      it "should return the string" do
-        plugin.string_or_inspect('foo').should == 'foo'
-      end
-    end
-
-    context "when integer" do
-      it "should return the string" do
-        plugin.string_or_inspect(1).should == '1'
-      end
-    end
-
-    context "when object" do
-      let(:object) { Object.new }
-
-      it "should return the string" do
-        plugin.string_or_inspect(object).should == object.inspect
-      end
-    end
-  end
 end
 
 describe Appsignal::Hooks::SidekiqHook do

data/spec/lib/appsignal/hooks_spec.rb

@@ -74,3 +74,79 @@ describe Appsignal::Hooks do
     Appsignal::Hooks.hooks[:mock_error_hook].installed?.should be_false
   end
 end
+
+describe Appsignal::Hooks::Helpers do
+  class ClassWithHelpers
+    include Appsignal::Hooks::Helpers
+  end
+
+  let(:class_with_helpers) { ClassWithHelpers.new }
+
+  describe "#truncate" do
+    it "should call the class method helper" do
+      expect( Appsignal::Hooks::Helpers ).to receive(:truncate).with('text')
+
+      class_with_helpers.truncate('text')
+    end
+  end
+
+  describe "#string_or_inspect" do
+    it "should call the class method helper" do
+      expect( Appsignal::Hooks::Helpers ).to receive(:string_or_inspect)
+                                              .with('string')
+
+      class_with_helpers.string_or_inspect('string')
+    end
+  end
+
+  describe Appsignal::Hooks::Helpers::ClassMethods do
+    describe "#truncate" do
+      it "should call the class method helper" do
+        expect( Appsignal::Hooks::Helpers ).to receive(:truncate).with('text')
+
+        ClassWithHelpers.truncate('text')
+      end
+    end
+
+    describe "#string_or_inspect" do
+      it "should call the class method helper" do
+        expect( Appsignal::Hooks::Helpers ).to receive(:string_or_inspect)
+                                                .with('string')
+
+        ClassWithHelpers.string_or_inspect('string')
+      end
+    end
+  end
+
+  describe ".truncate" do
+    let(:very_long_text) do
+      "a" * 400
+    end
+
+    it "should truncate the text to 200 chars max" do
+      Appsignal::Hooks::Helpers.truncate(very_long_text).should == "#{'a' * 197}..."
+    end
+  end
+
+  describe ".string_or_inspect" do
+    context "when string" do
+      it "should return the string" do
+        Appsignal::Hooks::Helpers.string_or_inspect('foo').should == 'foo'
+      end
+    end
+
+    context "when integer" do
+      it "should return the string" do
+        Appsignal::Hooks::Helpers.string_or_inspect(1).should == '1'
+      end
+    end
+
+    context "when object" do
+      let(:object) { Object.new }
+
+      it "should return the string" do
+        Appsignal::Hooks::Helpers.string_or_inspect(object).should == object.inspect
+      end
+    end
+  end
+end

data/spec/lib/appsignal/js_exception_transaction_spec.rb

@@ -14,6 +14,9 @@ describe Appsignal::JSExceptionTransaction do
       'backtrace'   => [
         'foo.bar/js:11:1',
         'foo.bar/js:22:2',
+      ],
+      'tags'        => [
+        'tag1'
       ]
     }
   end
@@ -25,7 +28,7 @@ describe Appsignal::JSExceptionTransaction do
       expect( transaction ).to receive(:set_action)
       expect( transaction ).to receive(:set_metadata)
       expect( transaction ).to receive(:set_error)
-      expect( transaction ).to receive(:set_error_data)
+      expect( transaction ).to receive(:set_sample_data)
 
       transaction.send :initialize, data
 
@@ -61,22 +64,23 @@ describe Appsignal::JSExceptionTransaction do
      expect( Appsignal::Extension ).to receive(:set_transaction_error).with(
       kind_of(Integer),
        'TypeError',
-       'foo is not a valid method'
+       'foo is not a valid method',
+       "[\"foo.bar/js:11:1\",\"foo.bar/js:22:2\"]"
      )
 
      transaction.set_error
    end
   end
 
-  describe "#set_error_data" do
+  describe "#set_sample_data" do
    it "should call `Appsignal::Extension.set_transaction_error_data`" do
-     expect( Appsignal::Extension ).to receive(:set_transaction_error_data).with(
+     expect( Appsignal::Extension ).to receive(:set_transaction_sample_data).with(
       kind_of(Integer),
-      'backtrace',
-      '["foo.bar/js:11:1","foo.bar/js:22:2"]'
+      'tags',
+      '["tag1"]'
      )
 
-     transaction.set_error_data
+     transaction.set_sample_data
    end
   end
 

data/spec/lib/appsignal/transaction_spec.rb

@@ -71,6 +71,24 @@ describe Appsignal::Transaction do
     end
   end
 
+  describe "#complete" do
+    it "should sample data if it needs to be sampled" do
+      Appsignal::Extension.should_receive(:finish_transaction).and_return(true)
+      Appsignal::Extension.should_receive(:complete_transaction)
+      transaction.should_receive(:sample_data)
+
+      transaction.complete
+    end
+
+    it "should not sample data if it does not need to be sampled" do
+      Appsignal::Extension.should_receive(:finish_transaction).and_return(false)
+      Appsignal::Extension.should_receive(:complete_transaction)
+      transaction.should_not_receive(:sample_data)
+
+      transaction.complete
+    end
+  end
+
   context "pausing" do
     describe "#pause!" do
       it "should change the pause flag to true" do
@@ -243,6 +261,62 @@ describe Appsignal::Transaction do
       end
     end
 
+    describe "set_sample_data" do
+      it "should generate json and set the data" do
+        Appsignal::Extension.should_receive(:set_transaction_sample_data).with(
+          kind_of(Integer),
+          'params',
+          '{"controller":"blog_posts","action":"show","id":"1"}'
+        ).once
+
+        transaction.set_sample_data(
+          'params',
+          {
+            :controller => 'blog_posts',
+            :action     => 'show',
+            :id         => '1'
+          }
+        )
+      end
+
+      it "should do nothing if the data cannot be converted to json" do
+        Appsignal::Extension.should_not_receive(:set_transaction_sample_data).with(
+          kind_of(Integer),
+          'params',
+          kind_of(String)
+        )
+
+        transaction.set_sample_data('params', 'string')
+      end
+    end
+
+    describe "#sample_data" do
+      it "should sample data" do
+        Appsignal::Extension.should_receive(:set_transaction_sample_data).with(
+          kind_of(Integer),
+          'environment',
+          "{\"CONTENT_LENGTH\":\"0\",\"REQUEST_METHOD\":\"GET\",\"SERVER_NAME\":\"example.org\",\"SERVER_PORT\":\"80\",\"PATH_INFO\":\"/blog\"}"
+        ).once
+        Appsignal::Extension.should_receive(:set_transaction_sample_data).with(
+          kind_of(Integer),
+          'session_data',
+          "{}"
+        ).once
+        Appsignal::Extension.should_receive(:set_transaction_sample_data).with(
+          kind_of(Integer),
+          'params',
+          '{"controller":"blog_posts","action":"show","id":"1"}'
+        ).once
+        Appsignal::Extension.should_receive(:set_transaction_sample_data).with(
+          kind_of(Integer),
+          'tags',
+          "{}"
+        ).once
+
+        transaction.sample_data
+      end
+    end
+
     describe '#set_error' do
       let(:env) { http_request_env_with_data }
       let(:error) { double(:error, :message => 'test message', :backtrace => ['line 1']) }
@@ -259,58 +333,13 @@ describe Appsignal::Transaction do
       end
 
       context "for a http request" do
-        it "should set an error and it's data in native" do
+        it "should set an error in the extension" do
           Appsignal::Extension.should_receive(:set_transaction_error).with(
             kind_of(Integer),
             'RSpec::Mocks::Mock',
-            'test message'
-          )
-          Appsignal::Extension.should_receive(:set_transaction_error_data).with(
-            kind_of(Integer),
-            'environment',
-            "{\"CONTENT_LENGTH\":\"0\",\"REQUEST_METHOD\":\"GET\",\"SERVER_NAME\":\"example.org\",\"SERVER_PORT\":\"80\",\"PATH_INFO\":\"/blog\"}"
-          ).once
-          Appsignal::Extension.should_receive(:set_transaction_error_data).with(
-            kind_of(Integer),
-            'session_data',
-            "{}"
-          ).once
-          Appsignal::Extension.should_receive(:set_transaction_error_data).with(
-            kind_of(Integer),
-            'backtrace',
+            'test message',
             "[\"line 1\"]"
-          ).once
-          Appsignal::Extension.should_receive(:set_transaction_error_data).with(
-            kind_of(Integer),
-            'params',
-            '{"controller":"blog_posts","action":"show","id":"1"}'
-          ).once
-          Appsignal::Extension.should_receive(:set_transaction_error_data).with(
-            kind_of(Integer),
-            'tags',
-            "{}"
-          ).once
-
-          transaction.set_error(error)
-        end
-      end
-
-      context "with a non-json convertable type" do
-        before do
-          transaction.stub(:sanitized_params => 'a string')
-        end
-
-        it "should skip the field" do
-          Appsignal::Extension.should_not_receive(:set_transaction_error_data).with(
-            kind_of(Integer),
-            'params',
-            kind_of(String)
           )
-          Appsignal::Extension.should_receive(:set_transaction_error_data).with(
-            kind_of(Integer),
-            kind_of(String),
-            kind_of(String)
-          ).exactly(4).times
 
           transaction.set_error(error)
         end

data/spec/lib/appsignal_spec.rb

@@ -401,7 +401,12 @@ describe Appsignal do
       describe ".increment_counter" do
         it "should call increment_counter on the extension" do
           Appsignal::Extension.should_receive(:increment_counter).with('key', 1)
-          Appsignal.increment_counter('key', 1)
+          Appsignal.increment_counter('key')
+        end
+
+        it "should call increment_counter on the extension with a count" do
+          Appsignal::Extension.should_receive(:increment_counter).with('key', 5)
+          Appsignal.increment_counter('key', 5)
         end
       end
 
@@ -453,17 +458,6 @@ describe Appsignal do
         end
       end
 
-      context "when the log path is not writable" do
-        let(:log_path) { '/nonsense/log' }
-
-        it "should log to stdout" do
-          Appsignal.start_logger
-          Appsignal.logger.error('Log to stdout')
-          out_stream.string.should include 'appsignal: Log to stdout'
-          out_stream.string.should include 'Log something'
-        end
-      end
-
       context "when we're on Heroku" do
         before do
           ENV['DYNO'] = 'dyno1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.12.rc.9
+  version: 0.12.rc.10
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack