appsignal 1.0.7 → 1.1.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42b356ab377c00b79733935aa019790911ccf833
-  data.tar.gz: a0cf25f397a828b9ad7ec98955e1d25f1b2369de
+  metadata.gz: 1b6829aaec5b482bbbce36c10e90369dc1d62c37
+  data.tar.gz: 4d339b3c07c604583c235f2d395812752c251073
 SHA512:
-  metadata.gz: 0ac9406deb657285528ada31371db9ae94e8dc68e67fd5d884c26141682ceec78fbaa057a65e3f5dc6b608be8a7d1ea7417f08e3e4b411703df0be0482e58455
-  data.tar.gz: a445c7e2e82c25abe89d2e9b12fe0783bc7a6702979c4e9293c352302c406cb6e4f4de929cdb319a8a8f95b76c44becc04779c3fa4c9b775154e088e172ad75b
+  metadata.gz: 8006649237b5e0e6d1c99ab039d90fe159f26c9e0dc7ff3c002f6cf778226ed6fab7eaabcb485073bf68bfdae793a5f7d5f4053248b2e8bec928045b553e699d
+  data.tar.gz: 6821cc4959da10f3f78bff97592cca2e9978b025e9ee4ef363b94476ce9936f7fd052f73d21c001b0b255457f05fa066011c5ff0abf556eb13478ac2b5911505

data/.travis.yml

@@ -23,6 +23,7 @@ gemfile:
   - "gemfiles/resque.gemfile"
   - "gemfiles/sequel.gemfile"
   - "gemfiles/sinatra.gemfile"
+  - "gemfiles/grape.gemfile"
 
 matrix:
   exclude:

data/CHANGELOG.md

@@ -1,24 +1,8 @@
-# 1.0.7
-* Another multibyte bugfix in sql sanizitation
-
-# 1.0.6
-* Bugfix in sql sanitization when using multibyte utf-8 characters
-
-# 1.0.5
-* Improved sql sanitization
-* Improved mongoid/mongodb sanitization
-* Minor performance improvements
-* Better handling for non-utf8 convertable strings
-* Make gem installable (but not functional) on jRuby
-
-# 1.0.4
-* Make working dir configurable using `APPSIGNAL_WORKING_DIR_PATH` or `:working_dir_path`
-
-# 1.0.3
-* Fix bug in completing JS transactions
-* Make Resque integration robust for bigger payloads
-* Message in logs if agent logging cannot initialize
-* Call `to_s` on DJ id to see the id when using MongoDB
+# 1.1
+* Collect global metrics for GC durations
+* Collect params from Delayed Job in a reliable way
+* Collect perams for Delayed Job and Sidekiq when using ActiveJob
+* Official Grape support
 
 # 1.0.2
 * Bug fix in format of process memory measurements

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rspec/core/rake_task'
+import 'lib/tasks/diag.rake'
 
 GEMFILES = %w(
   capistrano2
@@ -13,6 +14,7 @@ GEMFILES = %w(
   resque
   sequel
   sinatra
+  grape
 )
 
 RUBY_VERSIONS = %w(

data/circle.yml

@@ -1,6 +1,7 @@
 dependencies:
   override:
-    - rake generate_bundle_and_spec_all
+    - bundle
+    - bundle exec rake generate_bundle_and_spec_all
 
 test:
   override:

data/ext/agent.yml

@@ -1,15 +1,15 @@
 ---
-version: 8b9f469
+version: 77ab5fd
 triples:
   x86_64-linux:
-    checksum: 4477bd8083451e43e38f32bfecddacd5ae004b90ea834de201031c1f4b422fae
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/8b9f469/appsignal-agent-x86_64-linux-static.tar.gz
+    checksum: e8c9a38957a6d630b89f5588c256a160fd5be0b461a78bdca7d7d1f8b7b464ad
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/77ab5fd/appsignal-agent-x86_64-linux-static.tar.gz
     lib_filename: libappsignal.a
   i686-linux:
-    checksum: a62e91f8e88d00abe028e9ed4b0c57e1e0d2c810aef9a9c830dc012b54b5e7d0
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/8b9f469/appsignal-agent-i686-linux-static.tar.gz
+    checksum: 0d1c14a89eddcf99e64dbda02863939f98b7be4d7c53aab4717fd0c08131edac
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/77ab5fd/appsignal-agent-i686-linux-static.tar.gz
     lib_filename: libappsignal.a
   x86_64-darwin:
-    checksum: 8bd5b4bc3f884ae69fbe4759e01c33972f2d09b61b4008d0aae23fc68e617a9b
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/8b9f469/appsignal-agent-x86_64-darwin-static.tar.gz
+    checksum: 5f6c0056465a2c0a818d37326e1fe577618ae9dae2218d17496463dd6f176d37
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/77ab5fd/appsignal-agent-x86_64-darwin-static.tar.gz
     lib_filename: libappsignal.a

data/ext/appsignal_extension.c

@@ -26,19 +26,17 @@ static VALUE start_event(VALUE self, VALUE transaction_index) {
   return Qnil;
 }
 
-static VALUE finish_event(VALUE self, VALUE transaction_index, VALUE name, VALUE title, VALUE body, VALUE body_format) {
+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);
-  Check_Type(body_format, T_FIXNUM);
 
   appsignal_finish_event(
       FIX2INT(transaction_index),
       StringValueCStr(name),
       StringValueCStr(title),
-      StringValueCStr(body),
-      FIX2INT(body_format)
+      StringValueCStr(body)
   );
   return Qnil;
 }
@@ -218,7 +216,7 @@ void Init_appsignal_extension(void) {
   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, "finish_event",                finish_event,                4);
   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);

data/ext/extconf.rb

@@ -1,5 +1,6 @@
 require 'digest'
 require 'logger'
+require 'mkmf'
 require 'fileutils'
 require 'open-uri'
 require 'zlib'
@@ -29,13 +30,6 @@ end
 def install
   logger.info "Installing appsignal agent #{Appsignal::VERSION} for Ruby #{RUBY_VERSION} on #{RUBY_PLATFORM}"
 
-  if RUBY_PLATFORM =~ /java/
-    installation_failed(
-      "We do not support jRuby at the moment, email support@appsignal.com if you want to join the beta"
-    )
-    return
-  end
-
   unless AGENT_CONFIG['triples'].keys.include?(ARCH)
     installation_failed(
       "AppSignal currently does not support your system architecture (#{ARCH})." \
@@ -76,16 +70,13 @@ def install
   end
 
   logger.info "Creating makefile"
-  require 'mkmf'
-  if !find_library('appsignal', 'appsignal_start', EXT_PATH)
-    installation_failed 'Aborting installation, libappsignal not found'
-  elsif !find_executable('appsignal-agent', EXT_PATH)
-    installation_failed 'Aborting installation, appsignal-agent not found'
-  elsif !find_header('appsignal_extension.h', EXT_PATH)
-    installation_failed 'Aborting installation, appsignal_extension.h not found'
-  else
+  if find_library('appsignal', 'appsignal_start', EXT_PATH) &&
+       find_executable('appsignal-agent', EXT_PATH) &&
+       find_header('appsignal_extension.h', EXT_PATH)
     create_makefile 'appsignal_extension'
     logger.info 'Successfully installed appsignal extension'
+  else
+    installation_failed "Aborting installation, extension files were not present"
   end
 rescue => ex
   installation_failed "Exception while installing: #{ex}"

data/gemfiles/grape.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'grape', '0.14.0'
+
+gem 'generator_spec'
+
+gemspec :path => '../'

data/lib/appsignal/config.rb

@@ -42,8 +42,7 @@ module Appsignal
       'APPSIGNAL_HTTP_PROXY'                     => :http_proxy,
       '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_RUNNING_IN_CONTAINER'           => :running_in_container
     }.freeze
 
     attr_reader :root_path, :env, :initial_config, :config_hash
@@ -104,7 +103,6 @@ module Appsignal
       ENV['APPSIGNAL_HTTP_PROXY']                   = config_hash[:http_proxy]
       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]
     end
 
     protected
@@ -152,8 +150,7 @@ module Appsignal
 
       # Configuration with string type
       %w(APPSIGNAL_PUSH_API_KEY APPSIGNAL_APP_NAME APPSIGNAL_PUSH_API_ENDPOINT
-         APPSIGNAL_FRONTEND_ERROR_CATCHING_PATH APPSIGNAL_HTTP_PROXY APPSIGNAL_LOG_PATH
-         APPSIGNAL_WORKING_DIR_PATH).each do |var|
+         APPSIGNAL_FRONTEND_ERROR_CATCHING_PATH APPSIGNAL_HTTP_PROXY APPSIGNAL_LOG_PATH).each do |var|
         if env_var = ENV[var]
           config[ENV_TO_KEY_MAPPING[var]] = env_var
         end

data/lib/appsignal/event_formatter.rb

@@ -60,8 +60,6 @@ module Appsignal
       end
     end
   end
-
-  SQL_BODY_FORMAT = 1
 end
 
 Dir.glob(File.expand_path('../event_formatter/**/*.rb', __FILE__)).each do |file|

data/lib/appsignal/event_formatter/active_record/sql_formatter.rb

@@ -4,9 +4,55 @@ module Appsignal
       class SqlFormatter < Appsignal::EventFormatter
         register 'sql.active_record'
 
+        SINGLE_QUOTED_STRING = /'(.?|[^']).*'/.freeze
+        DOUBLE_QUOTED_STRING = /"(.?|[^"]).*"/.freeze
+        IN_OPERATOR_CONTENT  = /(IN \()[^SELECT][^\)]+(\))/.freeze
+        NUMERIC              = /\d*\.?\d+/.freeze
+        REPLACEMENT          = '?'.freeze
+        IN_REPLACEMENT       = '\1?\2'.freeze
+        SCHEMA               = 'SCHEMA'.freeze
+
+        attr_reader :adapter_uses_double_quoted_table_names
+
+        def initialize
+          @connection_config = connection_config
+          @adapter_uses_double_quoted_table_names = adapter_uses_double_quoted_table_names?
+        rescue ::ActiveRecord::ConnectionNotEstablished
+          Appsignal::EventFormatter.unregister('sql.active_record', self.class)
+          Appsignal.logger.error('Error while getting ActiveRecord connection info, unregistering sql.active_record event formatter')
+        end
+
         def format(payload)
-          [payload[:name], payload[:sql], SQL_BODY_FORMAT]
+          return nil if schema_query?(payload) || !payload[:sql]
+          sql_string = payload[:sql].dup
+          unless adapter_uses_double_quoted_table_names
+            sql_string.gsub!(DOUBLE_QUOTED_STRING, REPLACEMENT)
+          end
+          sql_string.gsub!(SINGLE_QUOTED_STRING, REPLACEMENT)
+          sql_string.gsub!(IN_OPERATOR_CONTENT, IN_REPLACEMENT)
+          sql_string.gsub!(NUMERIC, REPLACEMENT)
+          [payload[:name], sql_string]
         end
+
+        protected
+
+          def schema_query?(payload)
+            payload[:name] == SCHEMA
+          end
+
+          def connection_config
+            # TODO handle ActiveRecord::ConnectionNotEstablished
+            if ::ActiveRecord::Base.respond_to?(:connection_config)
+              ::ActiveRecord::Base.connection_config
+            else
+              ::ActiveRecord::Base.connection_pool.spec.config
+            end
+          end
+
+          def adapter_uses_double_quoted_table_names?
+            adapter = @connection_config[:adapter]
+            adapter =~ /postgres/ || adapter =~ /sqlite/
+          end
       end
     end
   end

data/lib/appsignal/event_formatter/elastic_search/search_formatter.rb

@@ -0,0 +1,29 @@
+module Appsignal
+  class EventFormatter
+    module ElasticSearch
+      class SearchFormatter < Appsignal::EventFormatter
+        register 'search.elasticsearch'
+
+        def format(payload)
+          [
+            "#{payload[:name]}: #{payload[:klass]}",
+            sanitized_search(payload[:search]).inspect
+          ]
+        end
+
+        def sanitized_search(search)
+          return nil unless search.is_a?(Hash)
+          {}.tap do |hsh|
+            search.each do |key, val|
+              if [:index, :type].include?(key)
+                hsh[key] = val
+              else
+                hsh[key] = Appsignal::Utils.sanitize(val)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/appsignal/event_formatter/moped/query_formatter.rb

@@ -11,12 +11,12 @@ module Appsignal
             when 'Moped::Protocol::Command'
               return ['Command', {
                 :database => op.full_collection_name,
-                :selector => Appsignal::Utils.sanitize(op.selector, true, :mongodb)
+                :selector => Appsignal::Utils.sanitize(op.selector)
               }.inspect]
             when 'Moped::Protocol::Query'
               return ['Query', {
                 :database => op.full_collection_name,
-                :selector => Appsignal::Utils.sanitize(op.selector, false, :mongodb),
+                :selector => Appsignal::Utils.sanitize(op.selector),
                 :flags    => op.flags,
                 :limit    => op.limit,
                 :skip     => op.skip,
@@ -25,21 +25,21 @@ module Appsignal
             when 'Moped::Protocol::Delete'
               return ['Delete', {
                 :database => op.full_collection_name,
-                :selector => Appsignal::Utils.sanitize(op.selector, false, :mongodb),
+                :selector => Appsignal::Utils.sanitize(op.selector),
                 :flags    => op.flags,
               }.inspect]
             when 'Moped::Protocol::Insert'
               return ['Insert', {
                 :database   => op.full_collection_name,
-                :documents  => Appsignal::Utils.sanitize(op.documents, true, :mongodb),
+                :documents  => Appsignal::Utils.sanitize(op.documents, true),
                 :count      => op.documents.count,
                 :flags      => op.flags,
               }.inspect]
             when 'Moped::Protocol::Update'
               return ['Update', {
                 :database => op.full_collection_name,
-                :selector => Appsignal::Utils.sanitize(op.selector, false, :mongodb),
-                :update   => Appsignal::Utils.sanitize(op.update, true, :mongodb),
+                :selector => Appsignal::Utils.sanitize(op.selector),
+                :update   => Appsignal::Utils.sanitize(op.update, true),
                 :flags    => op.flags,
               }.inspect]
             when 'Moped::Protocol::KillCursors'
@@ -53,6 +53,7 @@ module Appsignal
             end
           end
         end
+
       end
     end
   end

data/lib/appsignal/hooks.rb

@@ -45,6 +45,39 @@ module Appsignal
         raise NotImplementedError
       end
     end
+
+    module Helpers
+      def string_or_inspect(string_or_other)
+        if string_or_other.is_a?(String)
+          string_or_other
+        else
+          string_or_other.inspect
+        end
+      end
+
+      def truncate(text)
+        text.size > 200 ? "#{text[0...197]}..." : text
+      end
+
+      def extract_value(object_or_hash, field, default_value=nil, convert_to_s=false)
+        value = if object_or_hash.respond_to?(:[])
+          object_or_hash[field]
+        elsif object_or_hash.respond_to?(field)
+          object_or_hash.send(field)
+        end || default_value
+        if convert_to_s
+          value.to_s
+        else
+          value
+        end
+      end
+
+      def format_args(args)
+        args.map do |arg|
+          truncate(string_or_inspect(arg))
+        end
+      end
+    end
   end
 end
 

data/lib/appsignal/hooks/net_http.rb

@@ -6,7 +6,7 @@ module Appsignal
       register :net_http
 
       def dependencies_present?
-        Appsignal.config[:instrument_net_http]
+        Appsignal.config && Appsignal.config[:instrument_net_http]
       end
 
       def install

data/lib/appsignal/hooks/sequel.rb

@@ -3,10 +3,13 @@ module Appsignal
     module SequelExtension
       # Add query instrumentation
       def log_yield(sql, args = nil)
-        ActiveSupport::Notifications.instrument(
-          'sql.sequel',
-          :sql => sql
-        ) do
+
+        # We'd like to get full sql queries in the payloads as well. To do
+        # that we need to find out a way to ask Sequel which quoting strategy
+        # is used by the adapter. We can then do something similar to the AR
+        # formatter.
+
+        ActiveSupport::Notifications.instrument('sql.sequel') do
           yield
         end
       end

data/lib/appsignal/hooks/sidekiq.rb

@@ -1,21 +1,30 @@
 module Appsignal
   class Hooks
     class SidekiqPlugin
+      include Appsignal::Hooks::Helpers
+
       def job_keys
         @job_keys ||= Set.new(%w(
             class args retried_at failed_at
             error_message error_class backtrace
             error_backtrace enqueued_at retry
+            jid retry created_at wrapped
         ))
       end
 
       def call(worker, item, queue)
+        if item['class'] == 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper'
+          params = format_args(item['args'].first['arguments'])
+        else
+          params = format_args(item['args'])
+        end
+
         Appsignal.monitor_transaction(
           'perform_job.sidekiq',
           :class       => item['wrapped'] || item['class'],
           :method      => 'perform',
           :metadata    => formatted_metadata(item),
-          :params      => format_args(item['args']),
+          :params      => params,
           :queue_start => item['enqueued_at']
         ) do
           yield
@@ -29,24 +38,6 @@ module Appsignal
           end
         end
       end
-
-      def string_or_inspect(string_or_other)
-        if string_or_other.is_a?(String)
-          string_or_other
-        else
-          string_or_other.inspect
-        end
-      end
-
-      def format_args(args)
-        args.map do |arg|
-          truncate(string_or_inspect(arg))
-        end
-      end
-
-      def truncate(text)
-        text.size > 200 ? "#{text[0...197]}..." : text
-      end
     end
 
     class SidekiqHook < Appsignal::Hooks::Hook