elastic-apm 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e3f8d9490f60e28d99b6e15e7efa2823fb773bacbdc9762f91fc92a4214b05b
-  data.tar.gz: 655814ff9046d8e9dd2d586688b9bc45acdb95f0102626af5ad0886330b58c16
+  metadata.gz: '09106c431ff50c403a81c2013f49d9b6dfb17a23fefd88a1643919322dcf4ebe'
+  data.tar.gz: 4d3bde4e2bbd1de3dba89e992cd4ff032ad8580b82bce0b3d22eed5ce7c11f12
 SHA512:
-  metadata.gz: d4b9cace9b89eddb0ec281061fd098daa1e9297feb7fbc1c5de8ba44746ad2ab225df877480b5a213847d65502e39c321a79d4f35bee257d60d4a63a254c76e5
-  data.tar.gz: ae713fe3ad97666862ed91ecaeb8a199cfdaacb69edeb011840bb34e7da7692e97dffe15b729e3ec1275663bf2e381f241cb7579ca366a1ac7224c7465cbe9db
+  metadata.gz: f2f6b1e3e0da8311d54801cc8f9e84f2e9d6b119652a97e86549fdb9ddc03cab252830507c8c2489fbddb77e2903139490c710753f29a2f40357c65803575d53
+  data.tar.gz: 18050a76699c39f5cda9783a4c8eefb4443d2eefef61f5eaaf5107128f54806a34e6460271c63076425235eb86f408ca6663c9609a6547e969ff30f8eda0e5c6

data/.rspec

@@ -1,2 +1 @@
---format documentation
 --color

data/.rubocop.yml

@@ -53,5 +53,8 @@ Style/SafeNavigation:
 Style/DoubleNegation:
   Enabled: false
 
+Style/EmptyMethod:
+  Enabled: false
+
 Rails/Delegate:
   Enabled: false

data/Gemfile

@@ -38,6 +38,3 @@ when /.+/
 else
   gem framework
 end
-
-gem 'rails' if framework == 'sinatra'
-gem 'sinatra' if framework == 'rails'

data/elastic-apm.gemspec

@@ -14,10 +14,9 @@ Gem::Specification.new do |spec|
   spec.license       = 'Apache-2.0'
   spec.required_ruby_version = ">= 2.2.0"
 
-  spec.add_dependency('activesupport', '>= 3.0.0')
-
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
+
   spec.require_paths = ['lib']
 end

data/lib/elastic_apm/agent.rb

@@ -3,9 +3,10 @@
 require 'elastic_apm/naively_hashable'
 require 'elastic_apm/context_builder'
 require 'elastic_apm/error_builder'
+require 'elastic_apm/stacktrace_builder'
 require 'elastic_apm/error'
 require 'elastic_apm/http'
-require 'elastic_apm/injectors'
+require 'elastic_apm/spies'
 require 'elastic_apm/serializers'
 require 'elastic_apm/timed_worker'
 
@@ -58,26 +59,28 @@ module ElasticAPM
 
     def initialize(config)
       @config = config
+      @http = Http.new(config)
 
       @messages = Queue.new
       @pending_transactions = Queue.new
-      @http = Http.new(config)
 
-      @instrumenter = Instrumenter.new(config, self)
-      @context_builder = ContextBuilder.new(config)
-      @error_builder = ErrorBuilder.new(config)
+      @instrumenter = Instrumenter.new(self)
+
+      @context_builder = ContextBuilder.new(self)
+      @error_builder = ErrorBuilder.new(self)
+      @stacktrace_builder = StacktraceBuilder.new(self)
     end
 
     attr_reader :config, :messages, :pending_transactions, :instrumenter,
-      :context_builder, :http
+      :context_builder, :stacktrace_builder, :http
 
     def start
       debug '[%s] Starting agent, reporting to %s', VERSION, config.server_url
 
       @instrumenter.start
 
-      config.enabled_injectors.each do |lib|
-        require "elastic_apm/injectors/#{lib}"
+      config.enabled_spies.each do |lib|
+        require "elastic_apm/spies/#{lib}"
       end
 
       self
@@ -95,6 +98,8 @@ module ElasticAPM
       stop
     end
 
+    # queues
+
     def enqueue_transaction(transaction)
       boot_worker unless worker_running?
 

data/lib/elastic_apm/config.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'logger'
+require 'yaml'
 
 module ElasticAPM
   # rubocop:disable Metrics/ClassLength
@@ -36,7 +37,7 @@ module ElasticAPM
       source_lines_error_library_frames: 0,
       source_lines_span_library_frames: 0,
 
-      disabled_injectors: %w[json],
+      disabled_spies: %w[json],
 
       current_user_id_method: :id,
       current_user_email_method: :email,
@@ -74,7 +75,7 @@ module ElasticAPM
       'ELASTIC_APM_VERIFY_SERVER_CERT' => [:bool, 'verify_server_cert'],
       'ELASTIC_APM_TRANSACTION_MAX_SPANS' => [:int, 'transaction_max_spans'],
 
-      'ELASTIC_APM_DISABLED_INJECTORS' => [:list, 'disabled_injectors']
+      'ELASTIC_APM_DISABLED_SPIES' => [:list, 'disabled_spies']
     }.freeze
 
     def initialize(options = {})
@@ -123,7 +124,7 @@ module ElasticAPM
     attr_accessor :source_lines_error_library_frames
     attr_accessor :source_lines_span_library_frames
 
-    attr_accessor :disabled_injectors
+    attr_accessor :disabled_spies
 
     attr_accessor :view_paths
     attr_accessor :root_path
@@ -170,7 +171,7 @@ module ElasticAPM
     end
 
     # rubocop:disable Metrics/MethodLength
-    def available_injectors
+    def available_spies
       %w[
         action_dispatch
         delayed_job
@@ -187,8 +188,8 @@ module ElasticAPM
     end
     # rubocop:enable Metrics/MethodLength
 
-    def enabled_injectors
-      available_injectors - disabled_injectors
+    def enabled_spies
+      available_spies - disabled_spies
     end
 
     private

data/lib/elastic_apm/context_builder.rb

@@ -3,7 +3,7 @@
 module ElasticAPM
   # @api private
   class ContextBuilder
-    def initialize(_config); end
+    def initialize(_agent); end
 
     def build(rack_env)
       context = Context.new

data/lib/elastic_apm/error_builder.rb

@@ -3,15 +3,18 @@
 module ElasticAPM
   # @api private
   class ErrorBuilder
-    def initialize(config)
-      @config = config
+    def initialize(agent)
+      @agent = agent
     end
 
     def build_exception(exception, handled: true)
       error = Error.new
       error.exception = Error::Exception.new(exception, handled: handled)
 
-      add_stacktrace error, :exception, exception.backtrace
+      if exception.backtrace
+        add_stacktrace error, :exception, exception.backtrace
+      end
+
       add_transaction_id error
 
       if (transaction = ElasticAPM.current_transaction)
@@ -25,7 +28,10 @@ module ElasticAPM
       error = Error.new
       error.log = Error::Log.new(message, **attrs)
 
-      add_stacktrace error, :log, backtrace
+      if backtrace
+        add_stacktrace error, :log, backtrace
+      end
+
       add_transaction_id error
 
       error
@@ -34,7 +40,9 @@ module ElasticAPM
     private
 
     def add_stacktrace(error, kind, backtrace)
-      return unless (stacktrace = Stacktrace.build(@config, backtrace, :error))
+      stacktrace =
+        @agent.stacktrace_builder.build(backtrace, type: :error)
+      return unless stacktrace
 
       case kind
       when :exception

data/lib/elastic_apm/instrumenter.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'elastic_apm/subscriber'
 require 'elastic_apm/span'
 require 'elastic_apm/transaction'
 
@@ -26,24 +25,26 @@ module ElasticAPM
       end
     end
 
-    def initialize(config, agent, subscriber_class: Subscriber)
-      @config = config
+    def initialize(agent)
       @agent = agent
+      @config = agent.config
 
       @transaction_info = TransactionInfo.new
-
-      @subscriber = subscriber_class.new(config)
     end
 
-    attr_reader :config, :pending_transactions
+    attr_reader :agent, :config, :pending_transactions
 
     def start
-      @subscriber.register!
     end
 
     def stop
       current_transaction.release if current_transaction
-      @subscriber.unregister!
+      @subscriber.unregister! if @subscriber
+    end
+
+    def subscriber=(subscriber)
+      @subscriber = subscriber
+      @subscriber.register!
     end
 
     def current_transaction
@@ -112,7 +113,7 @@ module ElasticAPM
     end
 
     def submit_transaction(transaction)
-      @agent.enqueue_transaction transaction
+      agent.enqueue_transaction transaction
 
       return unless config.debug_transactions
       debug('Submitted transaction:') { Util.inspect_transaction transaction }

data/lib/elastic_apm/middleware.rb

@@ -10,20 +10,21 @@ module ElasticAPM
     # rubocop:disable Metrics/MethodLength
     def call(env)
       begin
-        transaction = ElasticAPM.transaction 'Rack', 'app',
+        transaction = ElasticAPM.transaction 'Rack', 'request',
           context: ElasticAPM.build_context(env)
 
         resp = @app.call env
         status, headers, = resp
 
         if transaction
-          transaction.submit(status, status: status, headers: headers)
+          result = "HTTP #{status.to_s[0]}xx"
+          transaction.submit(result, status: status, headers: headers)
         end
       rescue InternalError
         raise # Don't report ElasticAPM errors
       rescue ::Exception => e
         ElasticAPM.report(e, handled: false)
-        transaction.submit(500, status: 500) if transaction
+        transaction.submit('HTTP 5xx', status: 500) if transaction
         raise
       ensure
         transaction.release if transaction

data/lib/elastic_apm/normalizers/active_record.rb

@@ -19,8 +19,8 @@ module ElasticAPM
         def normalize(_transaction, _name, payload)
           return :skip if %w[SCHEMA CACHE].include?(payload[:name])
 
-          name = summarize(payload[:sql]) || payload[:name] || 'SQL'
-          context = Span::Context.new(statement: payload[:sql])
+          name = summarize(payload[:sql]) || payload[:name]
+          context = Span::Context.new(statement: payload[:sql].to_s)
           [name, @type, context]
         end
 

data/lib/elastic_apm/railtie.rb

@@ -1,18 +1,25 @@
 # frozen_string_literal: true
 
+require 'elastic_apm/subscriber'
+
 module ElasticAPM
   # @api private
   class Railtie < Rails::Railtie
     config.elastic_apm = ActiveSupport::OrderedOptions.new
+
     Config::DEFAULTS.each { |option, value| config.elastic_apm[option] = value }
 
     initializer 'elastic_apm.initialize' do |app|
       config = app.config.elastic_apm.merge(app: app)
 
       begin
-        ElasticAPM.start config
+        agent = ElasticAPM.start config
+
+        if agent
+          agent.instrumenter.subscriber = ElasticAPM::Subscriber.new(agent)
 
-        app.middleware.insert 0, Middleware
+          app.middleware.insert 0, Middleware
+        end
       rescue StandardError => e
         Rails.logger.error "#{Log::PREFIX}Failed to start: #{e.message}"
         Rails.logger.debug e.backtrace.join("\n")
@@ -20,7 +27,7 @@ module ElasticAPM
     end
 
     config.after_initialize do
-      require 'elastic_apm/injectors/action_dispatch'
+      require 'elastic_apm/spies/action_dispatch'
     end
   end
 end

data/lib/elastic_apm/{injectors.rb → spies.rb}

@@ -4,20 +4,20 @@ require 'elastic_apm/util/inflector'
 
 module ElasticAPM
   # @api private
-  module Injectors
+  module Spies
     # @api private
     class Registration
-      def initialize(const_name, require_paths, injector)
+      extend Forwardable
+
+      def initialize(const_name, require_paths, spy)
         @const_name = const_name
         @require_paths = Array(require_paths)
-        @injector = injector
+        @spy = spy
       end
 
-      attr_reader :const_name, :require_paths, :injector
+      attr_reader :const_name, :require_paths
 
-      def install
-        injector.install
-      end
+      def_delegator :@spy, :install
     end
 
     def self.require_hooks
@@ -31,9 +31,9 @@ module ElasticAPM
     def self.register(*args)
       registration = Registration.new(*args)
 
-      if const_defined?(registration.const_name)
-        installed[registration.const_name] = registration
+      if safe_defined?(registration.const_name)
         registration.install
+        installed[registration.const_name] = registration
       else
         register_require_hook registration
       end
@@ -47,7 +47,7 @@ module ElasticAPM
 
     def self.hook_into(name)
       return unless (registration = require_hooks[name])
-      return unless const_defined?(registration.const_name)
+      return unless safe_defined?(registration.const_name)
 
       installed[registration.const_name] = registration
       registration.install
@@ -57,11 +57,8 @@ module ElasticAPM
       end
     end
 
-    def self.const_defined?(const_name)
-      const = Util::Inflector.constantize(const_name)
-      !!const
-    rescue NameError
-      false
+    def self.safe_defined?(const_name)
+      Util::Inflector.safe_constantize(const_name)
     end
   end
 end
@@ -76,8 +73,11 @@ module Kernel
     res = require_without_apm(path)
 
     begin
-      ElasticAPM::Injectors.hook_into(path)
-    rescue ::Exception
+      ElasticAPM::Spies.hook_into(path)
+    rescue ::Exception => e
+      puts "Failed hooking into '#{path}'. Please report this at " \
+        'github.com/elastic/apm-agent-ruby'
+      puts e.backtrace.join("\n")
     end
 
     res

data/lib/elastic_apm/{injectors → spies}/action_dispatch.rb

@@ -2,9 +2,9 @@
 
 module ElasticAPM
   # @api private
-  module Injectors
+  module Spies
     # @api private
-    class ActionDispatchInjector
+    class ActionDispatchSpy
       def install
         ::ActionDispatch::ShowExceptions.class_eval do
           alias render_exception_without_apm render_exception
@@ -20,7 +20,7 @@ module ElasticAPM
     register(
       'ActionDispatch::ShowExceptions',
       'action_dispatch/show_exception',
-      ActionDispatchInjector.new
+      ActionDispatchSpy.new
     )
   end
 end

data/lib/elastic_apm/{injectors → spies}/delayed_job.rb

@@ -2,9 +2,9 @@
 
 module ElasticAPM
   # @api private
-  module Injectors
+  module Spies
     # @api private
-    class DelayedJobInjector
+    class DelayedJobSpy
       CLASS_SEPARATOR = '.'.freeze
       METHOD_SEPARATOR = '#'.freeze
       TYPE = 'Delayed::Job'.freeze
@@ -14,7 +14,7 @@ module ElasticAPM
           alias invoke_job_without_apm invoke_job
 
           def invoke_job(*args, &block)
-            ::ElasticAPM::Injectors::DelayedJobInjector
+            ::ElasticAPM::Spies::DelayedJobSpy
               .invoke_job(self, *args, &block)
           end
         end
@@ -62,7 +62,7 @@ module ElasticAPM
     register(
       'Delayed::Backend::Base',
       'delayed/backend/base',
-      DelayedJobInjector.new
+      DelayedJobSpy.new
     )
   end
 end

data/lib/elastic_apm/{injectors → spies}/elasticsearch.rb

@@ -2,9 +2,9 @@
 
 module ElasticAPM
   # @api private
-  module Injectors
+  module Spies
     # @api private
-    class ElasticsearchInjector
+    class ElasticsearchSpy
       NAME_FORMAT = '%s %s'.freeze
       TYPE = 'db.elasticsearch'.freeze
 
@@ -27,7 +27,7 @@ module ElasticAPM
     register(
       'Elasticsearch::Transport::Client',
       'elasticsearch-transport',
-      ElasticsearchInjector.new
+      ElasticsearchSpy.new
     )
   end
 end

data/lib/elastic_apm/{injectors → spies}/json.rb

@@ -4,9 +4,9 @@ require 'elastic_apm/span_helpers'
 
 module ElasticAPM
   # @api private
-  module Injectors
+  module Spies
     # @api private
-    class JSONInjector
+    class JSONSpy
       def install
         ::JSON.class_eval do
           include SpanHelpers
@@ -17,6 +17,6 @@ module ElasticAPM
       end
     end
 
-    register 'JSON', 'json', JSONInjector.new
+    register 'JSON', 'json', JSONSpy.new
   end
 end

data/lib/elastic_apm/{injectors → spies}/mongo.rb

@@ -2,9 +2,9 @@
 
 module ElasticAPM
   # @api private
-  module Injectors
+  module Spies
     # @api private
-    class MongoInjector
+    class MongoSpy
       def install
         ::Mongo::Monitoring::Global.subscribe(
           ::Mongo::Monitoring::COMMAND,
@@ -35,6 +35,8 @@ module ElasticAPM
         private
 
         def push_event(event)
+          return unless ElasticAPM.current_transaction
+
           ctx = Span::Context.new(
             instance: event.database_name,
             statement: nil,
@@ -46,12 +48,14 @@ module ElasticAPM
         end
 
         def pop_event(event)
-          span = @events[event.operation_id]
-          span.done
+          return unless ElasticAPM.current_transaction
+
+          span = @events.delete(event.operation_id)
+          span && span.done
         end
       end
     end
 
-    register 'Mongo', 'mongo', MongoInjector.new
+    register 'Mongo', 'mongo', MongoSpy.new
   end
 end

data/lib/elastic_apm/{injectors → spies}/net_http.rb

@@ -2,9 +2,9 @@
 
 module ElasticAPM
   # @api private
-  module Injectors
+  module Spies
     # @api private
-    class NetHTTPInjector
+    class NetHTTPSpy
       # rubocop:disable Metrics/MethodLength
       def install
         Net::HTTP.class_eval do
@@ -32,6 +32,6 @@ module ElasticAPM
       # rubocop:enable Metrics/MethodLength
     end
 
-    register 'Net::HTTP', 'net/http', NetHTTPInjector.new
+    register 'Net::HTTP', 'net/http', NetHTTPSpy.new
   end
 end

data/lib/elastic_apm/{injectors → spies}/redis.rb

@@ -2,9 +2,9 @@
 
 module ElasticAPM
   # @api private
-  module Injectors
+  module Spies
     # @api private
-    class RedisInjector
+    class RedisSpy
       def install
         ::Redis::Client.class_eval do
           alias call_without_apm call
@@ -22,6 +22,6 @@ module ElasticAPM
       end
     end
 
-    register 'Redis', 'redis', RedisInjector.new
+    register 'Redis', 'redis', RedisSpy.new
   end
 end

data/lib/elastic_apm/{injectors → spies}/sequel.rb

@@ -4,9 +4,9 @@ require 'elastic_apm/sql_summarizer'
 
 module ElasticAPM
   # @api private
-  module Injectors
+  module Spies
     # @api private
-    class SequelInjector
+    class SequelSpy
       TYPE = 'db.sequel.sql'.freeze
 
       def self.summarizer
@@ -25,7 +25,7 @@ module ElasticAPM
               return log_connection_yield_without_apm(sql, *args, &block)
             end
 
-            summarizer = ElasticAPM::Injectors::SequelInjector.summarizer
+            summarizer = ElasticAPM::Spies::SequelSpy.summarizer
             name = summarizer.summarize sql
             context = Span::Context.new(
               statement: sql,
@@ -40,6 +40,6 @@ module ElasticAPM
       # rubocop:enable Metrics/MethodLength
     end
 
-    register 'Sequel', 'sequel', SequelInjector.new
+    register 'Sequel', 'sequel', SequelSpy.new
   end
 end

data/lib/elastic_apm/{injectors → spies}/sidekiq.rb

@@ -2,9 +2,9 @@
 
 module ElasticAPM
   # @api private
-  module Injectors
+  module Spies
     # @api private
-    class SidekiqInjector
+    class SidekiqSpy
       ACTIVE_JOB_WRAPPER =
         'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper'.freeze
 
@@ -12,7 +12,7 @@ module ElasticAPM
       class Middleware
         # rubocop:disable Metrics/MethodLength
         def call(_worker, job, queue)
-          name = SidekiqInjector.name_for(job)
+          name = SidekiqSpy.name_for(job)
           transaction = ElasticAPM.transaction(name, 'Sidekiq')
           ElasticAPM.set_tag(:queue, queue)
 
@@ -58,10 +58,13 @@ module ElasticAPM
 
           def start
             result = start_without_apm
-            ElasticAPM.start # might already be running from railtie
 
-            return result unless ElasticAPM.running?
-            ElasticAPM.agent.config.logger = Sidekiq.logger
+            # Already running from Railtie if Rails
+            if ElasticAPM.running?
+              ElasticAPM.agent.config.logger = Sidekiq.logger
+            else
+              ElasticAPM.start
+            end
 
             result
           end
@@ -81,6 +84,6 @@ module ElasticAPM
       end
     end
 
-    register 'Sidekiq', 'sidekiq', SidekiqInjector.new
+    register 'Sidekiq', 'sidekiq', SidekiqSpy.new
   end
 end

data/lib/elastic_apm/{injectors → spies}/sinatra.rb

@@ -2,9 +2,9 @@
 
 module ElasticAPM
   # @api private
-  module Injectors
+  module Spies
     # @api private
-    class SinatraInjector
+    class SinatraSpy
       # rubocop:disable Metrics/MethodLength
       def install
         ::Sinatra::Base.class_eval do
@@ -34,8 +34,8 @@ module ElasticAPM
       # rubocop:enable Metrics/MethodLength
     end
 
-    register 'Sinatra::Base', 'sinatra/base', SinatraInjector.new
+    register 'Sinatra::Base', 'sinatra/base', SinatraSpy.new
 
-    require 'elastic_apm/injectors/tilt'
+    require 'elastic_apm/spies/tilt'
   end
 end

data/lib/elastic_apm/{injectors → spies}/tilt.rb

@@ -2,9 +2,9 @@
 
 module ElasticAPM
   # @api private
-  module Injectors
+  module Spies
     # @api private
-    class TiltInjector
+    class TiltSpy
       TYPE = 'template.tilt'.freeze
 
       def install
@@ -22,6 +22,6 @@ module ElasticAPM
       end
     end
 
-    register 'Tilt::Template', 'tilt/template', TiltInjector.new
+    register 'Tilt::Template', 'tilt/template', TiltSpy.new
   end
 end

data/lib/elastic_apm/sql_summarizer.rb

@@ -5,11 +5,16 @@ require 'elastic_apm/util/lru_cache'
 module ElasticAPM
   # @api private
   class SqlSummarizer
+    DEFAULT = 'SQL'.freeze
+    TABLE_REGEX = %{["'`]?([A-Za-z0-9]+)}.freeze
+
     REGEXES = {
-      /^SELECT .* FROM ([^ ]+)/i => 'SELECT FROM ',
-      /^INSERT INTO ([^ ]+)/i => 'INSERT INTO ',
-      /^UPDATE ([^ ]+)/i => 'UPDATE ',
-      /^DELETE FROM ([^ ]+)/i => 'DELETE FROM '
+      /^BEGIN/i => 'BEGIN',
+      /^COMMIT/i => 'COMMIT',
+      /^SELECT .* FROM #{TABLE_REGEX}/i => 'SELECT FROM ',
+      /^INSERT INTO #{TABLE_REGEX}/i => 'INSERT INTO ',
+      /^UPDATE #{TABLE_REGEX}/i => 'UPDATE ',
+      /^DELETE FROM #{TABLE_REGEX}/i => 'DELETE FROM '
     }.freeze
 
     FORMAT = '%s%s'.freeze
@@ -24,7 +29,7 @@ module ElasticAPM
           if (match = sql.match(regex))
             break format(FORMAT, sig, match[1].gsub(/["']/, ''))
           end
-        end
+        end || DEFAULT
     end
   end
 end

data/lib/elastic_apm/stacktrace.rb

@@ -1,36 +1,9 @@
 # frozen_string_literal: true
 
-require 'elastic_apm/stacktrace/frame'
-require 'elastic_apm/stacktrace/line_cache'
-
 module ElasticAPM
   # @api private
   class Stacktrace
-    JAVA_FORMAT = /^(.+)\.([^\.]+)\(([^\:]+)\:(\d+)\)$/
-    RUBY_FORMAT = /^(.+?):(\d+)(?::in `(.+?)')?$/
-
-    RUBY_VERS_REGEX = %r{ruby(/gems)?[-/](\d+\.)+\d}
-    JRUBY_ORG_REGEX = %r{org/jruby}
-
-    def initialize(backtrace)
-      @backtrace = backtrace
-    end
-
-    attr_reader :frames
-
-    def self.build(config, backtrace, type)
-      return nil unless backtrace
-
-      stack = new(backtrace)
-      stack.build_frames(config, type)
-      stack
-    end
-
-    def build_frames(config, type)
-      @frames = @backtrace.map do |line|
-        build_frame(config, line, type)
-      end
-    end
+    attr_accessor :frames
 
     def length
       frames.length
@@ -39,82 +12,5 @@ module ElasticAPM
     def to_a
       frames.map(&:to_h)
     end
-
-    private
-
-    def parse_line(line)
-      ruby_match = line.match(RUBY_FORMAT)
-
-      if ruby_match
-        _, file, number, method = ruby_match.to_a
-        file.sub!(/\.class$/, '.rb')
-        module_name = nil
-      else
-        java_match = line.match(JAVA_FORMAT)
-        _, module_name, method, file, number = java_match.to_a
-      end
-
-      [file, number, method, module_name]
-    end
-
-    def library_frame?(config, abs_path)
-      return false unless abs_path
-
-      if abs_path.start_with?(config.root_path)
-        return true if abs_path.start_with?(config.root_path + '/vendor')
-        return false
-      end
-
-      return true if abs_path.match(RUBY_VERS_REGEX)
-      return true if abs_path.match(JRUBY_ORG_REGEX)
-
-      false
-    end
-
-    class << self
-      attr_accessor :frame_cache
-    end
-
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-    def build_frame(config, line, type)
-      # TODO: Eventually move this to agent 'context'
-      self.class.frame_cache ||= Util::LruCache.new(2048) do |cache, keys|
-        line, type = keys
-        abs_path, lineno, function, _module_name = parse_line(line)
-
-        frame = Frame.new
-        frame.abs_path = abs_path
-        frame.filename = strip_load_path(abs_path)
-        frame.function = function
-        frame.lineno = lineno.to_i
-        frame.library_frame = library_frame?(config, abs_path)
-
-        line_count =
-          context_lines_for(config, type, library_frame: frame.library_frame)
-        frame.build_context line_count
-
-        cache[[line, type]] = frame
-      end
-
-      self.class.frame_cache[[line, type]]
-    end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-
-    def strip_load_path(path)
-      return nil if path.nil?
-
-      prefix =
-        $LOAD_PATH
-        .map(&:to_s)
-        .select { |s| path.start_with?(s) }
-        .max_by(&:length)
-
-      prefix ? path[prefix.chomp(File::SEPARATOR).length + 1..-1] : path
-    end
-
-    def context_lines_for(config, type, library_frame:)
-      key = "source_lines_#{type}_#{library_frame ? 'library' : 'app'}_frames"
-      config.send(key.to_sym)
-    end
   end
 end

data/lib/elastic_apm/stacktrace/frame.rb

@@ -38,11 +38,7 @@ module ElasticAPM
       private
 
       def read_lines(path, range)
-        if (cached = LineCache.get(path, range))
-          return cached
-        end
-
-        LineCache.set(path, range, File.readlines(path)[range]) || []
+        File.readlines(path)[range]
       rescue Errno::ENOENT
         []
       end

data/lib/elastic_apm/stacktrace_builder.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require 'elastic_apm/stacktrace/frame'
+require 'elastic_apm/util/lru_cache'
+
+module ElasticAPM
+  # @api private
+  class StacktraceBuilder
+    JAVA_FORMAT = /^(.+)\.([^\.]+)\(([^\:]+)\:(\d+)\)$/
+    RUBY_FORMAT = /^(.+?):(\d+)(?::in `(.+?)')?$/
+
+    RUBY_VERS_REGEX = %r{ruby(/gems)?[-/](\d+\.)+\d}
+    JRUBY_ORG_REGEX = %r{org/jruby}
+
+    def initialize(agent)
+      @config = agent.config
+      @cache = Util::LruCache.new(2048, &method(:build_frame))
+    end
+
+    attr_reader :config
+
+    def build(backtrace, type:)
+      Stacktrace.new.tap do |s|
+        s.frames = backtrace.map do |line|
+          @cache[[line, type]]
+        end
+      end
+    end
+
+    private
+
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def build_frame(cache, keys)
+      line, type = keys
+      abs_path, lineno, function, _module_name = parse_line(line)
+
+      frame = Stacktrace::Frame.new
+      frame.abs_path = abs_path
+      frame.filename = strip_load_path(abs_path)
+      frame.function = function
+      frame.lineno = lineno.to_i
+      frame.library_frame = library_frame?(config, abs_path)
+
+      line_count =
+        context_lines_for(config, type, library_frame: frame.library_frame)
+      frame.build_context line_count
+
+      cache[[line, type]] = frame
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+
+    def parse_line(line)
+      ruby_match = line.match(RUBY_FORMAT)
+
+      if ruby_match
+        _, file, number, method = ruby_match.to_a
+        file.sub!(/\.class$/, '.rb')
+        module_name = nil
+      else
+        java_match = line.match(JAVA_FORMAT)
+        _, module_name, method, file, number = java_match.to_a
+      end
+
+      [file, number, method, module_name]
+    end
+
+    def library_frame?(config, abs_path)
+      return false unless abs_path
+
+      if abs_path.start_with?(config.root_path)
+        return true if abs_path.start_with?(config.root_path + '/vendor')
+        return false
+      end
+
+      return true if abs_path.match(RUBY_VERS_REGEX)
+      return true if abs_path.match(JRUBY_ORG_REGEX)
+
+      false
+    end
+
+    def strip_load_path(path)
+      return nil if path.nil?
+
+      prefix =
+        $LOAD_PATH
+        .map(&:to_s)
+        .select { |s| path.start_with?(s) }
+        .max_by(&:length)
+
+      prefix ? path[prefix.chomp(File::SEPARATOR).length + 1..-1] : path
+    end
+
+    def context_lines_for(config, type, library_frame:)
+      key = "source_lines_#{type}_#{library_frame ? 'library' : 'app'}_frames"
+      config.send(key.to_sym)
+    end
+  end
+end

data/lib/elastic_apm/subscriber.rb

@@ -8,10 +8,9 @@ module ElasticAPM
   class Subscriber
     include Log
 
-    def initialize(config, agent: ElasticAPM)
-      @config = config
+    def initialize(agent)
       @agent = agent
-      @normalizers = Normalizers.build(config)
+      @normalizers = Normalizers.build(agent.config)
     end
 
     def register!

data/lib/elastic_apm/timed_worker.rb

@@ -75,6 +75,7 @@ module ElasticAPM
       @adapter.post('/v1/errors', payload)
     end
 
+    # rubocop:disable Metrics/MethodLength
     def collect_and_send_transactions
       return if pending_transactions.empty?
 
@@ -89,7 +90,10 @@ module ElasticAPM
         debug e.backtrace.join("\n")
         nil
       end
+
+      @last_sent_transactions = Time.now
     end
+    # rubocop:enable Metrics/MethodLength
 
     def collect_batched_transactions
       batch = []

data/lib/elastic_apm/transaction.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module ElasticAPM
+  # rubocop:disable Metrics/ClassLength
   # @api private
   class Transaction
     DEFAULT_TYPE = 'custom'.freeze
@@ -103,8 +104,10 @@ module ElasticAPM
       span = next_span(name, type, context)
       spans << span
 
-      span.stacktrace =
-        backtrace && Stacktrace.build(@instrumenter.config, backtrace, :span)
+      if backtrace
+        span.stacktrace =
+          @instrumenter.agent.stacktrace_builder.build(backtrace, type: :span)
+      end
 
       span.start
     end
@@ -141,4 +144,5 @@ module ElasticAPM
       )
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/elastic_apm/util/inflector.rb

@@ -1,14 +1,17 @@
+# frozen_string_literal: true
+
 module ElasticAPM
+  # rubocop:disable all
   module Util
-    # @api private
+    # From https://github.com/rails/rails/blob/v5.2.0/activesupport/lib/active_support/inflector/methods.rb#L254-L332
     module Inflector
-      # rubocop:disable all
-      # From https://github.com/rails/rails/blob/861b70e92f4a1fc0e465ffcf2ee62680519c8f6f/activesupport/lib/active_support/inflector/methods.rb#L249
+      extend self
+
       #
       # Tries to find a constant with the name specified in the argument string.
       #
-      #   'Module'.constantize     # => Module
-      #   'Test::Unit'.constantize # => Test::Unit
+      #   constantize('Module')   # => Module
+      #   constantize('Foo::Bar') # => Foo::Bar
       #
       # The name is assumed to be the one of a top-level constant, no matter
       # whether it starts with "::" or not. No lexical context is taken into
@@ -17,14 +20,14 @@ module ElasticAPM
       #   C = 'outside'
       #   module M
       #     C = 'inside'
-      #     C               # => 'inside'
-      #     'C'.constantize # => 'outside', same as ::C
+      #     C                # => 'inside'
+      #     constantize('C') # => 'outside', same as ::C
       #   end
       #
       # NameError is raised when the name is not in CamelCase or the constant is
       # unknown.
-      def self.constantize(camel_cased_word)
-        names = camel_cased_word.split('::')
+      def constantize(camel_cased_word)
+        names = camel_cased_word.split("::".freeze)
 
         # Trigger a built-in NameError exception including the ill-formed constant in the message.
         Object.const_get(camel_cased_word) if names.empty?
@@ -42,7 +45,7 @@ module ElasticAPM
 
             # Go down the ancestors to check if it is owned directly. The check
             # stops when we reach Object or the end of ancestors tree.
-            constant = constant.ancestors.inject do |const, ancestor|
+            constant = constant.ancestors.inject(constant) do |const, ancestor|
               break const    if ancestor == Object
               break ancestor if ancestor.const_defined?(name, false)
               const
@@ -53,7 +56,38 @@ module ElasticAPM
           end
         end
       end
-      # rubocop:enable all
+
+      # Tries to find a constant with the name specified in the argument string.
+      #
+      #   safe_constantize('Module')   # => Module
+      #   safe_constantize('Foo::Bar') # => Foo::Bar
+      #
+      # The name is assumed to be the one of a top-level constant, no matter
+      # whether it starts with "::" or not. No lexical context is taken into
+      # account:
+      #
+      #   C = 'outside'
+      #   module M
+      #     C = 'inside'
+      #     C                     # => 'inside'
+      #     safe_constantize('C') # => 'outside', same as ::C
+      #   end
+      #
+      # +nil+ is returned when the name is not in CamelCase or the constant (or
+      # part of it) is unknown.
+      #
+      #   safe_constantize('blargle')                  # => nil
+      #   safe_constantize('UnknownModule')            # => nil
+      #   safe_constantize('UnknownModule::Foo::Bar')  # => nil
+      def safe_constantize(camel_cased_word)
+        constantize(camel_cased_word)
+      rescue NameError => e
+        raise if e.name && !(camel_cased_word.to_s.split("::").include?(e.name.to_s) ||
+                             e.name.to_s == camel_cased_word.to_s)
+      rescue ArgumentError => e
+        raise unless /not missing constant #{const_regexp(camel_cased_word)}!$/.match?(e.message)
+      end
     end
   end
+  # rubocop:enable all
 end

data/lib/elastic_apm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ElasticAPM
-  VERSION = '0.6.2'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+date: 2018-05-16 00:00:00.000000000 Z
+dependencies: []
 description: 
 email:
 - mikkel@elastic.co
@@ -71,18 +57,6 @@ files:
 - lib/elastic_apm/filters/request_body_filter.rb
 - lib/elastic_apm/filters/secrets_filter.rb
 - lib/elastic_apm/http.rb
-- lib/elastic_apm/injectors.rb
-- lib/elastic_apm/injectors/action_dispatch.rb
-- lib/elastic_apm/injectors/delayed_job.rb
-- lib/elastic_apm/injectors/elasticsearch.rb
-- lib/elastic_apm/injectors/json.rb
-- lib/elastic_apm/injectors/mongo.rb
-- lib/elastic_apm/injectors/net_http.rb
-- lib/elastic_apm/injectors/redis.rb
-- lib/elastic_apm/injectors/sequel.rb
-- lib/elastic_apm/injectors/sidekiq.rb
-- lib/elastic_apm/injectors/sinatra.rb
-- lib/elastic_apm/injectors/tilt.rb
 - lib/elastic_apm/instrumenter.rb
 - lib/elastic_apm/internal_error.rb
 - lib/elastic_apm/log.rb
@@ -102,10 +76,22 @@ files:
 - lib/elastic_apm/span.rb
 - lib/elastic_apm/span/context.rb
 - lib/elastic_apm/span_helpers.rb
+- lib/elastic_apm/spies.rb
+- lib/elastic_apm/spies/action_dispatch.rb
+- lib/elastic_apm/spies/delayed_job.rb
+- lib/elastic_apm/spies/elasticsearch.rb
+- lib/elastic_apm/spies/json.rb
+- lib/elastic_apm/spies/mongo.rb
+- lib/elastic_apm/spies/net_http.rb
+- lib/elastic_apm/spies/redis.rb
+- lib/elastic_apm/spies/sequel.rb
+- lib/elastic_apm/spies/sidekiq.rb
+- lib/elastic_apm/spies/sinatra.rb
+- lib/elastic_apm/spies/tilt.rb
 - lib/elastic_apm/sql_summarizer.rb
 - lib/elastic_apm/stacktrace.rb
 - lib/elastic_apm/stacktrace/frame.rb
-- lib/elastic_apm/stacktrace/line_cache.rb
+- lib/elastic_apm/stacktrace_builder.rb
 - lib/elastic_apm/subscriber.rb
 - lib/elastic_apm/system_info.rb
 - lib/elastic_apm/timed_worker.rb

data/lib/elastic_apm/stacktrace/line_cache.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'elastic_apm/util/lru_cache'
-
-module ElasticAPM
-  class Stacktrace
-    # A basic LRU Cache
-    # @api private
-    class LineCache
-      class << self
-        def cache
-          @cache ||= Util::LruCache.new
-        end
-
-        def get(*key)
-          cache[key]
-        end
-
-        def set(*key, value)
-          cache[key] = value
-        end
-      end
-    end
-  end
-end