elastic-apm 3.2.0 → 3.3.0

data/lib/elastic_apm/transport/connection/http.rb

@@ -85,7 +85,6 @@ module ElasticAPM
           format('[THREAD:%s]', Thread.current.object_id)
         end
 
-        # rubocop:disable Metrics/MethodLength
         def open_request_in_thread(url)
           debug '%s: Opening new request', thread_str
           Thread.new do
@@ -104,7 +103,6 @@ module ElasticAPM
             end
           end
         end
-        # rubocop:enable Metrics/MethodLength
 
         def build_client
           client = HTTP.headers(@headers)

data/lib/elastic_apm/transport/filters.rb

@@ -19,7 +19,7 @@ module ElasticAPM
         end
 
         def add(key, filter)
-          @filters[key] = filter
+          @filters = @filters.merge(key => filter)
         end
 
         def remove(key)

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

@@ -40,9 +40,8 @@ module ElasticAPM
           payload
         end
 
-        # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
         def strip_from!(obj)
-          return unless obj && obj.is_a?(Hash)
+          return unless obj&.is_a?(Hash)
 
           obj.each do |k, v|
             if filter_key?(k)
@@ -59,7 +58,6 @@ module ElasticAPM
             end
           end
         end
-        # rubocop:enable Metrics/MethodLength, Metrics/CyclomaticComplexity
 
         def filter_key?(key)
           @key_filters.any? { |regex| key.match regex }

data/lib/elastic_apm/transport/serializers.rb

@@ -55,8 +55,6 @@ module ElasticAPM
         end
 
         attr_reader :transaction, :span, :error, :metadata, :metricset
-
-        # rubocop:disable Metrics/MethodLength
         def serialize(resource)
           case resource
           when Transaction
@@ -73,7 +71,6 @@ module ElasticAPM
             raise UnrecognizedResource, resource.inspect
           end
         end
-        # rubocop:enable Metrics/MethodLength
       end
 
       def self.new(config)

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

@@ -20,7 +20,6 @@ module ElasticAPM
 
         private
 
-        # rubocop:disable Metrics/MethodLength
         def build_request(request)
           return unless request
 
@@ -35,7 +34,6 @@ module ElasticAPM
             url: build_url(request.url)
           }
         end
-        # rubocop:enable Metrics/MethodLength
 
         def build_response(response)
           return unless response

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

@@ -9,7 +9,6 @@ module ElasticAPM
           @context_serializer ||= ContextSerializer.new(config)
         end
 
-        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         def build(error)
           base = {
             id: error.id,
@@ -36,7 +35,6 @@ module ElasticAPM
 
           { error: base }
         end
-        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
         private
 

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

@@ -18,7 +18,6 @@ module ElasticAPM
 
         private
 
-        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         def build_service(service)
           {
             name: keyword_field(service.name),
@@ -42,7 +41,6 @@ module ElasticAPM
             }
           }
         end
-        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
         def build_process(process)
           {

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

@@ -5,7 +5,6 @@ module ElasticAPM
     module Serializers
       # @api private
       class MetricsetSerializer < Serializer
-        # rubocop:disable Metrics/MethodLength
         def build(metricset)
           payload = {
             timestamp: metricset.timestamp.to_i,
@@ -26,7 +25,6 @@ module ElasticAPM
 
           { metricset: payload }
         end
-        # rubocop:enable Metrics/MethodLength
 
         private
 

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

@@ -12,8 +12,6 @@ module ElasticAPM
         end
 
         attr_reader :context_serializer
-
-        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         def build(span)
           {
             span: {
@@ -30,7 +28,6 @@ module ElasticAPM
             }
           }
         end
-        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
         # @api private
         class ContextSerializer < Serializer

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

@@ -9,7 +9,6 @@ module ElasticAPM
           @context_serializer ||= ContextSerializer.new(config)
         end
 
-        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         def build(transaction)
           {
             transaction: {
@@ -30,7 +29,6 @@ module ElasticAPM
             }
           }
         end
-        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
       end
     end
   end

data/lib/elastic_apm/transport/worker.rb

@@ -6,6 +6,14 @@ module ElasticAPM
     class Worker
       include Logging
 
+      class << self
+        def adapter
+          @adapter ||= Connection
+        end
+
+        attr_writer :adapter
+      end
+
       # @api private
       class StopMessage; end
 
@@ -16,8 +24,7 @@ module ElasticAPM
         config,
         queue,
         serializers:,
-        filters:,
-        conn_adapter: Connection
+        filters:
       )
         @config = config
         @queue = queue
@@ -25,12 +32,10 @@ module ElasticAPM
         @serializers = serializers
         @filters = filters
 
-        @connection = conn_adapter.new(config)
+        @connection = self.class.adapter.new(config)
       end
 
       attr_reader :queue, :filters, :name, :connection, :serializers
-
-      # rubocop:disable Metrics/MethodLength
       def work_forever
         while (msg = queue.pop)
           case msg
@@ -46,7 +51,6 @@ module ElasticAPM
         warn 'Worker died with exception: %s', e.inspect
         debug e.backtrace.join("\n")
       end
-      # rubocop:enable Metrics/MethodLength
 
       def process(resource)
         return unless (json = serialize_and_filter(resource))

data/lib/elastic_apm/util.rb

@@ -14,7 +14,7 @@ module ElasticAPM
 
     def self.git_sha
       sha = `git rev-parse --verify HEAD 2>&1`.chomp
-      $? && $?.success? ? sha : nil
+      $?&.success? ? sha : nil
     end
 
     def self.hex_to_bits(str)

data/lib/elastic_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2019-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -51,7 +51,6 @@ files:
 - ".ci/.jenkins_master_framework.yml"
 - ".ci/.jenkins_ruby.yml"
 - ".ci/Jenkinsfile"
-- ".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"
@@ -60,8 +59,8 @@ files:
 - ".ci/jobs/defaults.yml"
 - ".ci/linting.groovy"
 - ".ci/prepare-git-context.sh"
+- ".github/workflows/main.yml"
 - ".gitignore"
-- ".hound.yml"
 - ".pre-commit-config.yaml"
 - ".rspec"
 - ".rubocop.yml"
@@ -116,6 +115,7 @@ files:
 - lib/elastic_apm/config/duration.rb
 - lib/elastic_apm/config/options.rb
 - lib/elastic_apm/config/regexp_list.rb
+- lib/elastic_apm/config/wildcard_pattern_list.rb
 - lib/elastic_apm/context.rb
 - lib/elastic_apm/context/request.rb
 - lib/elastic_apm/context/request/socket.rb
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The official Elastic APM agent for Ruby

data/.ci/bin/check_paths_for_matches.py

@@ -1,80 +0,0 @@
-#!/usr/bin/env python3
-"""
-Small wrapper script for jenkins to see if a regex pattern matches any of the
-paths generated by diffing between two commits.
-"""
-import argparse
-import os
-import re
-import subprocess
-import sys
-
-debug = "DEBUG" in os.environ
-
-
-def check_paths_for_matches(pattern, git_commit, git_previous_commit):
-    """Check if any paths between GIT_PREVIOUS_COMMIT and GIT_COMMIT match our pattern.
-
-    For merge commits only actual path changes are included rather than changes
-    from all parents. If GIT_PREVIOUS_COMMIT is not populated, use just the
-    paths that GIT_COMMIT represents. If GIT_PREVIOUS_COMMIT is not populated
-    and GIT_COMMIT is a merge commit, use all path changes from each parent. If
-    GIT_PREVIOUS_COMMIT is the same as GIT_COMMIT, that should generate no path
-    changes.
-    """
-    # Handle case where GIT_PREVIOUS_COMMIT isn't set (e.g. the first build),
-    if not git_previous_commit:
-        command = [
-            "git",
-            "diff-tree",
-            "-m",
-            "--no-commit-id",
-            "--name-only",
-            "-r",
-            git_commit,
-        ]
-    else:
-        command = ["git", "diff", "--name-only", git_previous_commit, git_commit]
-
-    # Run the command and populate paths.
-    completed_process = subprocess.run(
-        command, check=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT
-    )
-    paths = completed_process.stdout.decode().strip().split("\n")
-
-    # Look for any matches of pattern -> path.
-    possible_matches = [(path, pattern.match(path)) for path in paths]
-    if any([match for path, match in possible_matches]):
-        if debug:
-            print("matching change(s) found for {}".format(git_commit))
-            for path, match in possible_matches:
-                if match:
-                    print(path)
-        sys.stdout.write("match")
-        sys.stdout.flush()
-        exit(0)
-    else:
-        if debug:
-            print("no matching change(s) found for {}".format(git_commit))
-        exit(1)
-
-
-if __name__ == "__main__":
-    # Change our working directory so we're in $WORKSPACE.
-    os.chdir(os.path.dirname(os.path.abspath(__file__)))
-
-    # Define and parse arguments.
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--pattern", help="A regular expression pattern.")
-    parser.add_argument(
-        "--git-commit", help="The contents of the GIT_COMMIT environmental variable."
-    )
-    parser.add_argument(
-        "--git-previous-commit",
-        nargs="?",
-        help="The contents of the GIT_PREVIOUS_COMMIT environmental variable.",
-    )
-    args = parser.parse_args()
-
-    compiled_pattern = re.compile(args.pattern)
-    check_paths_for_matches(compiled_pattern, args.git_commit, args.git_previous_commit)

data/.hound.yml

@@ -1,2 +0,0 @@
-ruby:
-  config_file: .rubocop.yml