elastic-apm 2.9.1 → 2.10.0

data/lib/elastic_apm/config/bytes.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module ElasticAPM
+  class Config
+    # @api private
+    class Bytes
+      MULTIPLIERS = {
+        'kb' => 1024,
+        'mb' => 1024 * 1_000,
+        'gb' => 1024 * 100_000
+      }.freeze
+      REGEX = /^(\d+)(b|kb|mb|gb)?$/i.freeze
+
+      def initialize(default_unit: 'kb')
+        @default_unit = default_unit
+      end
+
+      def call(value)
+        _, amount, unit = REGEX.match(String(value)).to_a
+        unit ||= @default_unit
+        MULTIPLIERS.fetch(unit.downcase, 1) * amount.to_i
+      end
+    end
+  end
+end

data/lib/elastic_apm/config/duration.rb

@@ -7,18 +7,16 @@ module ElasticAPM
       MULTIPLIERS = { 'ms' => 0.001, 'm' => 60 }.freeze
       REGEX = /^(-)?(\d+)(m|ms|s)?$/i.freeze
 
-      def initialize(seconds)
-        @seconds = seconds
+      def initialize(default_unit: 's')
+        @default_unit = default_unit
       end
 
-      attr_accessor :seconds
-
-      def self.parse(str, default_unit:)
-        _, negative, amount, unit = REGEX.match(str).to_a
-        unit ||= default_unit
+      def call(str)
+        _, negative, amount, unit = REGEX.match(String(str)).to_a
+        unit ||= @default_unit
         seconds = MULTIPLIERS.fetch(unit.downcase, 1) * amount.to_i
         seconds = 0 - seconds if negative
-        new(seconds)
+        seconds
       end
     end
   end

data/lib/elastic_apm/config/options.rb

@@ -0,0 +1,134 @@
+# frozen_string_literal: true
+
+module ElasticAPM
+  class Config
+    # @api private
+    module Options
+      # @api private
+      class Option
+        def initialize(
+          key,
+          value: nil,
+          type: :string,
+          default: nil,
+          converter: nil
+        )
+          @key = key
+          @type = type
+          @default = default
+          @converter = converter
+
+          set(value || default)
+        end
+
+        attr_reader :key, :value, :default, :type
+
+        def set(value)
+          @value = normalize(value)
+        end
+
+        def env_key
+          "ELASTIC_APM_#{key.upcase}"
+        end
+
+        private
+
+        # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+        def normalize(val)
+          return unless val
+
+          if @converter
+            return @converter.call(val)
+          end
+
+          case type
+          when :string then val.to_s
+          when :int then val.to_i
+          when :float then val.to_f
+          when :bool then normalize_bool(val)
+          when :list then normalize_list(val)
+          when :dict then normalize_dict(val)
+          else
+            # raise "Unknown options type '#{type.inspect}'"
+            val
+          end
+        end
+        # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength
+
+        def normalize_bool(val)
+          return val unless val.is_a?(String)
+          !%w[0 false].include?(val.strip.downcase)
+        end
+
+        def normalize_list(val)
+          return Array(val) unless val.is_a?(String)
+          val.split(/[ ,]/)
+        end
+
+        def normalize_dict(val)
+          return val unless val.is_a?(String)
+          Hash[val.split(/[&,]/).map { |kv| kv.split('=') }]
+        end
+      end
+
+      # @api private
+      module ClassMethods
+        def schema
+          @schema ||= {}
+        end
+
+        def option(*args)
+          key = args.shift
+          schema[key] = *args
+        end
+      end
+
+      # @api private
+      module InstanceMethods
+        def load_schema
+          Hash[self.class.schema.map do |key, args|
+            [key, Option.new(key, *args)]
+          end]
+        end
+
+        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+        def method_missing(name, *value)
+          name_str = name.to_s
+
+          if name_str.end_with?('=')
+            key = name_str[0...-1].to_sym
+            set(key, value.first)
+
+          elsif name_str.end_with?('?')
+            key = name_str[0...-1].to_sym
+            options.key?(key) ? options[key].value : super
+
+          elsif options.key?(name)
+            options.fetch(name).value
+
+          else
+            super
+          end
+        end
+        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+
+        def [](key)
+          options[key]
+        end
+        alias :get :[]
+
+        def set(key, value)
+          options.fetch(key.to_sym).set(value)
+        rescue KeyError
+          warn format("Unknown option '%s'", key)
+          nil
+        end
+      end
+
+      def self.extended(kls)
+        kls.instance_eval { extend ClassMethods }
+        kls.class_eval { include InstanceMethods }
+      end
+    end
+  end
+end

data/lib/elastic_apm/config/regexp_list.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module ElasticAPM
+  class Config
+    # @api private
+    class RegexpList
+      def call(value)
+        value = value.is_a?(String) ? value.split(',') : Array(value)
+        value.map(&Regexp.method(:new))
+      end
+    end
+  end
+end

data/lib/elastic_apm/metadata.rb

@@ -7,9 +7,10 @@ module ElasticAPM
       @service = ServiceInfo.new(config)
       @process = ProcessInfo.new(config)
       @system = SystemInfo.new(config)
+      @labels = config.global_labels
     end
 
-    attr_reader :service, :process, :system
+    attr_reader :service, :process, :system, :labels
   end
 end
 

data/lib/elastic_apm/metrics.rb

@@ -24,7 +24,7 @@ module ElasticAPM
       def initialize(config, tags: nil, &block)
         @config = config
         @tags = tags
-        @samplers = [CpuMem].map do |kls|
+        @samplers = [CpuMem, VM].map do |kls|
           debug "Adding metrics collector '#{kls}'"
           kls.new(config)
         end
@@ -95,3 +95,4 @@ module ElasticAPM
 end
 
 require 'elastic_apm/metrics/cpu_mem'
+require 'elastic_apm/metrics/vm'

data/lib/elastic_apm/metrics/vm.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module ElasticAPM
+  module Metrics
+    # @api private
+    class VM
+      include Logging
+
+      def initialize(config)
+        @total_time = 0
+        @disabled = false
+      end
+
+      attr_reader :config
+      attr_writer :disabled
+
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      def collect
+        return if disabled?
+
+        stat = GC.stat
+        thread_count = Thread.list.count
+
+        sample = {
+          'ruby.gc.count': stat[:count],
+          'ruby.threads': thread_count
+        }
+
+        (live_slots = stat[:heap_live_slots]) &&
+          sample[:'ruby.heap.slots.live'] = live_slots
+        (heap_slots = stat[:heap_free_slots]) &&
+          sample[:'ruby.heap.slots.free'] = heap_slots
+        (allocated = stat[:total_allocated_objects]) &&
+          sample[:'ruby.heap.allocations.total'] = allocated
+
+        return sample unless GC::Profiler.enabled?
+
+        @total_time += GC::Profiler.total_time
+        GC::Profiler.clear
+        sample[:'ruby.gc.time'] = @total_time
+
+        sample
+      rescue TypeError => e
+        error 'VM metrics encountered error: %s', e
+        debug('Backtrace:') { e.backtrace.join("\n") }
+
+        @disabled = true
+        nil
+      end
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+
+      def disabled?
+        @disabled
+      end
+    end
+  end
+end

data/lib/elastic_apm/normalizers/action_view.rb

@@ -19,7 +19,7 @@ module ElasticAPM
         end
 
         def view_path(path)
-          root = @config.view_paths.find { |vp| path.start_with?(vp) }
+          root = @config.__view_paths.find { |vp| path.start_with?(vp) }
           return unless root
 
           strip_root(root, path)

data/lib/elastic_apm/railtie.rb

@@ -7,10 +7,15 @@ module ElasticAPM
   class Railtie < Rails::Railtie
     config.elastic_apm = ActiveSupport::OrderedOptions.new
 
-    Config::DEFAULTS.each { |option, value| config.elastic_apm[option] = value }
+    Config.schema.each do |key, args|
+      next unless args.length > 1
+      config.elastic_apm[key] = args.last[:default]
+    end
 
     initializer 'elastic_apm.initialize' do |app|
-      config = Config.new(app.config.elastic_apm.merge(app: app)).tap do |c|
+      config = Config.new(app.config.elastic_apm).tap do |c|
+        c.app = app
+
         # Prepend Rails.root to log_path if present
         if c.log_path && !c.log_path.start_with?('/')
           c.log_path = Rails.root.join(c.log_path)
@@ -35,7 +40,7 @@ module ElasticAPM
     def start(config)
       if (reason = should_skip?(config))
         unless config.disable_start_message?
-          config.alert_logger.info "Skipping because: #{reason}. " \
+          config.logger.info "Skipping because: #{reason}. " \
             "Start manually with `ElasticAPM.start'"
         end
         return
@@ -45,8 +50,8 @@ module ElasticAPM
         attach_subscriber(agent)
       end
     rescue StandardError => e
-      config.alert_logger.error format('Failed to start: %s', e.message)
-      config.alert_logger.debug "Backtrace:\n" + e.backtrace.join("\n")
+      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
 

data/lib/elastic_apm/spies/mongo.rb

@@ -34,18 +34,29 @@ 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
+          name = [event.database_name,
+                  collection,
+                  event.command_name].compact.join('.')
 
           span =
             ElasticAPM.start_span(
-              event.command_name.to_s,
+              name,
               TYPE,
               context: build_context(event)
             )
 
           @events[event.operation_id] = span
         end
+        # rubocop:enable Metrics/MethodLength
 
         def pop_event(event)
           return unless (curr = ElasticAPM.current_span)
@@ -58,7 +69,7 @@ module ElasticAPM
           Span::Context.new(
             db: {
               instance: event.database_name,
-              statement: nil,
+              statement: event.command.to_s,
               type: 'mongodb',
               user: nil
             }

data/lib/elastic_apm/stacktrace_builder.rb

@@ -67,8 +67,8 @@ module ElasticAPM
     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')
+      if abs_path.start_with?(config.__root_path)
+        return true if abs_path.start_with?(config.__root_path + '/vendor')
         return false
       end
 

data/lib/elastic_apm/transport/connection.rb

@@ -7,6 +7,7 @@ require 'elastic_apm/transport/connection/http'
 
 module ElasticAPM
   module Transport
+    # rubocop:disable Metrics/ClassLength
     # @api private
     class Connection
       include Logging
@@ -150,5 +151,6 @@ module ElasticAPM
         end
       end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/elastic_apm/transport/serializers/metadata_serializer.rb

@@ -10,7 +10,8 @@ module ElasticAPM
             metadata: {
               service: build_service(metadata.service),
               process: build_process(metadata.process),
-              system: build_system(metadata.system)
+              system: build_system(metadata.system),
+              labels: build_labels(metadata.labels)
             }
           }
         end
@@ -59,6 +60,10 @@ module ElasticAPM
             kubernetes: keyword_object(system.kubernetes)
           }
         end
+
+        def build_labels(labels)
+          keyword_object(labels)
+        end
       end
     end
   end

data/lib/elastic_apm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ElasticAPM
-  VERSION = '2.9.1'
+  VERSION = '2.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.10.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -45,8 +45,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".ci/.jenkins_codecov.yml"
 - ".ci/.jenkins_exclude.yml"
 - ".ci/.jenkins_framework.yml"
+- ".ci/.jenkins_master_framework.yml"
 - ".ci/.jenkins_ruby.yml"
 - ".ci/Jenkinsfile"
 - ".ci/bin/check_paths_for_matches.py"
@@ -57,6 +59,7 @@ files:
 - ".ci/jobs/defaults.yml"
 - ".gitignore"
 - ".hound.yml"
+- ".pre-commit-config.yaml"
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
@@ -95,9 +98,13 @@ files:
 - lib/elastic-apm.rb
 - lib/elastic_apm.rb
 - lib/elastic_apm/agent.rb
+- lib/elastic_apm/central_config.rb
+- lib/elastic_apm/central_config/cache_control.rb
 - lib/elastic_apm/config.rb
+- lib/elastic_apm/config/bytes.rb
 - lib/elastic_apm/config/duration.rb
-- lib/elastic_apm/config/size.rb
+- lib/elastic_apm/config/options.rb
+- lib/elastic_apm/config/regexp_list.rb
 - lib/elastic_apm/context.rb
 - lib/elastic_apm/context/request.rb
 - lib/elastic_apm/context/request/socket.rb
@@ -120,6 +127,7 @@ files:
 - lib/elastic_apm/metadata/system_info/container_info.rb
 - lib/elastic_apm/metrics.rb
 - lib/elastic_apm/metrics/cpu_mem.rb
+- lib/elastic_apm/metrics/vm.rb
 - lib/elastic_apm/metricset.rb
 - lib/elastic_apm/middleware.rb
 - lib/elastic_apm/naively_hashable.rb