Updated

Signed-off-by: Sai Medhini Reddy Maryada <saimedhinireddymaryada@Sais-MacBook-Pro.local>

Author: Sai Medhini Reddy Maryada

opensearchpy/client/client.py

@@ -11,6 +11,7 @@
 
 from opensearchpy.client.utils import _normalize_hosts
 from opensearchpy.metrics.metrics import Metrics
+from opensearchpy.metrics.metrics_none import MetricsNone
 from opensearchpy.transport import Transport
 
 
@@ -23,7 +24,7 @@ def __init__(
         self,
         hosts: Optional[str] = None,
         transport_class: Type[Transport] = Transport,
-        metrics: Optional[Metrics] = None,
+        metrics: Optional[Metrics] = MetricsNone(),
         **kwargs: Any
     ) -> None:
         """

opensearchpy/connection/http_requests.py

@@ -29,6 +29,8 @@
 import warnings
 from typing import Any, Collection, Mapping, Optional, Union
 
+from opensearchpy.metrics.metrics_none import MetricsNone
+
 try:
     import requests
 
@@ -88,7 +90,7 @@ def __init__(
         http_compress: Any = None,
         opaque_id: Any = None,
         pool_maxsize: Any = None,
-        metrics: Optional[Metrics] = None,
+        metrics: Optional[Metrics] = MetricsNone(),
         **kwargs: Any
     ) -> None:
         self.metrics = metrics
@@ -192,8 +194,7 @@ def perform_request(  # type: ignore
         }
         send_kwargs.update(settings)
         try:
-            if self.metrics is not None:
-                self.metrics.request_start()
+            self.metrics.request_start()
             response = self.session.send(prepared_request, **send_kwargs)
             duration = time.time() - start
             raw_data = response.content.decode("utf-8", "surrogatepass")
@@ -214,8 +215,7 @@ def perform_request(  # type: ignore
                 raise ConnectionTimeout("TIMEOUT", str(e), e)
             raise ConnectionError("N/A", str(e), e)
         finally:
-            if self.metrics is not None:
-                self.metrics.request_end()
+            self.metrics.request_end()
 
         # raise warnings if any from the 'Warnings' header.
         warnings_headers = (

opensearchpy/connection/http_urllib3.py

@@ -35,6 +35,7 @@
 from urllib3.util.retry import Retry
 
 from opensearchpy.metrics.metrics import Metrics
+from opensearchpy.metrics.metrics_none import MetricsNone
 
 from ..compat import reraise_exceptions, urlencode
 from ..exceptions import (
@@ -117,7 +118,7 @@ def __init__(
         ssl_context: Any = None,
         http_compress: Any = None,
         opaque_id: Any = None,
-        metrics: Optional[Metrics] = None,
+        metrics: Optional[Metrics] = MetricsNone(),
         **kwargs: Any
     ) -> None:
         self.metrics = metrics
@@ -272,8 +273,7 @@ def perform_request(
                 if isinstance(self.http_auth, Callable):  # type: ignore
                     request_headers.update(self.http_auth(method, full_url, body))
 
-            if self.metrics is not None:
-                self.metrics.request_start()
+            self.metrics.request_start()
 
             response = self.pool.urlopen(
                 method, url, body, retries=Retry(False), headers=request_headers, **kw
@@ -292,8 +292,7 @@ def perform_request(
                 raise ConnectionTimeout("TIMEOUT", str(e), e)
             raise ConnectionError("N/A", str(e), e)
         finally:
-            if self.metrics is not None:
-                self.metrics.request_end()
+            self.metrics.request_end()
 
         # raise warnings if any from the 'Warnings' header.
         warning_headers = response.headers.get_all("warning", ())

opensearchpy/metrics/metrics_none.py

@@ -0,0 +1,49 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# The OpenSearch Contributors require contributions made to
+# this file be licensed under the Apache-2.0 license or a
+# compatible open source license.
+#
+# Modifications Copyright OpenSearch Contributors. See
+# GitHub history for details.
+
+import time
+from typing import Optional
+
+
+from opensearchpy.metrics.metrics import Metrics
+
+
+class MetricsNone(Metrics):
+    """
+    The MetricsEvents class implements the Metrics abstract base class
+    and tracks metrics such as start time, end time, and service time
+    during request processing.
+    """
+
+    @property
+    def start_time(self) -> Optional[float]:
+        return self._start_time
+
+    @property
+    def end_time(self) -> Optional[float]:
+        return self._end_time
+
+    @property
+    def service_time(self) -> Optional[float]:
+        return self._service_time
+
+    def __init__(self) -> None:
+        self._start_time: Optional[float] = None
+        self._end_time: Optional[float] = None
+        self._service_time: Optional[float] = None
+
+    def request_start(self) -> None:
+        self._start_time = None
+        self._end_time = None
+        self._service_time = None
+
+
+    def request_end(self) -> None:
+        self._end_time = None
+        self._service_time = None

opensearchpy/transport.py

@@ -30,6 +30,7 @@
 from typing import Any, Callable, Collection, Dict, List, Mapping, Optional, Type, Union
 
 from opensearchpy.metrics.metrics import Metrics
+from opensearchpy.metrics.metrics_none import MetricsNone
 
 from .connection import Connection, Urllib3HttpConnection
 from .connection_pool import ConnectionPool, DummyConnectionPool, EmptyConnectionPool
@@ -115,7 +116,7 @@ def __init__(
         retry_on_status: Collection[int] = (502, 503, 504),
         retry_on_timeout: bool = False,
         send_get_body_as: str = "GET",
-        metrics: Optional[Metrics] = None,
+        metrics: Optional[Metrics] = MetricsNone(),
         **kwargs: Any
     ) -> None:
         """