Merge branch 'main' into add-attributes

open-telemetry · Jul 3, 2024 · 9f99875 · 9f99875
2 parents c3e33d7 + 3836da8
commit 9f99875
Show file tree

Hide file tree

Showing 11 changed files with 106 additions and 38 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -93,8 +93,7 @@ jobs:
       if: ${{ matrix.os == 'windows-2019'}}
       run: git config --system core.longpaths true
     - name: run tox
-      run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-json=${{
-        env.RUN_MATRIX_COMBINATION }}-benchmark.json
+      run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-skip
   misc:
     strategy:
       fail-fast: false
@@ -214,4 +213,4 @@ jobs:
         key: v3-tox-cache-${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os
           }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-contrib
     - name: run tox
-      run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra
+      run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-skip
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Fix `start_time_unix_nano` for delta collection for explicit bucket histogram aggregation
+  ([#4009](https://github.com/open-telemetry/opentelemetry-python/pull/4009))
+- Fix `start_time_unix_nano` for delta collection for sum aggregation
+  ([#4011](https://github.com/open-telemetry/opentelemetry-python/pull/4011))
 - Do not execute Flask Tests in debug mode
   ([#3956](https://github.com/open-telemetry/opentelemetry-python/pull/3956))
 - When encountering an error encoding metric attributes in the OTLP exporter, log the key that had an error.

diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/tests/logs/test_otlp_logs_exporter.py b/exporter/opentelemetry-exporter-otlp-proto-grpc/tests/logs/test_otlp_logs_exporter.py
@@ -77,7 +77,7 @@ def Export(self, request, context):
                 (
                     "google.rpc.retryinfo-bin",
                     RetryInfo(
-                        retry_delay=Duration(seconds=4)
+                        retry_delay=Duration(nanos=int(1e7))
                     ).SerializeToString(),
                 ),
             )
@@ -300,15 +300,15 @@ def test_otlp_headers_from_env(self):
     @patch("opentelemetry.exporter.otlp.proto.grpc.exporter.sleep")
     def test_unavailable(self, mock_sleep, mock_expo):
 
-        mock_expo.configure_mock(**{"return_value": [1]})
+        mock_expo.configure_mock(**{"return_value": [0.01]})
 
         add_LogsServiceServicer_to_server(
             LogsServiceServicerUNAVAILABLE(), self.server
         )
         self.assertEqual(
             self.exporter.export([self.log_data_1]), LogExportResult.FAILURE
         )
-        mock_sleep.assert_called_with(1)
+        mock_sleep.assert_called_with(0.01)
 
     @patch(
         "opentelemetry.exporter.otlp.proto.grpc.exporter._create_exp_backoff_generator"
@@ -324,7 +324,7 @@ def test_unavailable_delay(self, mock_sleep, mock_expo):
         self.assertEqual(
             self.exporter.export([self.log_data_1]), LogExportResult.FAILURE
         )
-        mock_sleep.assert_called_with(4)
+        mock_sleep.assert_called_with(0.01)
 
     def test_success(self):
         add_LogsServiceServicer_to_server(

diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/tests/test_otlp_exporter_mixin.py b/exporter/opentelemetry-exporter-otlp-proto-grpc/tests/test_otlp_exporter_mixin.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import threading
-import time
 from logging import WARNING
+from time import time_ns
 from types import MethodType
 from typing import Sequence
 from unittest import TestCase
@@ -163,7 +163,7 @@ def code(self):
         def trailing_metadata(self):
             return {
                 "google.rpc.retryinfo-bin": RetryInfo(
-                    retry_delay=Duration(seconds=1)
+                    retry_delay=Duration(nanos=int(1e7))
                 ).SerializeToString()
             }
 
@@ -196,9 +196,9 @@ def _exporting(self) -> str:
             # pylint: disable=protected-access
             self.assertTrue(otlp_mock_exporter._export_lock.locked())
             # delay is 1 second while the default shutdown timeout is 30_000 milliseconds
-            start_time = time.time()
+            start_time = time_ns()
             otlp_mock_exporter.shutdown()
-            now = time.time()
+            now = time_ns()
             self.assertGreaterEqual(now, (start_time + 30 / 1000))
             # pylint: disable=protected-access
             self.assertTrue(otlp_mock_exporter._shutdown)

diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/tests/test_otlp_metrics_exporter.py b/exporter/opentelemetry-exporter-otlp-proto-grpc/tests/test_otlp_metrics_exporter.py
@@ -13,13 +13,13 @@
 # limitations under the License.
 
 import threading
-import time
 from concurrent.futures import ThreadPoolExecutor
 
 # pylint: disable=too-many-lines
 from logging import WARNING
 from os import environ
 from os.path import dirname
+from time import time_ns
 from typing import List
 from unittest import TestCase
 from unittest.mock import patch
@@ -97,7 +97,7 @@ def Export(self, request, context):
                 (
                     "google.rpc.retryinfo-bin",
                     RetryInfo(
-                        retry_delay=Duration(seconds=4)
+                        retry_delay=Duration(nanos=int(1e7))
                     ).SerializeToString(),
                 ),
             )
@@ -423,7 +423,7 @@ def test_otlp_exporter_otlp_compression_unspecified(
     @patch("opentelemetry.exporter.otlp.proto.grpc.exporter.sleep")
     def test_unavailable(self, mock_sleep, mock_expo):
 
-        mock_expo.configure_mock(**{"return_value": [1]})
+        mock_expo.configure_mock(**{"return_value": [0.01]})
 
         add_MetricsServiceServicer_to_server(
             MetricsServiceServicerUNAVAILABLE(), self.server
@@ -432,7 +432,7 @@ def test_unavailable(self, mock_sleep, mock_expo):
             self.exporter.export(self.metrics["sum_int"]),
             MetricExportResult.FAILURE,
         )
-        mock_sleep.assert_called_with(1)
+        mock_sleep.assert_called_with(0.01)
 
     @patch(
         "opentelemetry.exporter.otlp.proto.grpc.exporter._create_exp_backoff_generator"
@@ -449,7 +449,7 @@ def test_unavailable_delay(self, mock_sleep, mock_expo):
             self.exporter.export(self.metrics["sum_int"]),
             MetricExportResult.FAILURE,
         )
-        mock_sleep.assert_called_with(4)
+        mock_sleep.assert_called_with(0.01)
 
     @patch(
         "opentelemetry.exporter.otlp.proto.grpc.exporter._create_exp_backoff_generator"
@@ -802,9 +802,9 @@ def test_shutdown_wait_last_export(self):
             # pylint: disable=protected-access
             self.assertTrue(self.exporter._export_lock.locked())
             # delay is 4 seconds while the default shutdown timeout is 30_000 milliseconds
-            start_time = time.time()
+            start_time = time_ns()
             self.exporter.shutdown()
-            now = time.time()
+            now = time_ns()
             self.assertGreaterEqual(now, (start_time + 30 / 1000))
             # pylint: disable=protected-access
             self.assertTrue(self.exporter._shutdown)

diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/tests/test_otlp_trace_exporter.py b/exporter/opentelemetry-exporter-otlp-proto-grpc/tests/test_otlp_trace_exporter.py
@@ -14,9 +14,9 @@
 
 import os
 import threading
-import time
 from concurrent.futures import ThreadPoolExecutor
 from logging import WARNING
+from time import time_ns
 from unittest import TestCase
 from unittest.mock import Mock, PropertyMock, patch
 
@@ -91,7 +91,7 @@ def Export(self, request, context):
                 (
                     "google.rpc.retryinfo-bin",
                     RetryInfo(
-                        retry_delay=Duration(seconds=4)
+                        retry_delay=Duration(nanos=int(1e7))
                     ).SerializeToString(),
                 ),
             )
@@ -466,14 +466,14 @@ def test_otlp_headers(self, mock_ssl_channel, mock_secure):
     @patch("opentelemetry.exporter.otlp.proto.grpc.exporter.sleep")
     def test_unavailable(self, mock_sleep, mock_expo):
 
-        mock_expo.configure_mock(**{"return_value": [1]})
+        mock_expo.configure_mock(**{"return_value": [0.01]})
 
         add_TraceServiceServicer_to_server(
             TraceServiceServicerUNAVAILABLE(), self.server
         )
         result = self.exporter.export([self.span])
         self.assertEqual(result, SpanExportResult.FAILURE)
-        mock_sleep.assert_called_with(1)
+        mock_sleep.assert_called_with(0.01)
 
     @patch(
         "opentelemetry.exporter.otlp.proto.grpc.exporter._create_exp_backoff_generator"
@@ -489,7 +489,7 @@ def test_unavailable_delay(self, mock_sleep, mock_expo):
         self.assertEqual(
             self.exporter.export([self.span]), SpanExportResult.FAILURE
         )
-        mock_sleep.assert_called_with(4)
+        mock_sleep.assert_called_with(0.01)
 
     def test_success(self):
         add_TraceServiceServicer_to_server(
@@ -954,9 +954,9 @@ def test_shutdown_wait_last_export(self):
             # pylint: disable=protected-access
             self.assertTrue(self.exporter._export_lock.locked())
             # delay is 4 seconds while the default shutdown timeout is 30_000 milliseconds
-            start_time = time.time()
+            start_time = time_ns()
             self.exporter.shutdown()
-            now = time.time()
+            now = time_ns()
             self.assertGreaterEqual(now, (start_time + 30 / 1000))
             # pylint: disable=protected-access
             self.assertTrue(self.exporter._shutdown)

diff --git a/opentelemetry-api/pyproject.toml b/opentelemetry-api/pyproject.toml
@@ -29,7 +29,7 @@ dependencies = [
     "Deprecated >= 1.2.6",
     # FIXME This should be able to be removed after 3.12 is released if there is a reliable API
     # in importlib.metadata.
-    "importlib-metadata >= 6.0, <= 7.2.1",
+    "importlib-metadata >= 6.0, <= 8.0.0",
 ]
 dynamic = [
     "version",

diff --git a/opentelemetry-api/src/opentelemetry/_logs/_internal/__init__.py b/opentelemetry-api/src/opentelemetry/_logs/_internal/__init__.py
@@ -14,8 +14,7 @@
 """
 The OpenTelemetry logging API describes the classes used to generate logs and events.
 
-The :class:`.LoggerProvider` provides users access to the :class:`.Logger` which in
-turn is used to create :class:`.Event` and :class:`.Log` objects.
+The :class:`.LoggerProvider` provides users access to the :class:`.Logger`.
 
 This module provides abstract (i.e. unimplemented) classes required for
 logging, and a concrete no-op implementation :class:`.NoOpLogger` that allows applications

diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/aggregation.py b/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/aggregation.py
@@ -278,16 +278,16 @@ def collect(
                     is AggregationTemporality.DELTA
                 ):
 
-                    if current_value is None:
-                        return None
-
                     previous_collection_start_nano = (
                         self._previous_collection_start_nano
                     )
                     self._previous_collection_start_nano = (
                         collection_start_nano
                     )
 
+                    if current_value is None:
+                        return None
+
                     return NumberDataPoint(
                         attributes=self._attributes,
                         start_time_unix_nano=previous_collection_start_nano,
@@ -471,16 +471,16 @@ def collect(
                     is AggregationTemporality.DELTA
                 ):
 
-                    if current_value is None:
-                        return None
-
                     previous_collection_start_nano = (
                         self._previous_collection_start_nano
                     )
                     self._previous_collection_start_nano = (
                         collection_start_nano
                     )
 
+                    if current_value is None:
+                        return None
+
                     return HistogramDataPoint(
                         attributes=self._attributes,
                         start_time_unix_nano=previous_collection_start_nano,

diff --git a/...elemetry-sdk/tests/metrics/integration_test/test_explicit_bucket_histogram_aggregation.py b/...elemetry-sdk/tests/metrics/integration_test/test_explicit_bucket_histogram_aggregation.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from platform import system
+from time import sleep
 from unittest import TestCase
 
 from pytest import mark
@@ -123,11 +124,43 @@ def test_synchronous_delta_temporality(self):
 
             results.append(reader.get_metrics_data())
 
-        provider.shutdown()
-
         for metrics_data in results:
             self.assertIsNone(metrics_data)
 
+        results = []
+
+        histogram.record(1)
+        results.append(reader.get_metrics_data())
+
+        sleep(0.1)
+        results.append(reader.get_metrics_data())
+
+        histogram.record(2)
+        results.append(reader.get_metrics_data())
+
+        metric_data_0 = (
+            results[0]
+            .resource_metrics[0]
+            .scope_metrics[0]
+            .metrics[0]
+            .data.data_points[0]
+        )
+        metric_data_2 = (
+            results[2]
+            .resource_metrics[0]
+            .scope_metrics[0]
+            .metrics[0]
+            .data.data_points[0]
+        )
+
+        self.assertIsNone(results[1])
+
+        self.assertGreater(
+            metric_data_2.start_time_unix_nano, metric_data_0.time_unix_nano
+        )
+
+        provider.shutdown()
+
     @mark.skipif(
         system() != "Linux",
         reason=(

diff --git a/opentelemetry-sdk/tests/metrics/integration_test/test_sum_aggregation.py b/opentelemetry-sdk/tests/metrics/integration_test/test_sum_aggregation.py
@@ -15,6 +15,7 @@
 from itertools import count
 from logging import ERROR
 from platform import system
+from time import sleep
 from unittest import TestCase
 
 from pytest import mark
@@ -345,11 +346,43 @@ def test_synchronous_delta_temporality(self):
 
             results.append(reader.get_metrics_data())
 
-        provider.shutdown()
-
         for metrics_data in results:
             self.assertIsNone(metrics_data)
 
+        results = []
+
+        counter.add(1)
+        results.append(reader.get_metrics_data())
+
+        sleep(0.1)
+        results.append(reader.get_metrics_data())
+
+        counter.add(2)
+        results.append(reader.get_metrics_data())
+
+        metric_data_0 = (
+            results[0]
+            .resource_metrics[0]
+            .scope_metrics[0]
+            .metrics[0]
+            .data.data_points[0]
+        )
+        metric_data_2 = (
+            results[2]
+            .resource_metrics[0]
+            .scope_metrics[0]
+            .metrics[0]
+            .data.data_points[0]
+        )
+
+        self.assertIsNone(results[1])
+
+        self.assertGreater(
+            metric_data_2.start_time_unix_nano, metric_data_0.time_unix_nano
+        )
+
+        provider.shutdown()
+
     @mark.skipif(
         system() != "Linux",
         reason=(