Merge branch 'main' into export-nonmonotonic-sums-as-gauges-in-promet…

…heus
open-telemetry · Jun 23, 2023 · 326a315 · 326a315
2 parents 46a035a + 9d3d0f8
commit 326a315
Show file tree

Hide file tree

Showing 20 changed files with 388 additions and 615 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3306](https://github.com/open-telemetry/opentelemetry-python/pull/3306))
 - Add max_scale option to Exponential Bucket Histogram Aggregation [#3323](https://github.com/open-telemetry/opentelemetry-python/pull/3323))
 - Use BoundedAttributes instead of raw dict to extract attributes from LogRecord and Support dropped_attributes_count in LogRecord ([#3310](https://github.com/open-telemetry/opentelemetry-python/pull/3310))
+- Upgrade opentelemetry-proto to 0.20 and regen
+  [#3355](https://github.com/open-telemetry/opentelemetry-python/pull/3355))
 
 ## Version 1.18.0/0.39b0 (2023-05-04)
 

diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/tests/test_metrics_encoder.py b/exporter/opentelemetry-exporter-otlp-proto-common/tests/test_metrics_encoder.py
@@ -451,7 +451,6 @@ def test_encode_histogram(self):
                                                 bucket_counts=[1, 4],
                                                 explicit_bounds=[10.0, 20.0],
                                                 exemplars=[],
-                                                flags=pb2.DataPointFlags.FLAG_NONE,
                                                 max=18.0,
                                                 min=8.0,
                                             )
@@ -554,7 +553,6 @@ def test_encode_multiple_scope_histogram(self):
                                                 bucket_counts=[1, 4],
                                                 explicit_bounds=[10.0, 20.0],
                                                 exemplars=[],
-                                                flags=pb2.DataPointFlags.FLAG_NONE,
                                                 max=18.0,
                                                 min=8.0,
                                             )
@@ -590,7 +588,6 @@ def test_encode_multiple_scope_histogram(self):
                                                 bucket_counts=[1, 4],
                                                 explicit_bounds=[10.0, 20.0],
                                                 exemplars=[],
-                                                flags=pb2.DataPointFlags.FLAG_NONE,
                                                 max=18.0,
                                                 min=8.0,
                                             )
@@ -633,7 +630,6 @@ def test_encode_multiple_scope_histogram(self):
                                                 bucket_counts=[1, 4],
                                                 explicit_bounds=[10.0, 20.0],
                                                 exemplars=[],
-                                                flags=pb2.DataPointFlags.FLAG_NONE,
                                                 max=18.0,
                                                 min=8.0,
                                             )
@@ -676,7 +672,6 @@ def test_encode_multiple_scope_histogram(self):
                                                 bucket_counts=[1, 4],
                                                 explicit_bounds=[10.0, 20.0],
                                                 exemplars=[],
-                                                flags=pb2.DataPointFlags.FLAG_NONE,
                                                 max=18.0,
                                                 min=8.0,
                                             )

diff --git a/opentelemetry-proto/src/opentelemetry/proto/collector/logs/v1/logs_service_pb2.py b/opentelemetry-proto/src/opentelemetry/proto/collector/logs/v1/logs_service_pb2.py
diff --git a/opentelemetry-proto/src/opentelemetry/proto/collector/logs/v1/logs_service_pb2.pyi b/opentelemetry-proto/src/opentelemetry/proto/collector/logs/v1/logs_service_pb2.pyi
diff --git a/opentelemetry-proto/src/opentelemetry/proto/collector/metrics/v1/metrics_service_pb2.py b/opentelemetry-proto/src/opentelemetry/proto/collector/metrics/v1/metrics_service_pb2.py
diff --git a/opentelemetry-proto/src/opentelemetry/proto/collector/metrics/v1/metrics_service_pb2.pyi b/opentelemetry-proto/src/opentelemetry/proto/collector/metrics/v1/metrics_service_pb2.pyi