Remove _time_ns

Author: ocelotl

opentelemetry-api/src/opentelemetry/util/_time.py

@@ -20,6 +20,7 @@
 import os
 import threading
 import traceback
+from time import time_ns
 from typing import Any, Callable, Optional, Tuple, Union, cast
 
 from opentelemetry.sdk._logs.severity import SeverityNumber, std_to_otlp
@@ -37,7 +38,6 @@
 )
 from opentelemetry.trace.span import TraceFlags
 from opentelemetry.util._providers import _load_provider
-from opentelemetry.util._time import _time_ns
 from opentelemetry.util.types import Attributes
 
 _logger = logging.getLogger(__name__)
@@ -185,9 +185,9 @@ def force_flush(self, timeout_millis: int = 30000) -> bool:
             True if all the log processors flushes the logs within timeout,
             False otherwise.
         """
-        deadline_ns = _time_ns() + timeout_millis * 1000000
+        deadline_ns = time_ns() + timeout_millis * 1000000
         for lp in self._log_processors:
-            current_ts = _time_ns()
+            current_ts = time_ns()
             if current_ts >= deadline_ns:
                 return False
 

opentelemetry-sdk/src/opentelemetry/sdk/_logs/__init__.py

@@ -20,12 +20,12 @@
 import sys
 import threading
 from os import linesep
+from time import time_ns
 from typing import IO, Callable, Deque, List, Optional, Sequence
 
 from opentelemetry.context import attach, detach, set_value
 from opentelemetry.sdk._logs import LogData, LogProcessor, LogRecord
 from opentelemetry.util._once import Once
-from opentelemetry.util._time import _time_ns
 
 _logger = logging.getLogger(__name__)
 
@@ -205,9 +205,9 @@ def worker(self):
                     if self._shutdown:
                         break
 
-            start_ns = _time_ns()
+            start_ns = time_ns()
             self._export(flush_request)
-            end_ns = _time_ns()
+            end_ns = time_ns()
             # subtract the duration of this export call to the next timeout
             timeout = self._schedule_delay_millis / 1e3 - (
                 (end_ns - start_ns) / 1e9

opentelemetry-sdk/src/opentelemetry/sdk/_logs/export/__init__.py

@@ -15,6 +15,7 @@
 from atexit import register, unregister
 from logging import getLogger
 from threading import Lock
+from time import time_ns
 from typing import Optional, Sequence
 
 # This kind of import is needed to avoid Sphinx errors.
@@ -49,7 +50,6 @@
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.util.instrumentation import InstrumentationScope
 from opentelemetry.util._once import Once
-from opentelemetry.util._time import _time_ns
 
 _logger = getLogger(__name__)
 
@@ -376,12 +376,12 @@ def __init__(
             )
 
     def force_flush(self, timeout_millis: float = 10_000) -> bool:
-        deadline_ns = _time_ns() + timeout_millis * 10**6
+        deadline_ns = time_ns() + timeout_millis * 10**6
 
         metric_reader_error = {}
 
         for metric_reader in self._sdk_config.metric_readers:
-            current_ts = _time_ns()
+            current_ts = time_ns()
             try:
                 if current_ts >= deadline_ns:
                     raise MetricsTimeoutError(
@@ -413,7 +413,7 @@ def force_flush(self, timeout_millis: float = 10_000) -> bool:
         return True
 
     def shutdown(self, timeout_millis: float = 30_000):
-        deadline_ns = _time_ns() + timeout_millis * 10**6
+        deadline_ns = time_ns() + timeout_millis * 10**6
 
         def _shutdown():
             self._shutdown = True
@@ -427,7 +427,7 @@ def _shutdown():
         metric_reader_error = {}
 
         for metric_reader in self._sdk_config.metric_readers:
-            current_ts = _time_ns()
+            current_ts = time_ns()
             try:
                 if current_ts >= deadline_ns:
                     raise Exception(

opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/__init__.py

@@ -15,6 +15,7 @@
 
 from logging import getLogger
 from threading import Lock
+from time import time_ns
 from typing import Dict, Iterable
 
 from opentelemetry.metrics import Instrument
@@ -28,7 +29,6 @@
 from opentelemetry.sdk.metrics._internal.measurement import Measurement
 from opentelemetry.sdk.metrics._internal.point import DataPointT
 from opentelemetry.sdk.metrics._internal.view import View
-from opentelemetry.util._time import _time_ns
 
 _logger = getLogger(__name__)
 
@@ -40,7 +40,7 @@ def __init__(
         instrument: Instrument,
         instrument_class_aggregation: Dict[type, Aggregation],
     ):
-        self._start_time_unix_nano = _time_ns()
+        self._start_time_unix_nano = time_ns()
         self._view = view
         self._instrument = instrument
         self._attributes_aggregation: Dict[frozenset, _Aggregation] = {}

opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/_view_instrument_match.py

@@ -19,6 +19,7 @@
 from os import environ, linesep
 from sys import stdout
 from threading import Event, Lock, RLock, Thread
+from time import time_ns
 from typing import IO, Callable, Dict, Iterable, Optional
 
 from typing_extensions import final
@@ -51,7 +52,6 @@
 )
 from opentelemetry.sdk.metrics._internal.point import MetricsData
 from opentelemetry.util._once import Once
-from opentelemetry.util._time import _time_ns
 
 _logger = getLogger(__name__)
 
@@ -497,7 +497,7 @@ def _receive_metrics(
         detach(token)
 
     def shutdown(self, timeout_millis: float = 30_000, **kwargs) -> None:
-        deadline_ns = _time_ns() + timeout_millis * 10**6
+        deadline_ns = time_ns() + timeout_millis * 10**6
 
         def _shutdown():
             self._shutdown = True
@@ -508,8 +508,8 @@ def _shutdown():
             return
 
         self._shutdown_event.set()
-        self._daemon_thread.join(timeout=(deadline_ns - _time_ns()) / 10**9)
-        self._exporter.shutdown(timeout=(deadline_ns - _time_ns()) / 10**6)
+        self._daemon_thread.join(timeout=(deadline_ns - time_ns()) / 10**9)
+        self._exporter.shutdown(timeout=(deadline_ns - time_ns()) / 10**6)
 
     def force_flush(self, timeout_millis: float = 10_000) -> bool:
         super().force_flush(timeout_millis=timeout_millis)

opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/export/__init__.py

@@ -16,6 +16,7 @@
 
 from abc import ABC, abstractmethod
 from threading import Lock
+from time import time_ns
 from typing import Iterable, List, Mapping
 
 # This kind of import is needed to avoid Sphinx errors.
@@ -29,7 +30,6 @@
     MetricReaderStorage,
 )
 from opentelemetry.sdk.metrics._internal.point import Metric
-from opentelemetry.util._time import _time_ns
 
 
 class MeasurementConsumer(ABC):
@@ -100,13 +100,13 @@ def collect(
             metric_reader_storage = self._reader_storages[metric_reader]
             # for now, just use the defaults
             callback_options = CallbackOptions()
-            deadline_ns = _time_ns() + timeout_millis * 10**6
+            deadline_ns = time_ns() + timeout_millis * 10**6
 
             default_timeout_millis = 10000 * 10**6
 
             for async_instrument in self._async_instruments:
 
-                remaining_time = deadline_ns - _time_ns()
+                remaining_time = deadline_ns - time_ns()
 
                 if remaining_time < default_timeout_millis:
 
@@ -115,7 +115,7 @@ def collect(
                     )
 
                 measurements = async_instrument.callback(callback_options)
-                if _time_ns() >= deadline_ns:
+                if time_ns() >= deadline_ns:
                     raise MetricsTimeoutError(
                         "Timed out while executing callback"
                     )

opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/measurement_consumer.py

@@ -14,6 +14,7 @@
 
 from logging import getLogger
 from threading import RLock
+from time import time_ns
 from typing import Dict, List
 
 from opentelemetry.metrics import (
@@ -49,7 +50,6 @@
 )
 from opentelemetry.sdk.metrics._internal.view import View
 from opentelemetry.sdk.util.instrumentation import InstrumentationScope
-from opentelemetry.util._time import _time_ns
 
 _logger = getLogger(__name__)
 
@@ -130,7 +130,7 @@ def collect(self) -> MetricsData:
         # streams produced by the SDK, but we still align the output timestamps
         # for a single instrument.
 
-        collection_start_nanos = _time_ns()
+        collection_start_nanos = time_ns()
 
         with self._lock:
 

opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/metric_reader_storage.py

@@ -24,6 +24,7 @@
 from collections import OrderedDict
 from contextlib import contextmanager
 from os import environ
+from time import time_ns
 from types import MappingProxyType, TracebackType
 from typing import (
     Any,
@@ -64,7 +65,6 @@
 from opentelemetry.trace import SpanContext
 from opentelemetry.trace.status import Status, StatusCode
 from opentelemetry.util import types
-from opentelemetry.util._time import _time_ns
 
 logger = logging.getLogger(__name__)
 
@@ -184,9 +184,9 @@ def force_flush(self, timeout_millis: int = 30000) -> bool:
             True if all span processors flushed their spans within the
             given timeout, False otherwise.
         """
-        deadline_ns = _time_ns() + timeout_millis * 1000000
+        deadline_ns = time_ns() + timeout_millis * 1000000
         for sp in self._span_processors:
-            current_time_ns = _time_ns()
+            current_time_ns = time_ns()
             if current_time_ns >= deadline_ns:
                 return False
 
@@ -286,7 +286,7 @@ class EventBase(abc.ABC):
     def __init__(self, name: str, timestamp: Optional[int] = None) -> None:
         self._name = name
         if timestamp is None:
-            self._timestamp = _time_ns()
+            self._timestamp = time_ns()
         else:
             self._timestamp = timestamp
 
@@ -864,7 +864,7 @@ def start(
                 logger.warning("Calling start() on a started span.")
                 return
             self._start_time = (
-                start_time if start_time is not None else _time_ns()
+                start_time if start_time is not None else time_ns()
             )
 
         self._span_processor.on_start(self, parent_context=parent_context)
@@ -877,7 +877,7 @@ def end(self, end_time: Optional[int] = None) -> None:
                 logger.warning("Calling end() on an ended span.")
                 return
 
-            self._end_time = end_time if end_time is not None else _time_ns()
+            self._end_time = end_time if end_time is not None else time_ns()
 
         self._span_processor.on_end(self._readable_span())
 

opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py

@@ -20,6 +20,7 @@
 import typing
 from enum import Enum
 from os import environ, linesep
+from time import time_ns
 from typing import Optional
 
 from opentelemetry.context import (
@@ -37,7 +38,6 @@
 )
 from opentelemetry.sdk.trace import ReadableSpan, Span, SpanProcessor
 from opentelemetry.util._once import Once
-from opentelemetry.util._time import _time_ns
 
 logger = logging.getLogger(__name__)
 
@@ -273,9 +273,9 @@ def worker(self):
                         break
 
             # subtract the duration of this export call to the next timeout
-            start = _time_ns()
+            start = time_ns()
             self._export(flush_request)
-            end = _time_ns()
+            end = time_ns()
             duration = (end - start) / 1e9
             timeout = self.schedule_delay_millis / 1e3 - duration