[Client] Refactors User-Agent

Instead of setting it up on each request, this update sets it up on
client initialization.

Author: picandocodigo

lib/elastic/enterprise-search/client.rb

@@ -77,7 +77,8 @@ def transport
             request_timeout: overall_timeout,
             adapter: adapter,
             transport_options: {
-              request: { open_timeout: open_timeout }
+              request: { open_timeout: open_timeout },
+              headers: { user_agent: user_agent }
             },
             enable_meta_header: @options[:enable_meta_header] || true,
             trace: trace,
@@ -128,6 +129,19 @@ def host
 
         @options[:host]
       end
+
+      private
+
+      def user_agent
+        ua = "#{CLIENT_NAME}/#{CLIENT_VERSION}"
+        meta = ["RUBY_VERSION: #{RUBY_VERSION}"]
+        if RbConfig::CONFIG && RbConfig::CONFIG['host_os']
+          meta << "#{RbConfig::CONFIG['host_os'].split('_').first[/[a-z]+/i].downcase} " \
+                  "#{RbConfig::CONFIG['target_cpu']}"
+        end
+        meta << "elastic-transport: #{Elastic::Transport::VERSION}"
+        "#{ua} (#{meta.join('; ')})"
+      end
     end
   end
 end

lib/elastic/enterprise-search/request.rb

@@ -48,7 +48,7 @@ def delete(path, params = {}, headers = {})
 
       # Construct and send a request to the API.
       def request(method, path, params = {}, body = {}, headers = {})
-        meta_headers = { authorization: decide_authorization(params), user_agent: request_user_agent }
+        meta_headers = { authorization: decide_authorization(params) }
         headers = if !headers.is_a?(Hash)
                     meta_headers
                   else
@@ -79,17 +79,6 @@ def basic_auth_header
 
       private
 
-      def request_user_agent
-        ua = "#{CLIENT_NAME}/#{CLIENT_VERSION}"
-        meta = ["RUBY_VERSION: #{RUBY_VERSION}"]
-        if RbConfig::CONFIG && RbConfig::CONFIG['host_os']
-          meta << "#{RbConfig::CONFIG['host_os'].split('_').first[/[a-z]+/i].downcase} " \
-                  "#{RbConfig::CONFIG['target_cpu']}"
-        end
-        meta << "elastic-transport: #{Elastic::Transport::VERSION}"
-        "#{ua} (#{meta.join('; ')})"
-      end
-
       def decide_authorization(params)
         if params[:grant_type] == 'authorization_code'
           "Bearer #{params[:code]}"

spec/enterprise-search/client_spec.rb

@@ -104,5 +104,16 @@ def messages; @strio.string; end
     end
   end
 
+  context 'user-agent' do
+    context 'default' do
+      let(:transport) { Elastic::EnterpriseSearch::Client.new.instance_variable_get('@transport') }
+      let(:subject) { transport.transport.connections.first.connection.headers }
+
+      it 'includes the user-agent in transport' do
+        expect(subject['user-agent']).to match("elastic-enterprise-search-ruby/#{Elastic::EnterpriseSearch::VERSION}")
+      end
+    end
+  end
+
   include_examples 'adapters compatibility'
 end