Merge branch 'main' into issue_3824

open-telemetry · Apr 10, 2024 · cc4f651 · cc4f651
2 parents 5f14c23 + 1164ab6
commit cc4f651
Show file tree

Hide file tree

Showing 8 changed files with 208 additions and 58 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Update proto version to v1.2.0
+  ([#3844](https://github.com/open-telemetry/opentelemetry-python/pull/3844))
 - Add to_json method to ExponentialHistogram
   ([#3780](https://github.com/open-telemetry/opentelemetry-python/pull/3780))
 - Bump mypy to 1.9.0

diff --git a/opentelemetry-proto/README.rst b/opentelemetry-proto/README.rst
@@ -7,9 +7,9 @@ OpenTelemetry Python Proto
    :target: https://pypi.org/project/opentelemetry-proto/
 
 This library contains the generated code for OpenTelemetry protobuf data model. The code in the current
-package was generated using the v0.20.0 release_ of opentelemetry-proto.
+package was generated using the v1.2.0 release_ of opentelemetry-proto.
 
-.. _release: https://github.com/open-telemetry/opentelemetry-proto/releases/tag/v0.20.0
+.. _release: https://github.com/open-telemetry/opentelemetry-proto/releases/tag/v1.2.0
 
 Installation
 ------------

diff --git a/opentelemetry-proto/src/opentelemetry/proto/logs/v1/logs_pb2.pyi b/opentelemetry-proto/src/opentelemetry/proto/logs/v1/logs_pb2.pyi
diff --git a/opentelemetry-proto/src/opentelemetry/proto/metrics/v1/metrics_pb2.py b/opentelemetry-proto/src/opentelemetry/proto/metrics/v1/metrics_pb2.py