elastic-apm 2.10.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb99c67f61f3f3bc30f7fb7bc64accea3725295db3d7bf90c18f2ce33d183e1f
-  data.tar.gz: 1a45da759179fa4b284a14b580f9f318fe27d4d4ba60fc87d5360acbf1e5ab94
+  metadata.gz: 2dbd55033ad5acde5c178afb8af7e3c49aea9e64391901ddd571e6eb4a5db139
+  data.tar.gz: 0c117a6853b5e54af3f1ad2b42e0ff99e4d061c95da66a89ee35f525b7d11fd0
 SHA512:
-  metadata.gz: 731f900b1466cf7f017fbdf747c969e7748cb9fdedf4f9a2dd748d5dbf7da31a3ce96a249ecab002bf62c9961e9c9336b983f570f51775f352b8dba43f5a04cb
-  data.tar.gz: 52518d1fe04e4def36990303cee09643580dee8313ae2809f4e7f68fbc6783ba6028459987c291f153e29a5181ec3a289409d5bcc5fb138fbfae242b4f07747d
+  metadata.gz: 4e5a48afa71841e62e52917e71d6201b68d4b7d36636b93e5b0076999e5a6b13a31f6dac0f39501245122d143497648dafef50fa02a15a30dc767482b4a1181d
+  data.tar.gz: 671f26c821de9e4090aef5f1af8855729d86f4b3b1ef824d3f5114231e9ecb34ef2e1aa81cb9b84ffcfab7a307418bf95a90df4e034075c5d9bc56798344b31c

data/.ci/Jenkinsfile

@@ -56,6 +56,13 @@ pipeline {
     }
     stage('Sanity checks') {
       agent { label 'linux && immutable && docker' }
+      when {
+        beforeAgent true
+        anyOf {
+          not { changeRequest() }
+          expression { return params.Run_As_Master_Branch }
+        }
+      }
       options { skipDefaultCheckout() }
       environment {
         HOME = "${env.WORKSPACE}"

data/.ci/jobs/apm-agent-ruby-linting-mbp.yml

@@ -0,0 +1,38 @@
+---
+- job:
+    name: apm-agent-ruby/apm-agent-ruby-linting-mbp
+    display-name: APM Agent Ruby Linting
+    description: APM Agent Ruby Linting
+    script-path: .ci/linting.groovy
+    scm:
+    - github:
+        branch-discovery: no-pr
+        discover-pr-forks-strategy: merge-current
+        discover-pr-forks-trust: permission
+        discover-pr-origin: merge-current
+        discover-tags: false
+        notification-context: 'apm-ci/linting'
+        head-filter-regex: '^PR-.*$'
+        repo: apm-agent-ruby
+        repo-owner: elastic
+        credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken
+        ssh-checkout:
+          credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba
+        build-strategies:
+        - change-request:
+            ignore-target-only-changes: false
+        clean:
+          after: true
+          before: true
+        prune: true
+        shallow-clone: true
+        depth: 3
+        do-not-fetch-tags: true
+        submodule:
+          disable: false
+          recursive: true
+          parent-credentials: true
+          timeout: 100
+        timeout: '15'
+        use-author: true
+        wipe-workspace: 'True'

data/.ci/jobs/apm-agent-ruby-mbp.yml

@@ -11,6 +11,7 @@
         discover-pr-forks-trust: permission
         discover-pr-origin: merge-current
         discover-tags: true
+        notification-context: 'apm-ci'
         repo: apm-agent-ruby
         repo-owner: elastic
         credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken

data/.ci/linting.groovy

@@ -0,0 +1,32 @@
+#!/usr/bin/env groovy
+@Library('apm@current') _
+
+pipeline {
+  agent { label 'docker && linux && immutable' }
+  options {
+    buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20', daysToKeepStr: '30'))
+    timestamps()
+    ansiColor('xterm')
+    disableResume()
+    durabilityHint('PERFORMANCE_OPTIMIZED')
+    rateLimitBuilds(throttle: [count: 60, durationName: 'hour', userBoost: true])
+    quietPeriod(10)
+  }
+  triggers {
+    issueCommentTrigger('(?i).*(?:jenkins\\W+)?run\\W+(?:the\\W+)?linters(?:\\W+please)?.*')
+  }
+  stages {
+    stage('Sanity checks') {
+      environment {
+        HOME = "${env.WORKSPACE}"
+        PATH = "${env.WORKSPACE}/bin:${env.PATH}"
+      }
+      steps {
+        script {
+          def sha = getGitCommitSha()
+          preCommit(commit: "${sha}", junit: true)
+        }
+      }
+    }
+  }
+}

data/CHANGELOG.md

@@ -4,10 +4,18 @@ 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.10.1
+
+### Fixed
+
+- Fixed loading options from a config file specified by `ELASTIC_APM_CONFIG_FILE` ([#518](https://github.com/elastic/apm-agent-ruby/pull/518))
+- Fixed an issue with CentralConfig polling not starting ([#525](https://github.com/elastic/apm-agent-ruby/pull/525))
+
 ## 2.10.0
 
 ### Added
 
+- Support for chained exceptions ([#488](https://github.com/elastic/apm-agent-ruby/pull/488))
 - Add Ruby specific metrics ([#437](https://github.com/elastic/apm-agent-ruby/pull/437))
 - Support for APM Agent Configuration via Kibana ([#464](https://github.com/elastic/apm-agent-ruby/pull/464))
 - Change span name format and add command to context's db.statement for `MongoSpy` ([#488](https://github.com/elastic/apm-agent-ruby/pull/490))

data/lib/elastic_apm/agent.rb

@@ -79,8 +79,16 @@ module ElasticAPM
     end
     # rubocop:enable Metrics/MethodLength
 
-    attr_reader :config, :transport, :instrumenter,
-      :stacktrace_builder, :context_builder, :error_builder, :metrics
+    attr_reader(
+      :central_config,
+      :config,
+      :context_builder,
+      :error_builder,
+      :instrumenter,
+      :metrics,
+      :stacktrace_builder,
+      :transport
+    )
 
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def start
@@ -88,6 +96,7 @@ module ElasticAPM
         info '[%s] Starting agent, reporting to %s', VERSION, config.server_url
       end
 
+      central_config.start
       transport.start
       instrumenter.start
       metrics.start
@@ -104,6 +113,7 @@ module ElasticAPM
     def stop
       debug 'Stopping agent'
 
+      central_config.stop
       metrics.stop
       instrumenter.stop
       transport.stop

data/lib/elastic_apm/config.rb

@@ -30,9 +30,9 @@ module ElasticAPM
     ].freeze
 
     # rubocop:disable Metrics/LineLength, Layout/ExtraSpacing
-    option :config_file, default: 'config/elastic_apm.yml'
-    option :server_url, default: 'http://localhost:8200'
-    option :secret_token
+    option :config_file,                       type: :string, default: 'config/elastic_apm.yml'
+    option :server_url,                        type: :string, default: 'http://localhost:8200'
+    option :secret_token,                      type: :string
 
     option :active,                            type: :bool,   default: true
     option :api_buffer_size,                   type: :int,    default: 256
@@ -83,14 +83,23 @@ module ElasticAPM
     option :verify_server_cert,                type: :bool,   default: true
     # rubocop:enable Metrics/LineLength, Layout/ExtraSpacing
 
+    # rubocop:disable Metrics/MethodLength
     def initialize(options = {})
       @options = load_schema
 
       custom_logger = options.delete(:logger)
 
       assign(options)
+
+      # Pick out config_file specifically as we need it now to load it,
+      # but still need the other env vars to have precedence
+      env = load_env
+      if (env_config_file = env.delete(:config_file))
+        self.config_file = env_config_file
+      end
+
       assign(load_config_file)
-      assign(load_env)
+      assign(env)
 
       yield self if block_given?
 
@@ -99,6 +108,7 @@ module ElasticAPM
       @__view_paths = []
       @__root_path = Dir.pwd
     end
+    # rubocop:enable Metrics/MethodLength
 
     attr_accessor :__view_paths, :__root_path
     attr_accessor :logger
@@ -205,8 +215,9 @@ module ElasticAPM
     def load_config_file
       return unless File.exist?(config_file)
 
-      config = YAML.safe_load(ERB.new(File.read(config_file)).result)
-      assign(config)
+      read = File.read(config_file)
+      evaled = ERB.new(read).result
+      YAML.safe_load(evaled)
     end
 
     def load_env

data/lib/elastic_apm/error/exception.rb

@@ -11,6 +11,7 @@ module ElasticAPM
           "#{exception.class}: #{exception.message}"
         @type = exception.class.to_s
         @module = format_module exception
+        @cause = exception.cause && Exception.new(exception.cause)
 
         attrs.each do |key, val|
           send(:"#{key}=", val)
@@ -24,7 +25,8 @@ module ElasticAPM
         :message,
         :module,
         :stacktrace,
-        :type
+        :type,
+        :cause
       )
 
       private

data/lib/elastic_apm/metrics/vm.rb

@@ -7,6 +7,7 @@ module ElasticAPM
       include Logging
 
       def initialize(config)
+        @config = config
         @total_time = 0
         @disabled = false
       end
@@ -15,6 +16,7 @@ module ElasticAPM
       attr_writer :disabled
 
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      # rubocop:disable Metrics/CyclomaticComplexity
       def collect
         return if disabled?
 
@@ -47,6 +49,7 @@ module ElasticAPM
         @disabled = true
         nil
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       def disabled?

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

@@ -48,7 +48,8 @@ module ElasticAPM
             code: keyword_field(exception.code),
             attributes: exception.attributes,
             stacktrace: exception.stacktrace.to_a,
-            handled: exception.handled
+            handled: exception.handled,
+            cause: exception.cause && [build_exception(exception.cause)]
           }
         end
 

data/lib/elastic_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -54,9 +54,11 @@ files:
 - ".ci/bin/check_paths_for_matches.py"
 - ".ci/downstreamTests.groovy"
 - ".ci/jobs/apm-agent-ruby-downstream.yml"
+- ".ci/jobs/apm-agent-ruby-linting-mbp.yml"
 - ".ci/jobs/apm-agent-ruby-mbp.yml"
 - ".ci/jobs/apm-agent-ruby.yml"
 - ".ci/jobs/defaults.yml"
+- ".ci/linting.groovy"
 - ".gitignore"
 - ".hound.yml"
 - ".pre-commit-config.yaml"
@@ -204,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: The official Elastic APM agent for Ruby