From dc159653e2232c4a43cc1ce159e2e36228dbcbff Mon Sep 17 00:00:00 2001
From: Fernando Briano <fernando@picandocodigo.net>
Date: Tue, 9 Jan 2024 16:07:05 +0000
Subject: [PATCH 1/4] v4.7.1

---
 CHANGELOG.asciidoc         | 10 ++++++++++
 lib/elastic_apm/version.rb |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 0ebf8644a..4e063d634 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -34,10 +34,20 @@ 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
 
diff --git a/lib/elastic_apm/version.rb b/lib/elastic_apm/version.rb
index 65b0cd77f..8bcc8ccf3 100644
--- a/lib/elastic_apm/version.rb
+++ b/lib/elastic_apm/version.rb
@@ -18,5 +18,5 @@
 # frozen_string_literal: true
 
 module ElasticAPM
-  VERSION = '4.7.0'
+  VERSION = '4.7.1'
 end

From 5350ce711db20ed89ff20ac53bfaf31cd388b53f Mon Sep 17 00:00:00 2001
From: Fernando Briano <fernando@picandocodigo.net>
Date: Tue, 9 Jan 2024 16:25:29 +0000
Subject: [PATCH 2/4] Lock version of rubygems-update for Ruby 2.6|7

---
 spec/build/update.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/build/update.sh b/spec/build/update.sh
index 6518daaca..9fb02a233 100755
--- a/spec/build/update.sh
+++ b/spec/build/update.sh
@@ -11,6 +11,10 @@ if [[ "${FRAMEWORK}" =~ ^rails-4\.([0-9]) ]]; then
   gem i "rubygems-update:~>2.7" --no-document
   update_rubygems --no-document
   gem i "bundler:~>1.17.3" --no-document
+elif [[ "${RUBY_VERSION}" =~ ^2\.(6|7).+ ]]; then
+  gem i "rubygems-update:~>3.4.0" --no-document
+  update_rubygems --no-document
+  gem i bundler --no-document
 # Install specific dependencies for 2.4.x and 2.5.x ruby versions
 elif [[ "${RUBY_VERSION}" =~ ^2\.(4|5).+ ]]; then
   gem i "rubygems-update:~>2.7" --no-document

From c8bad3bcb9d2b0350644416153ab1d86639b1191 Mon Sep 17 00:00:00 2001
From: Fernando Briano <fernando@picandocodigo.net>
Date: Tue, 9 Jan 2024 17:22:50 +0000
Subject: [PATCH 3/4] Adjust google-protobuff dependency version for Ruby 2.6

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 942d78205..19f70996a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,7 +48,7 @@ else
 end
 if !defined?(JRUBY_VERSION)
   gem 'google-protobuf', '< 3.12' if RUBY_VERSION < '2.5'
-  gem 'google-protobuf', '< 3.25' if RUBY_VERSION < '2.7' && 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'

From 2035c0397ddb42fb9b6620dbb943ec95fa35be10 Mon Sep 17 00:00:00 2001
From: Fernando Briano <fernando@picandocodigo.net>
Date: Wed, 10 Jan 2024 07:29:43 +0000
Subject: [PATCH 4/4] Test longer timeout, one less span for graphql
 integration

---
 spec/integration/graphql_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/integration/graphql_spec.rb b/spec/integration/graphql_spec.rb
index 219e0d7b0..a521c93f7 100644
--- a/spec/integration/graphql_spec.rb
+++ b/spec/integration/graphql_spec.rb
@@ -181,7 +181,7 @@ def execute
           }
         '
 
-        wait_for transactions: 1, spans: 13
+        wait_for timeout: 10, transactions: 1, spans: 12
 
         expect(resp.status).to be 200