appsignal 0.12.beta.8 → 0.12.beta.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 15cdef7b5499176e7453ff3c4360754b29646fd2
+  data.tar.gz: 01c020ac0bd899d466085976b612588e19d8a9ef
+SHA512:
+  metadata.gz: 3eebc7f80f249e15bcc6fb540deed0bfe13b220bf7b4e97baf9a07e2de5df6acd7cd4d937a1deb6836ff485d1edf0e61aa469ab91e7fc8dc0e2e9757c6725cb3
+  data.tar.gz: 24eb957be42fc1ccff18275eb164da3222931ad2f0ab70983e4d4cc73f29b56e0dad79b74a1fac0abcecdd3fa2450bfc948e3cc2557f4c658759226f1aa11cf1

data/ext/appsignal_extension.c

@@ -2,8 +2,6 @@
 #include "ruby/debug.h"
 #include "appsignal_extension.h"
 
-VALUE __current_transaction_id = Qnil;
-
 static VALUE start(VALUE self) {
   appsignal_start();
 
@@ -19,27 +17,24 @@ static VALUE stop(VALUE self) {
 static VALUE start_transaction(VALUE self, VALUE transaction_id) {
   Check_Type(transaction_id, T_STRING);
 
-  __current_transaction_id = transaction_id;
-
-  appsignal_start_transaction(StringValueCStr(transaction_id));
-  return Qnil;
+  return INT2FIX(appsignal_start_transaction(StringValueCStr(transaction_id)));
 }
 
-static VALUE start_event(VALUE self, VALUE transaction_id) {
-  Check_Type(transaction_id, T_STRING);
+static VALUE start_event(VALUE self, VALUE transaction_index) {
+  Check_Type(transaction_index, T_FIXNUM);
 
-  appsignal_start_event(StringValueCStr(transaction_id));
+  appsignal_start_event(FIX2INT(transaction_index));
   return Qnil;
 }
 
-static VALUE finish_event(VALUE self, VALUE transaction_id, VALUE name, VALUE title, VALUE body) {
-  Check_Type(transaction_id, T_STRING);
+static VALUE finish_event(VALUE self, VALUE transaction_index, VALUE name, VALUE title, VALUE body) {
+  Check_Type(transaction_index, T_FIXNUM);
   Check_Type(name, T_STRING);
   Check_Type(title, T_STRING);
   Check_Type(body, T_STRING);
 
   appsignal_finish_event(
-      StringValueCStr(transaction_id),
+      FIX2INT(transaction_index),
       StringValueCStr(name),
       StringValueCStr(title),
       StringValueCStr(body)
@@ -47,40 +42,40 @@ static VALUE finish_event(VALUE self, VALUE transaction_id, VALUE name, VALUE ti
   return Qnil;
 }
 
-static VALUE set_transaction_error(VALUE self, VALUE transaction_id, VALUE name, VALUE message) {
-  Check_Type(transaction_id, T_STRING);
+static VALUE set_transaction_error(VALUE self, VALUE transaction_index, VALUE name, VALUE message) {
+  Check_Type(transaction_index, T_FIXNUM);
   Check_Type(name, T_STRING);
   Check_Type(message, T_STRING);
 
   appsignal_set_transaction_error(
-      StringValueCStr(transaction_id),
+      FIX2INT(transaction_index),
       StringValueCStr(name),
       StringValueCStr(message)
   );
   return Qnil;
 }
 
-static VALUE set_transaction_error_data(VALUE self, VALUE transaction_id, VALUE key, VALUE payload) {
-  Check_Type(transaction_id, T_STRING);
+static VALUE set_transaction_error_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(
-      StringValueCStr(transaction_id),
+      FIX2INT(transaction_index),
       StringValueCStr(key),
       StringValueCStr(payload)
   );
   return Qnil;
 }
 
-static VALUE set_transaction_basedata(VALUE self, VALUE transaction_id, VALUE namespace, VALUE action, VALUE queue_start) {
-  Check_Type(transaction_id, T_STRING);
+static VALUE set_transaction_base_data(VALUE self, VALUE transaction_index, VALUE namespace, VALUE action, VALUE queue_start) {
+  Check_Type(transaction_index, T_FIXNUM);
   Check_Type(namespace, T_STRING);
   Check_Type(action, T_STRING);
   Check_Type(queue_start, T_FIXNUM);
 
-  appsignal_set_transaction_basedata(
-      StringValueCStr(transaction_id),
+  appsignal_set_transaction_base_data(
+      FIX2INT(transaction_index),
       StringValueCStr(namespace),
       StringValueCStr(action),
       FIX2LONG(queue_start)
@@ -88,25 +83,23 @@ static VALUE set_transaction_basedata(VALUE self, VALUE transaction_id, VALUE na
   return Qnil;
 }
 
-static VALUE set_transaction_metadata(VALUE self, VALUE transaction_id, VALUE key, VALUE value) {
-  Check_Type(transaction_id, T_STRING);
+static VALUE set_transaction_metadata(VALUE self, VALUE transaction_index, VALUE key, VALUE value) {
+  Check_Type(transaction_index, T_FIXNUM);
   Check_Type(key, T_STRING);
   Check_Type(value, T_STRING);
 
   appsignal_set_transaction_metadata(
-      StringValueCStr(transaction_id),
+      FIX2INT(transaction_index),
       StringValueCStr(key),
       StringValueCStr(value)
   );
   return Qnil;
 }
 
-static VALUE finish_transaction(VALUE self, VALUE transaction_id) {
-  Check_Type(transaction_id, T_STRING);
-
-  __current_transaction_id = Qnil;
+static VALUE finish_transaction(VALUE self, VALUE transaction_index) {
+  Check_Type(transaction_index, T_FIXNUM);
 
-  appsignal_finish_transaction(StringValueCStr(transaction_id));
+  appsignal_finish_transaction(FIX2INT(transaction_index));
   return Qnil;
 }
 
@@ -166,15 +159,24 @@ static VALUE add_distribution_value(VALUE self, VALUE key, VALUE value) {
 }
 
 static void track_allocation(VALUE tpval, void *data) {
-  if (__current_transaction_id != Qnil) {
-    appsignal_track_allocation(StringValueCStr(__current_transaction_id));
+  appsignal_track_allocation();
+}
+
+static void track_gc(VALUE tpval, void *data) {
+  rb_trace_arg_t *tparg = rb_tracearg_from_tracepoint(tpval);
+  rb_event_flag_t flag  = rb_tracearg_event_flag(tparg);
+
+  switch (flag) {
+    case RUBY_INTERNAL_EVENT_GC_START:
+      appsignal_track_gc_start();
+    case RUBY_INTERNAL_EVENT_GC_END_SWEEP:
+      appsignal_track_gc_end();
   }
 }
 
-static void install_tracepoint() {
+static void install_tracepoint_callbacks() {
   #if defined(RUBY_INTERNAL_EVENT_NEWOBJ)
-  VALUE allocation_tracer;
-	allocation_tracer = rb_tracepoint_new(
+  VALUE allocation_tracer = rb_tracepoint_new(
       Qnil,
       RUBY_INTERNAL_EVENT_NEWOBJ,
       track_allocation,
@@ -182,6 +184,16 @@ static void install_tracepoint() {
   );
 	rb_tracepoint_enable(allocation_tracer);
   #endif
+  #if defined(RUBY_INTERNAL_EVENT_GC_START) && defined(RUBY_INTERNAL_EVENT_GC_END_SWEEP)
+  rb_event_flag_t events = RUBY_INTERNAL_EVENT_GC_START|RUBY_INTERNAL_EVENT_GC_END_SWEEP;
+  VALUE gc_tracer = rb_tracepoint_new(
+      Qnil,
+      events,
+      track_gc,
+      0
+  );
+	rb_tracepoint_enable(gc_tracer);
+  #endif
 }
 
 void Init_appsignal_extension(void) {
@@ -196,7 +208,7 @@ void Init_appsignal_extension(void) {
   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_basedata",   set_transaction_basedata,   4);
+  rb_define_singleton_method(Extension, "set_transaction_base_data",  set_transaction_base_data,   4);
   rb_define_singleton_method(Extension, "set_transaction_metadata",   set_transaction_metadata,   3);
   rb_define_singleton_method(Extension, "finish_transaction",         finish_transaction,         1);
 
@@ -207,6 +219,6 @@ void Init_appsignal_extension(void) {
   rb_define_singleton_method(Extension, "increment_counter",          increment_counter,          2);
   rb_define_singleton_method(Extension, "add_distribution_value",     add_distribution_value,     2);
 
-  // Install tracepoint
-  install_tracepoint();
+  // Tracepoint callbacks
+  install_tracepoint_callbacks();
 }

data/lib/appsignal.rb

@@ -137,16 +137,22 @@ module Appsignal
       @in_memory_log = StringIO.new unless @in_memory_log
       @logger ||= Logger.new(@in_memory_log).tap do |l|
         l.level = Logger::INFO
-        l.formatter = Logger::Formatter.new
+        l.formatter = log_formatter
       end
     end
 
+    def log_formatter
+        proc do |severity, datetime, progname, msg|
+          "[#{datetime.strftime('%Y-%m-%dT%H:%M:%S')} (process) ##{Process.pid}][#{severity}] #{msg}"
+        end
+    end
+
     def start_logger(path)
       if path && File.writable?(path) &&
          !ENV['DYNO'] &&
          !ENV['SHELLYCLOUD_DEPLOYMENT']
         @logger = Logger.new(File.join(path, 'appsignal.log'))
-        @logger.formatter = Logger::Formatter.new
+        @logger.formatter = log_formatter
       else
         @logger = Logger.new($stdout)
         @logger.formatter = lambda do |severity, datetime, progname, msg|

data/lib/appsignal/config.rb

@@ -7,11 +7,11 @@ module Appsignal
     include Appsignal::CarefulLogger
 
     DEFAULT_CONFIG = {
+      :debug                          => false,
       :ignore_exceptions              => [],
       :ignore_actions                 => [],
       :send_params                    => true,
       :endpoint                       => 'https://push.appsignal.com',
-      :slow_request_threshold         => 200,
       :instrument_net_http            => true,
       :skip_session_data              => false,
       :enable_frontend_error_catching => false,
@@ -72,6 +72,7 @@ module Appsignal
       ENV['APPSIGNAL_APP_PATH']          = root_path.to_s
       ENV['APPSIGNAL_AGENT_PATH']        = File.expand_path('../../../ext', __FILE__).to_s
       ENV['APPSIGNAL_LOG_PATH']          = File.join(root_path, 'log')
+      ENV['APPSIGNAL_DEBUG_LOGGING']     = config_hash[:debug].to_s
       ENV['APPSIGNAL_PUSH_API_ENDPOINT'] = config_hash[:endpoint]
       ENV['APPSIGNAL_PUSH_API_KEY']      = config_hash[:push_api_key]
       ENV['APPSIGNAL_APP_NAME']          = config_hash[:name]

data/lib/appsignal/js_exception_transaction.rb

@@ -1,11 +1,11 @@
 module Appsignal
   class JSExceptionTransaction
+    attr_reader :uuid, :transaction_index
 
     def initialize(data)
       @data = data
       @uuid = SecureRandom.uuid
-
-      Appsignal::Extension.start_transaction(@uuid)
+      @transaction_index = Appsignal::Extension.start_transaction(@uuid)
 
       set_base_data
       set_metadata
@@ -14,8 +14,8 @@ module Appsignal
     end
 
     def set_base_data
-      Appsignal::Extension.set_transaction_basedata(
-        @uuid,
+      Appsignal::Extension.set_transaction_base_data(
+        @transaction_index,
         'frontend',
         @data['action'],
         0
@@ -24,13 +24,13 @@ module Appsignal
 
     def set_metadata
       Appsignal::Extension.set_transaction_metadata(
-        @uuid, 'path', @data['path']
+        @transaction_index, 'path', @data['path']
       ) if @data['path']
     end
 
     def set_error
       Appsignal::Extension.set_transaction_error(
-        @uuid,
+        @transaction_index,
         @data['name'],
         @data['message']
       )
@@ -46,7 +46,7 @@ module Appsignal
         next unless data.is_a?(Array) || data.is_a?(Hash)
         begin
           Appsignal::Extension.set_transaction_error_data(
-            @uuid,
+            @transaction_index,
             key.to_s,
             JSON.generate(data)
           )
@@ -57,7 +57,7 @@ module Appsignal
     end
 
     def complete!
-      Appsignal::Extension.finish_transaction(@uuid)
+      Appsignal::Extension.finish_transaction(@transaction_index)
     end
   end
 end

data/lib/appsignal/subscriber.rb

@@ -35,7 +35,7 @@ module Appsignal
       return unless transaction = Appsignal::Transaction.current
 
       return if transaction.paused?
-      Appsignal::Extension.start_event(transaction.request_id)
+      Appsignal::Extension.start_event(transaction.transaction_index)
     end
 
     def finish(name, id, payload)
@@ -49,7 +49,7 @@ module Appsignal
 
       title, body = Appsignal::EventFormatter.format(name, payload)
       Appsignal::Extension.finish_event(
-        transaction.request_id,
+        transaction.transaction_index,
         name,
         title || BLANK,
         body || BLANK

data/lib/appsignal/transaction.rb

@@ -17,7 +17,6 @@ module Appsignal
     class << self
       def create(request_id, env)
         Appsignal.logger.debug("Creating transaction: #{request_id}")
-        Appsignal::Extension.start_transaction(request_id)
         Thread.current[:appsignal_transaction] = Appsignal::Transaction.new(request_id, env)
       end
 
@@ -27,7 +26,7 @@ module Appsignal
 
       def complete_current!
         if current
-          Appsignal::Extension.finish_transaction(current.request_id)
+          Appsignal::Extension.finish_transaction(current.transaction_index)
           Thread.current[:appsignal_transaction] = nil
         else
           Appsignal.logger.error('Trying to complete current, but no transaction present')
@@ -35,7 +34,7 @@ module Appsignal
       end
     end
 
-    attr_reader :request_id, :process_action_event, :action, :exception,
+    attr_reader :request_id, :transaction_index, :process_action_event, :action, :exception,
                 :env, :fullpath, :time, :tags, :kind, :queue_start, :paused, :root_event_payload
 
     def initialize(request_id, env)
@@ -47,6 +46,7 @@ module Appsignal
       @tags = {}
       @paused = false
       @queue_start = -1
+      @transaction_index = Appsignal::Extension.start_transaction(@request_id)
     end
 
     def sanitized_environment
@@ -80,8 +80,8 @@ module Appsignal
         @kind = BACKGROUND_JOB
         set_background_queue_start
       end
-      Appsignal::Extension.set_transaction_basedata(
-        request_id,
+      Appsignal::Extension.set_transaction_base_data(
+        transaction_index,
         kind,
         action,
         queue_start
@@ -90,14 +90,14 @@ module Appsignal
 
     def set_metadata(key, value)
       return unless value
-      Appsignal::Extension.set_transaction_metadata(request_id, key, value)
+      Appsignal::Extension.set_transaction_metadata(transaction_index, key, value)
     end
 
     def set_error(error)
       return unless error
       Appsignal.logger.debug("Adding #{error.class.name} to transaction: #{request_id}")
       Appsignal::Extension.set_transaction_error(
-        request_id,
+        transaction_index,
         error.class.name,
         error.message
       )
@@ -112,7 +112,7 @@ module Appsignal
         next unless data.is_a?(Array) || data.is_a?(Hash)
         begin
           Appsignal::Extension.set_transaction_error_data(
-            request_id,
+            transaction_index,
             key.to_s,
             JSON.generate(data)
           )

data/lib/appsignal/version.rb

@@ -1,4 +1,4 @@
 module Appsignal
-  VERSION       = '0.12.beta.8'
-  AGENT_VERSION = '561eea5'
+  VERSION       = '0.12.beta.9'
+  AGENT_VERSION = '4fdcd73'
 end

data/spec/lib/appsignal/config_spec.rb

@@ -16,13 +16,13 @@ describe Appsignal::Config do
 
     it "should merge with the default config and fill the config hash" do
       subject.config_hash.should == {
+        :debug                          => false,
         :ignore_exceptions              => [],
         :ignore_actions                 => [],
         :instrument_net_http            => true,
         :skip_session_data              => false,
         :send_params                    => true,
         :endpoint                       => 'https://push.appsignal.com',
-        :slow_request_threshold         => 200,
         :push_api_key                   => 'abc',
         :name                           => 'TestApp',
         :active                         => true,
@@ -51,6 +51,7 @@ describe Appsignal::Config do
         ENV['APPSIGNAL_APP_PATH'].should          end_with('spec/support/project_fixture')
         ENV['APPSIGNAL_AGENT_PATH'].should        end_with('/ext')
         ENV['APPSIGNAL_LOG_PATH'].should          end_with('/log')
+        ENV['APPSIGNAL_DEBUG_LOGGING'].should     == 'false'
         ENV['APPSIGNAL_PUSH_API_ENDPOINT'].should == 'https://push.appsignal.com'
         ENV['APPSIGNAL_PUSH_API_KEY'].should      == 'abc'
         ENV['APPSIGNAL_APP_NAME'].should          == 'TestApp'
@@ -152,6 +153,7 @@ describe Appsignal::Config do
         )
 
         subject.config_hash.should == {
+          :debug                          => false,
           :push_api_key                   => 'push_api_key',
           :ignore_exceptions              => [],
           :ignore_actions                 => [],
@@ -159,7 +161,6 @@ describe Appsignal::Config do
           :instrument_net_http            => true,
           :skip_session_data              => false,
           :endpoint                       => 'https://push.appsignal.com',
-          :slow_request_threshold         => 200,
           :active                         => true,
           :enable_frontend_error_catching => false,
           :frontend_error_catching_path   => '/appsignal_error_catcher'

data/spec/lib/appsignal/extension_spec.rb

@@ -22,12 +22,12 @@ describe Appsignal::Extension do
       end
 
       it "should have a start_event method" do
-        subject.start_event('request_id')
+        subject.start_event(1)
       end
 
       it "should have a finish_event method" do
         subject.finish_event(
-          'request_id',
+          1,
           'name',
           'title',
           'body'
@@ -36,7 +36,7 @@ describe Appsignal::Extension do
 
       it "should have a set_transaction_error method" do
         subject.set_transaction_error(
-          'request_id',
+          1,
           'name',
           'message'
         )
@@ -44,15 +44,15 @@ describe Appsignal::Extension do
 
       it "should have a set_transaction_error_data method" do
         subject.set_transaction_error_data(
-          'request_id',
+          1,
           'params',
           '{}'
         )
       end
 
-      it "should have a set_transaction_basedata method" do
-        subject.set_transaction_basedata(
-          'request_id',
+      it "should have a set_transaction_base_data method" do
+        subject.set_transaction_base_data(
+          1,
           'kind',
           'action',
           100
@@ -61,14 +61,34 @@ describe Appsignal::Extension do
 
       it "should have a set_transaction_metadata method" do
         subject.set_transaction_metadata(
-          'request_id',
+          1,
           'key',
           'value'
         )
       end
 
       it "should have a finish_transaction method" do
-        subject.finish_transaction('request_id')
+        subject.finish_transaction(1)
+      end
+
+      it "should have a set_gauge method" do
+        Appsignal.set_gauge('key', 1.0)
+      end
+
+      it "should have a set_host_gauge method" do
+        Appsignal.set_host_gauge('key', 1.0)
+      end
+
+      it "should have a set_process_gauge method" do
+        Appsignal.set_process_gauge('key', 1.0)
+      end
+
+      it "should have a increment_counter method" do
+        Appsignal.increment_counter('key', 1)
+      end
+
+      it "should have a add_distribution_value method" do
+        Appsignal.add_distribution_value('key', 1.0)
       end
     end
   end

data/spec/lib/appsignal/js_exception_transaction_spec.rb

@@ -20,7 +20,7 @@ describe Appsignal::JSExceptionTransaction do
 
   describe "#initialize" do
     it "should call all required methods" do
-      expect( Appsignal::Extension ).to receive(:start_transaction).with('123abc')
+      expect( Appsignal::Extension ).to receive(:start_transaction).with('123abc').and_return(1)
 
       expect( transaction ).to receive(:set_base_data)
       expect( transaction ).to receive(:set_metadata)
@@ -28,13 +28,15 @@ describe Appsignal::JSExceptionTransaction do
       expect( transaction ).to receive(:set_error_data)
 
       transaction.send :initialize, data
+
+      expect( transaction.transaction_index ).to eq(1)
     end
   end
 
   describe "#set_base_data" do
     it "should call `Appsignal::Extension.set_transaction_basedata`" do
-      expect( Appsignal::Extension ).to receive(:set_transaction_basedata).with(
-        '123abc',
+      expect( Appsignal::Extension ).to receive(:set_transaction_base_data).with(
+        kind_of(Integer),
         'frontend',
         'ExceptionIncidentComponent',
         0
@@ -47,7 +49,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(
-      '123abc',
+      kind_of(Integer),
        'path',
        'foo.bar/moo'
      )
@@ -59,7 +61,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(
-      '123abc',
+      kind_of(Integer),
        'TypeError',
        'foo is not a valid method'
      )
@@ -71,7 +73,7 @@ describe Appsignal::JSExceptionTransaction do
   describe "#set_error_data" do
    it "should call `Appsignal::Extension.set_transaction_error_data`" do
      expect( Appsignal::Extension ).to receive(:set_transaction_error_data).with(
-      '123abc',
+      kind_of(Integer),
       'backtrace',
       '["foo.bar/js:11:1","foo.bar/js:22:2"]'
      )
@@ -82,9 +84,8 @@ describe Appsignal::JSExceptionTransaction do
 
   describe "#complete!" do
     it "should call all required methods" do
-      expect( Appsignal::Extension ).to receive(:finish_transaction).with('123abc')
+      expect( Appsignal::Extension ).to receive(:finish_transaction).with(kind_of(Integer))
       transaction.complete!
     end
   end
-
 end

data/spec/lib/appsignal/rack/listener_spec.rb

@@ -19,7 +19,7 @@ describe Appsignal::Rack::Listener do
   let(:env) { {} }
 
   describe '#call' do
-    let(:current) { double(:request_id => '1', :set_error => true) }
+    let(:current) { double(:request_id => '1', :set_error => true, :transaction_index => 1) }
     before do
       middleware.stub(:request_id => '1')
       Appsignal::Transaction.stub(:current => current)

data/spec/lib/appsignal/subscriber_spec.rb

@@ -81,10 +81,10 @@ describe Appsignal::Subscriber do
 
       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('request-id', 'one', '', '').once
-        Appsignal::Extension.should_receive(:finish_event).with('request-id', 'two', '', '').once
-        Appsignal::Extension.should_receive(:finish_event).with('request-id', 'two.three', '', '').once
-        Appsignal::Extension.should_receive(:finish_event).with('request-id', 'one.three', '', '').once
+        Appsignal::Extension.should_receive(:finish_event).with(kind_of(Integer), 'one', '', '').once
+        Appsignal::Extension.should_receive(:finish_event).with(kind_of(Integer), 'two', '', '').once
+        Appsignal::Extension.should_receive(:finish_event).with(kind_of(Integer), 'two.three', '', '').once
+        Appsignal::Extension.should_receive(:finish_event).with(kind_of(Integer), 'one.three', '', '').once
 
         ActiveSupport::Notifications.instrument('one') do
           ActiveSupport::Notifications.instrument('two') do
@@ -99,7 +99,7 @@ describe Appsignal::Subscriber do
       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(
-            'request-id',
+            kind_of(Integer),
             'request.net_http',
             'GET http://www.google.com',
             ''

data/spec/lib/appsignal/transaction_spec.rb

@@ -50,7 +50,7 @@ describe Appsignal::Transaction do
         before { Appsignal::Transaction.create('2', {}) }
 
         it "should complete the current transaction and set the thread appsignal_transaction to nil" do
-          Appsignal::Extension.should_receive(:finish_transaction).with('2')
+          Appsignal::Extension.should_receive(:finish_transaction).with(kind_of(Integer))
 
           Appsignal::Transaction.complete_current!
 
@@ -114,6 +114,7 @@ describe Appsignal::Transaction do
       subject { transaction }
 
       its(:request_id)         { should == '3' }
+      its(:transaction_index)  { should be_a Integer }
       its(:root_event_payload) { should be_nil }
       its(:exception)          { should be_nil }
       its(:env)                { should == env }
@@ -141,8 +142,8 @@ describe Appsignal::Transaction do
         let(:payload) { create_payload }
 
         it "should set the meta data in the transaction and native" do
-          Appsignal::Extension.should_receive(:set_transaction_basedata).with(
-            '3',
+          Appsignal::Extension.should_receive(:set_transaction_base_data).with(
+            kind_of(Integer),
             'http_request',
             'BlogPostsController#show',
             kind_of(Integer)
@@ -172,8 +173,8 @@ describe Appsignal::Transaction do
         let(:payload) { create_background_payload }
 
         it "should set the meta data in the transaction and native" do
-          Appsignal::Extension.should_receive(:set_transaction_basedata).with(
-            '3',
+          Appsignal::Extension.should_receive(:set_transaction_base_data).with(
+            kind_of(Integer),
             'background_job',
             'BackgroundJob#perform',
             kind_of(Integer)
@@ -192,7 +193,7 @@ describe Appsignal::Transaction do
     describe "#set_metadata" do
       it "should set the metdata in native" do
         Appsignal::Extension.should_receive(:set_transaction_metadata).with(
-          '3',
+          kind_of(Integer),
           'request_method',
           'GET'
         ).once
@@ -216,27 +217,27 @@ describe Appsignal::Transaction do
 
       it "should set an error and it's data in native" do
         Appsignal::Extension.should_receive(:set_transaction_error).with(
-          '3',
+          kind_of(Integer),
           'RSpec::Mocks::Mock',
           'test message'
         )
         Appsignal::Extension.should_receive(:set_transaction_error_data).with(
-          '3',
+          kind_of(Integer),
           'environment',
           "{\"SERVER_NAME\":\"localhost\",\"HTTP_X_REQUEST_START\":\"1000000\",\"HTTP_USER_AGENT\":\"IE6\"}"
         ).once
         Appsignal::Extension.should_receive(:set_transaction_error_data).with(
-          '3',
+          kind_of(Integer),
           'session_data',
           "{}"
         ).once
         Appsignal::Extension.should_receive(:set_transaction_error_data).with(
-          '3',
+          kind_of(Integer),
           'backtrace',
           "[\"line 1\"]"
         ).once
         Appsignal::Extension.should_receive(:set_transaction_error_data).with(
-          '3',
+          kind_of(Integer),
           'tags',
           "{}"
         ).once
@@ -251,12 +252,12 @@ describe Appsignal::Transaction do
 
         it "should also set params" do
           Appsignal::Extension.should_receive(:set_transaction_error_data).with(
-            '3',
+            kind_of(Integer),
             'params',
             '{"controller":"blog_posts","action":"show","id":"1"}'
           ).once
           Appsignal::Extension.should_receive(:set_transaction_error_data).with(
-            '3',
+            kind_of(Integer),
             kind_of(String),
             kind_of(String)
           ).exactly(4).times
@@ -272,12 +273,12 @@ describe Appsignal::Transaction do
 
         it "should skip the field" do
           Appsignal::Extension.should_not_receive(:set_transaction_error_data).with(
-            '3',
+            kind_of(Integer),
             'params',
             kind_of(String)
           )
           Appsignal::Extension.should_receive(:set_transaction_error_data).with(
-            '3',
+            kind_of(Integer),
             kind_of(String),
             kind_of(String)
           ).exactly(4).times

data/spec/lib/appsignal_spec.rb

@@ -403,6 +403,16 @@ describe Appsignal do
       end
     end
 
+    describe ".log_formatter" do
+      subject { Appsignal.log_formatter }
+
+      it "should format a log line" do
+        Process.stub(:pid => 100)
+        subject.call('Debug', Time.parse('2015-07-08'), nil, 'log line').should ==
+          '[2015-07-08T00:00:00 (process) #100][Debug] log line'
+      end
+    end
+
     describe '.config' do
       subject { Appsignal.config }
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.12.beta.8
-  prerelease: 5
+  version: 0.12.beta.9
 platform: ruby
 authors:
 - Robert Beekman
@@ -13,118 +12,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: The official appsignal.com gem
@@ -136,9 +121,9 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -246,28 +231,27 @@ files:
 homepage: https://github.com/appsignal/appsignal
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
 test_files:
 - spec/lib/appsignal/auth_check_spec.rb