elastic-apm 4.7.0 → 4.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cd4366b1660aa74bcabd2f70126ab00d849d6bf326c884ab47d9877564430db
-  data.tar.gz: a9c5faf9bc50e3922ac2eb816e85b71c32a946c263c284b5c69675330b262047
+  metadata.gz: 2a42c0ce245df1d22209302a5047957fdc35532ef06e0834078200305377df50
+  data.tar.gz: 43cbfaca9d8b8d382bb95c42559a7a497e28926bf7067558741b57aa036842e0
 SHA512:
-  metadata.gz: 2fb7959b551db2b43453beeef14cf59adf3c9a18fecfe9b54129dbb449d6c7e320bfbf15df0b3e25fbebb8a3d96c59e91df841027c2cb1cefe55d288889738f8
-  data.tar.gz: ce91a520a1358d9610b816d1f6a1bf20bb6b270a66c6c6ff0a410af975f1535424b9686f3a958c1e22d1c630a465d7161cabe5fb48ffb17df7e3fe38bb97550e
+  metadata.gz: fe8f8a3f6228788632530c5ee4ecfcf8ade01e199aa5cc06bc40e1af68a54f75266d5fcae91aa4d2357bb57fbd54c62f357b24a6e89b841ac449ae75199b1603
+  data.tar.gz: 2d3f2ece8d92db1a43475384e284fc82678ca5bf8352ce3b5d384e682dfbf55c6324886de1a94f95641861ce808cadaa1f057e7956c2b46fe4ab39db213fa0c1

data/.ci/updatecli.d/update-gherkin-specs.yml

@@ -23,7 +23,15 @@ sources:
     transformers:
       - findsubmatch:
           pattern: "[0-9a-f]{40}"
-
+  pull_request:
+    kind: shell
+    dependson:
+      - sha
+    spec:
+      command: gh api /repos/elastic/apm/commits/{{ source "sha" }}/pulls --jq '.[].html_url'
+      environments:
+        - name: GITHUB_TOKEN
+        - name: PATH
   api_key.feature:
     kind: file
     spec:
@@ -65,6 +73,7 @@ actions:
         ### Why
         *Changeset*
         * https://github.com/elastic/apm/commit/{{ source "sha" }}
+        * {{ source "pull_request" }}
 
 targets:
   api_key.feature:

data/.ci/updatecli.d/update-json-specs.yml

@@ -23,7 +23,15 @@ sources:
     transformers:
       - findsubmatch:
           pattern: "[0-9a-f]{40}"
-
+  pull_request:
+    kind: shell
+    dependson:
+      - sha
+    spec:
+      command: gh api /repos/elastic/apm/commits/{{ source "sha" }}/pulls --jq '.[].html_url'
+      environments:
+        - name: GITHUB_TOKEN
+        - name: PATH
   container_metadata_discovery.json:
     kind: file
     spec:
@@ -68,6 +76,7 @@ actions:
         ### Why
         *Changeset*
         * https://github.com/elastic/apm/commit/{{ source "sha" }}
+        * {{ source "pull_request" }}
 
 targets:
   container_metadata_discovery.json:

data/.ci/updatecli.d/update-specs.yml

@@ -23,6 +23,15 @@ sources:
     transformers:
       - findsubmatch:
           pattern: "[0-9a-f]{40}"
+  pull_request:
+    kind: shell
+    dependson:
+      - sha
+    spec:
+      command: gh api /repos/elastic/apm-data/commits/{{ source "sha" }}/pulls --jq '.[].html_url'
+      environments:
+        - name: GITHUB_TOKEN
+        - name: PATH
   error.json:
     kind: file
     spec:
@@ -64,6 +73,7 @@ actions:
         ### Why
         *Changeset*
         * https://github.com/elastic/apm-data/commit/{{ source "sha" }}
+        * {{ source "pull_request" }}
 
 targets:
   error.json:

data/.github/dependabot.yml

@@ -3,7 +3,9 @@ updates:
 - package-ecosystem: bundler
   directory: "/"
   schedule:
-    interval: daily
+    interval: "weekly"
+    day: "sunday"
+    time: "22:00"
   open-pull-requests-limit: 10
   ignore:
   - dependency-name: sucker_punch
@@ -14,3 +16,17 @@ updates:
     - 1.8.10
     - 1.8.8
     - 1.8.9
+
+  # GitHub actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    reviewers:
+      - "elastic/observablt-ci"
+    schedule:
+      interval: "weekly"
+      day: "sunday"
+      time: "22:00"
+    groups:
+      github-actions:
+        patterns:
+          - "*"

data/.github/workflows/README.md

@@ -0,0 +1,58 @@
+## CI/CD
+
+There are 5 main stages that run on GitHub actions:
+
+* Linting
+* Test
+* Test `main` versions
+* Package
+* Release
+
+There are some other stages that run for every push on the main branches:
+
+* [Microbenchmark](./microbenchmark.yml)
+* [Snapshoty](./snapshoty.yml)
+
+### Scenarios
+
+* Compatibility matrix runs on branches, tags and PRs basis.
+* Tests should be triggered on branch, tag and PR basis.
+* Commits that are only affecting the docs files should not trigger any test or similar stages that are not required.
+* Automated release in the CI gets triggered when a tag release is created.
+* **This is not the case yet**, but if Github secrets are required then Pull Requests from forked repositories won't run any build accessing those secrets. If needed, then create a feature branch.
+
+### Compatibility matrix
+
+Ruby agent supports compatibility to different ruby versions and frameworks, those are defined in:
+
+* [frameworks](../../.ci/.framework.yml) for all the PRs.
+* [frameworks](../../.ci/.main_framework.yml) for all the PRs using the `main` branches.
+* Ruby [versions](../../.ci/.ruby.yml) for all the `*nix` builds.
+* [Exclude list](../../.ci/.exclude.yml) for the above entries.
+
+### How to interact with the CI?
+
+#### On a PR basis
+
+Once a PR has been opened then there are two different ways you can trigger builds in the CI:
+
+1. Commit based
+1. UI based, any Elasticians can force a build through the GitHub UI
+
+#### Branches
+
+Every time there is a merge to main or any release branches the whole workflow will compile and test every entry in the compatibility matrix for Linux.
+
+### Release process
+
+This process has been fully automated and it gets triggered when a tag release has been created.
+The tag release follows the naming convention: `v.<major>.<minor>.<patch>`, where `<major>`, `<minor>` and `<patch>`.
+
+### OpenTelemetry
+
+There is a GitHub workflow in charge to populate what the workflow run in terms of jobs and steps. Those details can be seen in [here](https://ela.st/oblt-ci-cd-stats) (**NOTE**: only available for Elasticians).
+
+## Bump automation
+
+[updatecli](https://www.updatecli.io/) is the tool we use to automatically update the specs
+the [APM agents](./updatecli.yml) use.

data/CHANGELOG.asciidoc

@@ -34,6 +34,19 @@ endif::[]
 [[release-notes-4.x]]
 === Ruby Agent version 4.x
 
+[[release-notes-4.7.1]
+==== 4.7.1
+
+[float]
+===== Fixed
+- Skip capturing cookie header when it's set separately {pull}1405[#1405]
+- Changes/fixes to metadata.cloud.* fields collected for GCP {pull}1415[#1415]
+- Pin version of bigdecimal for ruby 2.4 {pull}1417[#1417]
+- Use response method on Faraday error for older versions of the library {pull}1419[#1419]
+- Fix ActionDispatchSpy#render_exception for Rails 7.1 {pull}1423[#1423]
+- Use graphql < 2.1 when Ruby < 2.7 {pull}1425[#1425]
+- Guard against various Faraday exception response formats {pull}1428[#1428]
+
 [[release-notes-4.7.0]]
 ==== 4.7.0
 

data/Gemfile

@@ -41,9 +41,14 @@ gem 'ecs-logging', require: 'ecs_logging/logger'
 gem 'elasticsearch', require: nil
 gem 'fakeredis', require: nil
 gem 'faraday', require: nil
-gem 'graphql', require: nil
-if !defined?(JRUBY_VERSION) && RUBY_VERSION < '2.5'
-  gem 'google-protobuf', '< 3.12'
+if RUBY_VERSION < '2.7'
+  gem 'graphql', '< 2.1', require: nil
+else
+  gem 'graphql', require: nil
+end
+if !defined?(JRUBY_VERSION)
+  gem 'google-protobuf', '< 3.12' if RUBY_VERSION < '2.5'
+  gem 'google-protobuf', '< 3.23' if RUBY_VERSION < '2.7' && RUBY_VERSION > '2.5'
 end
 gem 'grpc' if !defined?(JRUBY_VERSION) && RUBY_VERSION < '3.0'
 gem 'json'
@@ -131,6 +136,10 @@ if Gem::Version.create(RUBY_VERSION) >= Gem::Version.create('2.5.0') && !defined
   gem 'sneakers', github: 'jondot/sneakers', ref: 'd761dfe1493', require: nil
 end
 
+if Gem::Version.create(RUBY_VERSION) <= Gem::Version.create('2.5.0')
+  gem 'bigdecimal', '1.3.5'
+end
+
 group :bench do
   gem 'ruby-prof', require: nil, platforms: %i[ruby]
   gem 'stackprof', require: nil, platforms: %i[ruby]

data/lib/elastic_apm/context_builder.rb

@@ -55,6 +55,9 @@ module ElasticAPM
       request.env = env if config.capture_env?
 
       request.cookies = req.cookies.dup
+      unless request.cookies.empty?
+        request.headers['Cookie'] = SKIPPED if request.headers.has_key?('Cookie')
+      end
 
       context
     end

data/lib/elastic_apm/metadata/cloud_info.rb

@@ -97,13 +97,12 @@ module ElasticAPM
         zone = metadata["instance"]["zone"]&.split("/")&.at(-1)
 
         self.provider = "gcp"
-        self.instance_id = metadata["instance"]["id"]
+        self.instance_id = metadata["instance"]["id"].to_s
         self.instance_name = metadata["instance"]["name"]
-        self.project_id = metadata["project"]["numericProjectId"]
-        self.project_name = metadata["project"]["projectId"]
+        self.project_id = metadata["project"]["projectId"]
         self.availability_zone = zone
         self.region = zone.split("-")[0..-2].join("-")
-        self.machine_type = metadata["instance"]["machineType"]
+        self.machine_type = metadata["instance"]["machineType"].split("/")[-1]
       rescue HTTP::TimeoutError, HTTP::ConnectionError
         nil
       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.7.0'
+  VERSION = '4.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.7.1
 platform: ruby
 authors:
 - Mikkel Malmberg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 2024-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -84,6 +84,7 @@ files:
 - ".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"