From 100a2e623b59dbc1e74aa9762360a857f73b4684 Mon Sep 17 00:00:00 2001
From: Philip Krauss <35487337+philkra@users.noreply.github.com>
Date: Thu, 8 Aug 2019 16:50:11 +0200
Subject: [PATCH] Send User-Agent header identifying the Client (#991)

* send user agent header identifing the client

* no need to instantiate a new var

* add python version to user-agent
---
 elasticsearch/transport.py           | 6 ++++++
 test_elasticsearch/test_transport.py | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/elasticsearch/transport.py b/elasticsearch/transport.py
index a5c0a976..86b1c678 100644
--- a/elasticsearch/transport.py
+++ b/elasticsearch/transport.py
@@ -1,9 +1,11 @@
 import time
 from itertools import chain
+from platform import python_version
 
 from .connection import Urllib3HttpConnection
 from .connection_pool import ConnectionPool, DummyConnectionPool
 from .serializer import JSONSerializer, Deserializer, DEFAULT_SERIALIZERS
+from . import __versionstr__
 from .exceptions import (
     ConnectionError,
     TransportError,
@@ -335,6 +337,10 @@ class Transport(object):
             if isinstance(ignore, int):
                 ignore = (ignore,)
 
+        if headers is None:
+            headers = {}
+        headers["user-agent"] = "elasticsearch-py/%s (Python %s)" % (__versionstr__, python_version())
+
         for attempt in range(self.max_retries + 1):
             connection = self.get_connection()
 
diff --git a/test_elasticsearch/test_transport.py b/test_elasticsearch/test_transport.py
index c2b7a10a..d14306db 100644
--- a/test_elasticsearch/test_transport.py
+++ b/test_elasticsearch/test_transport.py
@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 import time
+from platform import python_version
 
 from elasticsearch.transport import Transport, get_host_info
 from elasticsearch.connection import Connection
 from elasticsearch.connection_pool import DummyConnectionPool
 from elasticsearch.exceptions import ConnectionError, ImproperlyConfigured
+from elasticsearch import __versionstr__
 
 from .test_cases import TestCase
 
@@ -82,7 +84,9 @@ class TestTransport(TestCase):
         self.assertEquals(1, len(t.get_connection().calls))
         self.assertEquals(("GET", "/", {}, None), t.get_connection().calls[0][0])
         self.assertEquals(
-            {"timeout": 42, "ignore": (), "headers": None},
+            {"timeout": 42, "ignore": (), "headers": {
+                'user-agent':"elasticsearch-py/%s (Python %s)" % (__versionstr__, python_version())}
+            },
             t.get_connection().calls[0][1],
         )