Merge pull request #203 from reportportal/ga4

Ga4

Author: HardNorth

CHANGELOG.md

@@ -4,6 +4,11 @@
 ### Fixed
 - Issue [#198](https://github.com/reportportal/client-Python/issues/198): Python 3.8+ logging issue, by @HardNorth
 - Issue [#200](https://github.com/reportportal/client-Python/issues/200): max_pool_size not worked without retries setting, by @ericscobell
+- Issue [#202](https://github.com/reportportal/client-Python/issues/202): TypeError on request make, by @HardNorth
+### Changed
+- Statistics service rewrite, by @HardNorth
+### Removed
+- Deprecated code, `service.py` and `LogManager` in `core` package, by @HardNorth
 
 ## [5.2.5]
 ### Fixed

reportportal_client/__init__.py

@@ -16,15 +16,13 @@
 
 from ._local import current
 from .logs import RPLogger, RPLogHandler
-from .service import ReportPortalService
 from .client import RPClient
 from .steps import step
 
 __all__ = [
     'current',
     'RPLogger',
     'RPLogHandler',
-    'ReportPortalService',
     'RPClient',
     'step',
 ]

reportportal_client/client.py

@@ -14,6 +14,8 @@
 #  limitations under the License
 
 import logging
+from os import getenv
+
 import requests
 from requests.adapters import HTTPAdapter, Retry, DEFAULT_RETRIES
 
@@ -27,6 +29,7 @@
 )
 from .helpers import uri_join, verify_value_length
 from .logs.log_manager import LogManager, MAX_LOG_BATCH_PAYLOAD_SIZE
+from .services.statistics import send_event
 from .static.defines import NOT_FOUND
 from .steps import StepReporter
 
@@ -100,6 +103,7 @@ def __init__(self,
         self.step_reporter = StepReporter(self)
         self._item_stack = []
         self.mode = mode
+        self._skip_analytics = getenv('AGENT_NO_ANALYTICS')
 
         retry_strategy = Retry(
             total=retries,
@@ -108,6 +112,7 @@ def __init__(self,
         ) if retries else DEFAULT_RETRIES
         self.session.mount('https://', HTTPAdapter(
             max_retries=retry_strategy, pool_maxsize=max_pool_size))
+        # noinspection HttpUrlsUsage
         self.session.mount('http://', HTTPAdapter(
             max_retries=retry_strategy, pool_maxsize=max_pool_size))
         self.session.headers['Authorization'] = 'bearer {0}'.format(self.token)
@@ -300,9 +305,9 @@ def start_launch(self,
         :param start_time:  Launch start time
         :param description: Launch description
         :param attributes:  Launch attributes
-        :param rerun:       Enables launch rerun mode
-        :param rerun_of:    Rerun mode. Specifies launch to be re-runned.
-                            Should be used with the 'rerun' option.
+        :param rerun:       Start launch in rerun mode
+        :param rerun_of:    For rerun mode specifies which launch will be
+                            re-run. Should be used with the 'rerun' option.
         """
         url = uri_join(self.base_url_v2, 'launch')
 
@@ -333,6 +338,17 @@ def start_launch(self,
                                verify_ssl=self.verify_ssl).make()
         if not response:
             return
+
+        if not self._skip_analytics:
+            agent_name, agent_version = None, None
+
+            agent_attribute = [a for a in attributes if
+                               a.get('key') == 'agent'] if attributes else []
+            if len(agent_attribute) > 0 and agent_attribute[0].get('value'):
+                agent_name, agent_version = agent_attribute[0]['value'].split(
+                    '|')
+            send_event('start_launch', agent_name, agent_version)
+
         self._log_manager.launch_id = self.launch_id = response.id
         logger.debug('start_launch - ID: %s', self.launch_id)
         return self.launch_id

reportportal_client/client.pyi

@@ -2,8 +2,8 @@ from typing import Any, Dict, List, Optional, Text, Tuple, Union
 
 from requests import Session
 
-from reportportal_client.logs.log_manager import LogManager as LogManager
 from reportportal_client.core.rp_issues import Issue as Issue
+from reportportal_client.logs.log_manager import LogManager as LogManager
 from reportportal_client.steps import StepReporter
 
 
@@ -28,6 +28,7 @@ class RPClient:
     session: Session = ...
     step_reporter: StepReporter = ...
     mode: str = ...
+    _skip_analytics: Text = ...
 
     def __init__(
             self,
@@ -103,3 +104,5 @@ class RPClient:
                          description: Optional[Text]) -> Text: ...
 
     def current_item(self) -> Text: ...
+
+    def start(self) -> None : ...

reportportal_client/core/__init__.py

@@ -12,9 +12,3 @@
 #  limitations under the License
 
 """This package contains core reportportal-client modules."""
-
-from reportportal_client.logs import log_manager
-
-__all__ = [
-    'log_manager'
-]

reportportal_client/core/log_manager.py

@@ -76,7 +76,7 @@ def make(self):
                 timeout=self.http_timeout)
             )
             # https://github.com/reportportal/client-Python/issues/39
-        except (KeyError, IOError, ValueError) as exc:
+        except (KeyError, IOError, ValueError, TypeError) as exc:
             logger.warning(
                 "Report Portal %s request failed",
                 self.name,

reportportal_client/core/rp_requests.py

@@ -71,15 +71,7 @@ def _get_json(data):
         :param data: requests.Response object
         :return:     dict
         """
-        if not data.text:
-            return {}
-        try:
-            return data.json()
-        except ValueError as error:
-            logger.warning('Invalid response: {0}: {1}'
-                           .format(error, data.text),
-                           exc_info=error)
-            return {}
+        return data.json()
 
     @property
     def id(self):