elastic-apm 3.2.0 → 3.3.0

data/lib/elastic_apm/rails.rb

@@ -9,9 +9,7 @@ module ElasticAPM
   # It is recommended to use the Railtie instead.
   module Rails
     extend self
-
-    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     # Start the ElasticAPM agent and hook into Rails.
     # Note that the agent won't be started if the Rails console is being used.
     #
@@ -50,8 +48,7 @@ module ElasticAPM
         puts "Backtrace:\n" + e.backtrace.join("\n")
       end
     end
-    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
-    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
     private
 

data/lib/elastic_apm/sinatra.rb

@@ -30,7 +30,7 @@ module ElasticAPM
     end
 
     def format_name(str)
-      str && str.gsub('::', '_')
+      str&.gsub('::', '_')
     end
   end
 end

data/lib/elastic_apm/span.rb

@@ -10,7 +10,7 @@ module ElasticAPM
 
     DEFAULT_TYPE = 'custom'
 
-    # rubocop:disable Metrics/ParameterLists, Metrics/MethodLength
+    # rubocop:disable Metrics/ParameterLists
     def initialize(
       name:,
       transaction:,
@@ -39,7 +39,7 @@ module ElasticAPM
       @context = context || Span::Context.new
       @stacktrace_builder = stacktrace_builder
     end
-    # rubocop:enable Metrics/ParameterLists, Metrics/MethodLength
+    # rubocop:enable Metrics/ParameterLists
 
     def_delegators :@trace_context, :trace_id, :parent_id, :id
 

data/lib/elastic_apm/span/context.rb

@@ -28,12 +28,28 @@ module ElasticAPM
       # @api private
       class Http
         def initialize(url: nil, status_code: nil, method: nil)
-          @url = url
+          @url = sanitize_url(url)
           @status_code = status_code
           @method = method
         end
 
         attr_accessor :url, :status_code, :method
+
+        private
+
+        def sanitize_url(url)
+          uri = URI(url)
+
+          return url unless uri.userinfo
+
+          format(
+            '%s://%s@%s%s',
+            uri.scheme,
+            uri.user,
+            uri.hostname,
+            uri.path
+          )
+        end
       end
     end
   end

data/lib/elastic_apm/spies/elasticsearch.rb

@@ -7,8 +7,6 @@ module ElasticAPM
     class ElasticsearchSpy
       NAME_FORMAT = '%s %s'
       TYPE = 'db.elasticsearch'
-
-      # rubocop:disable Metrics/MethodLength
       def install
         ::Elasticsearch::Transport::Client.class_eval do
           alias perform_request_without_apm perform_request
@@ -24,7 +22,6 @@ module ElasticAPM
           end
         end
       end
-      # rubocop:enable Metrics/MethodLength
     end
 
     register(

data/lib/elastic_apm/spies/faraday.rb

@@ -16,8 +16,7 @@ module ElasticAPM
         end
       end
 
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-      # rubocop:disable Metrics/BlockLength, Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
       # rubocop:disable Metrics/CyclomaticComplexity
       def install
         ::Faraday::Connection.class_eval do
@@ -61,8 +60,7 @@ module ElasticAPM
         end
       end
       # rubocop:enable Metrics/CyclomaticComplexity
-      # rubocop:enable Metrics/BlockLength, Metrics/PerceivedComplexity
-      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+      # rubocop:enable Metrics/PerceivedComplexity
     end
 
     register 'Faraday', 'faraday', FaradaySpy.new

data/lib/elastic_apm/spies/http.rb

@@ -7,8 +7,6 @@ module ElasticAPM
     class HTTPSpy
       TYPE = 'ext'
       SUBTYPE = 'http_rb'
-
-      # rubocop:disable Metrics/MethodLength
       def install
         ::HTTP::Client.class_eval do
           alias perform_without_apm perform
@@ -36,7 +34,6 @@ module ElasticAPM
           end
         end
       end
-      # rubocop:enable Metrics/MethodLength
     end
 
     register 'HTTP', 'http', HTTPSpy.new

data/lib/elastic_apm/spies/mongo.rb

@@ -36,15 +36,21 @@ module ElasticAPM
 
         private
 
-        # rubocop:disable Metrics/MethodLength
         def push_event(event)
           return unless ElasticAPM.current_transaction
           # Some MongoDB commands are not on collections but rather are db
           # admin commands. For these commands, the value at the `command_name`
           # key is the integer 1.
-          unless event.command[event.command_name] == 1
-            collection = event.command[event.command_name]
-          end
+          # For getMore commands, the value at `command_name` is the cursor id
+          # and the collection name is at the key `collection`
+          collection =
+            if event.command[event.command_name] == 1 ||
+               event.command[event.command_name].is_a?(BSON::Int64)
+              event.command[:collection]
+            else
+              event.command[event.command_name]
+            end
+
           name = [event.database_name,
                   collection,
                   event.command_name].compact.join('.')
@@ -60,7 +66,6 @@ module ElasticAPM
 
           @events[event.operation_id] = span
         end
-        # rubocop:enable Metrics/MethodLength
 
         def pop_event(event)
           return unless (curr = ElasticAPM.current_span)

data/lib/elastic_apm/spies/net_http.rb

@@ -8,8 +8,6 @@ module ElasticAPM
       KEY = :__elastic_apm_net_http_disabled
       TYPE = 'ext'
       SUBTYPE = 'net_http'
-
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       class << self
         def disabled=(disabled)
           Thread.current[KEY] = disabled
@@ -42,7 +40,7 @@ module ElasticAPM
               return request_without_apm(req, body, &block)
             end
 
-            host, = req['host'] && req['host'].split(':')
+            host, = req['host']&.split(':')
             method = req.method
 
             host ||= address
@@ -62,7 +60,6 @@ module ElasticAPM
           end
         end
       end
-      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
     end
 
     register 'Net::HTTP', 'net/http', NetHTTPSpy.new

data/lib/elastic_apm/spies/rake.rb

@@ -5,7 +5,6 @@ module ElasticAPM
   module Spies
     # @api private
     class RakeSpy
-      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def install
         ::Rake::Task.class_eval do
           alias execute_without_apm execute
@@ -38,7 +37,6 @@ module ElasticAPM
           end
         end
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
     end
     register 'Rake::Task', 'rake', RakeSpy.new
   end

data/lib/elastic_apm/spies/sequel.rb

@@ -19,7 +19,6 @@ module ElasticAPM
         )
       end
 
-      # rubocop:disable Metrics/MethodLength
       def install
         require 'sequel/database/logging'
 
@@ -39,7 +38,6 @@ module ElasticAPM
           end
         end
       end
-      # rubocop:enable Metrics/MethodLength
     end
 
     register 'Sequel', 'sequel', SequelSpy.new

data/lib/elastic_apm/spies/sidekiq.rb

@@ -10,7 +10,6 @@ module ElasticAPM
 
       # @api private
       class Middleware
-        # rubocop:disable Metrics/MethodLength
         def call(_worker, job, queue)
           name = SidekiqSpy.name_for(job)
           transaction = ElasticAPM.start_transaction(name, 'Sidekiq')
@@ -18,15 +17,14 @@ module ElasticAPM
 
           yield
 
-          transaction.done :success if transaction
+          transaction&.done :success
         rescue ::Exception => e
           ElasticAPM.report(e, handled: false)
-          transaction.done :error if transaction
+          transaction&.done :error
           raise
         ensure
           ElasticAPM.end_transaction
         end
-        # rubocop:enable Metrics/MethodLength
       end
 
       def self.name_for(job)
@@ -48,7 +46,6 @@ module ElasticAPM
         end
       end
 
-      # rubocop:disable Metrics/MethodLength
       def install_processor
         require 'sidekiq/processor'
 
@@ -76,7 +73,6 @@ module ElasticAPM
           end
         end
       end
-      # rubocop:enable Metrics/MethodLength
 
       def install
         install_processor

data/lib/elastic_apm/spies/sinatra.rb

@@ -5,7 +5,6 @@ module ElasticAPM
   module Spies
     # @api private
     class SinatraSpy
-      # rubocop:disable Metrics/MethodLength
       def install
         ::Sinatra::Base.class_eval do
           alias dispatch_without_apm! dispatch!
@@ -31,7 +30,6 @@ module ElasticAPM
           end
         end
       end
-      # rubocop:enable Metrics/MethodLength
     end
 
     register 'Sinatra::Base', 'sinatra/base', SinatraSpy.new

data/lib/elastic_apm/stacktrace/frame.rb

@@ -21,8 +21,6 @@ module ElasticAPM
         :module,
         :colno
       )
-
-      # rubocop:disable Metrics/AbcSize
       def build_context(context_line_count)
         return unless abs_path && context_line_count > 0
 
@@ -38,7 +36,6 @@ module ElasticAPM
         self.pre_context  = file_lines.first(padding)
         self.post_context = file_lines.last(padding)
       end
-      # rubocop:enable Metrics/AbcSize
 
       private
 

data/lib/elastic_apm/stacktrace_builder.rb

@@ -31,7 +31,6 @@ module ElasticAPM
 
     private
 
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def build_frame(cache, keys)
       line, type = keys
       abs_path, lineno, function, _module_name = parse_line(line)
@@ -49,7 +48,6 @@ module ElasticAPM
 
       cache[[line, type]] = frame
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     def parse_line(line)
       ruby_match = line.match(RUBY_FORMAT)

data/lib/elastic_apm/subscriber.rb

@@ -28,8 +28,6 @@ module ElasticAPM
     # AS::Notifications API
 
     Notification = Struct.new(:id, :span)
-
-    # rubocop:disable Metrics/MethodLength
     def start(name, id, payload)
       return unless (transaction = @agent.current_transaction)
 
@@ -52,8 +50,8 @@ module ElasticAPM
 
       transaction.notifications << Notification.new(id, span)
     end
-    # rubocop:enable Metrics/MethodLength
 
+    # rubocop:disable Metrics/CyclomaticComplexity
     def finish(name, id, payload)
       # debug "AS::Notification#finish:#{name}:#{id}"
       return unless (transaction = @agent.current_transaction)
@@ -70,6 +68,7 @@ module ElasticAPM
         return
       end
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     private
 

data/lib/elastic_apm/trace_context.rb

@@ -29,8 +29,6 @@ module ElasticAPM
     attr_accessor :version, :id, :trace_id, :parent_id, :recorded
 
     alias :recorded? :recorded
-
-    # rubocop:disable Metrics/AbcSize
     def self.parse(header)
       raise InvalidTraceparentHeader unless header.length == 55
       raise InvalidTraceparentHeader unless header[0..1] == VERSION
@@ -45,7 +43,6 @@ module ElasticAPM
         raise InvalidTraceparentHeader if HEX_REGEX =~ t.parent_id
       end
     end
-    # rubocop:enable Metrics/AbcSize
 
     def flags=(flags)
       @flags = flags

data/lib/elastic_apm/transaction.rb

@@ -11,7 +11,7 @@ module ElasticAPM
 
     DEFAULT_TYPE = 'custom'
 
-    # rubocop:disable Metrics/MethodLength, Metrics/ParameterLists
+    # rubocop:disable Metrics/ParameterLists
     def initialize(
       name = nil,
       type = nil,
@@ -38,7 +38,7 @@ module ElasticAPM
 
       @notifications = [] # for AS::Notifications
     end
-    # rubocop:enable Metrics/MethodLength, Metrics/ParameterLists
+    # rubocop:enable Metrics/ParameterLists
 
     attr_accessor :name, :type, :result
 

data/lib/elastic_apm/transport/base.rb

@@ -13,7 +13,6 @@ require 'elastic_apm/util/throttle'
 
 module ElasticAPM
   module Transport
-    # rubocop:disable Metrics/ClassLength
     # @api private
     class Base
       include Logging
@@ -56,7 +55,6 @@ module ElasticAPM
         stop_workers
       end
 
-      # rubocop:disable Metrics/MethodLength
       def submit(resource)
         if @stopped.true?
           warn '%s: Transport stopping, no new events accepted', pid_str
@@ -75,7 +73,6 @@ module ElasticAPM
         error '%s: Failed adding to the transport queue: %p', pid_str, e.inspect
         nil
       end
-      # rubocop:enable Metrics/MethodLength
 
       def add_filter(key, callback)
         @filters.add(key, callback)
@@ -131,7 +128,6 @@ module ElasticAPM
         end
       end
 
-      # rubocop:disable Metrics/MethodLength
       def stop_workers
         debug '%s: Stopping workers', pid_str
 
@@ -152,7 +148,6 @@ module ElasticAPM
           @workers.clear
         end
       end
-      # rubocop:enable Metrics/MethodLength
 
       def send_stop_messages
         config.pool_size.times { queue.push(Worker::StopMessage.new, true) }
@@ -176,6 +171,5 @@ module ElasticAPM
         end).call
       end
     end
-    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/elastic_apm/transport/connection.rb

@@ -30,8 +30,6 @@ module ElasticAPM
       end
 
       attr_reader :http
-
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def write(str)
         return false if @config.disable_send
 
@@ -57,7 +55,6 @@ module ElasticAPM
           flush(:connection_error)
         end
       end
-      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       def flush(reason = :force)
         # Could happen from the timertask so we need to sync
@@ -70,7 +67,7 @@ module ElasticAPM
       def inspect
         format(
           '<%s url:%s closed:%s >',
-          super.split.first, url, http&.closed?
+          super.split.first, @url, http&.closed?
         )
       end