fix: standardizing timeout calculation in measurement consumer collec…

…t to nanoseconds
open-telemetry · Jul 23, 2024 · 79cabe8 · 79cabe8
1 parent 8749168
commit 79cabe8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/measurement_consumer.py b/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/measurement_consumer.py
@@ -100,18 +100,18 @@ 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 * 1e6)
 
-            default_timeout_millis = 10000 * 10**6
+            default_timeout_ns = 10000 * 1e6
 
             for async_instrument in self._async_instruments:
 
                 remaining_time = deadline_ns - time_ns()
 
-                if remaining_time < default_timeout_millis:
+                if remaining_time < default_timeout_ns:
 
                     callback_options = CallbackOptions(
-                        timeout_millis=remaining_time
+                        timeout_millis=remaining_time / 1e6
                     )
 
                 measurements = async_instrument.callback(callback_options)

diff --git a/opentelemetry-sdk/tests/metrics/test_measurement_consumer.py b/opentelemetry-sdk/tests/metrics/test_measurement_consumer.py
@@ -180,7 +180,13 @@ def sleep_1(*args, **kwargs):
             -1
         ].kwargs["timeout_millis"]
 
+        self.assertAlmostEqual(
+            round(10000 - callback_options_time_call),
+            1000.0,
+            places=1
+        )
+
         self.assertLess(
             callback_options_time_call,
-            10000 * 10**6,
+            10000,
         )