Merge branch 'main' into upgrade-markupsafe

CHANGELOG.md

@@ -9,10 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Upgrade markupsafe, Flask and related dependencies to dev and test
   environments ([#3609](https://github.com/open-telemetry/opentelemetry-python/pull/3609))
+- Handle HTTP 2XX responses as successful in OTLP exporters
+  ([#3623](https://github.com/open-telemetry/opentelemetry-python/pull/3623))
+- Improve Resource Detector timeout messaging
+  ([#3645](https://github.com/open-telemetry/opentelemetry-python/pull/3645))
 
 ## Version 1.22.0/0.43b0 (2023-12-15)
 
-- Prometheus exporter sanitize info metric ([#3572](https://github.com/open-telemetry/opentelemetry-python/pull/3572))
+- Prometheus exporter sanitize info metric
+  ([#3572](https://github.com/open-telemetry/opentelemetry-python/pull/3572))
 - Remove Jaeger exporters
   ([#3554](https://github.com/open-telemetry/opentelemetry-python/pull/3554))
 - Log stacktrace on `UNKNOWN` status OTLP export error 

docs/examples/opencensus-exporter-tracer/collector.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-#
 # Copyright The OpenTelemetry Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml

@@ -38,7 +38,7 @@ dependencies = [
 
 [project.optional-dependencies]
 test = [
-  "responses == 0.22.0",
+  "responses >= 0.22.0, < 0.25",
 ]
 
 [project.entry-points.opentelemetry_traces_exporter]

exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/_log_exporter/__init__.py

@@ -146,7 +146,7 @@ def export(self, batch: Sequence[LogData]) -> LogExportResult:
 
             resp = self._export(serialized_data)
             # pylint: disable=no-else-return
-            if resp.status_code in (200, 202):
+            if resp.ok:
                 return LogExportResult.SUCCESS
             elif self._retryable(resp):
                 _logger.warning(

exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/metric_exporter/__init__.py

@@ -178,7 +178,7 @@ def export(
 
             resp = self._export(serialized_data.SerializeToString())
             # pylint: disable=no-else-return
-            if resp.status_code in (200, 202):
+            if resp.ok:
                 return MetricExportResult.SUCCESS
             elif self._retryable(resp):
                 _logger.warning(

exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/trace_exporter/__init__.py

@@ -144,7 +144,7 @@ def export(self, spans) -> SpanExportResult:
 
             resp = self._export(serialized_data)
             # pylint: disable=no-else-return
-            if resp.status_code in (200, 202):
+            if resp.ok:
                 return SpanExportResult.SUCCESS
             elif self._retryable(resp):
                 _logger.warning(

exporter/opentelemetry-exporter-otlp-proto-http/tests/metrics/test_otlp_metrics_exporter.py

@@ -15,7 +15,7 @@
 from logging import WARNING
 from os import environ
 from unittest import TestCase
-from unittest.mock import patch
+from unittest.mock import MagicMock, Mock, patch
 
 from requests import Session
 from requests.models import Response
@@ -476,3 +476,14 @@ def test_exponential_explicit_bucket_histogram(self):
                 OTLPMetricExporter()._preferred_aggregation[Histogram],
                 ExplicitBucketHistogramAggregation,
             )
+
+    @patch.object(OTLPMetricExporter, "_export", return_value=Mock(ok=True))
+    def test_2xx_status_code(self, mock_otlp_metric_exporter):
+        """
+        Test that any HTTP 2XX code returns a successful result
+        """
+
+        self.assertEqual(
+            OTLPMetricExporter().export(MagicMock()),
+            MetricExportResult.SUCCESS,
+        )

exporter/opentelemetry-exporter-otlp-proto-http/tests/test_proto_log_exporter.py

@@ -16,7 +16,7 @@
 
 import unittest
 from typing import List
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock, Mock, patch
 
 import requests
 import responses
@@ -34,6 +34,7 @@
 from opentelemetry.exporter.otlp.proto.http.version import __version__
 from opentelemetry.sdk._logs import LogData
 from opentelemetry.sdk._logs import LogRecord as SDKLogRecord
+from opentelemetry.sdk._logs.export import LogExportResult
 from opentelemetry.sdk.environment_variables import (
     OTEL_EXPORTER_OTLP_CERTIFICATE,
     OTEL_EXPORTER_OTLP_COMPRESSION,
@@ -262,3 +263,13 @@ def _get_sdk_log_data() -> List[LogData]:
         )
 
         return [log1, log2, log3, log4]
+
+    @patch.object(OTLPLogExporter, "_export", return_value=Mock(ok=True))
+    def test_2xx_status_code(self, mock_otlp_metric_exporter):
+        """
+        Test that any HTTP 2XX code returns a successful result
+        """
+
+        self.assertEqual(
+            OTLPLogExporter().export(MagicMock()), LogExportResult.SUCCESS
+        )

exporter/opentelemetry-exporter-otlp-proto-http/tests/test_proto_span_exporter.py

@@ -14,7 +14,7 @@
 
 import unittest
 from collections import OrderedDict
-from unittest.mock import Mock, patch
+from unittest.mock import MagicMock, Mock, patch
 
 import requests
 import responses
@@ -42,6 +42,7 @@
     OTEL_EXPORTER_OTLP_TRACES_TIMEOUT,
 )
 from opentelemetry.sdk.trace import _Span
+from opentelemetry.sdk.trace.export import SpanExportResult
 
 OS_ENV_ENDPOINT = "os.env.base"
 OS_ENV_CERTIFICATE = "os/env/base.crt"
@@ -239,3 +240,13 @@ def generate_delays(*args, **kwargs):
 
         exporter.export([span])
         mock_sleep.assert_called_once_with(1)
+
+    @patch.object(OTLPSpanExporter, "_export", return_value=Mock(ok=True))
+    def test_2xx_status_code(self, mock_otlp_metric_exporter):
+        """
+        Test that any HTTP 2XX code returns a successful result
+        """
+
+        self.assertEqual(
+            OTLPSpanExporter().export(MagicMock()), SpanExportResult.SUCCESS
+        )

exporter/opentelemetry-exporter-otlp/tests/test_otlp.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest
 
 from opentelemetry.exporter.otlp.proto.grpc._log_exporter import (
     OTLPLogExporter,
@@ -26,19 +25,16 @@
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import (
     OTLPSpanExporter as HTTPSpanExporter,
 )
+from opentelemetry.test import TestCase
 
 
-class TestOTLPExporters(unittest.TestCase):
+class TestOTLPExporters(TestCase):
     def test_constructors(self):
         for exporter in [
             OTLPSpanExporter,
             HTTPSpanExporter,
             OTLPLogExporter,
             OTLPMetricExporter,
         ]:
-            try:
+            with self.assertNotRaises(Exception):
                 exporter()
-            except Exception:  # pylint: disable=broad-except
-                self.fail(
-                    f"Unexpected exception raised when instantiating {exporter.__name__}"
-                )

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

@@ -390,6 +390,14 @@ def get_aggregated_resources(
             detected_resource: Resource = _EMPTY_RESOURCE
             try:
                 detected_resource = future.result(timeout=timeout)
+            except concurrent.futures.TimeoutError as ex:
+                if detector.raise_on_error:
+                    raise ex
+                logger.warning(
+                    "Detector %s took longer than %s seconds, skipping",
+                    detector,
+                    timeout,
+                )
             # pylint: disable=broad-except
             except Exception as ex:
                 if detector.raise_on_error:

opentelemetry-sdk/tests/metrics/exponential_histogram/test_exponent_mapping.py

@@ -14,7 +14,6 @@
 
 from math import inf
 from sys import float_info, version_info
-from unittest import TestCase
 from unittest.mock import patch
 
 from pytest import mark
@@ -31,6 +30,7 @@
     MIN_NORMAL_EXPONENT,
     MIN_NORMAL_VALUE,
 )
+from opentelemetry.test import TestCase
 
 if version_info >= (3, 9):
     from math import nextafter
@@ -69,12 +69,9 @@ def test_init_called_once(self, mock_init):
 
     def test_exponent_mapping_0(self):
 
-        try:
+        with self.assertNotRaises(Exception):
             ExponentMapping(0)
 
-        except Exception as error:
-            self.fail(f"Unexpected exception raised: {error}")
-
     def test_exponent_mapping_zero(self):
 
         exponent_mapping = ExponentMapping(0)

opentelemetry-sdk/tests/metrics/exponential_histogram/test_exponential_bucket_histogram_aggregation.py

@@ -17,7 +17,6 @@
 from math import ldexp
 from sys import float_info
 from types import MethodType
-from unittest import TestCase
 from unittest.mock import Mock, patch
 
 from opentelemetry.sdk.metrics._internal.aggregation import (
@@ -41,6 +40,7 @@
 from opentelemetry.sdk.metrics.view import (
     ExponentialBucketHistogramAggregation,
 )
+from opentelemetry.test import TestCase
 
 
 def get_counts(buckets: Buckets) -> int:
@@ -793,11 +793,8 @@ def test_boundary_statistics(self):
 
                 index = mapping.map_to_index(value)
 
-                try:
+                with self.assertNotRaises(Exception):
                     boundary = mapping.get_lower_boundary(index + 1)
-                except Exception as error:
-                    raise error
-                    self.fail(f"Unexpected exception {error} raised")
 
                 if boundary < value:
                     above += 1
@@ -836,30 +833,6 @@ def test_aggregate_collect(self):
         """
         Tests a repeated cycle of aggregation and collection.
         """
-        """
-        try:
-            exponential_histogram_aggregation = (
-                _ExponentialBucketHistogramAggregation(
-                    Mock(),
-                    Mock(),
-                )
-            )
-
-            exponential_histogram_aggregation.aggregate(Measurement(2, Mock()))
-            exponential_histogram_aggregation.collect(
-                AggregationTemporality.CUMULATIVE, 0
-            )
-            exponential_histogram_aggregation.aggregate(Measurement(2, Mock()))
-            exponential_histogram_aggregation.collect(
-                AggregationTemporality.CUMULATIVE, 0
-            )
-            exponential_histogram_aggregation.aggregate(Measurement(2, Mock()))
-            exponential_histogram_aggregation.collect(
-                AggregationTemporality.CUMULATIVE, 0
-            )
-        except Exception as error:
-            self.fail(f"Unexpected exception raised: {error}")
-        """
         exponential_histogram_aggregation = (
             _ExponentialBucketHistogramAggregation(
                 Mock(),

opentelemetry-sdk/tests/metrics/test_backward_compat.py

@@ -26,7 +26,6 @@
 """
 
 from typing import Iterable, Sequence
-from unittest import TestCase
 
 from opentelemetry.metrics import CallbackOptions, Observation
 from opentelemetry.sdk.metrics import MeterProvider
@@ -38,6 +37,7 @@
     MetricReader,
     PeriodicExportingMetricReader,
 )
+from opentelemetry.test import TestCase
 
 
 # Do not change these classes until after major version 1
@@ -82,30 +82,24 @@ def test_metric_exporter(self):
         )
         # produce some data
         meter_provider.get_meter("foo").create_counter("mycounter").add(12)
-        try:
+        with self.assertNotRaises(Exception):
             meter_provider.shutdown()
-        except Exception:
-            self.fail()
 
     def test_metric_reader(self):
         reader = OrigMetricReader()
         meter_provider = MeterProvider(metric_readers=[reader])
         # produce some data
         meter_provider.get_meter("foo").create_counter("mycounter").add(12)
-        try:
+        with self.assertNotRaises(Exception):
             meter_provider.shutdown()
-        except Exception:
-            self.fail()
 
     def test_observable_callback(self):
         reader = InMemoryMetricReader()
         meter_provider = MeterProvider(metric_readers=[reader])
         # produce some data
         meter_provider.get_meter("foo").create_counter("mycounter").add(12)
-        try:
+        with self.assertNotRaises(Exception):
             metrics_data = reader.get_metrics_data()
-        except Exception:
-            self.fail()
 
         self.assertEqual(len(metrics_data.resource_metrics), 1)
         self.assertEqual(

opentelemetry-sdk/tests/metrics/test_import.py

@@ -14,7 +14,7 @@
 
 # pylint: disable=unused-import
 
-from unittest import TestCase
+from opentelemetry.test import TestCase
 
 
 class TestImport(TestCase):
@@ -23,7 +23,7 @@ def test_import_init(self):
         Test that the metrics root module has the right symbols
         """
 
-        try:
+        with self.assertNotRaises(Exception):
             from opentelemetry.sdk.metrics import (  # noqa: F401
                 Counter,
                 Histogram,
@@ -34,15 +34,13 @@ def test_import_init(self):
                 ObservableUpDownCounter,
                 UpDownCounter,
             )
-        except Exception as error:
-            self.fail(f"Unexpected error {error} was raised")
 
     def test_import_export(self):
         """
         Test that the metrics export module has the right symbols
         """
 
-        try:
+        with self.assertNotRaises(Exception):
             from opentelemetry.sdk.metrics.export import (  # noqa: F401
                 AggregationTemporality,
                 ConsoleMetricExporter,
@@ -63,15 +61,13 @@ def test_import_export(self):
                 ScopeMetrics,
                 Sum,
             )
-        except Exception as error:
-            self.fail(f"Unexpected error {error} was raised")
 
     def test_import_view(self):
         """
         Test that the metrics view module has the right symbols
         """
 
-        try:
+        with self.assertNotRaises(Exception):
             from opentelemetry.sdk.metrics.view import (  # noqa: F401
                 Aggregation,
                 DefaultAggregation,
@@ -81,5 +77,3 @@ def test_import_view(self):
                 SumAggregation,
                 View,
             )
-        except Exception as error:
-            self.fail(f"Unexpected error {error} was raised")