Merge pull request #158 from reportportal/interpreter-report-updated2

Add interpreter to GA

Author: HardNorth

reportportal_client/external/google_analytics.py

@@ -16,6 +16,7 @@
 """
 
 import logging
+from platform import python_version
 from pkg_resources import get_distribution
 import requests
 from uuid import uuid4
@@ -34,6 +35,14 @@ def _get_client_info():
     return client.project_name, client.version
 
 
+def _get_platform_info():
+    """Get current platform basic info, e.g.: 'Python 3.6.1'.
+
+    :return: str represents the current platform, e.g.: 'Python 3.6.1'
+    """
+    return 'Python ' + python_version()
+
+
 def send_event(agent_name, agent_version):
     """Send an event to GA about client and agent versions with their names.
 
@@ -47,8 +56,8 @@ def send_event(agent_name, agent_version):
         'aip': '1',
         'cid': str(uuid4()),
         't': 'event',
-        'ec': 'Client name "{}", version "{}"'.format(
-            client_name, client_version
+        'ec': 'Client name "{}", version "{}", interpreter "{}"'.format(
+            client_name, client_version, _get_platform_info()
         ),
         'ea': 'Start launch',
         'el': 'Agent name "{}", version "{}"'.format(

reportportal_client/external/google_analytics.pyi

@@ -7,4 +7,6 @@ logger: Logger
 
 def _get_client_info() -> tuple: ...
 
+def _get_platform_info() -> Text: ...
+
 def send_event(agent_name: Text, agent_version: Text) -> requests.Response: ...

tests/test_analytics.py

@@ -27,6 +27,8 @@
             mock.Mock(return_value=555))
 @mock.patch('reportportal_client.external.google_analytics.requests.post')
 @mock.patch('reportportal_client.external.google_analytics.get_distribution')
+@mock.patch('reportportal_client.external.google_analytics.python_version',
+            mock.Mock(return_value='3.6.6'))
 def test_send_event(mocked_distribution, mocked_requests):
     """Test functionality of the send_event() function.
 
@@ -46,13 +48,12 @@ def test_send_event(mocked_distribution, mocked_requests):
         'aip': '1',
         'cid': '555',
         't': 'event',
-        'ec': 'Client name "{}", version "{}"'.format(
-            expected_cl_name, expected_cl_version
-        ),
+        'ec': 'Client name "{}", version "{}", interpreter "Python 3.6.6"'
+              .format(expected_cl_name, expected_cl_version),
         'ea': 'Start launch',
         'el': 'Agent name "{}", version "{}"'.format(
             agent_name, agent_version
-        )
+            )
     }
     send_event(agent_name, agent_version)
     mocked_requests.assert_called_with(