elastic-apm 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da4eac00d32100e5f82cd8dfe3042278eb4f81865c797ee743b4e2fa89269c18
-  data.tar.gz: bd07824d56e89d645b08cfb2b5090a6ec4fcefbf360cb559420cd7f050629cd1
+  metadata.gz: 5e3f8d9490f60e28d99b6e15e7efa2823fb773bacbdc9762f91fc92a4214b05b
+  data.tar.gz: 655814ff9046d8e9dd2d586688b9bc45acdb95f0102626af5ad0886330b58c16
 SHA512:
-  metadata.gz: 1b57fe86030e4f0aeb667cf886ac45708c4c41d26a0e85ed7736ee8c98319763cc15e0504bee2407f29a4503e98c32899061ad7a5b7fd035fcc5ed527cd7b410
-  data.tar.gz: bfc683d303d7b0a7c5400cd064c76f12dca648eeb6c6cecf73bc25cdb6bae4253e32e708aa57168aa9f0963e5531c7e4cdba10dd5f9d10782197c6bc3426e382
+  metadata.gz: d4b9cace9b89eddb0ec281061fd098daa1e9297feb7fbc1c5de8ba44746ad2ab225df877480b5a213847d65502e39c321a79d4f35bee257d60d4a63a254c76e5
+  data.tar.gz: ae713fe3ad97666862ed91ecaeb8a199cfdaacb69edeb011840bb34e7da7692e97dffe15b729e3ec1275663bf2e381f241cb7579ca366a1ac7224c7465cbe9db

data/Gemfile

@@ -7,9 +7,9 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 gem 'elasticsearch'
-gem 'fakeredis', require: nil,
-  github: 'guilleiguaran/fakeredis' # needs master right now
+gem 'fakeredis', require: nil
 gem 'json-schema'
+gem 'mongo'
 gem 'pry'
 gem 'rack-test'
 gem 'redis', require: nil
@@ -39,8 +39,5 @@ else
   gem framework
 end
 
-# doesn't work with Rails master, so skip testing
-gem 'delayed_job', '~> 4' unless [framework, version] == %w[rails 5.2]
-
 gem 'rails' if framework == 'sinatra'
 gem 'sinatra' if framework == 'rails'

data/lib/elastic_apm.rb

@@ -61,7 +61,7 @@ module ElasticAPM
   # @param context [Context] An optional [Context]
   # @yield [Transaction] Optional block encapsulating transaction
   # @return [Transaction] Unless block given
-  def self.transaction(name, type = nil, context: nil, &block)
+  def self.transaction(name = nil, type = nil, context: nil, &block)
     return (block_given? ? yield : nil) unless agent
 
     agent.transaction(name, type, context: context, &block)

data/lib/elastic_apm/config.rb

@@ -8,21 +8,13 @@ module ElasticAPM
   class Config
     DEFAULTS = {
       config_file: 'config/elastic_apm.yml',
-
       server_url: 'http://localhost:8200',
-      secret_token: nil,
 
-      service_name: nil,
-      service_version: nil,
       environment: ENV['RAILS_ENV'] || ENV['RACK_ENV'],
       enabled_environments: %w[production],
-      framework_name: nil,
-      framework_version: nil,
-      hostname: nil,
 
       log_path: '-',
       log_level: Logger::INFO,
-      logger: nil,
 
       max_queue_size: 500,
       flush_interval: 10,
@@ -184,6 +176,7 @@ module ElasticAPM
         delayed_job
         elasticsearch
         json
+        mongo
         net_http
         redis
         sequel

data/lib/elastic_apm/http.rb

@@ -37,8 +37,7 @@ module ElasticAPM
       request = prepare_request path, payload.to_json
       response = @adapter.perform request
 
-      status = response.code.to_i
-      return response if status >= 200 && status <= 299
+      return response if response.is_a?(Net::HTTPSuccess)
 
       error 'POST returned an unsuccessful status code (%d)', response.code
       error "apm-server's response: %s", response.body

data/lib/elastic_apm/injectors.rb

@@ -68,6 +68,8 @@ end
 
 # @api private
 module Kernel
+  private
+
   alias require_without_apm require
 
   def require(path)

data/lib/elastic_apm/injectors/mongo.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module ElasticAPM
+  # @api private
+  module Injectors
+    # @api private
+    class MongoInjector
+      def install
+        ::Mongo::Monitoring::Global.subscribe(
+          ::Mongo::Monitoring::COMMAND,
+          Subscriber.new
+        )
+      end
+
+      # @api private
+      class Subscriber
+        TYPE = 'db.mongodb.query'.freeze
+
+        def initialize
+          @events = {}
+        end
+
+        def started(event)
+          push_event(event)
+        end
+
+        def failed(event)
+          pop_event(event)
+        end
+
+        def succeeded(event)
+          pop_event(event)
+        end
+
+        private
+
+        def push_event(event)
+          ctx = Span::Context.new(
+            instance: event.database_name,
+            statement: nil,
+            type: 'mongodb'.freeze,
+            user: nil
+          )
+          span = ElasticAPM.span(event.command_name, TYPE, context: ctx)
+          @events[event.operation_id] = span
+        end
+
+        def pop_event(event)
+          span = @events[event.operation_id]
+          span.done
+        end
+      end
+    end
+
+    register 'Mongo', 'mongo', MongoInjector.new
+  end
+end

data/lib/elastic_apm/injectors/net_http.rb

@@ -5,7 +5,7 @@ module ElasticAPM
   module Injectors
     # @api private
     class NetHTTPInjector
-      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:disable Metrics/MethodLength
       def install
         Net::HTTP.class_eval do
           alias request_without_apm request
@@ -15,21 +15,10 @@ module ElasticAPM
               return request_without_apm(req, body, &block)
             end
 
-            host, port = req['host'] && req['host'].split(':')
+            host, = req['host'] && req['host'].split(':')
             method = req.method
-            path = req.path
-            scheme = use_ssl? ? 'https' : 'http'
 
-            # inside a session
             host ||= address
-            port ||= 80
-
-            # TODO: investigate
-            _extra = {
-              scheme: scheme,
-              port: port,
-              path: path
-            }
 
             name = "#{method} #{host}"
             type = "ext.net_http.#{method}"
@@ -40,7 +29,7 @@ module ElasticAPM
           end
         end
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:enable Metrics/MethodLength
     end
 
     register 'Net::HTTP', 'net/http', NetHTTPInjector.new

data/lib/elastic_apm/normalizers.rb

@@ -57,7 +57,12 @@ module ElasticAPM # :nodoc:
     end
   end
 
-  %w[action_controller action_view active_record].each do |lib|
+  %w[
+    action_controller
+    action_mailer
+    action_view
+    active_record
+  ].each do |lib|
     require "elastic_apm/normalizers/#{lib}"
   end
 end

data/lib/elastic_apm/normalizers/action_mailer.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module ElasticAPM
+  module Normalizers
+    module ActionMailer
+      # @api private
+      class ProcessActionNormalizer < Normalizer
+        register 'process.action_mailer'
+        TYPE = 'app.mailer.action'.freeze
+
+        def normalize(transaction, _name, payload)
+          transaction.name = endpoint(payload)
+          [transaction.name, TYPE, nil]
+        end
+
+        private
+
+        def endpoint(payload)
+          "#{payload[:mailer]}##{payload[:action]}"
+        end
+      end
+    end
+  end
+end

data/lib/elastic_apm/serializers/errors.rb

@@ -4,7 +4,7 @@ module ElasticAPM
   module Serializers
     # @api private
     class Errors < Serializer
-      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def build(error)
         base = {
           id: error.id,
@@ -17,13 +17,17 @@ module ElasticAPM
           base[:exception] = build_exception exception
         end
 
+        if (log = error.log)
+          base[:log] = build_log log
+        end
+
         if (transaction_id = error.transaction_id)
           base[:transaction] = { id: transaction_id }
         end
 
         base
       end
-      # rubocop:enable Metrics/MethodLength
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       def build_all(errors)
         { errors: Array(errors).map(&method(:build)) }
@@ -42,6 +46,16 @@ module ElasticAPM
           handled: exception.handled
         }
       end
+
+      def build_log(log)
+        {
+          message: log.message,
+          level: log.level,
+          logger_name: log.logger_name,
+          param_message: log.param_message,
+          stacktrace: log.stacktrace.to_a
+        }
+      end
     end
   end
 end

data/lib/elastic_apm/stacktrace.rb

@@ -71,38 +71,45 @@ module ElasticAPM
       false
     end
 
-    # rubocop:disable Metrics/MethodLength
-    def build_frame(config, line, type)
-      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)
+    class << self
+      attr_accessor :frame_cache
+    end
 
-      line_count =
-        context_lines_for(config, type, library_frame: frame.library_frame)
-      frame.build_context line_count
+    # 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
 
-      frame
+      self.class.frame_cache[[line, type]]
     end
-    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     def strip_load_path(path)
-      return nil unless path
+      return nil if path.nil?
 
       prefix =
         $LOAD_PATH
         .map(&:to_s)
         .select { |s| path.start_with?(s) }
-        .sort_by(&:length)
-        .last
-
-      return path unless prefix
+        .max_by(&:length)
 
-      path[prefix.chomp(File::SEPARATOR).length + 1..-1]
+      prefix ? path[prefix.chomp(File::SEPARATOR).length + 1..-1] : path
     end
 
     def context_lines_for(config, type, library_frame:)

data/lib/elastic_apm/transaction.rb

@@ -6,7 +6,13 @@ module ElasticAPM
     DEFAULT_TYPE = 'custom'.freeze
 
     # rubocop:disable Metrics/MethodLength
-    def initialize(instrumenter, name, type = nil, context: nil, sampled: true)
+    def initialize(
+      instrumenter,
+      name = nil,
+      type = nil,
+      context: nil,
+      sampled: true
+    )
       @id = SecureRandom.uuid
       @instrumenter = instrumenter
       @name = name

data/lib/elastic_apm/util/lru_cache.rb

@@ -4,16 +4,21 @@ module ElasticAPM
   module Util
     # @api private
     class LruCache
-      def initialize(max_size = 512)
+      def initialize(max_size = 512, &block)
         @max_size = max_size
-        @data = {}
+        @data = Hash.new(&block)
+        @missing_key_block = block
       end
 
       def [](key)
         found = true
         value = @data.delete(key) { found = false }
 
-        found ? @data[key] = value : nil
+        if found
+          @data[key] = value
+        else
+          @missing_key_block && @missing_key_block.call(self, key)
+        end
       end
 
       def []=(key, val)

data/lib/elastic_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -76,6 +76,7 @@ files:
 - 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
@@ -89,6 +90,7 @@ files:
 - lib/elastic_apm/naively_hashable.rb
 - lib/elastic_apm/normalizers.rb
 - lib/elastic_apm/normalizers/action_controller.rb
+- lib/elastic_apm/normalizers/action_mailer.rb
 - lib/elastic_apm/normalizers/action_view.rb
 - lib/elastic_apm/normalizers/active_record.rb
 - lib/elastic_apm/process_info.rb