appsignal 1.4.0.alpha.2 → 1.4.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 418a7f404c4466510643a211e5c02f471eca6774
-  data.tar.gz: 76eb38f7a9095fce099bd1273018c25403e6fa40
+  metadata.gz: 596cead7e715bf92192c49a6a74a452836a72d2e
+  data.tar.gz: 08bbd29e1f602c14aaaf934284ab37f084d0879e
 SHA512:
-  metadata.gz: 6ad62b586d4c3f410129badb7355318ad6b099ddcdd739ef2c6d0f786b5f74b992fdaf4f3169eaccb98c15acdd22f729cf48826e5baaebd83b2ae074c033011d
-  data.tar.gz: 814450ee63b012e911f8e8b4c3a0c643a9b8b4f7282a42466318c38c10a8e7a38d32b484fe0bce392fbcefdc1d6faba136c548237b034933f0ff6a56ff3db907
+  metadata.gz: 303d79b2ba2a59165230a1462c53bc2e259438055319ce505d3b007a3825d8ddbcc2d9a78a3d1d77631e35ef425916fb412df085296cfe1ed22eb609444665d2
+  data.tar.gz: d95b49731fe7838487773f772b02a2c8da3d687df4be19e95b4c52d19c36090afba4c3b85bf7a4fd21ccd10f3ee1ddcfc2a7fd9cf10b301626463881ade5a0f6

data/.rspec

@@ -1 +1,3 @@
---order default --warnings
+--order default
+--warnings
+--require spec_helper

data/.travis.yml

@@ -45,4 +45,6 @@ matrix:
 env:
   global: "RAILS_ENV=test"
 
-script: "bundle exec rake travis"
+before_script: "bundle exec rake extension:install"
+
+script: "bundle exec rake test"

data/CHANGELOG.md

@@ -1,5 +1,40 @@
 # 1.4.0
-* Support for a wider range of Linux versions, including Alpine
+* Add Appsignal.instrument_sql convenience methods
+* Use Appsignal.instrument internally instead of AS instrument
+* Override AS instrument instead of subscribing
+* Use have_library to link libappsignal
+* Refactor rescueing of exceptions
+* Use GC::Profiler to track garbage collection time
+* Recognize wether we're running in container
+* Change load order to set system config first
+* Remove unused config method
+
+# 1.3.6
+* Support blocks arguments on method instrumentation
+* Support `APPSIGNAL_APP_ENV` for Sinatra
+* Minor improvements to installer
+* More robust handing of non-writable log files
+* Cleaner internal exception handling
+* Support for mixed case keywords in sql lexing
+* Support for inserting multiple rows in sql lexing
+
+# 1.3.5
+
+* Fix SSL certificate config in appsignal-agent. PR #151
+* Remove mounted_at Sinatra middleware option. Now detected by default. PR #146
+* Sinatra applications with middleware loading before AppSignal's middleware
+  would crash a request. Fixed in PR #156
+
+# 1.3.4
+
+* Fix argument order for `record_event` in the AppSignal extension
+
+# 1.3.3
+
+* Output AppSignal environment on `appsignal diagnose`
+* Prevent transaction crashes on Sinatra routes with optional parameters
+* Listen to `stage` option to Capistrano 2 for automatic environment detection
+* Add `appsignal_env` option to Capistrano 2 to set a custom environment
 
 # 1.3.2
 * Add method to discard a transaction
@@ -26,6 +61,8 @@
 * Allow overriding Padrino environment with APPSIGNAL_APP_ENV
 * Add mkmf.log to diagnose command
 * Allow for local install with bundler `bundle exec rake install`
+* Listen to `stage` option to Capistrano 3 for automatic environment detection
+* Add `appsignal_env` option to Capistrano 3 to set a custom environment
 
 # 1.2.5
 * Bugfix in CPU utilization calculation for host metrics

data/Rakefile

@@ -103,8 +103,8 @@ task :publish do
   end
 end
 
-task :install do
-  system 'cd ext && rm -f libappsignal.a appsignal-agent appsignal_extension.h Makefile appsignal.bundle && ruby extconf.rb && make && cd ..'
+desc 'Install the AppSignal gem, extension and all possible dependencies.'
+task :install => "extension:install" do
   Bundler.with_clean_env do
     GEMFILES.each do |gemfile|
       system "bundle --gemfile gemfiles/#{gemfile}.gemfile"
@@ -114,8 +114,10 @@ end
 
 task :spec_all_gemfiles do
   GEMFILES.each do |gemfile|
-    puts "Running #{gemfile}"
-    raise 'Not successful' unless system("env BUNDLE_GEMFILE=gemfiles/#{gemfile}.gemfile bundle exec rspec")
+    puts "Running tests for #{gemfile}"
+    unless system("env BUNDLE_GEMFILE=gemfiles/#{gemfile}.gemfile bundle exec rspec")
+      raise 'Not successful'
+    end
   end
 end
 
@@ -135,7 +137,7 @@ task :generate_bundle_and_spec_all do
       out << "#{switch_command.call(version)} || { echo 'Switching Ruby failed'; exit 1; }"
       out << "ruby -v"
       out << "echo 'Compiling extension'"
-      out << 'cd ext && rm -f appsignal-agent appsignal_extension.bundle appsignal.h libappsignal.a Makefile && ruby extconf.rb  && make && cd ..'
+      out << 'cd ext && rm -f appsignal-agent appsignal_extension.bundle appsignal.h libappsignal.a Makefile && ruby extconf.rb && make && cd ..'
       GEMFILES.each do |gemfile|
         unless EXCLUSIONS[gemfile] && EXCLUSIONS[gemfile].include?(short_version)
           out << "echo 'Bundling #{gemfile} in #{short_version}'"
@@ -169,19 +171,34 @@ task :console do
   IRB.start
 end
 
-task :install_extension do
-  `cd ext && rm -f libappsignal.a && ruby extconf.rb && make clean && make`
+namespace :extension do
+  desc 'Install the AppSignal gem extension'
+  task :install => :clean do
+    system 'cd ext && ruby extconf.rb && make clean && make'
+  end
+
+  desc 'Clean the AppSignal gem extension directory of installation artifacts'
+  task :clean do
+    system <<-COMMAND
+      cd ext &&
+        rm -f appsignal.bundle \
+          appsignal-agent \
+          appsignal.h \
+          appsignal_extension.o \
+          install.log \
+          libappsignal.a \
+          Makefile \
+          mkmf.log
+      COMMAND
+  end
 end
 
 begin
   require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new(:rspec) do |t|
-    t.pattern = Dir.glob('spec/**/*_spec.rb')
-  end
+  desc 'Run the AppSignal gem test suite.'
+  RSpec::Core::RakeTask.new :test
 rescue LoadError
   # When running rake install, there is no RSpec yet.
 end
 
-task :travis => [:install_extension, :rspec]
-
 task :default => [:generate_bundle_and_spec_all, :spec_all_gemfiles]

data/benchmark.rake

@@ -1,10 +1,7 @@
+require 'active_support'
 require 'appsignal'
 require 'benchmark'
 
-class ::Appsignal::EventFormatter::ActiveRecord::SqlFormatter
-  def connection_config; {:adapter => 'mysql'}; end
-end
-
 GC.disable
 
 task :default => :'benchmark:all'
@@ -46,9 +43,8 @@ def run_benchmark
       )
       Appsignal::Transaction.create("transaction_#{i}", Appsignal::Transaction::HTTP_REQUEST, request)
 
-      ActiveSupport::Notifications.instrument('process_action.action_controller') do
-        ActiveSupport::Notifications.instrument('sql.active_record', :sql => 'SELECT `users`.* FROM `users`
-                                                                              WHERE `users`.`id` = ?')
+      Appsignal.instrument('process_action.action_controller') do
+        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

data/ext/agent.yml

@@ -1,18 +1,18 @@
 ---
-version: 063afb6
+version: 61c23ea
 triples:
   x86_64-linux:
-    checksum: 01782fccb0a9908ac010944d825c5ad4520fccd7363089222ba9071216e9cd13
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/063afb6/appsignal-x86_64-linux-all-static.tar.gz
+    checksum: 6a0a1ebf6a1a9c7d2ac939f9077fd279155359ed72c74284d70daf0f53b27b10
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/61c23ea/appsignal-x86_64-linux-all-static.tar.gz
   i686-linux:
-    checksum: ef37569b39c2ba6a69db9c64e18f32aa19116b47d818450aa71e9d825a1cacc7
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/063afb6/appsignal-i686-linux-all-static.tar.gz
+    checksum: 498e11631eae3418a55a733ac13b993c35afb782be9fb5c4e5b6be0f52f4f76c
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/61c23ea/appsignal-i686-linux-all-static.tar.gz
   x86-linux:
-    checksum: ef37569b39c2ba6a69db9c64e18f32aa19116b47d818450aa71e9d825a1cacc7
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/063afb6/appsignal-i686-linux-all-static.tar.gz
+    checksum: 498e11631eae3418a55a733ac13b993c35afb782be9fb5c4e5b6be0f52f4f76c
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/61c23ea/appsignal-i686-linux-all-static.tar.gz
   x86_64-darwin:
-    checksum: 88123e35e5eaad135cf64f719fb9a9156db7a9aab999bd1aabf6a34e078972b6
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/063afb6/appsignal-x86_64-darwin-all-static.tar.gz
+    checksum: 62a6ffc8d379bcba0cf7e48f92690b62ffacee81f3e996ace215f56eb03d2be6
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/61c23ea/appsignal-x86_64-darwin-all-static.tar.gz
   universal-darwin:
-    checksum: 88123e35e5eaad135cf64f719fb9a9156db7a9aab999bd1aabf6a34e078972b6
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/063afb6/appsignal-x86_64-darwin-all-static.tar.gz
+    checksum: 62a6ffc8d379bcba0cf7e48f92690b62ffacee81f3e996ace215f56eb03d2be6
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/61c23ea/appsignal-x86_64-darwin-all-static.tar.gz

data/ext/appsignal_extension.c

@@ -17,7 +17,8 @@ static inline VALUE make_ruby_string(appsignal_string_t string) {
 
 VALUE Appsignal;
 VALUE Extension;
-VALUE ExtTransaction;
+VALUE Transaction;
+VALUE Data;
 
 static VALUE start(VALUE self) {
   appsignal_start();
@@ -44,106 +45,155 @@ static VALUE get_server_state(VALUE self, VALUE key) {
   }
 }
 
-static VALUE start_transaction(VALUE self, VALUE transaction_id, VALUE namespace) {
+static VALUE start_transaction(VALUE self, VALUE transaction_id, VALUE namespace, VALUE gc_duration_ms) {
   appsignal_transaction_t* transaction;
 
   Check_Type(transaction_id, T_STRING);
   Check_Type(namespace, T_STRING);
+  Check_Type(gc_duration_ms, T_FIXNUM);
 
   transaction = appsignal_start_transaction(
       make_appsignal_string(transaction_id),
-      make_appsignal_string(namespace)
+      make_appsignal_string(namespace),
+      NUM2LONG(gc_duration_ms)
   );
 
   if (transaction) {
-    return Data_Wrap_Struct(ExtTransaction, NULL, appsignal_free_transaction, transaction);
+    return Data_Wrap_Struct(Transaction, NULL, appsignal_free_transaction, transaction);
   } else {
     return Qnil;
   }
 }
 
-static VALUE start_event(VALUE self) {
+static VALUE start_event(VALUE self, VALUE gc_duration_ms) {
   appsignal_transaction_t* transaction;
 
+  Check_Type(gc_duration_ms, T_FIXNUM);
+
   Data_Get_Struct(self, appsignal_transaction_t, transaction);
 
-  appsignal_start_event(transaction);
+  appsignal_start_event(transaction, NUM2LONG(gc_duration_ms));
 
   return Qnil;
 }
 
-static VALUE finish_event(VALUE self, VALUE name, VALUE title, VALUE body, VALUE body_format) {
+static VALUE finish_event(VALUE self, VALUE name, VALUE title, VALUE body, VALUE body_format, VALUE gc_duration_ms) {
   appsignal_transaction_t* transaction;
+  appsignal_data_t* body_data;
+  int body_type;
 
   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_t, transaction);
 
-  appsignal_finish_event(
-      transaction,
-      make_appsignal_string(name),
-      make_appsignal_string(title),
-      make_appsignal_string(body),
-      FIX2INT(body_format)
-  );
+  body_type = TYPE(body);
+  if (body_type == T_STRING) {
+    appsignal_finish_event(
+        transaction,
+        make_appsignal_string(name),
+        make_appsignal_string(title),
+        make_appsignal_string(body),
+        FIX2INT(body_format),
+        FIX2LONG(gc_duration_ms)
+    );
+  } else if (body_type == RUBY_T_DATA) {
+    Data_Get_Struct(body, appsignal_data_t, body_data);
+    appsignal_finish_event_data(
+        transaction,
+        make_appsignal_string(name),
+        make_appsignal_string(title),
+        body_data,
+        FIX2INT(body_format),
+        FIX2LONG(gc_duration_ms)
+    );
+  } else {
+      rb_raise(rb_eTypeError, "body should be a String or Appsignal::Extension::Data");
+  }
+
   return Qnil;
 }
 
-static VALUE record_event(VALUE self, VALUE name, VALUE title, VALUE body, VALUE duration, VALUE body_format) {
+static VALUE record_event(VALUE self, VALUE name, VALUE title, VALUE body, VALUE duration, VALUE body_format, VALUE gc_duration_ms) {
   appsignal_transaction_t* transaction;
+  appsignal_data_t* body_data;
+  int body_type;
   int duration_type;
 
   Check_Type(name, T_STRING);
   Check_Type(title, T_STRING);
-  Check_Type(body, T_STRING);
   duration_type = TYPE(duration);
   if (duration_type != T_FIXNUM && duration_type != T_BIGNUM) {
       rb_raise(rb_eTypeError, "duration should be a Fixnum or Bignum");
   }
   Check_Type(body_format, T_FIXNUM);
+
   Data_Get_Struct(self, appsignal_transaction_t, transaction);
 
-  appsignal_record_event(
-      transaction,
-      make_appsignal_string(name),
-      make_appsignal_string(title),
-      make_appsignal_string(body),
-      FIX2INT(body_format),
-      NUM2LONG(duration)
-  );
+  body_type = TYPE(body);
+  if (body_type == T_STRING) {
+    appsignal_record_event(
+        transaction,
+        make_appsignal_string(name),
+        make_appsignal_string(title),
+        make_appsignal_string(body),
+        FIX2INT(body_format),
+        NUM2LONG(duration),
+        NUM2LONG(gc_duration_ms)
+    );
+  } else if (body_type == RUBY_T_DATA) {
+    Data_Get_Struct(body, appsignal_data_t, body_data);
+    appsignal_record_event_data(
+        transaction,
+        make_appsignal_string(name),
+        make_appsignal_string(title),
+        body_data,
+        FIX2INT(body_format),
+        NUM2LONG(duration),
+        NUM2LONG(gc_duration_ms)
+    );
+  } else {
+      rb_raise(rb_eTypeError, "body should be a String or Appsignal::Extension::Data");
+  }
+
   return Qnil;
 }
 
 static VALUE set_transaction_error(VALUE self, VALUE name, VALUE message, VALUE backtrace) {
   appsignal_transaction_t* transaction;
+  appsignal_data_t* backtrace_data;
 
   Check_Type(name, T_STRING);
   Check_Type(message, T_STRING);
-  Check_Type(backtrace, T_STRING);
+  Check_Type(backtrace, RUBY_T_DATA);
+
   Data_Get_Struct(self, appsignal_transaction_t, transaction);
+  Data_Get_Struct(backtrace, appsignal_data_t, backtrace_data);
 
   appsignal_set_transaction_error(
       transaction,
       make_appsignal_string(name),
       make_appsignal_string(message),
-      make_appsignal_string(backtrace)
+      backtrace_data
   );
   return Qnil;
 }
 
 static VALUE set_transaction_sample_data(VALUE self, VALUE key, VALUE payload) {
   appsignal_transaction_t* transaction;
+  appsignal_data_t* payload_data;
 
   Check_Type(key, T_STRING);
-  Check_Type(payload, T_STRING);
+  Check_Type(payload, RUBY_T_DATA);
+
   Data_Get_Struct(self, appsignal_transaction_t, transaction);
+  Data_Get_Struct(payload, appsignal_data_t, payload_data);
 
   appsignal_set_transaction_sample_data(
       transaction,
       make_appsignal_string(key),
-      make_appsignal_string(payload)
+      payload_data
   );
   return Qnil;
 }
@@ -194,13 +244,14 @@ static VALUE set_transaction_metadata(VALUE self, VALUE key, VALUE value) {
   return Qnil;
 }
 
-static VALUE finish_transaction(VALUE self) {
+static VALUE finish_transaction(VALUE self, VALUE gc_duration_ms) {
   appsignal_transaction_t* transaction;
   int sample;
 
+  Check_Type(gc_duration_ms, T_FIXNUM);
   Data_Get_Struct(self, appsignal_transaction_t, transaction);
 
-  sample = appsignal_finish_transaction(transaction);
+  sample = appsignal_finish_transaction(transaction, NUM2LONG(gc_duration_ms));
   return sample == 1 ? Qtrue : Qfalse;
 }
 
@@ -213,6 +264,249 @@ static VALUE complete_transaction(VALUE self) {
   return Qnil;
 }
 
+static VALUE data_map_new(VALUE self) {
+  appsignal_data_t* data;
+
+  data = appsignal_data_map_new();
+
+  if (data) {
+    return Data_Wrap_Struct(Data, NULL, appsignal_free_data, data);
+  } else {
+    return Qnil;
+  }
+}
+
+static VALUE data_array_new(VALUE self) {
+  appsignal_data_t* data;
+
+  data = appsignal_data_array_new();
+
+  if (data) {
+    return Data_Wrap_Struct(Data, NULL, appsignal_free_data, data);
+  } else {
+    return Qnil;
+  }
+}
+
+static VALUE data_set_string(VALUE self, VALUE key, VALUE value) {
+  appsignal_data_t* data;
+
+  Check_Type(key, T_STRING);
+  Check_Type(value, T_STRING);
+
+  Data_Get_Struct(self, appsignal_data_t, data);
+
+  appsignal_data_map_set_string(
+    data,
+    make_appsignal_string(key),
+    make_appsignal_string(value)
+  );
+
+  return Qnil;
+}
+
+static VALUE data_set_fixnum(VALUE self, VALUE key, VALUE value) {
+  appsignal_data_t* data;
+
+  Check_Type(key, T_STRING);
+  Check_Type(value, T_FIXNUM);
+
+  Data_Get_Struct(self, appsignal_data_t, data);
+
+  appsignal_data_map_set_integer(
+    data,
+    make_appsignal_string(key),
+    FIX2LONG(value)
+  );
+
+  return Qnil;
+}
+
+static VALUE data_set_float(VALUE self, VALUE key, VALUE value) {
+  appsignal_data_t* data;
+
+  Check_Type(key, T_STRING);
+  Check_Type(value, T_FLOAT);
+
+  Data_Get_Struct(self, appsignal_data_t, data);
+
+  appsignal_data_map_set_float(
+    data,
+    make_appsignal_string(key),
+    NUM2DBL(value)
+  );
+
+  return Qnil;
+}
+
+static VALUE data_set_boolean(VALUE self, VALUE key, VALUE value) {
+  appsignal_data_t* data;
+
+  Check_Type(key, T_STRING);
+
+  Data_Get_Struct(self, appsignal_data_t, data);
+
+  appsignal_data_map_set_boolean(
+    data,
+    make_appsignal_string(key),
+    RTEST(value)
+  );
+
+  return Qnil;
+}
+
+static VALUE data_set_nil(VALUE self, VALUE key) {
+  appsignal_data_t* data;
+
+  Check_Type(key, T_STRING);
+
+  Data_Get_Struct(self, appsignal_data_t, data);
+
+  appsignal_data_map_set_null(
+    data,
+    make_appsignal_string(key)
+  );
+
+  return Qnil;
+}
+
+static VALUE data_set_data(VALUE self, VALUE key, VALUE value) {
+  appsignal_data_t* data;
+  appsignal_data_t* value_data;
+
+  Check_Type(key, T_STRING);
+  Check_Type(value, RUBY_T_DATA);
+
+  Data_Get_Struct(self, appsignal_data_t, data);
+  Data_Get_Struct(value, appsignal_data_t, value_data);
+
+  appsignal_data_map_set_data(
+    data,
+    make_appsignal_string(key),
+    value_data
+  );
+
+  return Qnil;
+}
+
+static VALUE data_append_string(VALUE self, VALUE value) {
+  appsignal_data_t* data;
+
+  Check_Type(value, T_STRING);
+
+  Data_Get_Struct(self, appsignal_data_t, data);
+
+  appsignal_data_array_append_string(
+    data,
+    make_appsignal_string(value)
+  );
+
+  return Qnil;
+}
+
+static VALUE data_append_fixnum(VALUE self, VALUE value) {
+  appsignal_data_t* data;
+
+  Check_Type(value, T_FIXNUM);
+
+  Data_Get_Struct(self, appsignal_data_t, data);
+
+  appsignal_data_array_append_integer(
+    data,
+    FIX2LONG(value)
+ );
+
+  return Qnil;
+}
+
+static VALUE data_append_float(VALUE self, VALUE value) {
+  appsignal_data_t* data;
+
+  Check_Type(value, T_FLOAT);
+
+  Data_Get_Struct(self, appsignal_data_t, data);
+
+  appsignal_data_array_append_float(
+    data,
+    NUM2DBL(value)
+ );
+
+  return Qnil;
+}
+
+static VALUE data_append_boolean(VALUE self, VALUE value) {
+  appsignal_data_t* data;
+
+  Data_Get_Struct(self, appsignal_data_t, data);
+
+  appsignal_data_array_append_boolean(
+    data,
+    RTEST(value)
+ );
+
+  return Qnil;
+}
+
+static VALUE data_append_nil(VALUE self, VALUE value) {
+  appsignal_data_t* data;
+
+  Data_Get_Struct(self, appsignal_data_t, data);
+
+  appsignal_data_array_append_null(data);
+
+  return Qnil;
+}
+
+static VALUE data_append_data(VALUE self, VALUE value) {
+  appsignal_data_t* data;
+  appsignal_data_t* value_data;
+
+  Check_Type(value, RUBY_T_DATA);
+
+  Data_Get_Struct(self, appsignal_data_t, data);
+  Data_Get_Struct(value, appsignal_data_t, value_data);
+
+  appsignal_data_array_append_data(
+    data,
+    value_data
+  );
+
+  return Qnil;
+}
+
+static VALUE data_equal(VALUE self, VALUE other) {
+  appsignal_data_t* data;
+  appsignal_data_t* other_data;
+
+  if (TYPE(other) != RUBY_T_DATA) {
+    return Qfalse;
+  }
+
+  Data_Get_Struct(self, appsignal_data_t, data);
+  Data_Get_Struct(other, appsignal_data_t, other_data);
+
+  if (appsignal_data_equal(data, other_data) == 1) {
+    return Qtrue;
+  } else {
+    return Qfalse;
+  }
+}
+
+static VALUE data_to_s(VALUE self) {
+  appsignal_data_t* data;
+  appsignal_string_t json;
+
+  Data_Get_Struct(self, appsignal_data_t, data);
+
+  json = appsignal_data_to_json(data);
+
+  if (json.len == 0) {
+    return Qnil;
+  } else {
+    return make_ruby_string(json);
+  }
+}
+
 static VALUE set_gauge(VALUE self, VALUE key, VALUE value) {
   Check_Type(key, T_STRING);
   Check_Type(value, T_FLOAT);
@@ -272,14 +566,6 @@ static void track_allocation(rb_event_flag_t flag, VALUE arg1, VALUE arg2, ID ar
   appsignal_track_allocation();
 }
 
-static void track_gc_start(rb_event_flag_t flag, VALUE arg1, VALUE arg2, ID arg3, VALUE arg4) {
-  appsignal_track_gc_start();
-}
-
-static void track_gc_end(rb_event_flag_t flag, VALUE arg1, VALUE arg2, ID arg3, VALUE arg4) {
-  appsignal_track_gc_end();
-}
-
 static VALUE install_allocation_event_hook() {
   // This event hook is only available on Ruby 2.1 and 2.2
   #if defined(RUBY_INTERNAL_EVENT_NEWOBJ)
@@ -293,30 +579,11 @@ static VALUE install_allocation_event_hook() {
   return Qnil;
 }
 
-static VALUE install_gc_event_hooks() {
-  // These event hooks are only available on Ruby 2.1 and 2.2
-  #if defined(RUBY_INTERNAL_EVENT_GC_START)
-  rb_add_event_hook(
-      track_gc_start,
-      RUBY_INTERNAL_EVENT_GC_START,
-      Qnil
-  );
-  #endif
-  #if defined(RUBY_INTERNAL_EVENT_GC_END_MARK)
-  rb_add_event_hook(
-      track_gc_end,
-      RUBY_INTERNAL_EVENT_GC_END_MARK,
-      Qnil
-  );
-  #endif
-
-  return Qnil;
-}
-
 void Init_appsignal_extension(void) {
   Appsignal = rb_define_module("Appsignal");
   Extension = rb_define_class_under(Appsignal, "Extension", rb_cObject);
-  ExtTransaction = rb_define_class_under(Extension, "ExtTransaction", rb_cObject);
+  Transaction = rb_define_class_under(Extension, "Transaction", rb_cObject);
+  Data = rb_define_class_under(Extension, "Data", rb_cObject);
 
   // Starting and stopping
   rb_define_singleton_method(Extension, "start", start, 0);
@@ -326,23 +593,48 @@ void Init_appsignal_extension(void) {
   rb_define_singleton_method(Extension, "get_server_state", get_server_state, 1);
 
   // Start transaction
-  rb_define_singleton_method(Extension, "start_transaction", start_transaction, 2);
+  rb_define_singleton_method(Extension, "start_transaction", start_transaction, 3);
 
   // 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, "record_event",    record_event,                5);
-  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);
+  rb_define_method(Transaction, "start_event",     start_event,                 1);
+  rb_define_method(Transaction, "finish_event",    finish_event,                5);
+  rb_define_method(Transaction, "record_event",    record_event,                6);
+  rb_define_method(Transaction, "set_error",       set_transaction_error,       3);
+  rb_define_method(Transaction, "set_sample_data", set_transaction_sample_data, 2);
+  rb_define_method(Transaction, "set_action",      set_transaction_action,      1);
+  rb_define_method(Transaction, "set_queue_start", set_transaction_queue_start, 1);
+  rb_define_method(Transaction, "set_metadata",    set_transaction_metadata,    2);
+  rb_define_method(Transaction, "finish",          finish_transaction,          1);
+  rb_define_method(Transaction, "complete",        complete_transaction,        0);
+
+  // Create a data map or array
+  rb_define_singleton_method(Extension, "data_map_new", data_map_new, 0);
+  rb_define_singleton_method(Extension, "data_array_new", data_array_new, 0);
+
+  // Add content to a data map
+  rb_define_method(Data, "set_string",  data_set_string,  2);
+  rb_define_method(Data, "set_fixnum",  data_set_fixnum,  2);
+  rb_define_method(Data, "set_float",   data_set_float,   2);
+  rb_define_method(Data, "set_boolean", data_set_boolean, 2);
+  rb_define_method(Data, "set_nil",     data_set_nil,     1);
+  rb_define_method(Data, "set_data",    data_set_data,    2);
+
+  // Add content to a data array
+  rb_define_method(Data, "append_string",  data_append_string,  1);
+  rb_define_method(Data, "append_fixnum",  data_append_fixnum,  1);
+  rb_define_method(Data, "append_float",   data_append_float,   1);
+  rb_define_method(Data, "append_boolean", data_append_boolean, 1);
+  rb_define_method(Data, "append_nil",     data_append_nil,     0);
+  rb_define_method(Data, "append_data",    data_append_data,    1);
+
+  // Data equality
+  rb_define_method(Data, "==", data_equal, 1);
+
+  // Get Json content of a data
+  rb_define_method(Data, "to_s", data_to_s, 0);
 
   // Event hook installation
   rb_define_singleton_method(Extension, "install_allocation_event_hook", install_allocation_event_hook, 0);
-  rb_define_singleton_method(Extension, "install_gc_event_hooks",        install_gc_event_hooks,        0);
 
   // Metrics
   rb_define_singleton_method(Extension, "set_gauge",              set_gauge,              2);