elastic-apm 3.2.0 → 3.3.0

data/lib/elastic_apm/grape.rb

@@ -7,8 +7,6 @@ module ElasticAPM
   # Module for starting the ElasticAPM agent and hooking into Grape.
   module Grape
     extend self
-
-    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     # Start the ElasticAPM agent and hook into Grape.
     #
     # @param app [Grape::API] A Grape app.
@@ -27,7 +25,6 @@ module ElasticAPM
       config.logger.error format('Failed to start: %s', e.message)
       config.logger.debug "Backtrace:\n" + e.backtrace.join("\n")
     end
-    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
     private
 

data/lib/elastic_apm/instrumenter.rb

@@ -7,7 +7,6 @@ require 'elastic_apm/transaction'
 require 'elastic_apm/span_helpers'
 
 module ElasticAPM
-  # rubocop:disable Metrics/ClassLength
   # @api private
   class Instrumenter
     TRANSACTION_KEY = :__elastic_instrumenter_transaction_key
@@ -61,7 +60,7 @@ module ElasticAPM
       self.current_transaction = nil
       current_spans.pop until current_spans.empty?
 
-      @subscriber.unregister! if @subscriber
+      @subscriber&.unregister!
     end
 
     def subscriber=(subscriber)
@@ -80,7 +79,6 @@ module ElasticAPM
       @current.transaction = transaction
     end
 
-    # rubocop:disable Metrics/MethodLength
     def start_transaction(
       name = nil,
       type = nil,
@@ -112,7 +110,6 @@ module ElasticAPM
 
       self.current_transaction = transaction
     end
-    # rubocop:enable Metrics/MethodLength
 
     def end_transaction(result = nil)
       return nil unless (transaction = current_transaction)
@@ -138,8 +135,7 @@ module ElasticAPM
       current_spans.last
     end
 
-    # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
-    # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:disable Metrics/CyclomaticComplexity
     # rubocop:disable Metrics/ParameterLists
     def start_span(
       name,
@@ -183,8 +179,7 @@ module ElasticAPM
       span.start
     end
     # rubocop:enable Metrics/ParameterLists
-    # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity
-    # rubocop:enable Metrics/MethodLength, Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     def end_span
       return unless (span = current_spans.pop)
@@ -229,7 +224,6 @@ module ElasticAPM
       rand <= config.transaction_sample_rate
     end
 
-    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def update_transaction_metrics(transaction)
       return unless transaction.config.collect_metrics?
 
@@ -268,9 +262,7 @@ module ElasticAPM
         tags: span_tags, reset_on_collect: true
       ).inc!
     end
-    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
-    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def update_span_metrics(span)
       return unless span.transaction.config.breakdown_metrics?
 
@@ -292,7 +284,5 @@ module ElasticAPM
         tags: tags, reset_on_collect: true
       ).inc!
     end
-    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
   end
-  # rubocop:enable Metrics/ClassLength
 end

data/lib/elastic_apm/metadata/service_info.rb

@@ -17,8 +17,6 @@ module ElasticAPM
       class Framework < Versioned; end
       class Language < Versioned; end
       class Runtime < Versioned; end
-
-      # rubocop:disable Metrics/MethodLength
       def initialize(config)
         @config = config
 
@@ -33,14 +31,12 @@ module ElasticAPM
         @runtime = lookup_runtime
         @version = @config.service_version || Util.git_sha
       end
-      # rubocop:enable Metrics/MethodLength
 
       attr_reader :name, :environment, :agent, :framework, :language, :runtime,
         :version
 
       private
 
-      # rubocop:disable Metrics/MethodLength
       def lookup_runtime
         case RUBY_ENGINE
         when 'ruby'
@@ -55,7 +51,6 @@ module ElasticAPM
           )
         end
       end
-      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/elastic_apm/metadata/system_info/container_info.rb

@@ -34,7 +34,6 @@ module ElasticAPM
             end
         end
 
-        # rubocop:disable Metrics/MethodLength
         def kubernetes
           @kubernetes =
             begin
@@ -51,7 +50,6 @@ module ElasticAPM
               kubernetes
             end
         end
-        # rubocop:enable Metrics/MethodLength
 
         private
 
@@ -70,8 +68,8 @@ module ElasticAPM
         KUBEPODS_REGEX = %r{(?:^/kubepods/[^/]+/pod([^/]+)$)|(?:^/kubepods\.slice/kubepods-[^/]+\.slice/kubepods-[^/]+-pod([^/]+)\.slice$)}.freeze # rubocop:disable Metrics/LineLength
         SYSTEMD_SCOPE_SUFFIX = '.scope'
 
-        # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity
-        # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize
+        # rubocop:disable Metrics/PerceivedComplexity
+        # rubocop:disable Metrics/CyclomaticComplexity
         def read_from_cgroup!
           return unless File.exist?(cgroup_path)
           IO.readlines(cgroup_path).each do |line|
@@ -113,8 +111,8 @@ module ElasticAPM
             end
           end
         end
-        # rubocop:enable Metrics/MethodLength, Metrics/PerceivedComplexity
-        # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize
+        # rubocop:enable Metrics/PerceivedComplexity
+        # rubocop:enable Metrics/CyclomaticComplexity
       end
     end
   end

data/lib/elastic_apm/metrics.rb

@@ -23,8 +23,6 @@ module ElasticAPM
       end
 
       attr_reader :config, :sets, :callback
-
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def start
         unless config.collect_metrics?
           debug 'Skipping metrics'
@@ -61,7 +59,6 @@ module ElasticAPM
 
         @running = true
       end
-      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       def stop
         return unless running?

data/lib/elastic_apm/metrics/cpu_mem_set.rb

@@ -68,7 +68,6 @@ module ElasticAPM
         end
       end
 
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def read!
         return if disabled?
 
@@ -91,7 +90,6 @@ module ElasticAPM
 
         @previous = current
       end
-      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       def calculate_deltas(current, previous)
         system_cpu_total =
@@ -109,7 +107,6 @@ module ElasticAPM
 
       # @api private
       class Linux
-        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         def sample
           proc_stat = ProcStat.new.read!
           proc_self_stat = ProcSelfStat.new.read!
@@ -126,7 +123,6 @@ module ElasticAPM
             page_size: meminfo.page_size
           )
         end
-        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
         # @api private
         class ProcStat
@@ -144,8 +140,6 @@ module ElasticAPM
             guest
             guest_nice
           ].freeze
-
-          # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           def read!
             stat =
               IO.readlines('/proc/stat')
@@ -173,7 +167,6 @@ module ElasticAPM
 
             self
           end
-          # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
         end
 
         UTIME_POS = 13
@@ -204,8 +197,6 @@ module ElasticAPM
         # @api private
         class Meminfo
           attr_reader :total, :available, :page_size
-
-          # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           # rubocop:disable Metrics/PerceivedComplexity
           # rubocop:disable Metrics/CyclomaticComplexity
           def read!
@@ -240,7 +231,6 @@ module ElasticAPM
           end
           # rubocop:enable Metrics/CyclomaticComplexity
           # rubocop:enable Metrics/PerceivedComplexity
-          # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
         end
       end
     end

data/lib/elastic_apm/metrics/metric.rb

@@ -75,11 +75,15 @@ module ElasticAPM
       end
 
       def inc!
-        @value += 1
+        @mutex.synchronize do
+          @value += 1
+        end
       end
 
       def dec!
-        @value -= 1
+        @mutex.synchronize do
+          @value -= 1
+        end
       end
     end
 

data/lib/elastic_apm/metrics/set.rb

@@ -40,8 +40,11 @@ module ElasticAPM
         metric(Timer, key, tags: tags, **args)
       end
 
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def metric(kls, key, tags: nil, **args)
+        if @config.disable_metrics.any? { |p| p.match? key }
+          return NOOP
+        end
+
         key = key_with_tags(key, tags)
         return metrics[key] if metrics[key]
 
@@ -64,9 +67,7 @@ module ElasticAPM
             end
         end
       end
-      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
-      # rubocop:disable Metrics/MethodLength
       def collect
         return if disabled?
 
@@ -90,7 +91,6 @@ module ElasticAPM
           end.values
         end
       end
-      # rubocop:enable Metrics/MethodLength
 
       private
 

data/lib/elastic_apm/metrics/span_scoped_set.rb

@@ -6,7 +6,7 @@ module ElasticAPM
     class SpanScopedSet < Set
       def collect
         super.tap do |sets|
-          return unless sets
+          next unless sets
 
           sets.each do |set|
             move_transaction(set)

data/lib/elastic_apm/metrics/transaction_set.rb

@@ -7,5 +7,3 @@ module ElasticAPM
     end
   end
 end
-
-

data/lib/elastic_apm/metrics/vm_set.rb

@@ -11,7 +11,6 @@ module ElasticAPM
         super
       end
 
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def read!
         return if disabled?
 
@@ -37,8 +36,6 @@ module ElasticAPM
 
         disable!
       end
-
-      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
     end
   end
 end

data/lib/elastic_apm/middleware.rb

@@ -10,7 +10,6 @@ module ElasticAPM
       @app = app
     end
 
-    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def call(env)
       begin
         if running? && !path_ignored?(env)
@@ -35,7 +34,6 @@ module ElasticAPM
 
       resp
     end
-    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
     private
 

data/lib/elastic_apm/normalizers/grape/endpoint_run.rb

@@ -37,7 +37,8 @@ module ElasticAPM
         end
 
         def endpoint(env)
-          route_name = env['api.endpoint']&.routes&.first&.pattern&.origin ||
+          route_name =
+            env['api.endpoint']&.routes&.first&.pattern&.origin ||
             env['REQUEST_PATH']
           [env['REQUEST_METHOD'], route_name].join(' ')
         end

data/lib/elastic_apm/normalizers/rails/active_record.rb

@@ -34,7 +34,7 @@ module ElasticAPM
 
         def subtype(payload)
           cached_adapter_name(
-            payload[:connection] ? payload[:connection].adapter_name :
+            payload[:connection]&.adapter_name ||
               ::ActiveRecord::Base.connection_config[:adapter]
           )
         end

data/lib/elastic_apm/opentracing.rb

@@ -22,7 +22,6 @@ module ElasticAPM
         @span_context
       end
 
-      # rubocop:disable Metrics/MethodLength
       def set_label(key, val)
         if elastic_span.is_a?(Transaction)
           case key.to_s
@@ -39,7 +38,6 @@ module ElasticAPM
           elastic_span.context.labels[key] = val
         end
       end
-      # rubocop:enable Metrics/MethodLength
 
       def set_baggage_item(_key, _value)
         ElasticAPM.agent.config.logger.warn(
@@ -63,9 +61,8 @@ module ElasticAPM
           ElasticAPM.report_message message
         end
       end
-      # rubocop:enable Lint/UnusedMethodArgument
 
-      # rubocop:disable Metrics/MethodLength
+      # rubocop:enable Lint/UnusedMethodArgument
       def finish(clock_end: Util.monotonic_micros, end_time: nil)
         return unless (agent = ElasticAPM.agent)
 
@@ -86,7 +83,6 @@ module ElasticAPM
 
         agent.enqueue elastic_span
       end
-      # rubocop:enable Metrics/MethodLength
 
       private
 
@@ -179,8 +175,6 @@ module ElasticAPM
         @scope_stack.last
       end
     end
-
-    # rubocop:disable Metrics/ClassLength
     # A custom tracer to use the OpenTracing API with ElasticAPM
     class Tracer
       def initialize
@@ -193,7 +187,7 @@ module ElasticAPM
         scope_manager.active&.span
       end
 
-      # rubocop:disable Metrics/MethodLength, Metrics/ParameterLists
+      # rubocop:disable Metrics/ParameterLists
       def start_active_span(
         operation_name,
         child_of: nil,
@@ -224,10 +218,9 @@ module ElasticAPM
 
         scope
       end
-      # rubocop:enable Metrics/MethodLength, Metrics/ParameterLists
+      # rubocop:enable Metrics/ParameterLists
 
-      # rubocop:disable Metrics/MethodLength, Metrics/ParameterLists
-      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/ParameterLists
       def start_span(
         operation_name,
         child_of: nil,
@@ -245,7 +238,6 @@ module ElasticAPM
 
         if span_context
           trace_context =
-            span_context &&
             span_context.respond_to?(:trace_context) &&
             span_context.trace_context
         end
@@ -279,8 +271,8 @@ module ElasticAPM
 
         Span.new(elastic_span, span_context)
       end
-      # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/MethodLength, Metrics/ParameterLists
+
+      # rubocop:enable Metrics/ParameterLists
 
       def inject(span_context, format, carrier)
         case format
@@ -341,6 +333,5 @@ module ElasticAPM
         @scope_manager.active&.span&.context
       end
     end
-    # rubocop:enable Metrics/ClassLength
   end
 end