elastic-apm 4.6.2 → 4.7.3

data/lib/elastic_apm/context_builder.rb

@@ -44,18 +44,23 @@ module ElasticAPM
       request = context.request
 
       request.socket = Context::Request::Socket.new(req)
-      request.http_version = build_http_version rack_env
+      request.http_version = build_http_version req
       request.method = req.request_method
       request.url = Context::Request::Url.new(req)
 
       request.body = should_capture_body?(for_type) ? get_body(req) : SKIPPED
 
       headers, env = get_headers_and_env(rack_env)
-      request.headers = headers if config.capture_headers?
       request.env = env if config.capture_env?
-
       request.cookies = req.cookies.dup
 
+      if config.capture_headers?
+        request.headers = headers
+        unless request.cookies.empty?
+          request.headers['Cookie'] = SKIPPED if request.headers.has_key?('Cookie')
+        end
+      end
+
       context
     end
 
@@ -104,8 +109,8 @@ module ElasticAPM
       key.gsub(/^HTTP_/, '').split('_').map(&:capitalize).join('-')
     end
 
-    def build_http_version(rack_env)
-      return unless (http_version = rack_env['HTTP_VERSION'])
+    def build_http_version(req)
+      return unless (http_version = req.env['HTTP_VERSION'])
       http_version.gsub(%r{HTTP/}, '')
     end
   end

data/lib/elastic_apm/metadata/cloud_info.rb

@@ -94,16 +94,18 @@ module ElasticAPM
         return unless resp.status == 200
         return unless (metadata = JSON.parse(resp.body.to_s))
 
-        zone = metadata["instance"]["zone"]&.split("/")&.at(-1)
-
         self.provider = "gcp"
-        self.instance_id = metadata["instance"]["id"]
-        self.instance_name = metadata["instance"]["name"]
-        self.project_id = metadata["project"]["numericProjectId"]
-        self.project_name = metadata["project"]["projectId"]
+        self.project_id = metadata["project"]["projectId"]
+
+        return unless metadata['instance']
+
+        zone = metadata["instance"]["zone"]&.split("/")&.at(-1)
         self.availability_zone = zone
         self.region = zone.split("-")[0..-2].join("-")
-        self.machine_type = metadata["instance"]["machineType"]
+
+        self.instance_id = metadata["instance"]["id"].to_s
+        self.instance_name = metadata["instance"]["name"]
+        self.machine_type = metadata["instance"]["machineType"]&.split("/")&.at(-1)
       rescue HTTP::TimeoutError, HTTP::ConnectionError
         nil
       end

data/lib/elastic_apm/metrics.rb

@@ -50,27 +50,9 @@ module ElasticAPM
           return
         end
 
-        debug 'Starting metrics'
-
-        # Only set the @sets once, in case we stop
-        # and start again.
-        if @sets.nil?
-          sets = {
-            system: CpuMemSet,
-            vm: VMSet,
-            breakdown: BreakdownSet,
-            transaction: TransactionSet
-          }
-          if defined?(JVMSet)
-            debug "Enabling JVM metrics collection"
-            sets[:jvm] = JVMSet
-          end
+        define_sets
 
-          @sets = sets.each_with_object({}) do |(key, kls), _sets_|
-            debug "Adding metrics collector '#{kls}'"
-            _sets_[key] = kls.new(config)
-          end
-        end
+        debug 'Starting metrics'
 
         @timer_task = Concurrent::TimerTask.execute(
           run_now: true,
@@ -135,6 +117,28 @@ module ElasticAPM
           arr.concat(samples)
         end
       end
+
+      def define_sets
+        # Only set the @sets once, in case we stop
+        # and start again.
+        return unless @sets.nil?
+
+        sets = {
+          system: CpuMemSet,
+          vm: VMSet,
+          breakdown: BreakdownSet,
+          transaction: TransactionSet
+        }
+        if defined?(JVMSet)
+          debug "Enabling JVM metrics collection"
+          sets[:jvm] = JVMSet
+        end
+
+        @sets = sets.each_with_object({}) do |(key, kls), _sets_|
+          debug "Adding metrics collector '#{kls}'"
+          _sets_[key] = kls.new(config)
+        end
+      end
     end
   end
 end

data/lib/elastic_apm/span_helpers.rb

@@ -22,17 +22,17 @@ module ElasticAPM
   module SpanHelpers
     # @api private
     module ClassMethods
-      def span_class_method(method, name = nil, type = nil)
-        __span_method_on(singleton_class, method, name, type)
+      def span_class_method(method, name = nil, type = nil, **kwargs)
+        __span_method_on(singleton_class, method, name, type, **kwargs)
       end
 
-      def span_method(method, name = nil, type = nil)
-        __span_method_on(self, method, name, type)
+      def span_method(method, name = nil, type = nil, **kwargs)
+        __span_method_on(self, method, name, type, **kwargs)
       end
 
       private
 
-      def __span_method_on(klass, method, name = nil, type = nil)
+      def __span_method_on(klass, method, name = nil, type = nil, **kwargs)
         name ||= method.to_s
         type ||= Span::DEFAULT_TYPE
 
@@ -42,7 +42,7 @@ module ElasticAPM
               return super(*args, &block)
             end
 
-            ElasticAPM.with_span name.to_s, type.to_s do
+            ElasticAPM.with_span name.to_s, type.to_s, **kwargs do
               super(*args, &block)
             end
           end)

data/lib/elastic_apm/spies/action_dispatch.rb

@@ -24,11 +24,19 @@ module ElasticAPM
     class ActionDispatchSpy
       # @api private
       module Ext
-        def render_exception(env, exception)
-          context = ElasticAPM.build_context(rack_env: env, for_type: :error)
+        def render_exception(request, exception_or_wrapper)
+          context = ElasticAPM.build_context(
+            rack_env: request, for_type: :error
+          )
+          exception =
+            if exception_or_wrapper.is_a?(ActionDispatch::ExceptionWrapper)
+              exception_or_wrapper.exception
+            else
+              exception_or_wrapper
+            end
           ElasticAPM.report(exception, context: context, handled: false)
 
-          super(env, exception)
+          super(request, exception_or_wrapper)
         end
       end
 

data/lib/elastic_apm/spies/faraday.rb

@@ -109,7 +109,14 @@ module ElasticAPM
                   yield req if block
                 end
               rescue Faraday::ClientError, Faraday::ServerError => e # Faraday::Response::RaiseError
-                status = e.response[:status]
+                status =
+                  if e.respond_to?(:response_status)
+                    e.response_status
+                  elsif e.response && e.response.respond_to?(:status)
+                    e.response.status
+                  elsif e.response && e.response.respond_to?(:fetch)
+                    e.response[:status]
+                  end
                 http = span&.context&.http
                 if http && status
                   http.status_code = status.to_s

data/lib/elastic_apm/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 4.6.2
+  version: 4.7.3
 platform: ruby
 authors:
 - Mikkel Malmberg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 2024-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -60,13 +60,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".ci/.jenkins_codecov.yml"
-- ".ci/.jenkins_exclude.yml"
-- ".ci/.jenkins_framework.yml"
-- ".ci/.jenkins_main_framework.yml"
-- ".ci/.jenkins_ruby.yml"
-- ".ci/.jenkins_ruby_benchmarks.yml"
-- ".ci/Jenkinsfile"
+- ".ci/.codecov.yml"
+- ".ci/.exclude.yml"
+- ".ci/.framework.yml"
+- ".ci/.main_framework.yml"
+- ".ci/.ruby.yml"
 - ".ci/docker/jruby/11-jdk/Dockerfile"
 - ".ci/docker/jruby/12-jdk/Dockerfile"
 - ".ci/docker/jruby/13-jdk/Dockerfile"
@@ -75,23 +73,31 @@ files:
 - ".ci/docker/jruby/README.md"
 - ".ci/docker/jruby/run.sh"
 - ".ci/docker/jruby/test.sh"
-- ".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"
-- ".ci/packer_cache.sh"
+- ".ci/scripts/bench.sh"
+- ".ci/scripts/install-build-system.sh"
 - ".ci/snapshoty.yml"
-- ".ci/update-specs.yml"
+- ".ci/updatecli/updatecli.d/update-gherkin-specs.yml"
+- ".ci/updatecli/updatecli.d/update-json-specs.yml"
+- ".ci/updatecli/updatecli.d/update-specs.yml"
+- ".ci/updatecli/values.yml"
 - ".github/ISSUE_TEMPLATE/Bug_report.md"
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/dependabot.yml"
 - ".github/labeler-config.yml"
+- ".github/workflows/README.md"
 - ".github/workflows/addToProject.yml"
+- ".github/workflows/ci-docs.yml"
+- ".github/workflows/ci.yml"
+- ".github/workflows/coverage-reporter.yml"
 - ".github/workflows/labeler.yml"
-- ".github/workflows/update-specs.yml"
+- ".github/workflows/microbenchmark.yml"
+- ".github/workflows/opentelemetry.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/run-matrix.yml"
+- ".github/workflows/snapshoty.yml"
+- ".github/workflows/test-reporter.yml"
+- ".github/workflows/updatecli.yml"
 - ".gitignore"
 - ".pre-commit-config.yaml"
 - ".rspec"
@@ -133,10 +139,11 @@ files:
 - docs/images/dynamic-config.svg
 - docs/index.asciidoc
 - docs/introduction.asciidoc
-- docs/log-correlation.asciidoc
+- docs/logs.asciidoc
 - docs/metrics.asciidoc
 - docs/opentracing.asciidoc
 - docs/performance-tuning.asciidoc
+- docs/redirects.asciidoc
 - docs/release-notes.asciidoc
 - docs/set-up.asciidoc
 - docs/supported-technologies.asciidoc

data/.ci/.jenkins_exclude.yml

@@ -1,191 +0,0 @@
-exclude:
-  # Ruby 2.4
-  # Only test on rails-5.2, sinatra-1.4
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: rails-7.0
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: rails-6.1
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: rails-6.0
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: rails-4.2
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: sinatra-2.2
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: grape-1.6
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.0
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: rails-main
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: sinatra-main
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: grape-master
-
-  # rails-4.2 exclusions
-  # Only test on ruby 2.6, 2.5, 2.4
-  - RUBY_VERSION: ruby:3.1
-    FRAMEWORK: rails-4.2
-  - RUBY_VERSION: ruby:3.0
-    FRAMEWORK: rails-4.2
-  - RUBY_VERSION: ruby:2.7
-    FRAMEWORK: rails-4.2
-  - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: rails-4.2
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: rails-4.2
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: rails-4.2
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
-    FRAMEWORK: rails-4.2
-  # sinatra-1.4 exclusions
-  - RUBY_VERSION: ruby:3.1
-    FRAMEWORK: sinatra-1.4
-  - RUBY_VERSION: ruby:3.0
-    FRAMEWORK: sinatra-1.4
-  - RUBY_VERSION: ruby:2.7
-    FRAMEWORK: sinatra-1.4
-  - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: sinatra-1.4
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: sinatra-1.4
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: sinatra-1.4
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
-    FRAMEWORK: sinatra-1.4
-
-  # rails-6.0 and rails-6.1 exclusions
-  # Don't test on ruby 2.4
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: rails-6.1
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: rails-6.0
-
-  # Only test rails main on ruby 3.1
-  - RUBY_VERSION: ruby:3.0
-    FRAMEWORK: rails-main
-  - RUBY_VERSION: ruby:2.7
-    FRAMEWORK: rails-main
-  - RUBY_VERSION: ruby:2.6
-    FRAMEWORK: rails-main
-  - RUBY_VERSION: ruby:2.5
-    FRAMEWORK: rails-main
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: rails-main
-  - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: rails-main
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: rails-main
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: rails-main
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
-    FRAMEWORK: rails-main
-
-  # Only test rails 7.0 on ruby >= 2.7
-  - RUBY_VERSION: ruby:2.6
-    FRAMEWORK: rails-7.0
-  - RUBY_VERSION: ruby:2.5
-    FRAMEWORK: rails-7.0
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: rails-7.0
-  - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: rails-7.0
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: rails-7.0
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: rails-7.0
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
-    FRAMEWORK: rails-7.0
-
-  # Only test sinatra main on ruby 2.7 and ruby 3.1
-  - RUBY_VERSION: ruby:3.0
-    FRAMEWORK: sinatra-main
-  - RUBY_VERSION: ruby:2.6
-    FRAMEWORK: sinatra-main
-  - RUBY_VERSION: ruby:2.5
-    FRAMEWORK: sinatra-main
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: sinatra-main
-  - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: sinatra-main
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: sinatra-main
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: sinatra-main
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
-    FRAMEWORK: sinatra-main
-
-  # Only test grape master on ruby 2.7 and ruby 3.0
-  - RUBY_VERSION: ruby:2.6
-    FRAMEWORK: grape-master
-  - RUBY_VERSION: ruby:2.5
-    FRAMEWORK: grape-master
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: grape-master
-  - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: grape-master
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: grape-master
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: grape-master
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
-    FRAMEWORK: grape-master
-
-  # grape 1.5 doesn't support ruby 3.0
-  - RUBY_VERSION: ruby:3.1
-    FRAMEWORK: grape-1.6
-  - RUBY_VERSION: ruby:3.1
-    FRAMEWORK: grape-1.6,sinatra-2.2,rails-7.0
-  - RUBY_VERSION: ruby:3.1
-    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
-  - RUBY_VERSION: ruby:3.0
-    FRAMEWORK: grape-1.6
-  - RUBY_VERSION: ruby:3.0
-    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
-
-  # only test ruby >= 3.0 with rails 6.0 and rails 6.1
-  - RUBY_VERSION: ruby:3.1
-    FRAMEWORK: rails-5.2
-  - RUBY_VERSION: ruby:3.1
-    FRAMEWORK: rails-5.1
-  - RUBY_VERSION: ruby:3.0
-    FRAMEWORK: rails-5.2
-  - RUBY_VERSION: ruby:3.0
-    FRAMEWORK: rails-5.1
-
-  # Unsupported
-  # Ruby 2.6
-  - RUBY_VERSION: ruby:2.6
-    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
-  - RUBY_VERSION: ruby:2.6
-    FRAMEWORK: grape-1.6,sinatra-2.2,rails-7.0
-  # Ruby 2.5
-  - RUBY_VERSION: ruby:2.5
-    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
-  - RUBY_VERSION: ruby:2.5
-    FRAMEWORK: grape-1.6,sinatra-2.2,rails-7.0
-  # Ruby 2.4
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: grape-1.6,sinatra-2.2,rails-7.0
-  # JRuby 9.2
-  - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
-  - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: grape-1.6,sinatra-2.2,rails-7.0
-  # JRuby 9.2-13-jdk
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: grape-1.6,sinatra-2.2,rails-7.0
-  # JRuby 9.2-11-jdk
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: grape-1.6,sinatra-2.2,rails-7.0
-  # JRuby 9.2-8-jdk
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
-    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
-    FRAMEWORK: grape-1.6,sinatra-2.2,rails-7.0

data/.ci/.jenkins_ruby.yml

@@ -1,10 +0,0 @@
-RUBY_VERSION:
-  - ruby:3.1
-  - ruby:3.0
-  - ruby:2.7
-  - ruby:2.6
-  - ruby:2.4
-  - jruby:9.2
-  - docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-  - docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-  - docker.elastic.co/observability-ci/jruby:9.2-8-jdk

data/.ci/.jenkins_ruby_benchmarks.yml

@@ -1,6 +0,0 @@
-RUBY_VERSION:
-  - ruby:3.1
-  - ruby:3.0
-  - ruby:2.7
-  - ruby:2.6
-  - jruby:9.2