elastic-apm 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3fb435d6ad1fd7a4e60cadedf93d9058da43310444e2fe4751d340a8a0eb7ed
-  data.tar.gz: 7e4a452a0ef34cd1d91bb5b9e1e74cd4c14a2d66ed4fe85ee5317682077c193b
+  metadata.gz: a2ef17d6e9c0be751b1eec5e6083560d5eed2c3fbeb044adf361563b1f83ca01
+  data.tar.gz: b2ef8af13b2308b47149e9f9ac413825a5a23827f51af7a78c258848d99a6670
 SHA512:
-  metadata.gz: ad0a3ea9273288644640513a82db7baf1ed5c89f5ff4c1e57246d08d6baa8796d854263170afa887edbc5ab1ce2d73a5d73b8e6d367c58f56efd4d830e4c9be4
-  data.tar.gz: 0410ba02cd8c06b473fcb428900a5ed4d1eeae16134f187cde4525139edd669e75122cbe7b98d0a98a1639df4863d07d429dd6a3b27696604385e4703edaacb4
+  metadata.gz: ea7a58ffc1ed6eac693a32d9312f93e05ec47b047819b0420172a26de8a21bc7422a300fd6b405bbf24b8b40900a9ce6b7c97fc53502130eb641837120681420
+  data.tar.gz: b453578df37793a7dfeb6b3383530c652ec477b28303eefe35bf1e7a5ce3ea21fadb82621070c4de6de6d1c3e4acd6bd2023b3d9ec366a688b19ca73c93880e1

data/CHANGELOG.md

@@ -4,6 +4,16 @@ 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.5.0 (2019-03-01)
+
+### Added
+
+- Added the option `active` that will prevent the agent from starting if set to `false` ([#338](https://github.com/elastic/apm-agent-ruby/pull/338))
+
+### Fixed
+
+- Fix error with `capture_body` and nested request bodies ([#339](https://github.com/elastic/apm-agent-ruby/pull/339))
+
 ## 2.4.0 (2019-02-27)
 
 ### Added

data/Jenkinsfile

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-@Library('apm@v1.0.7') _
+@Library('apm@v1.0.9') _
 
 import co.elastic.matrix.*
 import groovy.transform.Field
@@ -199,6 +199,7 @@ class RubyParallelTaskGenerator extends DefaultParallelTaskGenerator {
   */
   public Closure generateStep(x, y){
     return {
+      steps.sleep steps.randomNumber(min:10, max: 30)
       steps.node('linux && immutable'){
         def label = "${tag}:${x}#${y}"
         try {

data/docs/configuration.asciidoc

@@ -119,6 +119,17 @@ ruby -r securerandom -e 'print SecureRandom.uuid'
 
 WARNING: Secret tokens only provide any real security if your APM server use TLS.
 
+[float]
+[[config-active]]
+==== `active`
+|============
+| Environment          | `Config` key | Default
+| `ELASTIC_APM_ACTIVE` | `active`     | `true`
+|============
+
+Whether or not to start the agent.
+If `active` is `false`, `ElasticAPM.start` will do nothing and all calls to the root API will return `nil`.
+
 [float]
 [[config-api-buffer-size]]
 ==== `api_buffer_size`

data/lib/elastic_apm/agent.rb

@@ -22,6 +22,7 @@ module ElasticAPM
       @instance
     end
 
+    # rubocop:disable Metrics/MethodLength
     def self.start(config)
       return @instance if @instance
 
@@ -30,9 +31,18 @@ module ElasticAPM
       LOCK.synchronize do
         return @instance if @instance
 
+        unless config.active?
+          config.logger.debug format(
+            '%sAgent disabled with active: false',
+            Logging::PREFIX
+          )
+          return
+        end
+
         @instance = new(config).start
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     def self.stop
       LOCK.synchronize do

data/lib/elastic_apm/config.rb

@@ -19,6 +19,7 @@ module ElasticAPM
 
       server_url: 'http://localhost:8200',
 
+      active: true,
       api_buffer_size: 256,
       api_request_size: '750kb',
       api_request_time: '10s',
@@ -59,6 +60,7 @@ module ElasticAPM
       'ELASTIC_APM_SERVER_URL' => 'server_url',
       'ELASTIC_APM_SECRET_TOKEN' => 'secret_token',
 
+      'ELASTIC_APM_ACTIVE' => [:bool, 'active'],
       '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',
@@ -131,6 +133,7 @@ module ElasticAPM
     attr_accessor :server_url
     attr_accessor :secret_token
 
+    attr_accessor :active
     attr_accessor :api_buffer_size
     attr_accessor :api_request_size
     attr_accessor :api_request_time
@@ -176,6 +179,7 @@ module ElasticAPM
     attr_accessor :view_paths
     attr_accessor :root_path
 
+    alias :active? :active
     alias :capture_body? :capture_body
     alias :capture_headers? :capture_headers
     alias :capture_env? :capture_env

data/lib/elastic_apm/spies/faraday.rb

@@ -17,6 +17,11 @@ module ElasticAPM
 
             host = if url_prefix.is_a?(URI) && url_prefix.host
                      url_prefix.host
+                   elsif url.nil?
+                     tmp_request = build_request(method) do |req|
+                       yield(req) if block_given?
+                     end
+                     URI(tmp_request.path).host
                    else
                      URI(url).host
                    end

data/lib/elastic_apm/transport/filters/secrets_filter.rb

@@ -37,15 +37,26 @@ module ElasticAPM
           payload
         end
 
+        # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
         def strip_from!(obj)
           return unless obj && obj.is_a?(Hash)
 
           obj.each do |k, v|
-            if filter_key?(k) || filter_value?(v)
-              obj[k] = FILTERED
+            if filter_key?(k)
+              next obj[k] = FILTERED
+            end
+
+            case v
+            when Hash
+              strip_from!(v)
+            when String
+              if filter_value?(v)
+                obj[k] = FILTERED
+              end
             end
           end
         end
+        # rubocop:enable Metrics/MethodLength, Metrics/CyclomaticComplexity
 
         def filter_key?(key)
           @key_filters.any? { |regex| key.match regex }

data/lib/elastic_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby