appsignal 0.12.beta.5 → 0.12.beta.6

data/.gitignore

@@ -23,6 +23,7 @@ bundle_and_spec_all_rbenv.sh
 bundle_and_spec_all_rvm.sh
 ext/libappsignal.*
 ext/appsignal-agent
+ext/appsignal_extension.h
 ext/Makefile
 ext/*.bundle
 ext/*.o

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 * Use native library and agent
 * Use API V2
 
+# 0.11.11
+* Reliably get errors in production for Sinatra
+
 # 0.11.10
 * Fix for binding bug in exceptions in Resque
 * Handle invalidly encoded characters in payload

data/ext/appsignal_extension.c

@@ -1,25 +1,5 @@
 #include<ruby.h>
-
-void appsignal_start(void);
-void appsignal_stop(void);
-void appsignal_start_transaction(char *);
-void appsignal_start_event(char *);
-void appsignal_finish_event(char *, char *, char *, char *);
-void appsignal_set_transaction_error(char *, char *, char *);
-void appsignal_set_transaction_error_data(char *, char *, char *);
-void appsignal_set_transaction_basedata(char *, char *, char *, long);
-void appsignal_set_transaction_metadata(char *, char *, char *);
-void appsignal_finish_transaction(char *);
-void appsignal_set_gauge(char *, float);
-void appsignal_set_process_gauge(char *, float);
-void appsignal_increment_counter(char *, int);
-void appsignal_add_distribution_value(char *, float);
-
-static char * STRING_POINTER(VALUE str) {
-  // TODO we should use RSTRING_PTR and RSTRING_LEN, see:
-  // https://github.com/ruby/ruby/blob/trunk/doc/extension.rdoc
-  return StringValueCStr(str);
-}
+#include<appsignal_extension.h>
 
 static VALUE start(VALUE self) {
   appsignal_start();
@@ -36,14 +16,14 @@ static VALUE stop(VALUE self) {
 static VALUE start_transaction(VALUE self, VALUE transaction_id) {
   Check_Type(transaction_id, T_STRING);
 
-  appsignal_start_transaction(STRING_POINTER(transaction_id));
+  appsignal_start_transaction(StringValueCStr(transaction_id));
   return Qnil;
 }
 
 static VALUE start_event(VALUE self, VALUE transaction_id) {
   Check_Type(transaction_id, T_STRING);
 
-  appsignal_start_event(STRING_POINTER(transaction_id));
+  appsignal_start_event(StringValueCStr(transaction_id));
   return Qnil;
 }
 
@@ -54,10 +34,10 @@ static VALUE finish_event(VALUE self, VALUE transaction_id, VALUE name, VALUE ti
   Check_Type(body, T_STRING);
 
   appsignal_finish_event(
-      STRING_POINTER(transaction_id),
-      STRING_POINTER(name),
-      STRING_POINTER(title),
-      STRING_POINTER(body)
+      StringValueCStr(transaction_id),
+      StringValueCStr(name),
+      StringValueCStr(title),
+      StringValueCStr(body)
   );
   return Qnil;
 }
@@ -68,9 +48,9 @@ static VALUE set_transaction_error(VALUE self, VALUE transaction_id, VALUE name,
   Check_Type(message, T_STRING);
 
   appsignal_set_transaction_error(
-      STRING_POINTER(transaction_id),
-      STRING_POINTER(name),
-      STRING_POINTER(message)
+      StringValueCStr(transaction_id),
+      StringValueCStr(name),
+      StringValueCStr(message)
   );
   return Qnil;
 }
@@ -81,9 +61,9 @@ static VALUE set_transaction_error_data(VALUE self, VALUE transaction_id, VALUE
   Check_Type(payload, T_STRING);
 
   appsignal_set_transaction_error_data(
-      STRING_POINTER(transaction_id),
-      STRING_POINTER(key),
-      STRING_POINTER(payload)
+      StringValueCStr(transaction_id),
+      StringValueCStr(key),
+      StringValueCStr(payload)
   );
   return Qnil;
 }
@@ -95,9 +75,9 @@ static VALUE set_transaction_basedata(VALUE self, VALUE transaction_id, VALUE na
   Check_Type(queue_start, T_FIXNUM);
 
   appsignal_set_transaction_basedata(
-      STRING_POINTER(transaction_id),
-      STRING_POINTER(namespace),
-      STRING_POINTER(action),
+      StringValueCStr(transaction_id),
+      StringValueCStr(namespace),
+      StringValueCStr(action),
       FIX2LONG(queue_start)
   );
   return Qnil;
@@ -109,9 +89,9 @@ static VALUE set_transaction_metadata(VALUE self, VALUE transaction_id, VALUE ke
   Check_Type(value, T_STRING);
 
   appsignal_set_transaction_metadata(
-      STRING_POINTER(transaction_id),
-      STRING_POINTER(key),
-      STRING_POINTER(value)
+      StringValueCStr(transaction_id),
+      StringValueCStr(key),
+      StringValueCStr(value)
   );
   return Qnil;
 }
@@ -119,7 +99,7 @@ static VALUE set_transaction_metadata(VALUE self, VALUE transaction_id, VALUE ke
 static VALUE finish_transaction(VALUE self, VALUE transaction_id) {
   Check_Type(transaction_id, T_STRING);
 
-  appsignal_finish_transaction(STRING_POINTER(transaction_id));
+  appsignal_finish_transaction(StringValueCStr(transaction_id));
   return Qnil;
 }
 
@@ -128,7 +108,18 @@ static VALUE set_gauge(VALUE self, VALUE key, VALUE value) {
   Check_Type(value, T_FLOAT);
 
   appsignal_set_gauge(
-      STRING_POINTER(key),
+      StringValueCStr(key),
+      NUM2DBL(value)
+  );
+  return Qnil;
+}
+
+static VALUE set_host_gauge(VALUE self, VALUE key, VALUE value) {
+  Check_Type(key, T_STRING);
+  Check_Type(value, T_FLOAT);
+
+  appsignal_set_host_gauge(
+      StringValueCStr(key),
       NUM2DBL(value)
   );
   return Qnil;
@@ -139,7 +130,7 @@ static VALUE set_process_gauge(VALUE self, VALUE key, VALUE value) {
   Check_Type(value, T_FLOAT);
 
   appsignal_set_process_gauge(
-      STRING_POINTER(key),
+      StringValueCStr(key),
       NUM2DBL(value)
   );
   return Qnil;
@@ -150,7 +141,7 @@ static VALUE increment_counter(VALUE self, VALUE key, VALUE count) {
   Check_Type(count, T_FIXNUM);
 
   appsignal_increment_counter(
-      STRING_POINTER(key),
+      StringValueCStr(key),
       FIX2INT(count)
   );
   return Qnil;
@@ -161,7 +152,7 @@ static VALUE add_distribution_value(VALUE self, VALUE key, VALUE value) {
   Check_Type(value, T_FLOAT);
 
   appsignal_add_distribution_value(
-      STRING_POINTER(key),
+      StringValueCStr(key),
       NUM2DBL(value)
   );
   return Qnil;
@@ -185,6 +176,7 @@ void Init_appsignal_extension(void) {
 
   // Metrics
   rb_define_singleton_method(Extension, "set_gauge",                  set_gauge,                  2);
+  rb_define_singleton_method(Extension, "set_host_gauge",             set_host_gauge,             2);
   rb_define_singleton_method(Extension, "set_process_gauge",          set_process_gauge,          2);
   rb_define_singleton_method(Extension, "increment_counter",          increment_counter,          2);
   rb_define_singleton_method(Extension, "add_distribution_value",     add_distribution_value,     2);

data/lib/appsignal.rb

@@ -117,6 +117,10 @@ module Appsignal
       Appsignal::Extension.set_gauge(key, value)
     end
 
+    def set_host_gauge(key, value)
+      Appsignal::Extension.set_host_gauge(key, value)
+    end
+
     def set_process_gauge(key, value)
       Appsignal::Extension.set_process_gauge(key, value)
     end

data/lib/appsignal/rack/sinatra_instrumentation.rb

@@ -21,6 +21,10 @@ module Appsignal
             payload[:action] = env['sinatra.route']
           end
         end
+      ensure
+        # In production newer versions of Sinatra don't raise errors, but store
+        # them in the sinatra.error env var.
+        Appsignal::Transaction.current.add_exception(env['sinatra.error']) if env['sinatra.error']
       end
 
       def raw_payload(env)

data/lib/appsignal/transaction.rb

@@ -95,6 +95,7 @@ module Appsignal
 
     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,
         error.class.name,

data/lib/appsignal/version.rb

@@ -1,4 +1,4 @@
 module Appsignal
-  VERSION       = '0.12.beta.5'
-  AGENT_VERSION = '5399e29'
+  VERSION       = '0.12.beta.6'
+  AGENT_VERSION = 'fc00f64'
 end

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

@@ -49,6 +49,19 @@ if defined?(::Sinatra)
         process_action_event.name.should == 'process_action.sinatra'
         process_action_event.payload[:action].should == 'GET /'
       end
+
+      it "should add exceptions stored in env under sinatra.error" do
+        exception = RuntimeError.new('Raise the roof')
+        env['sinatra.error'] = exception
+
+        transaction = double
+        transaction.stub(:set_process_action_event)
+        transaction.stub(:add_event)
+        transaction.should_receive(:add_exception).with(exception)
+        Appsignal::Transaction.stub(:current => transaction)
+
+        middleware.call(env)
+      end
     end
 
     describe "raw_payload" do

data/spec/lib/appsignal_spec.rb

@@ -300,6 +300,13 @@ describe Appsignal do
         end
       end
 
+      describe ".set_host_gauge" do
+        it "should call set_host_gauge on the extension" do
+          Appsignal::Extension.should_receive(:set_host_gauge).with('key', 0.1)
+          Appsignal.set_host_gauge('key', 0.1)
+        end
+      end
+
       describe ".set_process_gauge" do
         it "should call set_process_gauge on the extension" do
           Appsignal::Extension.should_receive(:set_process_gauge).with('key', 0.1)

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.12.beta.5
+  version: 0.12.beta.6
+  prerelease: 5
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,104 +13,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-06-18 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
@@ -121,9 +136,9 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -231,27 +246,28 @@ 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: 2.4.5
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Logs performance and exception data from your app to appsignal.com
 test_files:
 - spec/lib/appsignal/auth_check_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 271bcbb77742ccadac194841ea60e95de1342441
-  data.tar.gz: bf94b02a25609bcecd4eea352371df9120253ad5
-SHA512:
-  metadata.gz: 15b3ed0a890e045bbfce51c6e916c99e5dc6aa2d6e41f3111fa741896ae728e5761e55c08a5de67fe1a4f548fe0b0d38153cfbfd4310fec5a014100ae335b461
-  data.tar.gz: bb81572c79a901e99f535ea9164082a1575bf5b13057f00b04ce5ad4bbdebd519a81764ddad8472926d8a9f25623e9da13267d52898779b82194170af76356d2