Merge branch 'main' into fix_instrumentation_scope_encoding_to_otlp

xrmx · web-flow · commit 5901074207d3 · 2025-03-03T11:15:43.000+01:00
diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
@@ -0,0 +1,20 @@
+name: FOSSA scanning
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  fossa:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
+        with:
+          api-key: ${{secrets.FOSSA_API_KEY}}
+          team: OpenTelemetry
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,8 +9,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fix OTLP encoders missing instrumentation scope schema url and attributes
   ([#4359](https://github.com/open-telemetry/opentelemetry-python/pull/4359))  
+- prometheus-exporter: fix labels out of place for data points with different
+  attribute sets
+  ([#4413](https://github.com/open-telemetry/opentelemetry-python/pull/4413))
+- Type indent parameter in to_json
+  ([#4402](https://github.com/open-telemetry/opentelemetry-python/pull/4402))
 - Tolerates exceptions when loading resource detectors via `OTEL_EXPERIMENTAL_RESOURCE_DETECTORS`
   ([#4373](https://github.com/open-telemetry/opentelemetry-python/pull/4373))
+- Disconnect gRPC client stub when shutting down `OTLPSpanExporter`
+  ([#4370](https://github.com/open-telemetry/opentelemetry-python/pull/4370))
+- opentelemetry-sdk: fix OTLP exporting of Histograms with explicit buckets advisory
+  ([#4434](https://github.com/open-telemetry/opentelemetry-python/pull/4434))
+- opentelemetry-exporter-otlp-proto-grpc: better dependency version range for Python 3.13
+  ([#4444](https://github.com/open-telemetry/opentelemetry-python/pull/4444))
+- opentelemetry-exporter-opencensus: better dependency version range for Python 3.13
+  ([#4444](https://github.com/open-telemetry/opentelemetry-python/pull/4444))
+- Updated `tracecontext-integration-test` gitref to `d782773b2cf2fa4afd6a80a93b289d8a74ca894d`
+  ([#4448](https://github.com/open-telemetry/opentelemetry-python/pull/4448))
+- Make `trace_api.use_span()` record `BaseException` as well as `Exception`
+  ([#4406](https://github.com/open-telemetry/opentelemetry-python/pull/4406))
 
 ## Version 1.30.0/0.51b0 (2025-02-03)
 
diff --git a/exporter/opentelemetry-exporter-opencensus/pyproject.toml b/exporter/opentelemetry-exporter-opencensus/pyproject.toml
@@ -29,7 +29,8 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
-  "grpcio >= 1.0.0, < 2.0.0",
+  "grpcio >= 1.63.2, < 2.0.0; python_version < '3.13'",
+  "grpcio >= 1.66.2, < 2.0.0; python_version >= '3.13'",
   "opencensus-proto >= 0.1.0, < 1.0.0",
   "opentelemetry-api >= 1.31.0.dev",
   "opentelemetry-sdk >= 1.15",
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml
@@ -30,7 +30,8 @@ classifiers = [
 dependencies = [
   "Deprecated >= 1.2.6",
   "googleapis-common-protos ~= 1.52",
-  "grpcio >= 1.63.2, < 2.0.0",
+  "grpcio >= 1.63.2, < 2.0.0; python_version < '3.13'",
+  "grpcio >= 1.66.2, < 2.0.0; python_version >= '3.13'",
   "opentelemetry-api ~= 1.15",
   "opentelemetry-proto == 1.31.0.dev",
   "opentelemetry-sdk ~= 1.31.0.dev",
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/exporter.py b/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/exporter.py
@@ -243,8 +243,8 @@ def __init__(
         ) or Compression.NoCompression
 
         if insecure:
-            self._client = self._stub(
-                insecure_channel(self._endpoint, compression=compression)
+            self._channel = insecure_channel(
+                self._endpoint, compression=compression
             )
         else:
             credentials = _get_credentials(
@@ -253,11 +253,10 @@ def __init__(
                 OTEL_EXPORTER_OTLP_CLIENT_KEY,
                 OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE,
             )
-            self._client = self._stub(
-                secure_channel(
-                    self._endpoint, credentials, compression=compression
-                )
+            self._channel = secure_channel(
+                self._endpoint, credentials, compression=compression
             )
+        self._client = self._stub(self._channel)
 
         self._export_lock = threading.Lock()
         self._shutdown = False
@@ -360,6 +359,7 @@ def shutdown(self, timeout_millis: float = 30_000, **kwargs) -> None:
         # wait for the last export if any
         self._export_lock.acquire(timeout=timeout_millis / 1e3)
         self._shutdown = True
+        self._channel.close()
         self._export_lock.release()
 
     @property
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
@@ -874,6 +874,21 @@ def test_shutdown_wait_last_export(self):
         finally:
             export_thread.join()
 
+    def test_export_over_closed_grpc_channel(self):
+        # pylint: disable=protected-access
+
+        add_MetricsServiceServicer_to_server(
+            MetricsServiceServicerSUCCESS(), self.server
+        )
+        self.exporter.export(self.metrics["sum_int"])
+        self.exporter.shutdown()
+        data = self.exporter._translate_data(self.metrics["sum_int"])
+        with self.assertRaises(ValueError) as err:
+            self.exporter._client.Export(request=data)
+        self.assertEqual(
+            str(err.exception), "Cannot invoke RPC on closed channel!"
+        )
+
     def test_aggregation_temporality(self):
         # pylint: disable=protected-access
 
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
@@ -1017,6 +1017,21 @@ def test_shutdown_wait_last_export(self):
         finally:
             export_thread.join()
 
+    def test_export_over_closed_grpc_channel(self):
+        # pylint: disable=protected-access
+
+        add_TraceServiceServicer_to_server(
+            TraceServiceServicerSUCCESS(), self.server
+        )
+        self.exporter.export([self.span])
+        self.exporter.shutdown()
+        data = self.exporter._translate_data([self.span])
+        with self.assertRaises(ValueError) as err:
+            self.exporter._client.Export(request=data)
+        self.assertEqual(
+            str(err.exception), "Cannot invoke RPC on closed channel!"
+        )
+
 
 def _create_span_with_status(status: SDKStatus):
     span = _Span(
diff --git a/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/__init__.py b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/__init__.py
@@ -224,15 +224,14 @@ def _translate_to_prometheus(
                     metrics.append(metric)
 
         for metric in metrics:
-            label_valuess = []
+            label_values_data_points = []
+            label_keys_data_points = []
             values = []
 
-            pre_metric_family_ids = []
+            per_metric_family_ids = []
 
             metric_name = sanitize_full_name(metric.name)
-
             metric_description = metric.description or ""
-
             metric_unit = map_unit(metric.unit)
 
             for number_data_point in metric.data.data_points:
@@ -243,7 +242,7 @@ def _translate_to_prometheus(
                     label_keys.append(sanitize_attribute(key))
                     label_values.append(self._check_value(value))
 
-                pre_metric_family_ids.append(
+                per_metric_family_ids.append(
                     "|".join(
                         [
                             metric_name,
@@ -254,7 +253,8 @@ def _translate_to_prometheus(
                     )
                 )
 
-                label_valuess.append(label_values)
+                label_values_data_points.append(label_values)
+                label_keys_data_points.append(label_keys)
                 if isinstance(number_data_point, HistogramDataPoint):
                     values.append(
                         {
@@ -268,8 +268,11 @@ def _translate_to_prometheus(
                 else:
                     values.append(number_data_point.value)
 
-            for pre_metric_family_id, label_values, value in zip(
-                pre_metric_family_ids, label_valuess, values
+            for per_metric_family_id, label_keys, label_values, value in zip(
+                per_metric_family_ids,
+                label_keys_data_points,
+                label_values_data_points,
+                values,
             ):
                 is_non_monotonic_sum = (
                     isinstance(metric.data, Sum)
@@ -291,7 +294,7 @@ def _translate_to_prometheus(
                     and not should_convert_sum_to_gauge
                 ):
                     metric_family_id = "|".join(
-                        [pre_metric_family_id, CounterMetricFamily.__name__]
+                        [per_metric_family_id, CounterMetricFamily.__name__]
                     )
 
                     if metric_family_id not in metric_family_id_metric_family:
@@ -311,7 +314,7 @@ def _translate_to_prometheus(
                     or should_convert_sum_to_gauge
                 ):
                     metric_family_id = "|".join(
-                        [pre_metric_family_id, GaugeMetricFamily.__name__]
+                        [per_metric_family_id, GaugeMetricFamily.__name__]
                     )
 
                     if (
@@ -331,7 +334,7 @@ def _translate_to_prometheus(
                     ].add_metric(labels=label_values, value=value)
                 elif isinstance(metric.data, Histogram):
                     metric_family_id = "|".join(
-                        [pre_metric_family_id, HistogramMetricFamily.__name__]
+                        [per_metric_family_id, HistogramMetricFamily.__name__]
                     )
 
                     if (
diff --git a/exporter/opentelemetry-exporter-prometheus/tests/test_prometheus_exporter.py b/exporter/opentelemetry-exporter-prometheus/tests/test_prometheus_exporter.py
@@ -638,3 +638,59 @@ def test_semconv(self):
                 """
             ),
         )
+
+    def test_multiple_data_points_with_different_label_sets(self):
+        hist_point_1 = HistogramDataPoint(
+            attributes={"http_target": "/foobar", "net_host_port": 8080},
+            start_time_unix_nano=1641946016139533244,
+            time_unix_nano=1641946016139533244,
+            count=6,
+            sum=579.0,
+            bucket_counts=[1, 3, 2],
+            explicit_bounds=[123.0, 456.0],
+            min=1,
+            max=457,
+        )
+        hist_point_2 = HistogramDataPoint(
+            attributes={"net_host_port": 8080},
+            start_time_unix_nano=1641946016139533245,
+            time_unix_nano=1641946016139533245,
+            count=7,
+            sum=579.0,
+            bucket_counts=[1, 3, 3],
+            explicit_bounds=[123.0, 456.0],
+            min=1,
+            max=457,
+        )
+
+        metric = Metric(
+            name="http.server.request.duration",
+            description="test multiple label sets",
+            unit="s",
+            data=Histogram(
+                data_points=[hist_point_1, hist_point_2],
+                aggregation_temporality=AggregationTemporality.CUMULATIVE,
+            ),
+        )
+
+        self.verify_text_format(
+            metric,
+            dedent(
+                """\
+                # HELP http_server_request_duration_seconds test multiple label sets
+                # TYPE http_server_request_duration_seconds histogram
+                http_server_request_duration_seconds_bucket{http_target="/foobar",le="123.0",net_host_port="8080"} 1.0
+                http_server_request_duration_seconds_bucket{http_target="/foobar",le="456.0",net_host_port="8080"} 4.0
+                http_server_request_duration_seconds_bucket{http_target="/foobar",le="+Inf",net_host_port="8080"} 6.0
+                http_server_request_duration_seconds_count{http_target="/foobar",net_host_port="8080"} 6.0
+                http_server_request_duration_seconds_sum{http_target="/foobar",net_host_port="8080"} 579.0
+                # HELP http_server_request_duration_seconds test multiple label sets
+                # TYPE http_server_request_duration_seconds histogram
+                http_server_request_duration_seconds_bucket{le="123.0",net_host_port="8080"} 1.0
+                http_server_request_duration_seconds_bucket{le="456.0",net_host_port="8080"} 4.0
+                http_server_request_duration_seconds_bucket{le="+Inf",net_host_port="8080"} 7.0
+                http_server_request_duration_seconds_count{net_host_port="8080"} 7.0
+                http_server_request_duration_seconds_sum{net_host_port="8080"} 579.0
+                """
+            ),
+        )
diff --git a/opentelemetry-api/pyproject.toml b/opentelemetry-api/pyproject.toml
@@ -30,7 +30,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, <= 8.5.0",
+    "importlib-metadata >= 6.0, < 8.7.0",
 ]
 dynamic = [
     "version",
diff --git a/opentelemetry-api/src/opentelemetry/trace/__init__.py b/opentelemetry-api/src/opentelemetry/trace/__init__.py
@@ -590,7 +590,7 @@ def use_span(
         finally:
             context_api.detach(token)
 
-    except Exception as exc:  # pylint: disable=broad-exception-caught
+    except BaseException as exc:  # pylint: disable=broad-exception-caught
         if isinstance(span, Span) and span.is_recording():
             # Record the exception as an event
             if record_exception:
diff --git a/opentelemetry-api/test-requirements.txt b/opentelemetry-api/test-requirements.txt
@@ -1,6 +1,7 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-importlib-metadata==8.5.0
+importlib-metadata==8.5.0 ; python_version < "3.9"
+importlib-metadata==8.6.1 ; python_version >= "3.9"
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
diff --git a/opentelemetry-api/tests/trace/test_globals.py b/opentelemetry-api/tests/trace/test_globals.py
@@ -133,6 +133,18 @@ class TestUseSpanException(Exception):
 
         self.assertEqual(test_span.recorded_exception, exception)
 
+    def test_use_span_base_exception(self):
+        class TestUseSpanBaseException(BaseException):
+            pass
+
+        test_span = SpanTest(trace.INVALID_SPAN_CONTEXT)
+        exception = TestUseSpanBaseException("test exception")
+        with self.assertRaises(TestUseSpanBaseException):
+            with trace.use_span(test_span):
+                raise exception
+
+        self.assertEqual(test_span.recorded_exception, exception)
+
     def test_use_span_set_status(self):
         class TestUseSpanException(Exception):
             pass
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/__init__.py
@@ -217,7 +217,7 @@ def __eq__(self, other: object) -> bool:
             return NotImplemented
         return self.__dict__ == other.__dict__
 
-    def to_json(self, indent=4) -> str:
+    def to_json(self, indent: Optional[int] = 4) -> str:
         return json.dumps(
             {
                 "body": self.body,
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/aggregation.py b/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/aggregation.py
@@ -1367,10 +1367,6 @@ def __init__(
         boundaries: Optional[Sequence[float]] = None,
         record_min_max: bool = True,
     ) -> None:
-        if boundaries is None:
-            boundaries = (
-                _DEFAULT_EXPLICIT_BUCKET_HISTOGRAM_AGGREGATION_BOUNDARIES
-            )
         self._boundaries = boundaries
         self._record_min_max = record_min_max
 
@@ -1391,6 +1387,12 @@ def _create_aggregation(
                 AggregationTemporality.CUMULATIVE
             )
 
+        if self._boundaries is None:
+            self._boundaries = (
+                instrument._advisory.explicit_bucket_boundaries
+                or _DEFAULT_EXPLICIT_BUCKET_HISTOGRAM_AGGREGATION_BOUNDARIES
+            )
+
         return _ExplicitBucketHistogramAggregation(
             attributes,
             instrument_aggregation_temporality,
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/point.py b/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/point.py
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/util/instrumentation.py b/opentelemetry-sdk/src/opentelemetry/sdk/util/instrumentation.py
diff --git a/opentelemetry-sdk/tests/metrics/integration_test/test_histogram_advisory_explicit_buckets.py b/opentelemetry-sdk/tests/metrics/integration_test/test_histogram_advisory_explicit_buckets.py
diff --git a/scripts/tracecontext-integration-test.sh b/scripts/tracecontext-integration-test.sh
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ dependencies = [`
`30`	`30`	`"Deprecated >= 1.2.6",`
`31`	`31`	`# FIXME This should be able to be removed after 3.12 is released if there is a reliable API`
`32`	`32`	`# in importlib.metadata.`
`33`		`- "importlib-metadata >= 6.0, <= 8.5.0",`
	`33`	`+ "importlib-metadata >= 6.0, < 8.7.0",`
`34`	`34`	`]`
`35`	`35`	`dynamic = [`
`36`	`36`	`"version",`