aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/libs
diff options
context:
space:
mode:
authorrobot-contrib <robot-contrib@yandex-team.com>2024-07-13 15:38:12 +0300
committerrobot-contrib <robot-contrib@yandex-team.com>2024-07-13 15:51:02 +0300
commite12a75707d4c42a0081e951c9142db0bf460d802 (patch)
tree69900dba00055b1e1316cd42a141d2c7440e7d68 /contrib/libs
parent5c685c219a8601139af8cfdc5e0c69a3c6b0e9a6 (diff)
downloadydb-e12a75707d4c42a0081e951c9142db0bf460d802.tar.gz
Update contrib/libs/opentelemetry-proto to 1.3.2
f36edbe7d6f7b3df4d0e8cc7f7bb4755e8fadd42
Diffstat (limited to 'contrib/libs')
-rw-r--r--contrib/libs/opentelemetry-proto/CHANGELOG.md12
-rw-r--r--contrib/libs/opentelemetry-proto/RELEASING.md97
-rw-r--r--contrib/libs/opentelemetry-proto/opentelemetry/proto/profiles/v1experimental/pprofextended.proto4
-rw-r--r--contrib/libs/opentelemetry-proto/opentelemetry/proto/profiles/v1experimental/profiles.proto2
-rw-r--r--contrib/libs/opentelemetry-proto/ya.make4
5 files changed, 31 insertions, 88 deletions
diff --git a/contrib/libs/opentelemetry-proto/CHANGELOG.md b/contrib/libs/opentelemetry-proto/CHANGELOG.md
index 7af14f1762..c8b0e45899 100644
--- a/contrib/libs/opentelemetry-proto/CHANGELOG.md
+++ b/contrib/libs/opentelemetry-proto/CHANGELOG.md
@@ -2,12 +2,20 @@
## Unreleased
-Full list of differences found in [this compare](https://github.com/open-telemetry/opentelemetry-proto/compare/v1.1.0...main).
+The full list of changes can be found in the compare view for the respective release at <https://github.com/open-telemetry/opentelemetry-proto/releases>.
-### Added
+## 1.3.2 - 2024-06-28
+
+### Changed
+
+* profiles: add missing java_package option to pprofextended. [#558](https://github.com/open-telemetry/opentelemetry-proto/pull/558)
+
+## 1.3.1 - 2024-05-07
### Changed
+* profiles: fix versioning in selector. [#551](https://github.com/open-telemetry/opentelemetry-proto/pull/551)
+
## 1.3.0 - 2024-04-24
### Added
diff --git a/contrib/libs/opentelemetry-proto/RELEASING.md b/contrib/libs/opentelemetry-proto/RELEASING.md
index 207d234a90..5546cd8e06 100644
--- a/contrib/libs/opentelemetry-proto/RELEASING.md
+++ b/contrib/libs/opentelemetry-proto/RELEASING.md
@@ -1,89 +1,22 @@
-# How to Create a Release of OpenTelemetry Proto (for Maintainers Only)
+# How to Create a Release
-## Tagging the Release
+_Instruction for Maintainers only._
-Our release branches follow the naming convention of `v<major>.<minor>.x`, while
-the tags include the patch version `v<major>.<minor>.<patch>`. For example, the
-same branch `v0.3.x` would be used to create all `v0.3` tags (e.g. `v0.3.0`,
-`v0.3.1`).
+- Prepare the release by updating [CHANGELOG.md](CHANGELOG.md), see for example
+[this PR](https://github.com/open-telemetry/opentelemetry-proto/pull/537).
+Merge the PR. From this point on no new PRs can be merged until the release is complete.
-In this section upstream repository refers to the main opentelemetry-proto
-github repository.
+- Go to Github [release page](https://github.com/open-telemetry/opentelemetry-proto/releases),
+click `Draft a new release`.
-Before any push to the upstream repository you need to create a [personal access
-token](https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/).
+- Click "Choose a tag" and specify the next version number. The Target branch should be "main".
-1. Create the release branch and push it to GitHub:
+- Click "Generate release notes" to get a draft release note. Remove editorial
+changes from the notes and any other changes that you don't want in the release notes.
+In addition, you can refer to [CHANGELOG.md](CHANGELOG.md) for a list of major changes since last release.
- ```bash
- MAJOR=0 MINOR=3 PATCH=0 # Set appropriately for new release
- git checkout -b v$MAJOR.$MINOR.x main
- git push upstream v$MAJOR.$MINOR.x
- ```
+- Click "Publish Release".
-2. Enable branch protection for the new branch, if you have admin access.
- Otherwise, let someone with admin access know that there is a new release
- branch.
-
- - Open the branch protection settings for the new branch, by following
- [Github's instructions](https://help.github.com/articles/configuring-protected-branches/).
- - Copy the settings from a previous branch, i.e., check
- - `Protect this branch`
- - `Require pull request reviews before merging`
- - `Require status checks to pass before merging`
- - `Include administrators`
-
- Enable the following required status checks:
- - `cla/linuxfoundation`
- - `ci/circleci: build`
- - Uncheck everything else.
- - Click "Save changes".
-
-3. For `vMajor.Minor.x` branch:
-
- - Create and push a tag:
-
- ```bash
- git checkout v$MAJOR.$MINOR.x
- git pull upstream v$MAJOR.$MINOR.x
- git tag -a v$MAJOR.$MINOR.$PATCH -m "Version $MAJOR.$MINOR.$PATCH"
- git push upstream v$MAJOR.$MINOR.$PATCH
- ```
-
-## Patch Release
-
-All patch releases should include only bug-fixes, and must avoid
-adding/modifying the public APIs. To cherry-pick one commit use the following
-instructions:
-
-- Create and push a tag:
-
-```bash
-COMMIT=1224f0a # Set the right commit hash.
-git checkout -b cherrypick v$MAJOR.$MINOR.x
-git cherry-pick -x $COMMIT
-git commit -a -m "Cherry-pick commit $COMMIT"
-```
-
-- Go through PR review and merge it to GitHub v$MAJOR.$MINOR.x branch.
-
-- Tag a new patch release when all commits are merged.
-
-## Announcement
-
-Once deployment is done, go to Github [release
-page](https://github.com/open-telemetry/opentelemetry-proto/releases), press
-`Draft a new release` to write release notes about the new release.
-
-You can use `git log upstream/v$MAJOR.$((MINOR-1)).x..upstream/v$MAJOR.$MINOR.x --graph --first-parent`
-or the Github [compare tool](https://github.com/open-telemetry/opentelemetry-proto/compare/)
-to view a summary of all commits since last release as a reference.
-
-In addition, you can refer to [CHANGELOG.md](CHANGELOG.md)
-for a list of major changes since last release.
-
-## Update release versions in documentations and CHANGELOG files
-
-After releasing is done, you need to update [README.md](README.md) and [CHANGELOG.md](CHANGELOG.md).
-
-Create a PR to mark the new release in [CHANGELOG.md](CHANGELOG.md) on main branch.
+Our tags follow the naming convention of `v1.<minor>.<patch>`. Increment `minor` by 1
+and use `patch` value of 0 for new minor version releases. For patch releases keep `minor`
+unchanged and increment the `patch`.
diff --git a/contrib/libs/opentelemetry-proto/opentelemetry/proto/profiles/v1experimental/pprofextended.proto b/contrib/libs/opentelemetry-proto/opentelemetry/proto/profiles/v1experimental/pprofextended.proto
index bd30083554..b5b5b88fce 100644
--- a/contrib/libs/opentelemetry-proto/opentelemetry/proto/profiles/v1experimental/pprofextended.proto
+++ b/contrib/libs/opentelemetry-proto/opentelemetry/proto/profiles/v1experimental/pprofextended.proto
@@ -59,6 +59,8 @@ package opentelemetry.proto.profiles.v1experimental;
import "opentelemetry/proto/common/v1/common.proto";
option csharp_namespace = "OpenTelemetry.Proto.Profiles.V1Experimental";
+option java_multiple_files = true;
+option java_package = "io.opentelemetry.proto.profiles.v1experimental";
option go_package = "go.opentelemetry.io/proto/otlp/profiles/v1experimental";
// Represents a complete profile, including sample types, samples,
@@ -203,7 +205,7 @@ enum AggregationTemporality {
11. A request is received, the system measures 1 request.
12. The 1 second collection cycle ends. A metric is exported for the
number of requests received over the interval of time t_1 to
- t_0+1 with a value of 1.
+ t_1+1 with a value of 1.
Note: Even though, when reporting changes since last report time, using
CUMULATIVE is valid, it is not recommended. */
diff --git a/contrib/libs/opentelemetry-proto/opentelemetry/proto/profiles/v1experimental/profiles.proto b/contrib/libs/opentelemetry-proto/opentelemetry/proto/profiles/v1experimental/profiles.proto
index bbc2b2931d..84b0108f86 100644
--- a/contrib/libs/opentelemetry-proto/opentelemetry/proto/profiles/v1experimental/profiles.proto
+++ b/contrib/libs/opentelemetry-proto/opentelemetry/proto/profiles/v1experimental/profiles.proto
@@ -55,7 +55,7 @@ option go_package = "go.opentelemetry.io/proto/otlp/profiles/v1experimental";
// ┌──────────────────┐
// │ Profile │
// └──────────────────┘
-// │ 1-n
+// │ n-1
// │ 1-n ┌───────────────────────────────────────┐
// ▼ │ ▽
// ┌──────────────────┐ 1-n ┌──────────────┐ ┌──────────┐
diff --git a/contrib/libs/opentelemetry-proto/ya.make b/contrib/libs/opentelemetry-proto/ya.make
index 8d341a731a..ec3477245b 100644
--- a/contrib/libs/opentelemetry-proto/ya.make
+++ b/contrib/libs/opentelemetry-proto/ya.make
@@ -6,9 +6,9 @@ LICENSE(Apache-2.0)
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-VERSION(1.3.1)
+VERSION(1.3.2)
-ORIGINAL_SOURCE(https://github.com/open-telemetry/opentelemetry-proto/archive/v1.3.1.tar.gz)
+ORIGINAL_SOURCE(https://github.com/open-telemetry/opentelemetry-proto/archive/v1.3.2.tar.gz)
PY_NAMESPACE(.)