Merge branch 'main' into 2024/add/tokenTyping

Author: mrnicegyu11

.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

CHANGELOG.md

@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4164](https://github.com/open-telemetry/opentelemetry-python/pull/4346))
 - Tolerates exceptions when loading resource detectors via `OTEL_EXPERIMENTAL_RESOURCE_DETECTORS`
   ([#4373](https://github.com/open-telemetry/opentelemetry-python/pull/4373))
+- 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))
 
 ## Version 1.30.0/0.51b0 (2025-02-03)
 

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",

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",

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",

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

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,

opentelemetry-sdk/tests/metrics/integration_test/test_histogram_advisory_explicit_buckets.py

@@ -15,6 +15,7 @@
 from unittest import TestCase
 
 from opentelemetry.sdk.metrics import MeterProvider
+from opentelemetry.sdk.metrics._internal.instrument import Histogram
 from opentelemetry.sdk.metrics.export import InMemoryMetricReader
 from opentelemetry.sdk.metrics.view import (
     ExplicitBucketHistogramAggregation,
@@ -133,3 +134,33 @@ def test_view_overrides_buckets(self):
         self.assertEqual(
             metric.data.data_points[0].explicit_bounds, (10.0, 100.0, 1000.0)
         )
+
+    def test_explicit_aggregation(self):
+        reader = InMemoryMetricReader(
+            preferred_aggregation={
+                Histogram: ExplicitBucketHistogramAggregation()
+            }
+        )
+        meter_provider = MeterProvider(
+            metric_readers=[reader],
+        )
+        meter = meter_provider.get_meter("testmeter")
+        histogram = meter.create_histogram(
+            "testhistogram",
+            explicit_bucket_boundaries_advisory=[1.0, 2.0, 3.0],
+        )
+        histogram.record(1, {"label": "value"})
+        histogram.record(2, {"label": "value"})
+        histogram.record(3, {"label": "value"})
+
+        metrics = reader.get_metrics_data()
+        self.assertEqual(len(metrics.resource_metrics), 1)
+        self.assertEqual(len(metrics.resource_metrics[0].scope_metrics), 1)
+        self.assertEqual(
+            len(metrics.resource_metrics[0].scope_metrics[0].metrics), 1
+        )
+        metric = metrics.resource_metrics[0].scope_metrics[0].metrics[0]
+        self.assertEqual(metric.name, "testhistogram")
+        self.assertEqual(
+            metric.data.data_points[0].explicit_bounds, (1.0, 2.0, 3.0)
+        )