elastic-apm 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 461871ffc956519fbd712017336bcc012f0c41d6b1696dc32a3117860b3b736d
-  data.tar.gz: 468207605feaa4d888fbf1bfcd665c8f7bb0953d0b5c7e1e92d4f266c85855f6
+  metadata.gz: f64eb5692ec903ccffcb881d4c7de8a725171d5d85d231b00ef3031dd8972768
+  data.tar.gz: 437ad5c85f6d56cae467c816b6916159a9dd406dcdfd9c7baa4bed4125b62132
 SHA512:
-  metadata.gz: b22550a4a59b6311e55a86306ab9c5af705f65754e7f7f0afa7509565724f68c4ada5781c17354bc724da181acc2158c45f8447297dea1ead99bdc20f74094a9
-  data.tar.gz: 15b61ed7489a8468a56983c0e8a33418441695bcc28c08e477110204ba8b53e1a022ebfbd660720e8a3227004ac0adc1b8eeb34523cceba902f78129421baabe
+  metadata.gz: 1def6a88dd72516323da5f9c65a3941679d14e9a8c95b6688f29127c0c155db25dae65bd2574a822114e52f55ea201bb9df0f791476b40f2f86e513dc4cd90ab
+  data.tar.gz: 5e7b21bbf7f688da977b48b3bcdf1ccaf4d585ec2546214eda20ef158f460175d79cd67adfe8a9705e9946dab226ac1924dad780e0a1f645fd21ab6e5b47999c

data/CHANGELOG.md

@@ -4,6 +4,14 @@ 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.1
+
+### Fixed
+
+- Setting `config_file` via `ELASTIC_APM_CONFIG_FILE` ([#363(https://github.com/elastic/apm-agent-ruby/pull/363))
+- Stopping the Metrics collector when it is disabled ([#357](https://github.com/elastic/apm-agent-ruby/pull/357))
+- HTTP proxy settings can now be set by ENV variable ([#367](https://github.com/elastic/apm-agent-ruby/pull/367))
+
 ## 2.6.0 (2019-03-19)
 
 ### Deprecated

data/lib/elastic_apm/config.rb

@@ -41,7 +41,7 @@ module ElasticAPM
       instrumented_rake_tasks: [],
       log_level: Logger::INFO,
       log_path: nil,
-      metrics_interval: 30,
+      metrics_interval: '30s',
       pool_size: 1,
       source_lines_error_app_frames: 5,
       source_lines_error_library_frames: 0,
@@ -67,6 +67,7 @@ module ElasticAPM
       'ELASTIC_APM_CAPTURE_BODY' => 'capture_body',
       'ELASTIC_APM_CAPTURE_HEADERS' => [:bool, 'capture_headers'],
       'ELASTIC_APM_CAPTURE_ENV' => [:bool, 'capture_env'],
+      'ELASTIC_APM_CONFIG_FILE' => 'config_file',
       'ELASTIC_APM_CUSTOM_KEY_FILTERS' => [:list, 'custom_key_filters'],
       'ELASTIC_APM_DEFAULT_TAGS' => [:dict, 'default_tags'],
       'ELASTIC_APM_DISABLED_SPIES' => [:list, 'disabled_spies'],
@@ -81,7 +82,12 @@ module ElasticAPM
         [:list, 'instrumented_rake_tasks'],
       'ELASTIC_APM_LOG_LEVEL' => [:int, 'log_level'],
       'ELASTIC_APM_LOG_PATH' => 'log_path',
-      'ELASTIC_APM_METRICS_INTERVAL' => [:int, 'metrics_interval'],
+      'ELASTIC_APM_METRICS_INTERVAL' => 'metrics_interval',
+      'ELASTIC_APM_PROXY_ADDRESS' => 'proxy_address',
+      'ELASTIC_APM_PROXY_HEADERS' => [:dict, 'proxy_headers'],
+      'ELASTIC_APM_PROXY_PASSWORD' => 'proxy_password',
+      'ELASTIC_APM_PROXY_PORT' => [:int, 'proxy_port'],
+      'ELASTIC_APM_PROXY_USERNAME' => 'proxy_username',
       'ELASTIC_APM_POOL_SIZE' => [:int, 'pool_size'],
       'ELASTIC_APM_SERVER_CA_CERT' => 'server_ca_cert',
       'ELASTIC_APM_SERVICE_NAME' => 'service_name',
@@ -300,7 +306,7 @@ module ElasticAPM
     end
 
     def collect_metrics?
-      metrics_interval != 0
+      metrics_interval > 0
     end
 
     # rubocop:disable Metrics/MethodLength
@@ -354,7 +360,7 @@ module ElasticAPM
           when :float then value.to_f
           when :bool then !%w[0 false].include?(value.strip.downcase)
           when :list then value.split(/[ ,]/)
-          when :dict then Hash[value.split('&').map { |kv| kv.split('=') }]
+          when :dict then Hash[value.split(/[&,]/).map { |kv| kv.split('=') }]
           else value
           end
 

data/lib/elastic_apm/metrics.rb

@@ -54,6 +54,8 @@ module ElasticAPM
       # rubocop:enable Metrics/MethodLength
 
       def stop
+        return unless running?
+
         @timer_task.shutdown
         @running = false
       end

data/lib/elastic_apm/version.rb

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

metadata

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