elastic-apm 3.12.1 → 3.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de9bb2ac6873a987cb7c7d0cdf51f8c11908d0d3ada729bd21bb4bc24d3aa3dc
-  data.tar.gz: 571507faa100bb620c116dbe11bdcad1b958c718c89a7f8572732ef3939ad70f
+  metadata.gz: 49c0c5abfddc19b97d5a0a25f7adeff62bd8ed99a1bdcb97d94ca9b3ff09134f
+  data.tar.gz: 4e7a68808d904181b3649cc766c075e5b575633b55a370047cd85c4eff53c5ef
 SHA512:
-  metadata.gz: 916cfb05143133cf1c0680d2495f2877997d607cac710063d3862acf62105d256434f0e3f9170599fa5d6c2a59c80ff39dace42584a0cce493b5f476ad6e8e5e
-  data.tar.gz: af7f87595e02ec5996c7a1ecf5aac7e7deb376ae4a32d30c250ad6293be3ce086a8a64074e88b79f6dcb2ce52b1c9861e7d7031119da58026bfff9e2ca841eb4
+  metadata.gz: 94af89d9a12520b2344f941b85eefdd6d0bd447dc75ac75b220b491611e0b16a47722cce78badf8f065f78cd09496d7a63d5a0e392af3ee939ed86ecef43599b
+  data.tar.gz: '0790d669dede1e490e290960129488264dc9661224ccb011094c1a3a5a48419ad628f5b7e83ba11ad273c8af1698e9d935cb2d6f3a823197793931f2ec27e7de'

data/.github/labeler-config.yml

@@ -0,0 +1,3 @@
+# add 'agent-ruby' label to all new issues
+agent-ruby:
+  - '.*'

data/.github/workflows/labeler.yml

@@ -0,0 +1,16 @@
+name: "Issue Labeler"
+on:
+  issues:
+    types: [opened]
+  pull_request_target:
+    types: [opened]
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: AlexanderWert/issue-labeler@v2.3
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        configuration-path: .github/labeler-config.yml
+        enable-versioned-regex: 0

data/.rubocop.yml

@@ -1,11 +1,13 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
+  NewCops: enable
   Exclude:
     - 'elastic-apm.gemspec'
     - 'vendor/**/*'
     - 'bench/*'
     - 'spec/support/helloworld_pb.rb'
     - 'spec/support/helloworld_services_pb.rb'
+    - 'features/step_definitions/stepdefs.rb'
 
 require:
   - rubocop-performance
@@ -32,6 +34,15 @@ Lint/RescueException:
 Lint/SuppressedException:
   Enabled: false
 
+Lint/ConstantDefinitionInBlock: # So we can define a class in an rspec block
+  Enabled: false
+
+Lint/EmptyClass:
+  Enabled: false
+
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: false
+
 # Metrics /
 
 Metrics/AbcSize:
@@ -104,9 +115,27 @@ Style/HashEachMethods:
 Style/HashTransformKeys:
   Enabled: true
 
-Style/HashTransformValues:
-  Enabled: true
-
 Style/FrozenStringLiteralComment:
   Enabled: false
 
+Style/StringLiterals:
+  Enabled: false
+
+Style/RescueStandardError:
+  Enabled: false
+
+Style/SoleNestedConditional:
+  Enabled: false
+
+Style/StringConcatenation:
+  Enabled: false
+
+Style/DocumentDynamicEvalDefinition:
+  Enabled: false
+
+# Applies to > ruby 2.3, enable when 2.3 support is dropped
+Performance/RegexpMatch:
+  Enabled: false
+
+Style/HashTransformValues:
+  Enabled: false

data/CHANGELOG.asciidoc

@@ -35,6 +35,26 @@ endif::[]
 [[release-notes-3.x]]
 === Ruby Agent version 3.x
 
+[[release-notes-3.13.0]]
+==== 3.13.0 (2020-12-22)
+
+[float]
+===== Fixed
+
+- Handle invalid utf-8 byte sequences in sql summarizer and DB statement {pull}896[#896]
+- Expand Kubernetes metadata discovery {pull}916[#916]
+- Fix fetching cloud info on Http.rb 3.x versions {pull}919[#919]
+
+[float]
+===== Added
+
+- Support both integer and string log levels, and extra central config values {pull}902[#902]
+
+[float]
+===== Changed
+
+- Rename server_ca_cert to server_ca_cert_file {pull}908[#908]
+
 [[release-notes-3.12.1]]
 ==== 3.12.1 (2020-11-16)
 

data/Gemfile

@@ -37,8 +37,10 @@ gem 'elasticsearch', require: nil
 gem 'fakeredis', require: nil
 gem 'faraday', require: nil
 gem 'graphql', require: nil
-gem 'google-protobuf', '< 3.12' if !defined?(JRUBY_VERSION) && RUBY_VERSION < '2.5'
-gem 'grpc' if !defined?(JRUBY_VERSION)
+if !defined?(JRUBY_VERSION) && RUBY_VERSION < '2.5'
+  gem 'google-protobuf', '< 3.12'
+end
+gem 'grpc' unless defined?(JRUBY_VERSION)
 gem 'json'
 gem 'json-schema', require: nil
 gem 'mongo', require: nil
@@ -93,7 +95,7 @@ if RUBY_PLATFORM == 'java'
 elsif frameworks_versions['rails'] =~ /^(4|5)/
   gem 'sqlite3', '~> 1.3.6'
 else
-  gem 'sqlite3' # rubocop:disable Bundler/DuplicatedGem
+  gem 'sqlite3'
 end
 
 group :bench do

data/Rakefile

@@ -19,9 +19,9 @@
 
 require 'bundler/gem_tasks'
 
-desc """Post release action:
-Update `3.x` branch to be at released commit and push it to GitHub.
-"""
+desc 'Post release action:'\
+'Update `3.x` branch to be at released commit and push it to GitHub.'
+
 namespace :release do
   task :update_branch do
     `git checkout 3.x &&
@@ -41,11 +41,11 @@ task docs: :yard
 task default: :spec
 
 namespace :coverage do
-    desc "Collates all result sets generated by the different test runners"
-    task :report do
-      require 'simplecov'
-      require 'simplecov-cobertura'
-      SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
-      SimpleCov.collate Dir["coverage/matrix_results/**/.resultset.json"]
-    end
+  desc "Collates all result sets generated by the different test runners"
+  task :report do
+    require 'simplecov'
+    require 'simplecov-cobertura'
+    SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
+    SimpleCov.collate Dir["coverage/matrix_results/**/.resultset.json"]
   end
+end

data/docs/configuration.asciidoc

@@ -798,12 +798,12 @@ It has to be provided in *<<config-format-duration, duration format>>*.
 
 [float]
 [[config-ssl-ca-cert]]
-==== `server_ca_cert`
+==== `server_ca_cert_file`
 
 [options="header"]
 |============
-| Environment                  | `Config` key     | Default | Example
-| `ELASTIC_APM_SERVER_CA_CERT` | `server_ca_cert` | `nil`   | `'/path/to/ca.pem'`
+| Environment                       | `Config` key     | Default | Example
+| `ELASTIC_APM_SERVER_CA_CERT_FILE` | `server_ca_cert_file` | `nil`   | `'/path/to/ca.pem'`
 |============
 
 The path to a custom CA certificate for connecting to APM Server.

data/lib/elastic_apm.rb

@@ -106,6 +106,7 @@ module ElasticAPM
     # @yield [String|nil, String|nil, String|nil] The transaction, span,
     # and trace ids.
     # @return [String] Unless block given
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def log_ids
       trace_id = (current_transaction || current_span)&.trace_id
       if block_given?
@@ -118,6 +119,7 @@ module ElasticAPM
       ids << "trace.id=#{trace_id}" if trace_id
       ids.join(' ')
     end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
     # Start a new transaction
     #
@@ -293,12 +295,10 @@ module ElasticAPM
             sync: sync
           )
         result = yield span
-        span&.outcome =
-          Span::Outcome::SUCCESS unless span&.outcome
+        span&.outcome ||= Span::Outcome::SUCCESS
         result
       rescue
-        span&.outcome =
-          Span::Outcome::FAILURE unless span&.outcome
+        span&.outcome ||= Span::Outcome::FAILURE
         raise
       ensure
         end_span

data/lib/elastic_apm/central_config.rb

@@ -19,6 +19,7 @@
 
 require 'elastic_apm/central_config/cache_control'
 
+# rubocop:disable Style/AccessorGrouping
 module ElasticAPM
   # @api private
   class CentralConfig
@@ -27,6 +28,7 @@ module ElasticAPM
     # @api private
     class ResponseError < InternalError
       def initialize(response)
+        super
         @response = response
       end
 
@@ -72,6 +74,7 @@ module ElasticAPM
     def fetch_config
       resp = perform_request
 
+      # rubocop:disable Lint/DuplicateBranch
       case resp.status
       when 200..299
         resp
@@ -82,6 +85,7 @@ module ElasticAPM
       when 500..599
         raise ServerError, resp
       end
+      # rubocop:enable Lint/DuplicateBranch
     end
 
     def assign(update)
@@ -122,7 +126,7 @@ module ElasticAPM
           assign(update)
         end
 
-        if update && update.any?
+        if update&.any?
           info 'Updated config from Kibana'
           debug 'Modified: %s', update.inspect
           debug 'Modified original options: %s', @modified_options.inspect
@@ -160,7 +164,7 @@ module ElasticAPM
       @server_url ||=
         config.server_url +
         '/config/v1/agents' \
-        "?service.name=#{config.service_name}"
+        "?service.name=#{CGI.escape(config.service_name)}"
     end
 
     def headers
@@ -182,3 +186,4 @@ module ElasticAPM
     end
   end
 end
+# rubocop:enable Style/AccessorGrouping

data/lib/elastic_apm/config.rb

@@ -19,6 +19,7 @@
 
 require 'elastic_apm/config/bytes'
 require 'elastic_apm/config/duration'
+require 'elastic_apm/config/log_level_map'
 require 'elastic_apm/config/options'
 require 'elastic_apm/config/round_float'
 require 'elastic_apm/config/regexp_list'
@@ -32,11 +33,13 @@ module ElasticAPM
     DEPRECATED_OPTIONS = %i[].freeze
 
     # DEPRECATED: To align with other agents, change on next major bump to:
-    # "password, passwd, pwd, secret, *key, *token*, *session*, *credit*, *card*, authorization, set-cookie"
+    # "password, passwd, pwd, secret, *key, *token*, *session*, *credit*,
+    # *card*, authorization, set-cookie"
     SANITIZE_FIELD_NAMES_DEFAULT =
-      %w[*password* *passwd* *pwd* *secret* *key* *token* *session* *credit* *card* *authorization* *set-cookie*]
+      %w[*password* *passwd* *pwd* *secret* *key* *token* *session*
+         *credit* *card* *authorization* *set-cookie*].freeze
 
-    # rubocop:disable Metrics/LineLength, Layout/ExtraSpacing
+    # rubocop:disable Layout/LineLength, Layout/ExtraSpacing
     option :config_file,                       type: :string, default: 'config/elastic_apm.yml'
     option :server_url,                        type: :url,    default: 'http://localhost:8200'
     option :secret_token,                      type: :string
@@ -73,7 +76,7 @@ module ElasticAPM
     option :ignore_url_patterns,               type: :list,   default: [],      converter: RegexpList.new
     option :instrument,                        type: :bool,   default: true
     option :instrumented_rake_tasks,           type: :list,   default: []
-    option :log_level,                         type: :int,    default: Logger::INFO
+    option :log_level,                         type: :int,    default: Logger::INFO, converter: LogLevelMap.new
     option :log_path,                          type: :string
     option :metrics_interval,                  type: :int,    default: '30s',   converter: Duration.new
     option :pool_size,                         type: :int,    default: 1
@@ -83,9 +86,8 @@ module ElasticAPM
     option :proxy_port,                        type: :int
     option :proxy_username,                    type: :string
     option :recording,                         type: :bool,   default: true
-    option :sanitize_field_names,              type: :list,
-      default: SANITIZE_FIELD_NAMES_DEFAULT, converter: WildcardPatternList.new
-    option :server_ca_cert,                    type: :string
+    option :sanitize_field_names,              type: :list,   default: SANITIZE_FIELD_NAMES_DEFAULT, converter: WildcardPatternList.new
+    option :server_ca_cert_file,               type: :string
     option :service_name,                      type: :string
     option :service_node_name,                 type: :string
     option :service_version,                   type: :string
@@ -102,7 +104,7 @@ module ElasticAPM
     option :use_legacy_sql_parser,             type: :bool,   default: false
     option :verify_server_cert,                type: :bool,   default: true
 
-    # rubocop:enable Metrics/LineLength, Layout/ExtraSpacing
+    # rubocop:enable Layout/LineLength, Layout/ExtraSpacing
     def initialize(options = {})
       @options = load_schema
 
@@ -126,8 +128,7 @@ module ElasticAPM
       @__root_path ||= Dir.pwd
     end
 
-    attr_accessor :__view_paths, :__root_path
-    attr_accessor :logger
+    attr_accessor :__view_paths, :__root_path, :logger
 
     attr_reader :options
 
@@ -201,8 +202,9 @@ module ElasticAPM
     def sanitize_field_names=(value)
       list = WildcardPatternList.new.call(value)
       defaults = WildcardPatternList.new.call(SANITIZE_FIELD_NAMES_DEFAULT)
+      # use regex pattern for comparisons
       get(:sanitize_field_names).value =
-        defaults.concat(list).uniq(&:pattern) # use regex pattern for comparisons
+        defaults.concat(list).uniq(&:pattern)
     end
 
     def span_frames_min_duration?
@@ -223,8 +225,8 @@ module ElasticAPM
 
       @ssl_context ||=
         OpenSSL::SSL::SSLContext.new.tap do |context|
-          if server_ca_cert
-            context.ca_file = server_ca_cert
+          if server_ca_cert_file
+            context.ca_file = server_ca_cert_file
           else
             context.cert_store =
               OpenSSL::X509::Store.new.tap(&:set_default_paths)
@@ -278,15 +280,20 @@ module ElasticAPM
     end
     alias active? active
 
+    def server_ca_cert
+      server_ca_cert_file
+    end
+
     def disabled_instrumentations=(value)
       warn '[DEPRECATED] The option disabled_instrumentations has been ' \
         'renamed to disable_instrumentations to align with other agents.'
       self.disable_instrumentations = value
     end
 
-    def use_experimental_sql_parser=(value)
-      warn '[DEPRECATED] The new SQL parser is now the default. To use the old one, '
-        'use use_legacy_sql_parser and please report why you wish to do so.'
+    def use_experimental_sql_parser=(_value)
+      warn '[DEPRECATED] The new SQL parser is now the default. To use the ' \
+           'old one, use use_legacy_sql_parser and please report why you ' \
+           'wish to do so.'
     end
 
     def active=(value)
@@ -295,6 +302,12 @@ module ElasticAPM
       self.enabled = value
     end
 
+    def server_ca_cert=(value)
+      warn '[DEPRECATED] The option server_ca_cert has been ' \
+        'renamed to server_ca_cert_file to align with other agents.'
+      self.server_ca_cert_file = value
+    end
+
     private
 
     def load_config_file
@@ -313,7 +326,7 @@ module ElasticAPM
     end
 
     def build_logger
-      Logger.new(log_path == '-' ? STDOUT : log_path).tap do |logger|
+      Logger.new(log_path == '-' ? $stdout : log_path).tap do |logger|
         logger.level = log_level
       end
     end
@@ -344,7 +357,8 @@ module ElasticAPM
       self.logger ||= ::Rails.logger
 
       self.__root_path = ::Rails.root.to_s
-      self.__view_paths = app.config.paths['app/views'].existent + [::Rails.root.to_s]
+      self.__view_paths = app.config.paths['app/views'].existent +
+                          [::Rails.root.to_s]
     end
 
     def rails_app_name(app)

data/lib/elastic_apm/config/log_level_map.rb

@@ -0,0 +1,47 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# frozen_string_literal: true
+
+module ElasticAPM
+  class Config
+    # @api private
+    class LogLevelMap
+      LEVELS = {
+        debug: Logger::DEBUG,
+        info: Logger::INFO,
+        warn: Logger::WARN,
+        error: Logger::ERROR,
+        fatal: Logger::FATAL,
+        trace: Logger::DEBUG,
+        warning: Logger::WARN,
+        critical: Logger::FATAL,
+        off: Logger::FATAL
+      }.freeze
+
+      DEFAULT = Logger::INFO
+
+      def call(value)
+        if value.is_a?(Integer)
+          LEVELS.value?(value) ? value : DEFAULT
+        else
+          LEVELS.fetch(value.to_sym, DEFAULT)
+        end
+      end
+    end
+  end
+end

data/lib/elastic_apm/context.rb

@@ -36,14 +36,9 @@ module ElasticAPM
     Service = Struct.new(:framework)
     Framework = Struct.new(:name, :version)
 
-    attr_accessor :request
-    attr_accessor :response
-    attr_accessor :user
-    attr_reader :custom
-    attr_reader :labels
-    attr_reader :service
+    attr_accessor :request, :response, :user
+    attr_reader :custom, :labels, :service
 
-    # rubocop:disable Metrics/CyclomaticComplexity
     def empty?
       return false if labels.any?
       return false if custom.any?
@@ -53,7 +48,6 @@ module ElasticAPM
 
       true
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
 
     def set_service(framework_name: nil, framework_version: nil)
       @service = Service.new(

data/lib/elastic_apm/graphql.rb

@@ -48,6 +48,7 @@ module ElasticAPM
       # "authorized" => "graphql.authorized",
     }.freeze
 
+    # rubocop:disable Style/ExplicitBlockArgument
     def self.trace(key, data)
       return yield unless KEYS_TO_NAME.key?(key)
       return yield unless (transaction = ElasticAPM.current_transaction)
@@ -69,6 +70,7 @@ module ElasticAPM
 
       results
     end
+    # rubocop:enable Style/ExplicitBlockArgument
 
     class << self
       private

data/lib/elastic_apm/grpc.rb

@@ -25,7 +25,7 @@ module ElasticAPM
       TYPE = 'external'
       SUBTYPE = 'grpc'
 
-      # rubocop:disable Lint/UnusedMethodArgument
+      # rubocop:disable Lint/UnusedMethodArgument, Style/ExplicitBlockArgument
       def request_response(request:, call:, method:, metadata:)
         return yield unless (transaction = ElasticAPM.current_transaction)
         if (trace_context = transaction.trace_context)
@@ -40,7 +40,7 @@ module ElasticAPM
           yield
         end
       end
-      # rubocop:enable Lint/UnusedMethodArgument
+      # rubocop:enable Lint/UnusedMethodArgument, Style/ExplicitBlockArgument
 
       private
 
@@ -71,7 +71,7 @@ module ElasticAPM
         transaction.done 'success'
       rescue ::Exception => e
         ElasticAPM.report(e, handled: false)
-        transaction.done 'error' if transaction
+        transaction&.done 'error'
         raise
       ensure
         ElasticAPM.end_transaction

data/lib/elastic_apm/instrumenter.rb

@@ -239,7 +239,7 @@ module ElasticAPM
     def set_label(key, value)
       return unless current_transaction
 
-      key = key.to_s.gsub(/[\."\*]/, '_').to_sym
+      key = key.to_s.gsub(/[."*]/, '_').to_sym
       current_transaction.context.labels[key] = value
     end
 

data/lib/elastic_apm/metadata/cloud_info.rb

@@ -31,7 +31,7 @@ module ElasticAPM
 
       def initialize(config)
         @config = config
-        @client = HTTP.timeout(0.1)
+        @client = HTTP.timeout(connect: 0.1, read: 0.1)
       end
 
       attr_reader :config
@@ -49,6 +49,7 @@ module ElasticAPM
         :region
       )
 
+      # rubocop:disable Metrics/CyclomaticComplexity
       def fetch!
         case config.cloud_provider
         when "aws"
@@ -67,6 +68,7 @@ module ElasticAPM
 
         self
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
 
       private
 

data/lib/elastic_apm/metadata/service_info.rb

@@ -52,8 +52,8 @@ module ElasticAPM
         @version = @config.service_version || Util.git_sha
       end
 
-      attr_reader :name, :node_name, :environment, :agent, :framework, :language,
-        :runtime, :version
+      attr_reader :name, :node_name, :environment, :agent, :framework,
+        :language, :runtime, :version
 
       private
 

data/lib/elastic_apm/metadata/system_info/container_info.rb

@@ -81,15 +81,23 @@ module ElasticAPM
             ENV.fetch('KUBERNETES_POD_UID', kubernetes_pod_uid)
         end
 
+        # rubocop:disable Style/RegexpLiteral
         CONTAINER_ID_REGEXES = [
           %r{^[[:xdigit:]]{64}$},
-          %r{^[[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4,}$}
-        ]
+          %r{
+            ^[[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit:]]
+            {4}-[[:xdigit:]]{4}-[[:xdigit:]]{4,}$
+          }x
+        ].freeze
         KUBEPODS_REGEXES = [
           %r{(?:^/kubepods[^\s]*/pod([^/]+)$)},
-          %r{(?:^/kubepods\.slice/kubepods-[^/]+\.slice/kubepods-[^/]+-pod([^/]+)\.slice$)}
-        ]
+          %r{
+            (?:^/kubepods\.slice/(kubepods-[^/]+\.slice/)?
+             kubepods[^/]*-pod([^/]+)\.slice$)
+          }x
+        ].freeze
         SYSTEMD_SCOPE_SUFFIX = '.scope'
+        # rubocop:enable Style/RegexpLiteral
 
         # rubocop:disable Metrics/PerceivedComplexity
         # rubocop:disable Metrics/CyclomaticComplexity
@@ -125,7 +133,10 @@ module ElasticAPM
             end
 
             if (kubepods_match = match_kubepods(directory))
-              pod_id = kubepods_match[1] || kubepods_match[2]
+              unless (pod_id = kubepods_match[1])
+                pod_id = kubepods_match[2]
+                pod_id&.tr!('_', '-')
+              end
 
               self.container_id = container_id
               self.kubernetes_pod_uid = pod_id

data/lib/elastic_apm/metrics.rb

@@ -40,6 +40,7 @@ module ElasticAPM
       end
 
       attr_reader :config, :sets, :callback
+
       def start
         unless config.collect_metrics?
           debug 'Skipping metrics'

data/lib/elastic_apm/metrics/cpu_mem_set.rb

@@ -214,6 +214,7 @@ module ElasticAPM
         # @api private
         class Meminfo
           attr_reader :total, :available, :page_size
+
           # rubocop:disable Metrics/PerceivedComplexity
           # rubocop:disable Metrics/CyclomaticComplexity
           def read!

data/lib/elastic_apm/opentracing.rb

@@ -123,6 +123,7 @@ module ElasticAPM
       end
 
       attr_accessor :trace_context
+
       def_delegators :trace_context, :trace_id, :id, :parent_id
 
       def self.from_header(header)
@@ -345,7 +346,7 @@ module ElasticAPM
         context = context_from_child_of(child_of) ||
                   context_from_references(references) ||
                   context_from_active_scope(ignore_active_scope)
-        return context.child if context&.respond_to?(:child)
+        return context.child if context.respond_to?(:child)
 
         context
       end

data/lib/elastic_apm/span.rb

@@ -49,8 +49,7 @@ module ElasticAPM
       action: nil,
       context: nil,
       stacktrace_builder: nil,
-      sync: nil,
-      sample_rate: nil
+      sync: nil
     )
       @name = name
 

data/lib/elastic_apm/span/context/db.rb

@@ -30,7 +30,7 @@ module ElasticAPM
           rows_affected: nil
         )
           @instance = instance
-          @statement = statement
+          @statement = statement&.encode('utf-8', invalid: :replace, undef: :replace)
           @type = type
           @user = user
           @rows_affected = rows_affected

data/lib/elastic_apm/spies/delayed_job.rb

@@ -55,7 +55,9 @@ module ElasticAPM
       def self.name_from_payload(payload_object)
         if payload_object.is_a?(::Delayed::PerformableMethod)
           performable_method_name(payload_object)
-        elsif payload_object.class.name == 'ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper'
+        elsif payload_object.instance_of?(
+          ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper
+        )
           payload_object.job_data['job_class']
         else
           payload_object.class.name

data/lib/elastic_apm/spies/dynamo_db.rb

@@ -25,9 +25,11 @@ module ElasticAPM
       def self.without_net_http
         return yield unless defined?(NetHTTPSpy)
 
+        # rubocop:disable Style/ExplicitBlockArgument
         ElasticAPM::Spies::NetHTTPSpy.disable_in do
           yield
         end
+        # rubocop:enable Style/ExplicitBlockArgument
       end
 
       def install
@@ -37,7 +39,12 @@ module ElasticAPM
             alias :"#{operation_name}_without_apm" :"#{operation_name}"
 
             define_method(operation_name) do |params = {}, options = {}|
-              ElasticAPM.with_span(operation_name, 'db', subtype: 'dynamodb', action: operation_name) do
+              ElasticAPM.with_span(
+                operation_name,
+                'db',
+                subtype: 'dynamodb',
+                action: operation_name
+              ) do
                 ElasticAPM::Spies::DynamoDBSpy.without_net_http do
                   original_method = method("#{operation_name}_without_apm")
                   original_method.call(params, options)

data/lib/elastic_apm/spies/elasticsearch.rb

@@ -31,7 +31,8 @@ module ElasticAPM
           begin
             config = ElasticAPM.agent.config
             ElasticAPM::Transport::Filters::HashSanitizer.new(
-              key_patterns: config.custom_key_filters + config.sanitize_field_names
+              key_patterns: config.custom_key_filters +
+                            config.sanitize_field_names
             )
           end
       end
@@ -53,7 +54,8 @@ module ElasticAPM
             if ElasticAPM.agent.config.capture_elasticsearch_queries
               unless args[1].nil? || args[1].empty?
                 statement << {
-                  body: ElasticAPM::Spies::ElasticsearchSpy.sanitizer.strip_from(args[1])
+                  body: ElasticAPM::Spies::ElasticsearchSpy
+                             .sanitizer.strip_from(args[1])
                 }
               end
             end

data/lib/elastic_apm/spies/faraday.rb

@@ -28,12 +28,14 @@ module ElasticAPM
       def self.without_net_http
         return yield unless defined?(NetHTTPSpy)
 
+        # rubocop:disable Style/ExplicitBlockArgument
         ElasticAPM::Spies::NetHTTPSpy.disable_in do
           yield
         end
+        # rubocop:enable Style/ExplicitBlockArgument
       end
 
-      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def install
         ::Faraday::Connection.class_eval do
           alias run_request_without_apm run_request
@@ -96,7 +98,7 @@ module ElasticAPM
           end
         end
       end
-      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     end
 
     register 'Faraday', 'faraday', FaradaySpy.new

data/lib/elastic_apm/spies/net_http.rb

@@ -47,6 +47,7 @@ module ElasticAPM
       end
 
       # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
       def install
         Net::HTTP.class_eval do
           alias request_without_apm request
@@ -103,6 +104,7 @@ module ElasticAPM
         end
       end
       # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/PerceivedComplexity
     end
 
     register 'Net::HTTP', 'net/http', NetHTTPSpy.new

data/lib/elastic_apm/spies/sequel.rb

@@ -31,6 +31,7 @@ module ElasticAPM
         @summarizer ||= Sql.summarizer
       end
 
+      # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
       def install
         require 'sequel/database/logging'
 
@@ -84,6 +85,7 @@ module ElasticAPM
           end
         end
       end
+      # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
     end
 
     register 'Sequel', 'sequel', SequelSpy.new

data/lib/elastic_apm/sql/signature.rb

@@ -36,8 +36,8 @@ module ElasticAPM
       end
 
       def initialize(sql)
-        @sql = sql
-        @tokenizer = Tokenizer.new(sql)
+        @sql = sql.encode('utf-8', invalid: :replace, undef: :replace)
+        @tokenizer = Tokenizer.new(@sql)
       end
 
       def parse
@@ -158,9 +158,11 @@ module ElasticAPM
       def scan_dotted_identifier
         table = @tokenizer.text
 
+        # rubocop:disable Style/WhileUntilModifier
         while scan_token(PERIOD) && scan_token(IDENT)
           table += ".#{@tokenizer.text}"
         end
+        # rubocop:enable Style/WhileUntilModifier
 
         table
       end

data/lib/elastic_apm/sql/tokenizer.rb

@@ -130,7 +130,7 @@ module ElasticAPM
       end
       # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
-      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/CyclomaticComplexity
       def scan_dollar_sign
         while (peek = peek_char)
           case peek
@@ -165,7 +165,7 @@ module ElasticAPM
 
         OTHER
       end
-      # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity
 
       def scan_quoted_indentifier(delimiter)
         while (char = next_char)

data/lib/elastic_apm/stacktrace/frame.rb

@@ -38,6 +38,7 @@ module ElasticAPM
         :module,
         :colno
       )
+
       def build_context(context_line_count)
         return unless abs_path && context_line_count > 0
 

data/lib/elastic_apm/stacktrace_builder.rb

@@ -23,7 +23,7 @@ require 'elastic_apm/util/lru_cache'
 module ElasticAPM
   # @api private
   class StacktraceBuilder
-    JAVA_FORMAT = /^(.+)\.([^\.]+)\(([^\:]+)\:(\d+)\)$/.freeze
+    JAVA_FORMAT = /^(.+)\.([^.]+)\(([^:]+):(\d+)\)$/.freeze
     RUBY_FORMAT = /^(.+?):(\d+)(?::in `(.+?)')?$/.freeze
 
     RUBY_VERS_REGEX = %r{ruby(/gems)?[-/](\d+\.)+\d}.freeze
@@ -86,14 +86,13 @@ module ElasticAPM
       [file, number, method, module_name]
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity
     def library_frame?(config, abs_path)
       return false unless abs_path
 
       return true if abs_path.start_with?(GEMS_PATH)
 
       if abs_path.start_with?(config.__root_path)
-        return true if abs_path.start_with?(config.__root_path + '/vendor')
+        return true if abs_path.start_with?("#{config.__root_path}/vendor")
         return false
       end
 
@@ -102,7 +101,6 @@ module ElasticAPM
 
       false
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
 
     def strip_load_path(path)
       return nil if path.nil?

data/lib/elastic_apm/trace_context.rb

@@ -42,7 +42,6 @@ module ElasticAPM
       :version, :trace_id, :id, :parent_id, :ensure_parent_id, :recorded?
 
     class << self
-      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def parse(legacy_header = nil, env: nil, metadata: nil)
         unless legacy_header || env || metadata
           raise ArgumentError, 'TraceContext expects env:, metadata: ' \
@@ -57,7 +56,6 @@ module ElasticAPM
           trace_context_from_metadata(metadata)
         end
       end
-      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       private
 

data/lib/elastic_apm/trace_context/traceparent.rb

@@ -27,7 +27,6 @@ module ElasticAPM
       TRACE_ID_LENGTH = 16
       ID_LENGTH = 8
 
-      # rubocop:disable Metrics/ParameterLists
       def initialize(
         version: VERSION,
         trace_id: nil,
@@ -42,7 +41,6 @@ module ElasticAPM
         @id = id || hex(ID_LENGTH)
         @recorded = recorded
       end
-      # rubocop:enable Metrics/ParameterLists
 
       attr_accessor :version, :id, :trace_id, :parent_id, :recorded
 

data/lib/elastic_apm/trace_context/tracestate.rb

@@ -37,12 +37,13 @@ module ElasticAPM
         end
       end
 
+      # @api private
       class EsEntry
         ASSIGN = ':'
         SPLIT = ';'
 
-        SHORT_TO_LONG = { 's' => 'sample_rate' }
-        LONG_TO_SHORT = { 'sample_rate' => 's' }
+        SHORT_TO_LONG = { 's' => 'sample_rate' }.freeze
+        LONG_TO_SHORT = { 'sample_rate' => 's' }.freeze
 
         def initialize(values = nil)
           parse(values)
@@ -83,7 +84,7 @@ module ElasticAPM
 
           values.split(SPLIT).map do |kv|
             k, v = kv.split(ASSIGN)
-            next unless SHORT_TO_LONG.keys.include?(k)
+            next unless SHORT_TO_LONG.key?(k)
             send("#{SHORT_TO_LONG[k]}=", v)
           end
         end
@@ -136,8 +137,9 @@ module ElasticAPM
         def split_by_nl_and_comma(str)
           # HTTP allows multiple headers with the same name, eg. multiple
           # Set-Cookie headers per response.
-          # Rack handles this by joining the headers under the same key, separated
-          # by newlines, see https://www.rubydoc.info/github/rack/rack/file/SPEC
+          # Rack handles this by joining the headers under the same key,
+          # separated by newlines.
+          # See https://www.rubydoc.info/github/rack/rack/file/SPEC
           String(str).split("\n").map { |s| s.split(',') }.flatten
         end
       end

data/lib/elastic_apm/transaction.rb

@@ -20,7 +20,6 @@
 module ElasticAPM
   # @api private
   class Transaction
-
     # @api private
     class Outcome
       FAILURE = "failure"
@@ -45,10 +44,10 @@ module ElasticAPM
     def initialize(
       name = nil,
       type = nil,
+      config:,
       sampled: true,
       sample_rate: 1,
       context: nil,
-      config:,
       trace_context: nil
     )
       @name = name
@@ -75,7 +74,9 @@ module ElasticAPM
       unless (@trace_context = trace_context)
         @trace_context = TraceContext.new(
           traceparent: TraceContext::Traceparent.new(recorded: sampled),
-          tracestate: TraceContext::Tracestate.new(sample_rate: sampled ? sample_rate : 0)
+          tracestate: TraceContext::Tracestate.new(
+            sample_rate: sampled ? sample_rate : 0
+          )
         )
       end
 
@@ -102,7 +103,7 @@ module ElasticAPM
       :started_spans,
       :timestamp,
       :trace_context,
-      :transaction_max_spans 
+      :transaction_max_spans
     )
 
     alias :collect_metrics? :collect_metrics

data/lib/elastic_apm/transport/connection.rb

@@ -42,7 +42,7 @@ module ElasticAPM
             Metadata.new(config)
           )
         )
-        @url = config.server_url + '/intake/v2/events'
+        @url = "#{config.server_url}/intake/v2/events"
         @mutex = Mutex.new
       end
 

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

@@ -22,6 +22,7 @@ require 'elastic_apm/util/deep_dup'
 module ElasticAPM
   module Transport
     module Filters
+      # @api private
       class HashSanitizer
         FILTERED = '[FILTERED]'
 
@@ -45,7 +46,7 @@ module ElasticAPM
         end
 
         def strip_from!(obj)
-          return unless obj&.is_a?(Hash)
+          return unless obj.is_a?(Hash)
 
           obj.each do |k, v|
             if filter_key?(k)

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

@@ -28,22 +28,42 @@ module ElasticAPM
           @config = config
           @sanitizer =
             HashSanitizer.new(
-              key_patterns: config.custom_key_filters + config.sanitize_field_names
+              key_patterns: config.custom_key_filters +
+                            config.sanitize_field_names
             )
         end
 
         def call(payload)
-          @sanitizer.strip_from! payload.dig(:transaction, :context, :request, :body)
-          @sanitizer.strip_from! payload.dig(:transaction, :context, :request, :cookies)
-          @sanitizer.strip_from! payload.dig(:transaction, :context, :request, :env)
-          @sanitizer.strip_from! payload.dig(:transaction, :context, :request, :headers)
-          @sanitizer.strip_from! payload.dig(:transaction, :context, :response, :headers)
-          @sanitizer.strip_from! payload.dig(:error, :context, :request, :body)
-          @sanitizer.strip_from! payload.dig(:error, :context, :request, :cookies)
-          @sanitizer.strip_from! payload.dig(:error, :context, :request, :env)
-          @sanitizer.strip_from! payload.dig(:error, :context, :request, :headers)
-          @sanitizer.strip_from! payload.dig(:error, :context, :response, :headers)
-
+          @sanitizer.strip_from!(
+            payload.dig(:transaction, :context, :request, :body)
+          )
+          @sanitizer.strip_from!(
+            payload.dig(:transaction, :context, :request, :cookies)
+          )
+          @sanitizer.strip_from!(
+            payload.dig(:transaction, :context, :request, :env)
+          )
+          @sanitizer.strip_from!(
+            payload.dig(:transaction, :context, :request, :headers)
+          )
+          @sanitizer.strip_from!(
+            payload.dig(:transaction, :context, :response, :headers)
+          )
+          @sanitizer.strip_from!(
+            payload.dig(:error, :context, :request, :body)
+          )
+          @sanitizer.strip_from!(
+            payload.dig(:error, :context, :request, :cookies)
+          )
+          @sanitizer.strip_from!(
+            payload.dig(:error, :context, :request, :env)
+          )
+          @sanitizer.strip_from!(
+            payload.dig(:error, :context, :request, :headers)
+          )
+          @sanitizer.strip_from!(
+            payload.dig(:error, :context, :response, :headers)
+          )
           payload
         end
       end

data/lib/elastic_apm/transport/serializers.rb

@@ -74,6 +74,7 @@ module ElasticAPM
         end
 
         attr_reader :transaction, :span, :error, :metadata, :metricset
+
         def serialize(resource)
           case resource
           when Transaction

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

@@ -31,7 +31,7 @@ module ElasticAPM
               labels: build_labels(metadata.labels)
             }
 
-          if (metadata.cloud.provider)
+          if metadata.cloud.provider
             base[:cloud] = build_cloud(metadata.cloud)
           end
 
@@ -64,7 +64,7 @@ module ElasticAPM
               }
             }
 
-          if node_name = service.node_name
+          if (node_name = service.node_name)
             base[:node] = { name: keyword_field(node_name) }
           end
 
@@ -93,17 +93,17 @@ module ElasticAPM
             provider: cloud.provider,
             account: {
               id: keyword_field(cloud.account_id),
-              name: keyword_field(cloud.account_name),
+              name: keyword_field(cloud.account_name)
             },
             availability_zone: keyword_field(cloud.availability_zone),
             instance: {
               id: keyword_field(cloud.instance_id),
-              name: keyword_field(cloud.instance_name),
+              name: keyword_field(cloud.instance_name)
             },
             machine: { type: keyword_field(cloud.machine_type) },
             project: {
               id: keyword_field(cloud.project_id),
-              name: keyword_field(cloud.project_name),
+              name: keyword_field(cloud.project_name)
             },
             region: keyword_field(cloud.region)
           )
@@ -115,7 +115,7 @@ module ElasticAPM
 
         # A bug in APM Server 7.9 disallows null values in `cloud`
         def strip_nulls!(hash)
-          hash.keys.each do |key|
+          hash.each_key do |key|
             case value = hash[key]
             when Hash
               strip_nulls!(value)

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

@@ -51,7 +51,6 @@ module ElasticAPM
 
         # @api private
         class ContextSerializer < Serializer
-          # rubocop:disable Metrics/CyclomaticComplexity
           def build(context)
             return unless context
 
@@ -68,7 +67,6 @@ module ElasticAPM
 
             base
           end
-          # rubocop:enable Metrics/CyclomaticComplexity
 
           private
 

data/lib/elastic_apm/util/deep_dup.rb

@@ -23,7 +23,7 @@ module ElasticAPM
     #
     # Makes a deep copy of an Array or Hash
     # NB: Not guaranteed to work well with complex objects, only simple Hash,
-    # Array, String, Number, etc…
+    # Array, String, Number, etc.
     class DeepDup
       def initialize(obj)
         @obj = obj
@@ -63,4 +63,3 @@ module ElasticAPM
     end
   end
 end
-

data/lib/elastic_apm/util/precision_validator.rb

@@ -24,7 +24,7 @@ module ElasticAPM
     # If `minimum` is provided, and the value rounds to 0 (but was not zero to
     # begin with), use the minimum instead.
     module PrecisionValidator
-      extend self
+      module_function
 
       def validate(value, precision: 0, minimum: nil)
         float = Float(value)

data/lib/elastic_apm/version.rb

@@ -18,5 +18,5 @@
 # frozen_string_literal: true
 
 module ElasticAPM
-  VERSION = '3.12.1'
+  VERSION = '3.13.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 3.12.1
+  version: 3.13.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2020-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -69,6 +69,8 @@ files:
 - ".github/ISSUE_TEMPLATE/Bug_report.md"
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/labeler-config.yml"
+- ".github/workflows/labeler.yml"
 - ".gitignore"
 - ".pre-commit-config.yaml"
 - ".rspec"
@@ -126,6 +128,7 @@ files:
 - lib/elastic_apm/config.rb
 - lib/elastic_apm/config/bytes.rb
 - lib/elastic_apm/config/duration.rb
+- lib/elastic_apm/config/log_level_map.rb
 - lib/elastic_apm/config/options.rb
 - lib/elastic_apm/config/regexp_list.rb
 - lib/elastic_apm/config/round_float.rb