appsignal 1.2.0.alpha.1 → 1.2.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f58ac33205387cf0533543da6b6921c97cab0ab
-  data.tar.gz: 50fa169704eedfbe308a26148e8d222d203e0046
+  metadata.gz: 933e766ae7c1e093d8550927bb4585607a136935
+  data.tar.gz: 46996d9237382423ffe444ef48e199c3a6db6c0d
 SHA512:
-  metadata.gz: 1b67b2d5ee82fafd83ca90998199bbbed1e7608f393e92ac88e3f9fd977533aac9da9dbfd3f918cfa2ca3636129ae4f4aaafa2234b9962f1fcf132ec1ea9be2a
-  data.tar.gz: cdb457db7efe9c3c4627d840a97bccb412fdc628f93dfc202604304e242ac019d472a979b0c1de059e272f0818beac6a99e06c78aa77a04bc38f017ba7b36837
+  metadata.gz: ed0342c7f1be05351ea7ceaed903a153a06b094e186158fab39cb8dcfd354c3b6a694fd02ec9f562c00add31a168ba8b4c2b2739fa8e4b57e98f7d95f1224957
+  data.tar.gz: 6de43ca1045c5200fa0e4355b728a5fd5e2a5d43d90e40a98313e60755968c2a3a378ed14c9f9da166591dfbb42705a509440b32e6ac3b5378a05acb37044138

data/CHANGELOG.md

@@ -1,9 +1,11 @@
 # 1.2.0
 * Restart background thread when FD's are closed
+* Beta version of collecting host metrics (disabled by default)
 
 # 1.1.7
 * Make logging resilient for closing FD's (daemons gem does this)
 * Add support for using Resque through ActiveJob
+* Rescue more expections in json generation
 
 # 1.1.6
 * Generic Rack instrumentation middleware

data/ext/agent.yml

@@ -1,19 +1,19 @@
 ---
-version: 594b119
+version: b9b98f1
 triples:
   x86_64-linux:
-    checksum: b80bb04c42f662b5b66a9b7061805ff6843f5fa27026d0c87ab7a7c8da6c2a64
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/594b119/appsignal-agent-x86_64-linux-static.tar.gz
+    checksum: 69542d576478984d769257fb58639728a937872d35d3f9bb30da986e02d36909
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/b9b98f1/appsignal-agent-x86_64-linux-static.tar.gz
     lib_filename: libappsignal.a
   i686-linux:
-    checksum: 39d0a0d3aaf82743a4158a1c274e076c05fdc8a44c8e76d47bef78166af5e440
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/594b119/appsignal-agent-i686-linux-static.tar.gz
+    checksum: 7bf25f151a255227c8bee0b75b8e8c75adc484f2b418c2dfc760e0a82869ed27
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/b9b98f1/appsignal-agent-i686-linux-static.tar.gz
     lib_filename: libappsignal.a
   x86-linux:
-    checksum: 39d0a0d3aaf82743a4158a1c274e076c05fdc8a44c8e76d47bef78166af5e440
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/594b119/appsignal-agent-i686-linux-static.tar.gz
+    checksum: 7bf25f151a255227c8bee0b75b8e8c75adc484f2b418c2dfc760e0a82869ed27
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/b9b98f1/appsignal-agent-i686-linux-static.tar.gz
     lib_filename: libappsignal.a
   x86_64-darwin:
-    checksum: c64c2b7b774c4c60ed99e5d508fc44bfbf99bd738fabd3d62157715f5215692f
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/594b119/appsignal-agent-x86_64-darwin-static.tar.gz
+    checksum: c8b0df3b38e9747d468e12bb7d7c6bfdc901b62d6138b5629c3969e78ff6cc4d
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/b9b98f1/appsignal-agent-x86_64-darwin-static.tar.gz
     lib_filename: libappsignal.a

data/ext/appsignal_extension.c

@@ -1,6 +1,10 @@
 #include "ruby/ruby.h"
 #include "appsignal_extension.h"
 
+VALUE Appsignal;
+VALUE Extension;
+VALUE ExtTransaction;
+
 static VALUE start(VALUE self) {
   appsignal_start();
 
@@ -14,27 +18,43 @@ static VALUE stop(VALUE self) {
 }
 
 static VALUE start_transaction(VALUE self, VALUE transaction_id, VALUE namespace) {
+  appsignal_transaction* transaction;
+
   Check_Type(transaction_id, T_STRING);
 
-  return INT2FIX(appsignal_start_transaction(StringValueCStr(transaction_id), StringValueCStr(namespace)));
+  transaction = appsignal_start_transaction(
+      StringValueCStr(transaction_id),
+      StringValueCStr(namespace)
+  );
+
+  if (transaction) {
+    return Data_Wrap_Struct(ExtTransaction, NULL, appsignal_free_transaction, transaction);
+  } else {
+    return Qnil;
+  }
 }
 
-static VALUE start_event(VALUE self, VALUE transaction_index) {
-  Check_Type(transaction_index, T_FIXNUM);
+static VALUE start_event(VALUE self) {
+  appsignal_transaction* transaction;
+
+  Data_Get_Struct(self, appsignal_transaction, transaction);
+
+  appsignal_start_event(transaction);
 
-  appsignal_start_event(FIX2INT(transaction_index));
   return Qnil;
 }
 
-static VALUE finish_event(VALUE self, VALUE transaction_index, VALUE name, VALUE title, VALUE body, VALUE body_format) {
-  Check_Type(transaction_index, T_FIXNUM);
+static VALUE finish_event(VALUE self, VALUE name, VALUE title, VALUE body, VALUE body_format) {
+  appsignal_transaction* transaction;
+
   Check_Type(name, T_STRING);
   Check_Type(title, T_STRING);
   Check_Type(body, T_STRING);
   Check_Type(body_format, T_FIXNUM);
+  Data_Get_Struct(self, appsignal_transaction, transaction);
 
   appsignal_finish_event(
-      FIX2INT(transaction_index),
+      transaction,
       StringValueCStr(name),
       StringValueCStr(title),
       StringValueCStr(body),
@@ -43,14 +63,16 @@ 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, VALUE backtrace) {
-  Check_Type(transaction_index, T_FIXNUM);
+static VALUE set_transaction_error(VALUE self, VALUE name, VALUE message, VALUE backtrace) {
+  appsignal_transaction* transaction;
+
   Check_Type(name, T_STRING);
   Check_Type(message, T_STRING);
   Check_Type(backtrace, T_STRING);
+  Data_Get_Struct(self, appsignal_transaction, transaction);
 
   appsignal_set_transaction_error(
-      FIX2INT(transaction_index),
+      transaction,
       StringValueCStr(name),
       StringValueCStr(message),
       StringValueCStr(backtrace)
@@ -58,67 +80,78 @@ static VALUE set_transaction_error(VALUE self, VALUE transaction_index, VALUE na
   return Qnil;
 }
 
-static VALUE set_transaction_sample_data(VALUE self, VALUE transaction_index, VALUE key, VALUE payload) {
-  Check_Type(transaction_index, T_FIXNUM);
+static VALUE set_transaction_sample_data(VALUE self, VALUE key, VALUE payload) {
+  appsignal_transaction* transaction;
+
   Check_Type(key, T_STRING);
   Check_Type(payload, T_STRING);
+  Data_Get_Struct(self, appsignal_transaction, transaction);
 
   appsignal_set_transaction_sample_data(
-      FIX2INT(transaction_index),
+      transaction,
       StringValueCStr(key),
       StringValueCStr(payload)
   );
   return Qnil;
 }
 
-static VALUE set_transaction_action(VALUE self, VALUE transaction_index, VALUE action) {
-  Check_Type(transaction_index, T_FIXNUM);
+static VALUE set_transaction_action(VALUE self, VALUE action) {
+  appsignal_transaction* transaction;
+
   Check_Type(action, T_STRING);
+  Data_Get_Struct(self, appsignal_transaction, transaction);
 
   appsignal_set_transaction_action(
-      FIX2INT(transaction_index),
+      transaction,
       StringValueCStr(action)
   );
   return Qnil;
 }
 
-static VALUE set_transaction_queue_start(VALUE self, VALUE transaction_index, VALUE queue_start) {
-  Check_Type(transaction_index, T_FIXNUM);
+static VALUE set_transaction_queue_start(VALUE self, VALUE queue_start) {
+  appsignal_transaction* transaction;
+
   Check_Type(queue_start, T_FIXNUM);
+  Data_Get_Struct(self, appsignal_transaction, transaction);
 
   appsignal_set_transaction_queue_start(
-      FIX2INT(transaction_index),
+      transaction,
       FIX2LONG(queue_start)
   );
   return Qnil;
 }
 
-static VALUE set_transaction_metadata(VALUE self, VALUE transaction_index, VALUE key, VALUE value) {
-  Check_Type(transaction_index, T_FIXNUM);
+static VALUE set_transaction_metadata(VALUE self, VALUE key, VALUE value) {
+  appsignal_transaction* transaction;
+
   Check_Type(key, T_STRING);
   Check_Type(value, T_STRING);
+  Data_Get_Struct(self, appsignal_transaction, transaction);
 
   appsignal_set_transaction_metadata(
-      FIX2INT(transaction_index),
+      transaction,
       StringValueCStr(key),
       StringValueCStr(value)
   );
   return Qnil;
 }
 
-static VALUE finish_transaction(VALUE self, VALUE transaction_index) {
+static VALUE finish_transaction(VALUE self) {
+  appsignal_transaction* transaction;
   int sample;
 
-  Check_Type(transaction_index, T_FIXNUM);
+  Data_Get_Struct(self, appsignal_transaction, transaction);
 
-  sample = appsignal_finish_transaction(FIX2INT(transaction_index));
+  sample = appsignal_finish_transaction(transaction);
   return sample == 1 ? Qtrue : Qfalse;
 }
 
-static VALUE complete_transaction(VALUE self, VALUE transaction_index) {
-  Check_Type(transaction_index, T_FIXNUM);
+static VALUE complete_transaction(VALUE self) {
+  appsignal_transaction* transaction;
+
+  Data_Get_Struct(self, appsignal_transaction, transaction);
 
-  appsignal_complete_transaction(FIX2INT(transaction_index));
+  appsignal_complete_transaction(transaction);
   return Qnil;
 }
 
@@ -201,22 +234,27 @@ static VALUE install_gc_event_hooks() {
 }
 
 void Init_appsignal_extension(void) {
-  VALUE Appsignal = rb_define_module("Appsignal");
-  VALUE Extension = rb_define_class_under(Appsignal, "Extension", rb_cObject);
-
-  // Transaction monitoring
-  rb_define_singleton_method(Extension, "start",                       start,                       0);
-  rb_define_singleton_method(Extension, "stop",                        stop,                        0);
-  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,                5);
-  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);
+  Appsignal = rb_define_module("Appsignal");
+  Extension = rb_define_class_under(Appsignal, "Extension", rb_cObject);
+  ExtTransaction = rb_define_class_under(Extension, "ExtTransaction", rb_cObject);
+
+  // Starting and stopping
+  rb_define_singleton_method(Extension, "start", start, 0);
+  rb_define_singleton_method(Extension, "stop",  stop,  0);
+
+  // Start transaction
+  rb_define_singleton_method(Extension, "start_transaction", start_transaction, 2);
+
+  // Transaction instance methods
+  rb_define_method(ExtTransaction, "start_event",     start_event,                 0);
+  rb_define_method(ExtTransaction, "finish_event",    finish_event,                4);
+  rb_define_method(ExtTransaction, "set_error",       set_transaction_error,       3);
+  rb_define_method(ExtTransaction, "set_sample_data", set_transaction_sample_data, 2);
+  rb_define_method(ExtTransaction, "set_action",      set_transaction_action,      1);
+  rb_define_method(ExtTransaction, "set_queue_start", set_transaction_queue_start, 1);
+  rb_define_method(ExtTransaction, "set_metadata",    set_transaction_metadata,    2);
+  rb_define_method(ExtTransaction, "finish",          finish_transaction,          0);
+  rb_define_method(ExtTransaction, "complete",        complete_transaction,        0);
 
   // Event hook installation
   rb_define_singleton_method(Extension, "install_allocation_event_hook", install_allocation_event_hook, 0);

data/lib/appsignal.rb

@@ -1,3 +1,4 @@
+require 'json'
 require 'logger'
 require 'securerandom'
 

data/lib/appsignal/config.rb

@@ -18,7 +18,8 @@ module Appsignal
       :frontend_error_catching_path   => '/appsignal_error_catcher',
       :enable_allocation_tracking     => true,
       :enable_gc_instrumentation      => false,
-      :running_in_container           => false
+      :running_in_container           => false,
+      :collect_host_metrics           => false
     }.freeze
 
     ENV_TO_KEY_MAPPING = {
@@ -40,7 +41,8 @@ module Appsignal
       'APPSIGNAL_ENABLE_ALLOCATION_TRACKING'     => :enable_allocation_tracking,
       'APPSIGNAL_ENABLE_GC_INSTRUMENTATION'      => :enable_gc_instrumentation,
       'APPSIGNAL_RUNNING_IN_CONTAINER'           => :running_in_container,
-      'APPSIGNAL_WORKING_DIR_PATH'               => :working_dir_path
+      'APPSIGNAL_WORKING_DIR_PATH'               => :working_dir_path,
+      'APPSIGNAL_COLLECT_HOST_METRICS'           => :collect_host_metrics
     }.freeze
 
     attr_reader :root_path, :env, :initial_config, :config_hash
@@ -111,6 +113,7 @@ module Appsignal
       ENV['APPSIGNAL_IGNORE_ACTIONS']               = config_hash[:ignore_actions].join(',')
       ENV['APPSIGNAL_RUNNING_IN_CONTAINER']         = config_hash[:running_in_container].to_s
       ENV['APPSIGNAL_WORKING_DIR_PATH']             = config_hash[:working_dir_path] if config_hash[:working_dir_path]
+      ENV['APPSIGNAL_COLLECT_HOST_METRICS']         = config_hash[:collect_host_metrics].to_s
     end
 
     protected

data/lib/appsignal/integrations/mongo_ruby_driver.rb

@@ -16,7 +16,7 @@ module Appsignal
         store[event.request_id] = command
 
         # Start this event
-        Appsignal::Extension.start_event(transaction.transaction_index)
+        transaction.start_event
       end
 
       # Called by Mongo::Monitor when query succeeds
@@ -42,8 +42,7 @@ module Appsignal
         command = store.delete(event.request_id) || {}
 
         # Finish the event in the extension.
-        Appsignal::Extension.finish_event(
-          transaction.transaction_index,
+        transaction.finish_event(
           'query.mongodb',
           "#{event.command_name.to_s} | #{event.database_name} | #{result}",
           Appsignal::Utils.json_generate(command),
@@ -51,6 +50,5 @@ module Appsignal
         )
       end
     end
-
   end
 end

data/lib/appsignal/js_exception_transaction.rb

@@ -1,11 +1,11 @@
 module Appsignal
   class JSExceptionTransaction
-    attr_reader :uuid, :transaction_index
+    attr_reader :uuid, :ext
 
     def initialize(data)
       @data = data
       @uuid = SecureRandom.uuid
-      @transaction_index = Appsignal::Extension.start_transaction(@uuid, Appsignal::Transaction::FRONTEND)
+      @ext = Appsignal::Extension.start_transaction(@uuid, Appsignal::Transaction::FRONTEND)
 
       set_action
       set_metadata
@@ -14,18 +14,17 @@ module Appsignal
     end
 
     def set_action
-      Appsignal::Extension.set_transaction_action(@transaction_index, @data['action'])
+      @ext.set_action(@data['action'])
     end
 
     def set_metadata
-      Appsignal::Extension.set_transaction_metadata(
-        @transaction_index, 'path', @data['path']
+      @ext.set_metadata(
+        'path', @data['path']
       ) if @data['path']
     end
 
     def set_error
-      Appsignal::Extension.set_transaction_error(
-        @transaction_index,
+      @ext.set_error(
         @data['name'],
         @data['message'],
         Appsignal::Utils.json_generate(@data['backtrace'])
@@ -40,20 +39,19 @@ module Appsignal
       }.each do |key, data|
         next unless data.is_a?(Array) || data.is_a?(Hash)
         begin
-          Appsignal::Extension.set_transaction_sample_data(
-            @transaction_index,
+          @ext.set_sample_data(
             key.to_s,
             Appsignal::Utils.json_generate(data)
           )
-        rescue JSON::GeneratorError=>e
-          Appsignal.logger.error("JSON generate error (#{e.message}) for '#{data.inspect}'")
+        rescue *Appsignal::Transaction::JSON_EXCEPTIONS => e
+          Appsignal.logger.error("Error generating JSON (#{e.class}: #{e.message}) for '#{backtrace.inspect}'")
         end
       end
     end
 
     def complete!
-      Appsignal::Extension.finish_transaction(@transaction_index)
-      Appsignal::Extension.complete_transaction(@transaction_index)
+      @ext.finish
+      @ext.complete
     end
   end
 end

data/lib/appsignal/subscriber.rb

@@ -1,7 +1,5 @@
 module Appsignal
   class Subscriber
-    BLANK = ''.freeze
-
     attr_reader :as_subscriber
 
     def initialize
@@ -38,7 +36,7 @@ module Appsignal
       return unless transaction = Appsignal::Transaction.current
       return if transaction.nil_transaction? || transaction.paused?
 
-      Appsignal::Extension.start_event(transaction.transaction_index)
+      transaction.start_event
     end
 
     def finish(name, id, payload)
@@ -46,12 +44,11 @@ module Appsignal
       return if transaction.nil_transaction? || transaction.paused?
 
       title, body, body_format = Appsignal::EventFormatter.format(name, payload)
-      Appsignal::Extension.finish_event(
-        transaction.transaction_index,
+      transaction.finish_event(
         name,
-        title || BLANK,
-        body || BLANK,
-        body_format || 0
+        title,
+        body,
+        body_format
       )
     end
   end

data/lib/appsignal/transaction.rb

@@ -3,6 +3,7 @@ module Appsignal
     HTTP_REQUEST   = 'http_request'.freeze
     BACKGROUND_JOB = 'background_job'.freeze
     FRONTEND       = 'frontend'.freeze
+    BLANK          = ''.freeze
 
     # Based on what Rails uses + some variables we'd like to show
     ENV_METHODS = %w(CONTENT_LENGTH AUTH_TYPE GATEWAY_INTERFACE
@@ -15,6 +16,13 @@ module Appsignal
     HTTP_CACHE_CONTROL HTTP_CONNECTION HTTP_USER_AGENT HTTP_FROM HTTP_NEGOTIATE
     HTTP_PRAGMA HTTP_REFERER HTTP_X_FORWARDED_FOR HTTP_CLIENT_IP HTTP_RANGE)
 
+    JSON_EXCEPTIONS = [
+      IOError,
+      NotImplementedError,
+      JSON::GeneratorError,
+      Encoding::UndefinedConversionError
+    ].freeze
+
     class << self
       def create(id, namespace, request, options={})
         # Check if we already have a running transaction
@@ -43,7 +51,7 @@ module Appsignal
       end
     end
 
-    attr_reader :transaction_index, :transaction_id, :namespace, :request, :paused, :tags, :options
+    attr_reader :ext, :transaction_id, :namespace, :request, :paused, :tags, :options
 
     def initialize(transaction_id, namespace, request, options={})
       @transaction_id = transaction_id
@@ -55,7 +63,7 @@ module Appsignal
       @options = options
       @options[:params_method] ||= :params
 
-      @transaction_index = Appsignal::Extension.start_transaction(@transaction_id, @namespace)
+      @ext = Appsignal::Extension.start_transaction(@transaction_id, @namespace)
     end
 
     def nil_transaction?
@@ -63,10 +71,10 @@ module Appsignal
     end
 
     def complete
-      if Appsignal::Extension.finish_transaction(transaction_index)
+      if @ext.finish
         sample_data
       end
-      Appsignal::Extension.complete_transaction(transaction_index)
+      @ext.complete
     end
 
     def pause!
@@ -91,7 +99,7 @@ module Appsignal
 
     def set_action(action)
       return unless action
-      Appsignal::Extension.set_transaction_action(transaction_index, action)
+      @ext.set_action(action)
     end
 
     def set_http_or_background_action(from=request.params)
@@ -105,7 +113,7 @@ module Appsignal
 
     def set_queue_start(start)
       return unless start
-      Appsignal::Extension.set_transaction_queue_start(transaction_index, start)
+      @ext.set_queue_start(start)
     end
 
     def set_http_or_background_queue_start
@@ -118,18 +126,17 @@ module Appsignal
 
     def set_metadata(key, value)
       return unless key && value
-      Appsignal::Extension.set_transaction_metadata(transaction_index, key, value)
+      @ext.set_metadata(key, value)
     end
 
     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,
+      @ext.set_sample_data(
         key.to_s,
         Appsignal::Utils.json_generate(data)
       )
-    rescue JSON::GeneratorError=>e
-      Appsignal.logger.error("JSON generate error (#{e.message}) for '#{data.inspect}'")
+    rescue *JSON_EXCEPTIONS => e
+      Appsignal.logger.error("Error generating JSON (#{e.class}: #{e.message}) for '#{data.inspect}'")
     end
 
     def sample_data
@@ -150,17 +157,29 @@ module Appsignal
       return if Appsignal.is_ignored_error?(error)
 
       backtrace = cleaned_backtrace(error.backtrace)
-      Appsignal::Extension.set_transaction_error(
-        transaction_index,
+      @ext.set_error(
         error.class.name,
         error.message.to_s,
         backtrace ? Appsignal::Utils.json_generate(backtrace) : ''
       )
-    rescue JSON::GeneratorError=>e
-      Appsignal.logger.error("JSON generate error (#{e.message}) for '#{backtrace.inspect}'")
+    rescue *JSON_EXCEPTIONS => e
+      Appsignal.logger.error("Error generating JSON (#{e.class}: #{e.message}) for '#{backtrace.inspect}'")
     end
     alias_method :add_exception, :set_error
 
+    def start_event
+      @ext.start_event
+    end
+
+    def finish_event(name, title, body, body_format)
+      @ext.finish_event(
+        name,
+        title || BLANK,
+        body || BLANK,
+        body_format || 0
+      )
+    end
+
     class GenericRequest
       attr_reader :env
 

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.2.0.alpha.1'
+  VERSION = '1.2.0.alpha.2'
 end

data/spec/lib/appsignal/config_spec.rb

@@ -33,7 +33,8 @@ describe Appsignal::Config do
         :frontend_error_catching_path   => '/appsignal_error_catcher',
         :enable_allocation_tracking     => true,
         :enable_gc_instrumentation      => false,
-        :running_in_container           => false
+        :running_in_container           => false,
+        :collect_host_metrics           => false
       }
     end
 
@@ -112,6 +113,7 @@ describe Appsignal::Config do
         ENV['APPSIGNAL_IGNORE_ACTIONS'].should               == 'action1,action2'
         ENV['APPSIGNAL_RUNNING_IN_CONTAINER'].should         == 'false'
         ENV['APPSIGNAL_WORKING_DIR_PATH'].should             be_nil
+        ENV['APPSIGNAL_COLLECT_HOST_METRICS'].should         == 'false'
       end
 
       context "if working_dir_path is set" do

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

@@ -31,10 +31,9 @@ describe Appsignal::Hooks::MongoMonitorSubscriber do
       end
 
       it "should start an event in the extension" do
-        Appsignal::Extension.should receive(:start_event)
-          .with(transaction.transaction_index)
+        transaction.should receive(:start_event)
 
-          subscriber.started(event)
+        subscriber.started(event)
       end
     end
 
@@ -80,8 +79,7 @@ describe Appsignal::Hooks::MongoMonitorSubscriber do
       end
 
       it "should finish the transaction in the extension" do
-        Appsignal::Extension.should receive(:finish_event).with(
-          transaction.transaction_index,
+        transaction.should receive(:finish_event).with(
           'query.mongodb',
           'find | test | SUCCEEDED',
           "{\"foo\":\"?\"}",

data/spec/lib/appsignal/js_exception_transaction_spec.rb

@@ -32,15 +32,14 @@ describe Appsignal::JSExceptionTransaction do
 
       transaction.send :initialize, data
 
-      expect( transaction.transaction_index ).to eq(1)
+      expect( transaction.ext ).not_to be_nil
     end
   end
 
   describe "#set_base_data" do
     it "should call `Appsignal::Extension.set_transaction_basedata`" do
-      expect( Appsignal::Extension ).to receive(:set_transaction_action).with(
-        kind_of(Integer),
-        'ExceptionIncidentComponent',
+      expect( transaction.ext ).to receive(:set_action).with(
+        'ExceptionIncidentComponent'
       )
 
       transaction.set_action
@@ -49,8 +48,7 @@ describe Appsignal::JSExceptionTransaction do
 
   describe "#set_metadata" do
    it "should call `Appsignal::Extension.set_transaction_metadata`" do
-     expect( Appsignal::Extension ).to receive(:set_transaction_metadata).with(
-      kind_of(Integer),
+     expect( transaction.ext ).to receive(:set_metadata).with(
        'path',
        'foo.bar/moo'
      )
@@ -61,8 +59,7 @@ describe Appsignal::JSExceptionTransaction do
 
   describe "#set_error" do
    it "should call `Appsignal::Extension.set_transaction_error`" do
-     expect( Appsignal::Extension ).to receive(:set_transaction_error).with(
-      kind_of(Integer),
+     expect( transaction.ext ).to receive(:set_error).with(
        'TypeError',
        'foo is not a valid method',
        "[\"foo.bar/js:11:1\",\"foo.bar/js:22:2\"]"
@@ -74,8 +71,7 @@ describe Appsignal::JSExceptionTransaction do
 
   describe "#set_sample_data" do
    it "should call `Appsignal::Extension.set_transaction_error_data`" do
-     expect( Appsignal::Extension ).to receive(:set_transaction_sample_data).with(
-      kind_of(Integer),
+     expect( transaction.ext ).to receive(:set_sample_data).with(
       'tags',
       '["tag1"]'
      )
@@ -86,8 +82,8 @@ describe Appsignal::JSExceptionTransaction do
 
   describe "#complete!" do
     it "should call all required methods" do
-      expect( Appsignal::Extension ).to receive(:finish_transaction).with(kind_of(Integer))
-      expect( Appsignal::Extension ).to receive(:complete_transaction).with(kind_of(Integer))
+      expect( transaction.ext ).to receive(:finish)
+      expect( transaction.ext ).to receive(:complete)
       transaction.complete!
     end
   end

data/spec/lib/appsignal/subscriber_spec.rb

@@ -97,11 +97,11 @@ describe Appsignal::Subscriber do
       end
 
       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', '', '', 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
+        transaction.should_receive(:start_event).exactly(4).times
+        transaction.should_receive(:finish_event).with('one', nil, nil, nil).once
+        transaction.should_receive(:finish_event).with('two', nil, nil, nil).once
+        transaction.should_receive(:finish_event).with('two.three', nil, nil, nil).once
+        transaction.should_receive(:finish_event).with('one.three', nil, nil, nil).once
 
         ActiveSupport::Notifications.instrument('one') do
           ActiveSupport::Notifications.instrument('two') do
@@ -114,13 +114,12 @@ describe Appsignal::Subscriber do
       end
 
       it "should call finish with title and body if there is a formatter" do
-        Appsignal::Extension.should_receive(:start_event).once
-        Appsignal::Extension.should_receive(:finish_event).with(
-          kind_of(Integer),
+        transaction.should_receive(:start_event).once
+        transaction.should_receive(:finish_event).with(
           'request.net_http',
           'GET http://www.google.com',
-          '',
-          0
+          nil,
+          nil
         ).once
 
         ActiveSupport::Notifications.instrument(
@@ -132,9 +131,8 @@ 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),
+        transaction.should_receive(:start_event).once
+        transaction.should_receive(:finish_event).with(
           'sql.active_record',
           'Something load',
           'SELECT * FROM something',

data/spec/lib/appsignal/transaction_spec.rb

@@ -96,7 +96,7 @@ describe Appsignal::Transaction do
       before { Appsignal::Transaction.create('2', Appsignal::Transaction::HTTP_REQUEST, {}) }
 
       it "should complete the current transaction and set the thread appsignal_transaction to nil" do
-        Appsignal::Extension.should_receive(:finish_transaction).with(kind_of(Integer))
+        Appsignal::Transaction.current.should_receive(:complete)
 
         Appsignal::Transaction.complete_current!
 
@@ -104,7 +104,7 @@ describe Appsignal::Transaction do
       end
 
       it "should still clear the transaction if there is an error" do
-        Appsignal::Extension.should_receive(:finish_transaction).with(kind_of(Integer)).and_raise 'Error'
+        Appsignal::Transaction.current.should_receive(:complete).and_raise 'Error'
 
         Appsignal::Transaction.complete_current!
 
@@ -115,17 +115,17 @@ describe Appsignal::Transaction do
 
   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.ext.should_receive(:finish).and_return(true)
       transaction.should_receive(:sample_data)
+      transaction.ext.should_receive(:complete)
 
       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.ext.should_receive(:finish).and_return(false)
       transaction.should_not_receive(:sample_data)
+      transaction.ext.should_receive(:complete)
 
       transaction.complete
     end
@@ -170,13 +170,12 @@ describe Appsignal::Transaction do
     context "initialization" do
       subject { transaction }
 
+      its(:ext)                { should_not be_nil }
       its(:transaction_id)     { should == '1' }
       its(:namespace)          { should == 'http_request' }
-      its(:transaction_index)  { should be_a Integer }
       its(:request)            { should_not be_nil }
       its(:paused)             { should be_false }
       its(:tags)               { should == {} }
-      its(:transaction_index)  { should be_a Integer }
 
       context "options" do
         subject { transaction.options }
@@ -214,8 +213,7 @@ describe Appsignal::Transaction do
 
     describe "set_action" do
       it "should set the action in extension" do
-          Appsignal::Extension.should_receive(:set_transaction_action).with(
-            kind_of(Integer),
+          transaction.ext.should_receive(:set_action).with(
             'PagesController#show'
           ).once
 
@@ -259,8 +257,7 @@ describe Appsignal::Transaction do
 
     describe "set_queue_start" do
       it "should set the queue start in extension" do
-        Appsignal::Extension.should_receive(:set_transaction_queue_start).with(
-          kind_of(Integer),
+        transaction.ext.should_receive(:set_queue_start).with(
           10.0
         ).once
 
@@ -268,7 +265,7 @@ describe Appsignal::Transaction do
       end
 
       it "should not set the queue start in extension when value is nil" do
-        Appsignal::Extension.should_not_receive(:set_transaction_queue_start)
+        transaction.ext.should_not_receive(:set_queue_start)
 
         transaction.set_queue_start(nil)
       end
@@ -300,8 +297,7 @@ describe Appsignal::Transaction do
 
     describe "#set_metadata" do
       it "should set the metdata in extension" do
-        Appsignal::Extension.should_receive(:set_transaction_metadata).with(
-          kind_of(Integer),
+        transaction.ext.should_receive(:set_metadata).with(
           'request_method',
           'GET'
         ).once
@@ -310,7 +306,7 @@ describe Appsignal::Transaction do
       end
 
       it "should not set the metdata in extension when value is nil" do
-        Appsignal::Extension.should_not_receive(:set_transaction_metadata)
+        transaction.ext.should_not_receive(:set_metadata)
 
         transaction.set_metadata('request_method', nil)
       end
@@ -318,8 +314,7 @@ describe Appsignal::Transaction do
 
     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),
+        transaction.ext.should_receive(:set_sample_data).with(
           'params',
           '{"controller":"blog_posts","action":"show","id":"1"}'
         ).once
@@ -335,8 +330,7 @@ describe Appsignal::Transaction do
       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),
+        transaction.ext.should_not_receive(:set_sample_data).with(
           'params',
           kind_of(String)
         )
@@ -347,28 +341,23 @@ describe Appsignal::Transaction do
 
     describe "#sample_data" do
       it "should sample data" do
-        Appsignal::Extension.should_receive(:set_transaction_sample_data).with(
-          kind_of(Integer),
+        transaction.ext.should_receive(:set_sample_data).with(
           '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),
+        transaction.ext.should_receive(:set_sample_data).with(
           'session_data',
           "{}"
         ).once
-        Appsignal::Extension.should_receive(:set_transaction_sample_data).with(
-          kind_of(Integer),
+        transaction.ext.should_receive(:set_sample_data).with(
           'params',
           '{"controller":"blog_posts","action":"show","id":"1"}'
         ).once
-        Appsignal::Extension.should_receive(:set_transaction_sample_data).with(
-          kind_of(Integer),
+        transaction.ext.should_receive(:set_sample_data).with(
           'metadata',
           '{"key":"value"}'
         ).once
-        Appsignal::Extension.should_receive(:set_transaction_sample_data).with(
-          kind_of(Integer),
+        transaction.ext.should_receive(:set_sample_data).with(
           'tags',
           "{}"
         ).once
@@ -387,22 +376,21 @@ describe Appsignal::Transaction do
 
       it "should not add the error if it's in the ignored list" do
         Appsignal.stub(:is_ignored_error? => true)
-        Appsignal::Extension.should_not_receive(:set_transaction_error)
+        transaction.ext.should_not_receive(:set_error)
 
         transaction.set_error(error)
       end
 
       it "should not add the error if appsignal is not active" do
         Appsignal.stub(:active? => false)
-        Appsignal::Extension.should_not_receive(:set_transaction_error)
+        transaction.ext.should_not_receive(:set_error)
 
         transaction.set_error(error)
       end
 
       context "for a http request" do
         it "should set an error in the extension" do
-          Appsignal::Extension.should_receive(:set_transaction_error).with(
-            kind_of(Integer),
+          transaction.ext.should_receive(:set_error).with(
             'RSpec::Mocks::Mock',
             'test message',
             "[\"line 1\"]"
@@ -420,8 +408,7 @@ describe Appsignal::Transaction do
         end
 
         it "should set an error in the extension" do
-          Appsignal::Extension.should_receive(:set_transaction_error).with(
-            kind_of(Integer),
+          transaction.ext.should_receive(:set_error).with(
             'RSpec::Mocks::Mock',
             '',
             "[\"line 1\"]"
@@ -432,6 +419,48 @@ describe Appsignal::Transaction do
       end
     end
 
+    describe "#start_event" do
+      it "should start the event in the extension" do
+        transaction.ext.should_receive(:start_event)
+
+        transaction.start_event
+      end
+    end
+
+    describe "finish_event" do
+      it "should finish the event in the extension" do
+        transaction.ext.should_receive(:finish_event).with(
+          'name',
+          'title',
+          'body',
+          1
+        )
+
+        transaction.finish_event(
+          'name',
+          'title',
+          'body',
+          1
+        )
+      end
+
+      it "should finish the event in the extension with nil arguments" do
+        transaction.ext.should_receive(:finish_event).with(
+          'name',
+          '',
+          '',
+          0
+        )
+
+        transaction.finish_event(
+          'name',
+          nil,
+          nil,
+          nil
+        )
+      end
+    end
+
     context "generic request" do
       let(:env) { {} }
       subject { Appsignal::Transaction::GenericRequest.new(env) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.1
+  version: 1.2.0.alpha.2
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack