elastic-apm 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2ef17d6e9c0be751b1eec5e6083560d5eed2c3fbeb044adf361563b1f83ca01
-  data.tar.gz: b2ef8af13b2308b47149e9f9ac413825a5a23827f51af7a78c258848d99a6670
+  metadata.gz: 461871ffc956519fbd712017336bcc012f0c41d6b1696dc32a3117860b3b736d
+  data.tar.gz: 468207605feaa4d888fbf1bfcd665c8f7bb0953d0b5c7e1e92d4f266c85855f6
 SHA512:
-  metadata.gz: ea7a58ffc1ed6eac693a32d9312f93e05ec47b047819b0420172a26de8a21bc7422a300fd6b405bbf24b8b40900a9ce6b7c97fc53502130eb641837120681420
-  data.tar.gz: b453578df37793a7dfeb6b3383530c652ec477b28303eefe35bf1e7a5ce3ea21fadb82621070c4de6de6d1c3e4acd6bd2023b3d9ec366a688b19ca73c93880e1
+  metadata.gz: b22550a4a59b6311e55a86306ab9c5af705f65754e7f7f0afa7509565724f68c4ada5781c17354bc724da181acc2158c45f8447297dea1ead99bdc20f74094a9
+  data.tar.gz: 15b61ed7489a8468a56983c0e8a33418441695bcc28c08e477110204ba8b53e1a022ebfbd660720e8a3227004ac0adc1b8eeb34523cceba902f78129421baabe

data/CHANGELOG.md

@@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.6.0 (2019-03-19)
+
+### Deprecated
+
+- `ElasticAPM.build_context` now takes two keyword arguments instead of a single, normal argument. [Docs](https://www.elastic.co/guide/en/apm/agent/ruby/2.x/api.html#api-agent-build-context).
+- The option `capture_body` has a string value instead of boolean. [Docs](https://www.elastic.co/guide/en/apm/agent/ruby/2.x/configuration.html#config-capture-body).
+
+Both APIs are backwards compatible with fallbacks and deprecation warnings, scheduled for removal in next major release.
+
+### Added 
+
+- Configuration options to use an HTTP proxy ([#352](https://github.com/elastic/apm-agent-ruby/pull/352))
+
+### Changed
+
+- Errors get their own contexts, perhaps leading to slightly different (but more correct) results. ([#335](https://github.com/elastic/apm-agent-ruby/pull/335))
+- The agent no longer starts automatically inside Rails' console ([#343](https://github.com/elastic/apm-agent-ruby/pull/343))
+
+### Fixed
+
+- Fixed reading available memory on older Linux kernels ([#351](https://github.com/elastic/apm-agent-ruby/pull/351))
+- Don't apply filters to original response headers ([#354](https://github.com/elastic/apm-agent-ruby/pull/354))
+
 ## 2.5.0 (2019-03-01)
 
 ### Added

data/CONTRIBUTING.md

@@ -85,8 +85,9 @@ $ spec/scripts/spec.sh ruby-2.6 rails-5.2
 To release a new version:
 
 1. Update `VERSION` in `lib/elastic_apm/version.rb` according to the changes (major, minor, patch).
-2. Update `CHANGELOG.md` to reflect the new version -- change _Unreleased_ section to _Version (release date)_.
-3. Run `rake release`. This will...
+2. Update `CHANGELOG.md` to reflect the new version – change _Unreleased_ section to _Version (release date)_.
+3. Make a new commit with the changes above, with a message in the style of `vX.X.X`.
+4. Run `rake release`. This will...
     1. Tag the current commit as new version.
     2. Push the tag to GitHub.
     3. Build the gem and upload to Rubygems (local user needs to be signed in and authorized.)

data/Jenkinsfile

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-@Library('apm@v1.0.9') _
+@Library('apm@current') _
 
 import co.elastic.matrix.*
 import groovy.transform.Field
@@ -25,6 +25,8 @@ pipeline {
     ansiColor('xterm')
     disableResume()
     durabilityHint('PERFORMANCE_OPTIMIZED')
+    rateLimitBuilds(throttle: [count: 60, durationName: 'hour', userBoost: true])
+    quietPeriod(10)
   }
   triggers {
     issueCommentTrigger('.*(?:jenkins\\W+)?run\\W+(?:the\\W+)?tests(?:\\W+please)?.*')
@@ -39,7 +41,7 @@ pipeline {
     Checkout the code and stash it, to use it on other stages.
     */
     stage('Checkout') {
-      agent { label 'flyweight' }
+      agent { label 'master || immutable' }
       options { skipDefaultCheckout() }
       steps {
         deleteDir()
@@ -51,7 +53,7 @@ pipeline {
     Execute unit tests.
     */
     stage('Test') {
-      agent { label 'flyweight' }
+      agent { label 'linux && immutable' }
       options { skipDefaultCheckout() }
       steps {
         deleteDir()

data/README.md

@@ -1,7 +1,7 @@
 # elastic-apm
 ## Elastic APM agent for ♦️Ruby
 
-[![Jenkins](https://img.shields.io/jenkins/s/https/apm-ci.elastic.co/job/elastic+apm-agent-ruby+master.svg)](https://apm-ci.elastic.co/job/elastic+apm-agent-ruby+master/) [![Gem](https://img.shields.io/gem/v/elastic-apm.svg)](https://rubygems.org/gems/elastic-apm) [![codecov](https://codecov.io/gh/elastic/apm-agent-ruby/branch/master/graph/badge.svg)](https://codecov.io/gh/elastic/apm-agent-ruby)
+[![Jenkins](https://apm-ci.elastic.co/buildStatus/icon?job=apm-agent-ruby/apm-agent-ruby-mbp/master)](https://apm-ci.elastic.co/job/apm-agent-ruby/apm-agent-ruby-mbp/master) [![Gem](https://img.shields.io/gem/v/elastic-apm.svg)](https://rubygems.org/gems/elastic-apm) [![codecov](https://codecov.io/gh/elastic/apm-agent-ruby/branch/master/graph/badge.svg)](https://codecov.io/gh/elastic/apm-agent-ruby)
 
 The official Rubygem for [Elastic][] [APM][].
 

data/docs/api.asciidoc

@@ -182,6 +182,7 @@ A context provides information about the current request, response, user and mor
 Arguments:
 
   * `rack_env`: An instance of Rack::Env
+  * `for_type`: Symbol representing type of event, eg. `:transaction` or `error`
 
 Returns the built context.
 

data/docs/configuration.asciidoc

@@ -177,11 +177,21 @@ It has to be provided in *<<config-format-duration, duration format>>*.
 [[config-capture-body]]
 ==== `capture_body`
 |============
-| Environment                | `Config` key   | Default
-| `ELASTIC_APM_CAPTURE_BODY` | `capture_body` | `true`
+| Environment                | `Config` key   | Default | Example |
+| `ELASTIC_APM_CAPTURE_BODY` | `capture_body` | `"off"` | `"all"`
 |============
 
-Whether or not to attach the request body to transactions and errors.
+For transactions that are HTTP requests,
+the Ruby agent can optionally capture the request body (e.g. `POST` variables or JSON data).
+
+Possible values: `"errors"`, `"transactions"`, `"all"`, `"off"`.
+
+If the request has a body and this setting is disabled, the body will be shown as `[SKIPPED]`.
+
+WARNING: request bodies often contain sensitive values like passwords, credit card numbers etc.
+We try to strip sensitive looking data from form bodies but don't touch text bodies like JSON.
+If your service handles data like this, we advise to only enable this feature with care.
+
 
 [float]
 [[config-capture-headers]]
@@ -442,6 +452,28 @@ This makes sure the agent doesn't block the main thread any more than necessary.
 If you have high load and get warnings about the buffer being full, increasing
 the worker pool size might help.
 
+[float]
+[[config-proxy-address]]
+==== `proxy_address`
+
+[options="header"]
+|============
+| Environment | `Config` key    | Default | Example
+| N/A         | `proxy_address` | `nil`   | `"example.com"`
+|============
+
+An address to use as a proxy for the HTTP client.
+
+Options available are:
+
+- `proxy_address`
+- `proxy_headers`
+- `proxy_password`
+- `proxy_port`
+- `proxy_username`
+
+See https://github.com/httprb/http/wiki/Proxy-Support[Http.rb's docs].
+
 [float]
 [[config-service-name]]
 ==== `service_name`

data/lib/elastic_apm.rb

@@ -285,8 +285,17 @@ module ElasticAPM # rubocop:disable Metrics/ModuleLength
     #
     # @param rack_env [Rack::Env] A Rack env
     # @return [Context] The built context
-    def build_context(rack_env)
-      agent&.build_context(rack_env)
+    def build_context(
+      deprecated_env = nil,
+      rack_env: nil,
+      for_type: :transaction
+    )
+      if !rack_env && (rack_env = deprecated_env)
+        warn "[ElasticAPM] [DEPRECATED] `build_context' expects two keyword" \
+          "arguments, `rack_env:' and `for_type:'"
+      end
+
+      agent&.build_context(rack_env: rack_env, for_type: for_type)
     end
 
     ### Errors
@@ -294,18 +303,25 @@ module ElasticAPM # rubocop:disable Metrics/ModuleLength
     # Report and exception to APM
     #
     # @param exception [Exception] The exception
+    # @param context [Context] An optional [Context]
     # @param handled [Boolean] Whether the exception was rescued
     # @return [Error] The generated [Error]
-    def report(exception, handled: true)
-      agent&.report(exception, handled: handled)
+    def report(exception, context: nil, handled: true)
+      agent&.report(exception, context: context, handled: handled)
     end
 
     # Report a custom string error message to APM
     #
     # @param message [String] The message
+    # @param context [Context] An optional [Context]
     # @return [Error] The generated [Error]
-    def report_message(message, **attrs)
-      agent&.report_message(message, backtrace: caller, **attrs)
+    def report_message(message, context: nil, **attrs)
+      agent&.report_message(
+        message,
+        context: context,
+        backtrace: caller,
+        **attrs
+      )
     end
 
     ### Context

data/lib/elastic_apm/agent.rb

@@ -169,25 +169,27 @@ module ElasticAPM
       instrumenter.set_user(user)
     end
 
-    def build_context(rack_env)
-      @context_builder.build(rack_env)
+    def build_context(rack_env:, for_type:)
+      @context_builder.build(rack_env: rack_env, for_type: for_type)
     end
 
     # errors
 
-    def report(exception, handled: true)
+    def report(exception, context: nil, handled: true)
       return if config.filter_exception_types.include?(exception.class.to_s)
 
       error = @error_builder.build_exception(
         exception,
+        context: context,
         handled: handled
       )
       enqueue error
     end
 
-    def report_message(message, backtrace: nil, **attrs)
+    def report_message(message, context: nil, backtrace: nil, **attrs)
       error = @error_builder.build_log(
         message,
+        context: context,
         backtrace: backtrace,
         **attrs
       )

data/lib/elastic_apm/config.rb

@@ -23,7 +23,7 @@ module ElasticAPM
       api_buffer_size: 256,
       api_request_size: '750kb',
       api_request_time: '10s',
-      capture_body: false,
+      capture_body: 'off',
       capture_headers: true,
       capture_env: true,
       current_user_email_method: :email,
@@ -64,7 +64,7 @@ module ElasticAPM
       'ELASTIC_APM_API_BUFFER_SIZE' => [:int, 'api_buffer_size'],
       'ELASTIC_APM_API_REQUEST_SIZE' => [:int, 'api_request_size'],
       'ELASTIC_APM_API_REQUEST_TIME' => 'api_request_time',
-      'ELASTIC_APM_CAPTURE_BODY' => [:bool, 'capture_body'],
+      'ELASTIC_APM_CAPTURE_BODY' => 'capture_body',
       'ELASTIC_APM_CAPTURE_HEADERS' => [:bool, 'capture_headers'],
       'ELASTIC_APM_CAPTURE_ENV' => [:bool, 'capture_env'],
       'ELASTIC_APM_CUSTOM_KEY_FILTERS' => [:list, 'custom_key_filters'],
@@ -137,9 +137,8 @@ module ElasticAPM
     attr_accessor :api_buffer_size
     attr_accessor :api_request_size
     attr_accessor :api_request_time
-    attr_accessor :capture_body
-    attr_accessor :capture_headers
     attr_accessor :capture_env
+    attr_accessor :capture_headers
     attr_accessor :current_user_email_method
     attr_accessor :current_user_id_method
     attr_accessor :current_user_method
@@ -160,6 +159,11 @@ module ElasticAPM
     attr_accessor :logger
     attr_accessor :metrics_interval
     attr_accessor :pool_size
+    attr_accessor :proxy_address
+    attr_accessor :proxy_headers
+    attr_accessor :proxy_password
+    attr_accessor :proxy_port
+    attr_accessor :proxy_username
     attr_accessor :server_ca_cert
     attr_accessor :service_name
     attr_accessor :service_version
@@ -171,11 +175,14 @@ module ElasticAPM
     attr_accessor :transaction_sample_rate
     attr_accessor :verify_server_cert
 
+    attr_reader :capture_body
     attr_reader :custom_key_filters
     attr_reader :ignore_url_patterns
     attr_reader :span_frames_min_duration
     attr_reader :span_frames_min_duration_us
 
+    attr_writer :alert_logger
+
     attr_accessor :view_paths
     attr_accessor :root_path
 
@@ -296,6 +303,31 @@ module ElasticAPM
       metrics_interval != 0
     end
 
+    # rubocop:disable Metrics/MethodLength
+    def capture_body=(value)
+      if value =~ /(all|transactions|errors|off)/
+        @capture_body = value
+        return
+      end
+
+      case value
+      when true
+        alert_logger.warn "Boolean value for option `capture_body' has " \
+          "been deprecated. Setting to 'all'"
+        @capture_body = 'all'
+      when false
+        alert_logger.warn "Boolean value for option `capture_body' has " \
+          "been deprecated. Setting to 'off'"
+        @capture_body = 'off'
+      else
+        default = DEFAULTS[:capture_body]
+        alert_logger.warn "Unknown value `#{value}' for option "\
+          "`capture_body'. Defaulting to `#{default}'"
+        @capture_body = default
+      end
+    end
+    # rubocop:enable Metrics/MethodLength
+
     private
 
     def assign(options)
@@ -376,7 +408,7 @@ module ElasticAPM
     end
 
     def format_name(str)
-      str.gsub('::', '_')
+      str && str.gsub('::', '_')
     end
 
     def normalize_durations

data/lib/elastic_apm/context.rb

@@ -9,13 +9,25 @@ require 'elastic_apm/context/user'
 module ElasticAPM
   # @api private
   class Context
-    attr_accessor :request, :response, :user
-    attr_reader :custom, :tags
-
     def initialize(custom: {}, tags: {}, user: nil)
       @custom = custom
       @tags = tags
       @user = user || User.new
     end
+
+    attr_accessor :request
+    attr_accessor :response
+    attr_accessor :user
+    attr_reader :custom
+    attr_reader :tags
+
+    def empty?
+      return false if tags.any?
+      return false if custom.any?
+      return false if user.any?
+      return false if request || response
+
+      true
+    end
   end
 end

data/lib/elastic_apm/context/user.rb

@@ -26,6 +26,10 @@ module ElasticAPM
         !id && !email && !username
       end
 
+      def any?
+        !empty?
+      end
+
       class << self
         private
 

data/lib/elastic_apm/context_builder.rb

@@ -12,16 +12,16 @@ module ElasticAPM
 
     attr_reader :config
 
-    def build(rack_env)
-      context = Context.new
-      apply_to_request(context, rack_env)
-      context
+    def build(rack_env:, for_type:)
+      Context.new.tap do |context|
+        apply_to_request(context, rack_env: rack_env, for_type: for_type)
+      end
     end
 
     private
 
     # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-    def apply_to_request(context, rack_env)
+    def apply_to_request(context, rack_env:, for_type:)
       req = rails_req?(rack_env) ? rack_env : Rack::Request.new(rack_env)
 
       context.request = Context::Request.new unless context.request
@@ -32,7 +32,7 @@ module ElasticAPM
       request.method = req.request_method
       request.url = Context::Request::Url.new(req)
 
-      request.body = config.capture_body? ? get_body(req) : SKIPPED
+      request.body = should_capture_body?(for_type) ? get_body(req) : SKIPPED
 
       headers, env = get_headers_and_env(rack_env)
       request.headers = headers if config.capture_headers?
@@ -42,12 +42,20 @@ module ElasticAPM
     end
     # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
+    def should_capture_body?(for_type)
+      option = config.capture_body
+
+      return true if option == 'all'
+      return true if option == 'transactions' && for_type == :transaction
+      return true if option == 'errors' && for_type == :error
+
+      false
+    end
+
     def get_body(req)
       case req.media_type
-      when 'application/x-www-form-urlencoded'
-        req.POST
-      when 'multipart/form-data'
-        req.POST
+      when 'application/x-www-form-urlencoded', 'multipart/form-data'
+        req.POST.dup
       else
         body = req.body.read
         req.body.rewind
@@ -56,8 +64,7 @@ module ElasticAPM
     end
 
     def rails_req?(env)
-      defined?(ActionDispatch::Request) &&
-        env.is_a?(ActionDispatch::Request)
+      defined?(ActionDispatch::Request) && env.is_a?(ActionDispatch::Request)
     end
 
     def get_headers_and_env(rack_env)

data/lib/elastic_apm/error.rb

@@ -8,17 +8,11 @@ require 'elastic_apm/error/log'
 module ElasticAPM
   # @api private
   class Error
-    def initialize(culprit: nil)
+    def initialize(culprit: nil, context: nil)
       @id = SecureRandom.hex(16)
-      @trace_id = nil
       @culprit = culprit
-
       @timestamp = Util.micros
-      @context = Context.new
-
-      @transaction_id = nil
-      @transaction = nil
-      @parent_id = nil
+      @context = context
     end
 
     attr_accessor :id, :culprit, :exception, :log, :transaction_id,

data/lib/elastic_apm/error_builder.rb

@@ -7,37 +7,28 @@ module ElasticAPM
       @agent = agent
     end
 
-    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-    def build_exception(exception, handled: true)
-      error = Error.new
+    def build_exception(exception, context: nil, handled: true)
+      error = Error.new context: context || Context.new
       error.exception = Error::Exception.new(exception, handled: handled)
 
       if exception.backtrace
         add_stacktrace error, :exception, exception.backtrace
       end
 
-      add_current_transaction_fields error
-
-      if (transaction = ElasticAPM.current_transaction)
-        error.context = transaction.context.dup
-        error.trace_id = transaction.trace_id
-        error.transaction_id = transaction.id
-        error.parent_id = ElasticAPM.current_span&.id || transaction.id
-      end
+      add_current_transaction_fields error, ElasticAPM.current_transaction
 
       error
     end
-    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
-    def build_log(message, backtrace: nil, **attrs)
-      error = Error.new
+    def build_log(message, context: nil, backtrace: nil, **attrs)
+      error = Error.new context: context || Context.new
       error.log = Error::Log.new(message, **attrs)
 
       if backtrace
         add_stacktrace error, :log, backtrace
       end
 
-      add_current_transaction_fields error
+      add_current_transaction_fields error, ElasticAPM.current_transaction
 
       error
     end
@@ -59,10 +50,20 @@ module ElasticAPM
       error.culprit = stacktrace.frames.first.function
     end
 
-    def add_current_transaction_fields(error)
-      return unless (transaction = ElasticAPM.current_transaction)
+    # rubocop:disable Metrics/AbcSize
+    def add_current_transaction_fields(error, transaction)
+      return unless transaction
+
       error.transaction_id = transaction.id
       error.transaction = { sampled: transaction.sampled? }
+      error.trace_id = transaction.trace_id
+      error.parent_id = ElasticAPM.current_span&.id || transaction.id
+
+      return unless transaction.context
+
+      Util.reverse_merge!(error.context.tags, transaction.context.tags)
+      Util.reverse_merge!(error.context.custom, transaction.context.custom)
     end
+    # rubocop:enable Metrics/AbcSize
   end
 end

data/lib/elastic_apm/metrics/cpu_mem.rb

@@ -198,6 +198,8 @@ module ElasticAPM
           attr_reader :total, :available, :page_size
 
           # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+          # rubocop:disable Metrics/PerceivedComplexity
+          # rubocop:disable Metrics/CyclomaticComplexity
           def read!
             # rubocop:disable Style/RescueModifier
             @page_size = `getconf PAGESIZE`.chomp.to_i rescue 4096
@@ -211,16 +213,25 @@ module ElasticAPM
                     hsh[:total] = line.split[1].to_i * 1024
                   elsif line.start_with?('MemAvailable:')
                     hsh[:available] = line.split[1].to_i * 1024
+                  elsif line.start_with?('MemFree:')
+                    hsh[:free] = line.split[1].to_i * 1024
+                  elsif line.start_with?('Buffers:')
+                    hsh[:buffers] = line.split[1].to_i * 1024
+                  elsif line.start_with?('Cached:')
+                    hsh[:cached] = line.split[1].to_i * 1024
                   end
 
-                  break hsh if hsh.length == 2
+                  break hsh if hsh[:total] && hsh[:available]
                 end
 
             @total = info[:total]
-            @available = info[:available]
+            @available =
+              info[:available] || info[:free] + info[:buffers] + info[:cached]
 
             self
           end
+          # rubocop:enable Metrics/CyclomaticComplexity
+          # rubocop:enable Metrics/PerceivedComplexity
           # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
         end
       end

data/lib/elastic_apm/middleware.rb

@@ -10,7 +10,7 @@ module ElasticAPM
       @app = app
     end
 
-    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def call(env)
       begin
         if running? && !path_ignored?(env)
@@ -21,12 +21,13 @@ module ElasticAPM
       rescue InternalError
         raise # Don't report ElasticAPM errors
       rescue ::Exception => e
-        ElasticAPM.report(e, handled: false)
+        context = ElasticAPM.build_context(rack_env: env, for_type: :error)
+        ElasticAPM.report(e, context: context, handled: false)
         raise
       ensure
         if resp && transaction
           status, headers, _body = resp
-          transaction.add_response(status, headers: headers)
+          transaction.add_response(status, headers: headers.dup)
         end
 
         ElasticAPM.end_transaction http_result(status)
@@ -34,7 +35,7 @@ module ElasticAPM
 
       resp
     end
-    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
     private
 
@@ -49,8 +50,10 @@ module ElasticAPM
     end
 
     def start_transaction(env)
+      context = ElasticAPM.build_context(rack_env: env, for_type: :transaction)
+
       ElasticAPM.start_transaction 'Rack', 'request',
-        context: ElasticAPM.build_context(env),
+        context: context,
         trace_context: trace_context(env)
     end
 

data/lib/elastic_apm/railtie.rb

@@ -17,22 +17,46 @@ module ElasticAPM
         end
       end
 
-      begin
-        agent = ElasticAPM.start config
-
-        if agent
-          agent.instrumenter.subscriber = ElasticAPM::Subscriber.new(agent)
-
-          app.middleware.insert 0, Middleware
-        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")
+      if start(config)
+        app.middleware.insert 0, Middleware
       end
     end
 
     config.after_initialize do
       require 'elastic_apm/spies/action_dispatch'
     end
+
+    private
+
+    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+    def start(config)
+      if (reason = should_skip?(config))
+        config.alert_logger.info "Skipping because: #{reason}. " \
+          "Start manually with `ElasticAPM.start'"
+        return
+      end
+
+      ElasticAPM.start(config).tap do |agent|
+        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")
+    end
+    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+
+    def should_skip?(_config)
+      if Rails.const_defined? :Console
+        return 'Rails console'
+      end
+
+      nil
+    end
+
+    def attach_subscriber(agent)
+      return unless agent
+
+      agent.instrumenter.subscriber = ElasticAPM::Subscriber.new(agent)
+    end
   end
 end

data/lib/elastic_apm/spies/action_dispatch.rb

@@ -10,7 +10,9 @@ module ElasticAPM
           alias render_exception_without_apm render_exception
 
           def render_exception(env, exception)
-            ElasticAPM.report(exception)
+            context = ElasticAPM.build_context(rack_env: env, for_type: :error)
+            ElasticAPM.report(exception, context: context, handled: false)
+
             render_exception_without_apm env, exception
           end
         end

data/lib/elastic_apm/spies/faraday.rb

@@ -6,6 +6,8 @@ module ElasticAPM
     # @api private
     class FaradaySpy
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      # rubocop:disable Metrics/BlockLength, Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/CyclomaticComplexity
       def install
         ::Faraday::Connection.class_eval do
           alias run_request_without_apm run_request
@@ -43,6 +45,8 @@ module ElasticAPM
           end
         end
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/BlockLength, Metrics/PerceivedComplexity
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
     end
 

data/lib/elastic_apm/transport/connection.rb

@@ -28,7 +28,7 @@ module ElasticAPM
       }.freeze
       GZIP_HEADERS = HEADERS.merge('Content-Encoding' => 'gzip').freeze
 
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      # rubocop:disable Metrics/MethodLength
       def initialize(config, metadata)
         @config = config
         @metadata = metadata.to_json
@@ -42,16 +42,36 @@ module ElasticAPM
           headers['Authorization'] = "Bearer #{token}"
         end
 
-        if config.use_ssl? && config.server_ca_cert
-          @ssl_context = OpenSSL::SSL::SSLContext.new
-          @ssl_context.ca_file = config.server_ca_cert
-        end
-
         @client = HTTP.headers(headers).persistent(@url)
 
+        configure_proxy
+        configure_ssl
+
         @mutex = Mutex.new
       end
-      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+      # rubocop:enable Metrics/MethodLength
+
+      def configure_proxy
+        unless @config.proxy_address && @config.proxy_port
+          return
+        end
+
+        @client = @client.via(
+          @config.proxy_address,
+          @config.proxy_port,
+          @config.proxy_username,
+          @config.proxy_password,
+          @config.proxy_headers
+        )
+      end
+
+      def configure_ssl
+        return unless @config.use_ssl? && @config.server_ca_cert
+
+        @ssl_context = OpenSSL::SSL::SSLContext.new.tap do |context|
+          context.ca_file = @config.server_ca_cert
+        end
+      end
 
       def write(str)
         return if @config.disable_send

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

@@ -6,6 +6,8 @@ module ElasticAPM
       # @api private
       class ContextSerializer < Serializer
         def build(context)
+          return nil if context.nil? || context.empty?
+
           {
             custom: context.custom,
             tags: keyword_object(context.tags),

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

@@ -9,7 +9,7 @@ module ElasticAPM
           @context_serializer ||= ContextSerializer.new(config)
         end
 
-        # rubocop:disable Metrics/MethodLength
+        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         def build(error)
           base = {
             id: error.id,
@@ -19,10 +19,13 @@ module ElasticAPM
             parent_id: error.parent_id,
 
             culprit: error.culprit,
-            timestamp: error.timestamp,
-            context: context_serializer.build(error.context)
+            timestamp: error.timestamp
           }
 
+          if (context = context_serializer.build(error.context))
+            base[:context] = context
+          end
+
           if (exception = error.exception)
             base[:exception] = build_exception exception
           end
@@ -33,7 +36,7 @@ module ElasticAPM
 
           { error: base }
         end
-        # rubocop:enable Metrics/MethodLength
+        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
         private
 

data/lib/elastic_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-01 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The official Elastic APM agent for Ruby