appsignal 0.11.18 → 0.12.beta.0

data/.gitignore

@@ -21,3 +21,9 @@ gemfiles/*.lock
 .ruby-version
 bundle_and_spec_all_rbenv.sh
 bundle_and_spec_all_rvm.sh
+ext/libappsignal.*
+ext/appsignal-agent
+ext/Makefile
+ext/*.bundle
+ext/*.o
+ext/*.so

data/CHANGELOG.md

@@ -1,39 +1,7 @@
-# 0.11.18
-* Fix in Rake integration
-* Refactor of Resque integration
-
-# 0.11.17
-* Fix for bug using rack request in `send_exception`
-
-# 0.11.16
-* Send tags passed to the frontend error catcher
-* Fix issue with ActiveAdmin sending incompatible instrumentation events
-
-# 0.11.15
-* Improve Sinatra support
-
-# 0.11.14
-* Support ActiveJob wrapped jobs
-* Improve proxy support
-* Improve rake support
-
-# 0.11.13
-* Add Padrino support
-* Add Rake task monitoring
-* Add http proxy support
-* Configure Net::HTTP to only use TLS
-* Don't send queue if there is no content
-* Don't retry transmission when response code is 400 (no content)
-* Don't start Resque IPC server when AppSignal is not active
-* Display warning message when attempting to send a non-exception to `send_exception`
-* Fix capistrano 2 detection
-* Fix issue with Sinatra integration attempting to attach an exception to a transaction that doesn't exist.
-
-# 0.11.12
-* Sanitizer will no longer inspect unknown objects, since implementations of inspect sometimes trigger unexpected behavior.
-
-# 0.11.11
-* Reliably get errors in production for Sinatra
+# 0.12.0
+* New version of event formatting and collection
+* Use native library and agent
+* Use API V2
 
 # 0.11.10
 * Fix for binding bug in exceptions in Resque
@@ -47,8 +15,6 @@
 * Add background job metadata (queue, priority etc.) to transaction overview
 * Add APPSIGNAL_APP_ENV variable to Rails config, so you can override the environment
 * Handle http queue times in microseconds too
-* Use less memory when retrying transmissions and don't retry if there's
-  a queue on shutdown
 
 # 0.11.7
 * Add option to override Job name in Delayed Job

data/Rakefile

@@ -10,15 +10,13 @@ GEMFILES = %w(
   rails-4.2
   sequel
   sinatra
-  resque
 )
 
 RUBY_VERSIONS = %w(
   1.9.3-p429
   2.0.0-p451
   2.1.2
-  jruby-1.7.9
-  rbx-2.2.9
+  2.2.0
 )
 
 VERSION_MANAGERS = {
@@ -49,8 +47,8 @@ task :publish do
       puts `git tag #{version}`
       puts `git push origin #{version}`
       puts `git push appsignal #{version}`
-      puts `git push origin master`
-      puts `git push appsignal master`
+      puts `git push origin #{branch}`
+      puts `git push appsignal #{branch}`
     rescue
       raise "Tag: '#{version}' already exists"
     end
@@ -68,6 +66,16 @@ task :publish do
     @version ||= 'v' << gem_version
   end
 
+  def branch
+    if gem_version.include?('alpha') ||
+         gem_version.include?('beta') ||
+         gem_version.include?('rc')
+      'develop'
+    else
+      'master'
+    end
+  end
+
   def git_status_to_array(changes)
     changes.split("\n").each { |change| change.gsub!(/^.. /,'') }
   end
@@ -108,11 +116,11 @@ task :generate_bundle_and_spec_all do
       out << '#!/bin/sh'
     end
     out << 'rm -f .ruby-version'
-
     out << "echo 'Using #{version_manager}'"
     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 ..'
       GEMFILES.each do |gemfile|
         out << "echo 'Bundling #{gemfile} in #{version}'"
         out << "bundle --quiet --gemfile gemfiles/#{gemfile}.gemfile || { echo 'Bundling failed'; exit 1; }"

data/appsignal.gemspec

@@ -20,10 +20,12 @@ Gem::Specification.new do |gem|
   gem.executables           = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files            = gem.files.grep(%r{^(test|spec|features)/})
   gem.name                  = 'appsignal'
-  gem.require_paths         = ['lib']
+  gem.require_paths         = ['lib', 'ext']
   gem.version               = Appsignal::VERSION
   gem.required_ruby_version = '>= 1.9'
 
+  gem.extensions = %w(ext/extconf.rb)
+
   gem.add_dependency 'rack'
   gem.add_dependency 'thread_safe'
 

data/benchmark.rake

@@ -1,7 +1,7 @@
 require 'appsignal'
 require 'benchmark'
 
-class ::Appsignal::Event::ActiveRecordEvent
+class ::Appsignal::EventFormatter::ActiveRecord::SqlFormatter
   def connection_config; {:adapter => 'mysql'}; end
 end
 
@@ -14,11 +14,7 @@ namespace :benchmark do
   task :run_inactive do
     puts 'Running with appsignal off'
     ENV['APPSIGNAL_PUSH_API_KEY'] = nil
-    subscriber = ActiveSupport::Notifications.subscribe do |*args|
-      # Add a subscriber so we can track the overhead of just appsignal
-    end
     run_benchmark
-    ActiveSupport::Notifications.unsubscribe(subscriber)
   end
 
   task :run_active do
@@ -29,18 +25,24 @@ namespace :benchmark do
 end
 
 def run_benchmark
+  no_transactions = 10_000
+
   total_objects = ObjectSpace.count_objects[:TOTAL]
   puts "Initializing, currently #{total_objects} objects"
-  Appsignal.config = Appsignal::Config.new('', 'production')
+
+  Appsignal.config = Appsignal::Config.new(Dir.pwd, 'production', :endpoint => 'http://localhost:8080')
   Appsignal.start
   puts "Appsignal #{Appsignal.active? ? 'active' : 'not active'}"
 
-  puts 'Running 10_000 normal transactions'
+  puts "Running #{no_transactions} normal transactions"
   puts(Benchmark.measure do
-    10_000.times do |i|
+    no_transactions.times do |i|
+      transaction_id = "transaction_#{i}"
+      ActiveSupport::Notifications.instrumenter.instance_variable_set(:@id, transaction_id)
       Appsignal::Transaction.create("transaction_#{i}", {})
 
-      ActiveSupport::Notifications.instrument('sql.active_record', :sql => 'SELECT `users`.* FROM `users` WHERE `users`.`id` = ?')
+      ActiveSupport::Notifications.instrument('sql.active_record', :sql => 'SELECT `users`.* FROM `users`
+                                                                            WHERE `users`.`id` = ?')
       10.times do
         ActiveSupport::Notifications.instrument('sql.active_record', :sql => 'SELECT `todos`.* FROM `todos` WHERE `todos`.`id` = ?')
       end
@@ -64,14 +66,8 @@ def run_benchmark
 
       Appsignal::Transaction.complete_current!
     end
+    puts 'Finished'
   end)
 
-  if Appsignal.active?
-    puts "Running aggregator post_processed_queue! for #{Appsignal.agent.aggregator.queue.length} transactions"
-    puts(Benchmark.measure do
-      Appsignal.agent.aggregator.post_processed_queue!.to_json
-    end)
-  end
-
   puts "Done, currently #{ObjectSpace.count_objects[:TOTAL] - total_objects} objects created"
 end

data/ext/appsignal_extension.c

@@ -0,0 +1,183 @@
+#include<ruby.h>
+
+void appsignal_start(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);
+}
+
+static VALUE start(VALUE self) {
+  appsignal_start();
+
+  return Qnil;
+}
+
+static VALUE start_transaction(VALUE self, VALUE transaction_id) {
+  Check_Type(transaction_id, T_STRING);
+
+  appsignal_start_transaction(STRING_POINTER(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));
+  return Qnil;
+}
+
+static VALUE finish_event(VALUE self, VALUE transaction_id, VALUE name, VALUE title, VALUE body) {
+  Check_Type(transaction_id, T_STRING);
+  Check_Type(name, T_STRING);
+  Check_Type(title, T_STRING);
+  Check_Type(body, T_STRING);
+
+  appsignal_finish_event(
+      STRING_POINTER(transaction_id),
+      STRING_POINTER(name),
+      STRING_POINTER(title),
+      STRING_POINTER(body)
+  );
+  return Qnil;
+}
+
+static VALUE set_transaction_error(VALUE self, VALUE transaction_id, VALUE name, VALUE message) {
+  Check_Type(transaction_id, T_STRING);
+  Check_Type(name, T_STRING);
+  Check_Type(message, T_STRING);
+
+  appsignal_set_transaction_error(
+      STRING_POINTER(transaction_id),
+      STRING_POINTER(name),
+      STRING_POINTER(message)
+  );
+  return Qnil;
+}
+
+static VALUE set_transaction_error_data(VALUE self, VALUE transaction_id, VALUE key, VALUE payload) {
+  Check_Type(transaction_id, T_STRING);
+  Check_Type(key, T_STRING);
+  Check_Type(payload, T_STRING);
+
+  appsignal_set_transaction_error_data(
+      STRING_POINTER(transaction_id),
+      STRING_POINTER(key),
+      STRING_POINTER(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);
+  Check_Type(namespace, T_STRING);
+  Check_Type(action, T_STRING);
+  Check_Type(queue_start, T_FIXNUM);
+
+  appsignal_set_transaction_basedata(
+      STRING_POINTER(transaction_id),
+      STRING_POINTER(namespace),
+      STRING_POINTER(action),
+      FIX2LONG(queue_start)
+  );
+  return Qnil;
+}
+
+static VALUE set_transaction_metadata(VALUE self, VALUE transaction_id, VALUE key, VALUE value) {
+  Check_Type(transaction_id, T_STRING);
+  Check_Type(key, T_STRING);
+  Check_Type(value, T_STRING);
+
+  appsignal_set_transaction_metadata(
+      STRING_POINTER(transaction_id),
+      STRING_POINTER(key),
+      STRING_POINTER(value)
+  );
+  return Qnil;
+}
+
+static VALUE finish_transaction(VALUE self, VALUE transaction_id) {
+  Check_Type(transaction_id, T_STRING);
+
+  appsignal_finish_transaction(STRING_POINTER(transaction_id));
+  return Qnil;
+}
+
+static VALUE set_gauge(VALUE self, VALUE key, VALUE value) {
+  Check_Type(key, T_STRING);
+  Check_Type(value, T_FLOAT);
+
+  appsignal_set_gauge(
+      STRING_POINTER(key),
+      NUM2DBL(value)
+  );
+  return Qnil;
+}
+
+static VALUE set_process_gauge(VALUE self, VALUE key, VALUE value) {
+  Check_Type(key, T_STRING);
+  Check_Type(value, T_FLOAT);
+
+  appsignal_set_process_gauge(
+      STRING_POINTER(key),
+      NUM2DBL(value)
+  );
+  return Qnil;
+}
+
+static VALUE increment_counter(VALUE self, VALUE key, VALUE count) {
+  Check_Type(key, T_STRING);
+  Check_Type(count, T_FIXNUM);
+
+  appsignal_increment_counter(
+      STRING_POINTER(key),
+      FIX2INT(count)
+  );
+  return Qnil;
+}
+
+static VALUE add_distribution_value(VALUE self, VALUE key, VALUE value) {
+  Check_Type(key, T_STRING);
+  Check_Type(value, T_FLOAT);
+
+  appsignal_add_distribution_value(
+      STRING_POINTER(key),
+      NUM2DBL(value)
+  );
+  return Qnil;
+}
+
+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, "start_transaction",          start_transaction,          1);
+  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_basedata",   set_transaction_basedata,   4);
+  rb_define_singleton_method(Extension, "set_transaction_metadata",   set_transaction_metadata,   3);
+  rb_define_singleton_method(Extension, "finish_transaction",         finish_transaction,         1);
+
+  // Metrics
+  rb_define_singleton_method(Extension, "set_gauge",                  set_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/ext/extconf.rb

@@ -0,0 +1,39 @@
+require 'mkmf'
+require 'fileutils'
+require 'open-uri'
+require 'zlib'
+require 'rubygems/package'
+require File.expand_path('../../lib/appsignal/version.rb', __FILE__)
+
+HOST            = 'd135dj0rjqvssy.cloudfront.net'
+SUPPORTED_ARCHS = %w(x86_64-linux x86_64-darwin)
+
+def ext_path(path)
+  File.join(File.expand_path('..', __FILE__), path)
+end
+
+arch = "#{Gem::Platform.local.cpu}-#{Gem::Platform.local.os}"
+
+if SUPPORTED_ARCHS.include?(arch)
+  if !File.exists?(ext_path('appsignal-agent')) || !File.exists?(ext_path('libappsignal.a'))
+    archive_url = "https://#{HOST}/#{Appsignal::AGENT_VERSION}/appsignal-agent-#{arch}.tar.gz"
+    archive     = open(archive_url)
+    Gem::Package::TarReader.new(Zlib::GzipReader.open(archive)) do |tar|
+      tar.each do |entry|
+        if entry.file?
+          File.open(ext_path(entry.full_name), 'wb') do |f|
+            f.write(entry.read)
+          end
+        end
+      end
+    end
+    FileUtils.chmod(0755, ext_path('appsignal-agent'))
+  end
+
+  have_library 'appsignal', 'appsignal_start'
+
+  create_makefile 'appsignal_extension'
+else
+  puts "AppSignal currently does not support your system architecture (#{arch})."
+  puts "Please let us know at support@appsignal.com, we aim to support everything our customers run."
+end

data/gemfiles/capistrano2.gemfile

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'capistrano', '< 3.0'
-gem 'net-ssh', '2.9.2' # 3.x doesn't compile on < Ruby 2.0
 
 gemspec :path => '../'

data/gemfiles/capistrano3.gemfile

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'capistrano', '>= 3.0'
-gem 'net-ssh', '2.9.2' # 3.x doesn't compile on < Ruby 2.0
 
 gemspec :path => '../'

data/gemfiles/rails-4.2.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 4.2.0'
+gem 'rails', '~> 4.2.0.rc'
 
 gem 'generator_spec'