From b920d39b027ac8a356e8c86de5680a4057eb324a Mon Sep 17 00:00:00 2001
From: Fernando Briano <fernando@picandocodigo.net>
Date: Tue, 16 Jul 2024 17:10:47 +0100
Subject: [PATCH] Bumps version to 8.3.5 and updates CHANGELOG

---
 CHANGELOG.md                         | 11 ++++++-----
 lib/elastic/transport/meta_header.rb |  6 +++++-
 lib/elastic/transport/version.rb     |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8adde59..0bb800a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,12 @@
-## 8.3.4
-
-- Fixes issue with ES_SERVERLESS_SERVICE_VERSION for backwards compatibility
-
-## 8.3.3
+## 8.3.5
 
 - Small updates in source code documentation.
 - Updates meta header for Elasticsearch Serverless.
+- Fixes issues with ES_SERVERLESS_SERVICE_VERSION for backwards compatibility
+
+## 8.3.3, 8.3.4 (yanked)
+
+- Yanked due to errors.
 
 ## 8.3.2
 
diff --git a/lib/elastic/transport/meta_header.rb b/lib/elastic/transport/meta_header.rb
index 8dd48d6..fe9bf5b 100644
--- a/lib/elastic/transport/meta_header.rb
+++ b/lib/elastic/transport/meta_header.rb
@@ -42,7 +42,11 @@ def meta_header_service_version
         if enterprise_search?
           Elastic::ENTERPRISE_SERVICE_VERSION
         elsif serverless?
-          Elastic::ES_SERVERLESS_SERVICE_VERSION || Elastic::ELASTICSEARCH_SERVICE_VERSION
+          if defined?(Elastic::ES_SERVERLESS_SERVICE_VERSION)
+            Elastic::ES_SERVERLESS_SERVICE_VERSION
+          else
+            Elastic::ELASTICSEARCH_SERVICE_VERSION
+          end
         elsif elasticsearch?
           Elastic::ELASTICSEARCH_SERVICE_VERSION
         elsif defined?(Elasticsearch::VERSION)
diff --git a/lib/elastic/transport/version.rb b/lib/elastic/transport/version.rb
index 8a45c97..d626c84 100644
--- a/lib/elastic/transport/version.rb
+++ b/lib/elastic/transport/version.rb
@@ -17,6 +17,6 @@
 
 module Elastic
   module Transport
-    VERSION = '8.3.4'.freeze
+    VERSION = '8.3.5'.freeze
   end
 end