Merge pull request #27203 from ydb-platform/merge-rightlib-251021-0051HEADmain

15 files changed, 134 insertions, 84 deletions

diff --git a/contrib/libs/opentelemetry-proto/.yandex_meta/__init__.py b/contrib/libs/opentelemetry-proto/.yandex_meta/__init__.py
index 350ecd71a9f..34a3f3fd550 100644
--- a/contrib/libs/opentelemetry-proto/.yandex_meta/__init__.py
+++ b/contrib/libs/opentelemetry-proto/.yandex_meta/__init__.py
@@ -14,7 +14,6 @@ def post_install(self):
         PROTO_NAMESPACE=ArcPath(self.arcdir, GLOBAL=True),
         PY_NAMESPACE=".",
     )
-    self.yamakes["."].before("END", "EXCLUDE_TAGS(GO_PROTO)\n")
 
 
 opentelemetry_proto = NixSourceProject(
diff --git a/contrib/libs/opentelemetry-proto/CHANGELOG.md b/contrib/libs/opentelemetry-proto/CHANGELOG.md
index b9d67b09eb2..337663e39b8 100644
--- a/contrib/libs/opentelemetry-proto/CHANGELOG.md
+++ b/contrib/libs/opentelemetry-proto/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 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>.
 
+### Removed
+
+- profiles: remove aggregation temporality enum and field. [#710](https://github.com/open-telemetry/opentelemetry-proto/pull/710)
+
 ## 1.8.0 - 2025-09-02
 
 ### Changed
diff --git a/contrib/libs/opentelemetry-proto/opentelemetry/proto/collector/logs/v1/logs_service.proto b/contrib/libs/opentelemetry-proto/opentelemetry/proto/collector/logs/v1/logs_service.proto
index 8be5cf75ef1..0dbac7fda01 100644
--- a/contrib/libs/opentelemetry-proto/opentelemetry/proto/collector/logs/v1/logs_service.proto
+++ b/contrib/libs/opentelemetry-proto/opentelemetry/proto/collector/logs/v1/logs_service.proto
@@ -22,7 +22,7 @@ option csharp_namespace = "OpenTelemetry.Proto.Collector.Logs.V1";
 option java_multiple_files = true;
 option java_package = "io.opentelemetry.proto.collector.logs.v1";
 option java_outer_classname = "LogsServiceProto";
-option go_package = "go.opentelemetry.io/proto/otlp/collector/logs/v1";
+option go_package = "a.yandex-team.ru/contrib/libs/opentelemetry-proto";
 
 // Service that can be used to push logs between one Application instrumented with
 // OpenTelemetry and an collector, or between an collector and a central collector (in this
diff --git a/contrib/libs/opentelemetry-proto/opentelemetry/proto/collector/metrics/v1/metrics_service.proto b/contrib/libs/opentelemetry-proto/opentelemetry/proto/collector/metrics/v1/metrics_service.proto
index bc024284415..5cee87b17c4 100644
--- a/contrib/libs/opentelemetry-proto/opentelemetry/proto/collector/metrics/v1/metrics_service.proto
+++ b/contrib/libs/opentelemetry-proto/opentelemetry/proto/collector/metrics/v1/metrics_service.proto
@@ -22,7 +22,7 @@ option csharp_namespace = "OpenTelemetry.Proto.Collector.Metrics.V1";
 option java_multiple_files = true;
 option java_package = "io.opentelemetry.proto.collector.metrics.v1";
 option java_outer_classname = "MetricsServiceProto";
-option go_package = "go.opentelemetry.io/proto/otlp/collector/metrics/v1";
+option go_package = "a.yandex-team.ru/contrib/libs/opentelemetry-proto";
 
 // Service that can be used to push metrics between one Application
 // instrumented with OpenTelemetry and a collector, or between a collector and a
diff --git a/contrib/libs/opentelemetry-proto/opentelemetry/proto/collector/profiles/v1development/profiles_service.proto b/contrib/libs/opentelemetry-proto/opentelemetry/proto/collector/profiles/v1development/profiles_service.proto
index 81bb210646f..33a5c185adf 100644
--- a/contrib/libs/opentelemetry-proto/opentelemetry/proto/collector/profiles/v1development/profiles_service.proto
+++ b/contrib/libs/opentelemetry-proto/opentelemetry/proto/collector/profiles/v1development/profiles_service.proto
@@ -22,7 +22,7 @@ option csharp_namespace = "OpenTelemetry.Proto.Collector.Profiles.V1Development"
 option java_multiple_files = true;
 option java_package = "io.opentelemetry.proto.collector.profiles.v1development";
 option java_outer_classname = "ProfilesServiceProto";
-option go_package = "go.opentelemetry.io/proto/otlp/collector/profiles/v1development";
+option go_package = "a.yandex-team.ru/contrib/libs/opentelemetry-proto";
 
 // Service that can be used to push profiles between one Application instrumented with
 // OpenTelemetry and a collector, or between a collector and a central collector.
diff --git a/contrib/libs/opentelemetry-proto/opentelemetry/proto/collector/trace/v1/trace_service.proto b/contrib/libs/opentelemetry-proto/opentelemetry/proto/collector/trace/v1/trace_service.proto
index efbbedbe454..aa1345345a4 100644
--- a/contrib/libs/opentelemetry-proto/opentelemetry/proto/collector/trace/v1/trace_service.proto
+++ b/contrib/libs/opentelemetry-proto/opentelemetry/proto/collector/trace/v1/trace_service.proto
@@ -22,7 +22,7 @@ option csharp_namespace = "OpenTelemetry.Proto.Collector.Trace.V1";
 option java_multiple_files = true;
 option java_package = "io.opentelemetry.proto.collector.trace.v1";
 option java_outer_classname = "TraceServiceProto";
-option go_package = "go.opentelemetry.io/proto/otlp/collector/trace/v1";
+option go_package = "a.yandex-team.ru/contrib/libs/opentelemetry-proto";
 
 // Service that can be used to push spans between one Application instrumented with
 // OpenTelemetry and a collector, or between a collector and a central collector (in this
diff --git a/contrib/libs/opentelemetry-proto/opentelemetry/proto/common/v1/common.proto b/contrib/libs/opentelemetry-proto/opentelemetry/proto/common/v1/common.proto
index 57c9f86e006..c8111692363 100644
--- a/contrib/libs/opentelemetry-proto/opentelemetry/proto/common/v1/common.proto
+++ b/contrib/libs/opentelemetry-proto/opentelemetry/proto/common/v1/common.proto
@@ -20,7 +20,7 @@ option csharp_namespace = "OpenTelemetry.Proto.Common.V1";
 option java_multiple_files = true;
 option java_package = "io.opentelemetry.proto.common.v1";
 option java_outer_classname = "CommonProto";
-option go_package = "go.opentelemetry.io/proto/otlp/common/v1";
+option go_package = "a.yandex-team.ru/contrib/libs/opentelemetry-proto";
 
 // AnyValue is used to represent any type of attribute value. AnyValue may contain a
 // primitive value such as a string or integer or it may contain an arbitrary nested
diff --git a/contrib/libs/opentelemetry-proto/opentelemetry/proto/logs/v1/logs.proto b/contrib/libs/opentelemetry-proto/opentelemetry/proto/logs/v1/logs.proto
index 4fe11308618..5243794390a 100644
--- a/contrib/libs/opentelemetry-proto/opentelemetry/proto/logs/v1/logs.proto
+++ b/contrib/libs/opentelemetry-proto/opentelemetry/proto/logs/v1/logs.proto
@@ -23,7 +23,7 @@ option csharp_namespace = "OpenTelemetry.Proto.Logs.V1";
 option java_multiple_files = true;
 option java_package = "io.opentelemetry.proto.logs.v1";
 option java_outer_classname = "LogsProto";
-option go_package = "go.opentelemetry.io/proto/otlp/logs/v1";
+option go_package = "a.yandex-team.ru/contrib/libs/opentelemetry-proto";
 
 // LogsData represents the logs data that can be stored in a persistent storage,
 // OR can be embedded by other protocols that transfer OTLP logs data but do not
diff --git a/contrib/libs/opentelemetry-proto/opentelemetry/proto/metrics/v1/metrics.proto b/contrib/libs/opentelemetry-proto/opentelemetry/proto/metrics/v1/metrics.proto
index 8915e3c16b6..7f5c016ccf4 100644
--- a/contrib/libs/opentelemetry-proto/opentelemetry/proto/metrics/v1/metrics.proto
+++ b/contrib/libs/opentelemetry-proto/opentelemetry/proto/metrics/v1/metrics.proto
@@ -23,7 +23,7 @@ option csharp_namespace = "OpenTelemetry.Proto.Metrics.V1";
 option java_multiple_files = true;
 option java_package = "io.opentelemetry.proto.metrics.v1";
 option java_outer_classname = "MetricsProto";
-option go_package = "go.opentelemetry.io/proto/otlp/metrics/v1";
+option go_package = "a.yandex-team.ru/contrib/libs/opentelemetry-proto";
 
 // MetricsData represents the metrics data that can be stored in a persistent
 // storage, OR can be embedded by other protocols that transfer OTLP metrics
diff --git a/contrib/libs/opentelemetry-proto/opentelemetry/proto/profiles/v1development/profiles.proto b/contrib/libs/opentelemetry-proto/opentelemetry/proto/profiles/v1development/profiles.proto
index dc101770dc3..cd90faa57c9 100644
--- a/contrib/libs/opentelemetry-proto/opentelemetry/proto/profiles/v1development/profiles.proto
+++ b/contrib/libs/opentelemetry-proto/opentelemetry/proto/profiles/v1development/profiles.proto
@@ -39,7 +39,7 @@ option csharp_namespace = "OpenTelemetry.Proto.Profiles.V1Development";
 option java_multiple_files = true;
 option java_package = "io.opentelemetry.proto.profiles.v1development";
 option java_outer_classname = "ProfilesProto";
-option go_package = "go.opentelemetry.io/proto/otlp/profiles/v1development";
+option go_package = "a.yandex-team.ru/contrib/libs/opentelemetry-proto";
 
 //                Relationships Diagram
 //
@@ -308,80 +308,10 @@ message Link {
   bytes span_id = 2;
 }
 
-// Specifies the method of aggregating metric values, either DELTA (change since last report)
-// or CUMULATIVE (total since a fixed start time).
-enum AggregationTemporality {
-  /* UNSPECIFIED is the default AggregationTemporality, it MUST not be used. */
-  AGGREGATION_TEMPORALITY_UNSPECIFIED = 0;
-
-  /** DELTA is an AggregationTemporality for a profiler which reports
-  changes since last report time. Successive metrics contain aggregation of
-  values from continuous and non-overlapping intervals.
-
-  The values for a DELTA metric are based only on the time interval
-  associated with one measurement cycle. There is no dependency on
-  previous measurements like is the case for CUMULATIVE metrics.
-
-  For example, consider a system measuring the number of requests that
-  it receives and reports the sum of these requests every second as a
-  DELTA metric:
-
-  1. The system starts receiving at time=t_0.
-  2. A request is received, the system measures 1 request.
-  3. A request is received, the system measures 1 request.
-  4. A request is received, the system measures 1 request.
-  5. The 1 second collection cycle ends. A metric is exported for the
-      number of requests received over the interval of time t_0 to
-      t_0+1 with a value of 3.
-  6. A request is received, the system measures 1 request.
-  7. A request is received, the system measures 1 request.
-  8. The 1 second collection cycle ends. A metric is exported for the
-      number of requests received over the interval of time t_0+1 to
-      t_0+2 with a value of 2. */
-  AGGREGATION_TEMPORALITY_DELTA = 1;
-
-  /** CUMULATIVE is an AggregationTemporality for a profiler which
-  reports changes since a fixed start time. This means that current values
-  of a CUMULATIVE metric depend on all previous measurements since the
-  start time. Because of this, the sender is required to retain this state
-  in some form. If this state is lost or invalidated, the CUMULATIVE metric
-  values MUST be reset and a new fixed start time following the last
-  reported measurement time sent MUST be used.
-
-  For example, consider a system measuring the number of requests that
-  it receives and reports the sum of these requests every second as a
-  CUMULATIVE metric:
-
-  1. The system starts receiving at time=t_0.
-  2. A request is received, the system measures 1 request.
-  3. A request is received, the system measures 1 request.
-  4. A request is received, the system measures 1 request.
-  5. The 1 second collection cycle ends. A metric is exported for the
-      number of requests received over the interval of time t_0 to
-      t_0+1 with a value of 3.
-  6. A request is received, the system measures 1 request.
-  7. A request is received, the system measures 1 request.
-  8. The 1 second collection cycle ends. A metric is exported for the
-      number of requests received over the interval of time t_0 to
-      t_0+2 with a value of 5.
-  9. The system experiences a fault and loses state.
-  10. The system recovers and resumes receiving at time=t_1.
-  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_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. */
-  AGGREGATION_TEMPORALITY_CUMULATIVE = 2;
-}
-
-// ValueType describes the type and units of a value, with an optional aggregation temporality.
+// ValueType describes the type and units of a value.
 message ValueType {
   int32 type_strindex = 1; // Index into ProfilesDictionary.string_table.
   int32 unit_strindex = 2; // Index into ProfilesDictionary.string_table.
-
-  AggregationTemporality aggregation_temporality = 3;
 }
 
 // Each Sample records values encountered in some program context. The program
diff --git a/contrib/libs/opentelemetry-proto/opentelemetry/proto/resource/v1/resource.proto b/contrib/libs/opentelemetry-proto/opentelemetry/proto/resource/v1/resource.proto
index 8affbe3326d..78ca19ae1e9 100644
--- a/contrib/libs/opentelemetry-proto/opentelemetry/proto/resource/v1/resource.proto
+++ b/contrib/libs/opentelemetry-proto/opentelemetry/proto/resource/v1/resource.proto
@@ -22,7 +22,7 @@ option csharp_namespace = "OpenTelemetry.Proto.Resource.V1";
 option java_multiple_files = true;
 option java_package = "io.opentelemetry.proto.resource.v1";
 option java_outer_classname = "ResourceProto";
-option go_package = "go.opentelemetry.io/proto/otlp/resource/v1";
+option go_package = "a.yandex-team.ru/contrib/libs/opentelemetry-proto";
 
 // Resource information.
 message Resource {
diff --git a/contrib/libs/opentelemetry-proto/opentelemetry/proto/trace/v1/trace.proto b/contrib/libs/opentelemetry-proto/opentelemetry/proto/trace/v1/trace.proto
index fec6f9e3a9d..4f403b28c9a 100644
--- a/contrib/libs/opentelemetry-proto/opentelemetry/proto/trace/v1/trace.proto
+++ b/contrib/libs/opentelemetry-proto/opentelemetry/proto/trace/v1/trace.proto
@@ -23,7 +23,7 @@ option csharp_namespace = "OpenTelemetry.Proto.Trace.V1";
 option java_multiple_files = true;
 option java_package = "io.opentelemetry.proto.trace.v1";
 option java_outer_classname = "TraceProto";
-option go_package = "go.opentelemetry.io/proto/otlp/trace/v1";
+option go_package = "a.yandex-team.ru/contrib/libs/opentelemetry-proto";
 
 // TracesData represents the traces data that can be stored in a persistent storage,
 // OR can be embedded by other protocols that transfer OTLP traces data but do
diff --git a/contrib/libs/opentelemetry-proto/patches/01_make_go_proto_generation.sh b/contrib/libs/opentelemetry-proto/patches/01_make_go_proto_generation.sh
new file mode 100644
index 00000000000..082c3011bda
--- /dev/null
+++ b/contrib/libs/opentelemetry-proto/patches/01_make_go_proto_generation.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -euo pipefail
+
+find . -path "*/opentelemetry/proto/*" -name "*.proto" -type f -exec sed -i '
+    # Заменяем go_package с go.opentelemetry.io на a.yandex-team.ru
+    s|option go_package = "go\.opentelemetry\.io/proto/otlp/[^"]*";|option go_package = "a.yandex-team.ru/contrib/libs/opentelemetry-proto";|g
+' {} \;
diff --git a/contrib/libs/opentelemetry-proto/patches/a59a58f1860a1ca2caa751c03b7b4a49c2a529c9.patch b/contrib/libs/opentelemetry-proto/patches/a59a58f1860a1ca2caa751c03b7b4a49c2a529c9.patch
new file mode 100644
index 00000000000..e61e9ab522e
--- /dev/null
+++ b/contrib/libs/opentelemetry-proto/patches/a59a58f1860a1ca2caa751c03b7b4a49c2a529c9.patch
@@ -0,0 +1,111 @@
+From a59a58f1860a1ca2caa751c03b7b4a49c2a529c9 Mon Sep 17 00:00:00 2001
+From: Alexey Alexandrov <[email protected]>
+Date: Fri, 5 Sep 2025 12:10:17 -0700
+Subject: [PATCH] Remove aggregation temporality enum and field. (#710)
+
+---
+ CHANGELOG.md                                  |  4 ++
+ .../profiles/v1development/profiles.proto     | 72 +------------------
+ 2 files changed, 5 insertions(+), 71 deletions(-)
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index b9d67b09..337663e3 100644
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -4,6 +4,10 @@
+ 
+ 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>.
+ 
++### Removed
++
++- profiles: remove aggregation temporality enum and field. [#710](https://github.com/open-telemetry/opentelemetry-proto/pull/710)
++
+ ## 1.8.0 - 2025-09-02
+ 
+ ### Changed
+diff --git a/opentelemetry/proto/profiles/v1development/profiles.proto b/opentelemetry/proto/profiles/v1development/profiles.proto
+index dc101770..e05c847d 100644
+--- a/opentelemetry/proto/profiles/v1development/profiles.proto
++++ b/opentelemetry/proto/profiles/v1development/profiles.proto
+@@ -308,80 +308,10 @@ message Link {
+   bytes span_id = 2;
+ }
+ 
+-// Specifies the method of aggregating metric values, either DELTA (change since last report)
+-// or CUMULATIVE (total since a fixed start time).
+-enum AggregationTemporality {
+-  /* UNSPECIFIED is the default AggregationTemporality, it MUST not be used. */
+-  AGGREGATION_TEMPORALITY_UNSPECIFIED = 0;
+-
+-  /** DELTA is an AggregationTemporality for a profiler which reports
+-  changes since last report time. Successive metrics contain aggregation of
+-  values from continuous and non-overlapping intervals.
+-
+-  The values for a DELTA metric are based only on the time interval
+-  associated with one measurement cycle. There is no dependency on
+-  previous measurements like is the case for CUMULATIVE metrics.
+-
+-  For example, consider a system measuring the number of requests that
+-  it receives and reports the sum of these requests every second as a
+-  DELTA metric:
+-
+-  1. The system starts receiving at time=t_0.
+-  2. A request is received, the system measures 1 request.
+-  3. A request is received, the system measures 1 request.
+-  4. A request is received, the system measures 1 request.
+-  5. The 1 second collection cycle ends. A metric is exported for the
+-      number of requests received over the interval of time t_0 to
+-      t_0+1 with a value of 3.
+-  6. A request is received, the system measures 1 request.
+-  7. A request is received, the system measures 1 request.
+-  8. The 1 second collection cycle ends. A metric is exported for the
+-      number of requests received over the interval of time t_0+1 to
+-      t_0+2 with a value of 2. */
+-  AGGREGATION_TEMPORALITY_DELTA = 1;
+-
+-  /** CUMULATIVE is an AggregationTemporality for a profiler which
+-  reports changes since a fixed start time. This means that current values
+-  of a CUMULATIVE metric depend on all previous measurements since the
+-  start time. Because of this, the sender is required to retain this state
+-  in some form. If this state is lost or invalidated, the CUMULATIVE metric
+-  values MUST be reset and a new fixed start time following the last
+-  reported measurement time sent MUST be used.
+-
+-  For example, consider a system measuring the number of requests that
+-  it receives and reports the sum of these requests every second as a
+-  CUMULATIVE metric:
+-
+-  1. The system starts receiving at time=t_0.
+-  2. A request is received, the system measures 1 request.
+-  3. A request is received, the system measures 1 request.
+-  4. A request is received, the system measures 1 request.
+-  5. The 1 second collection cycle ends. A metric is exported for the
+-      number of requests received over the interval of time t_0 to
+-      t_0+1 with a value of 3.
+-  6. A request is received, the system measures 1 request.
+-  7. A request is received, the system measures 1 request.
+-  8. The 1 second collection cycle ends. A metric is exported for the
+-      number of requests received over the interval of time t_0 to
+-      t_0+2 with a value of 5.
+-  9. The system experiences a fault and loses state.
+-  10. The system recovers and resumes receiving at time=t_1.
+-  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_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. */
+-  AGGREGATION_TEMPORALITY_CUMULATIVE = 2;
+-}
+-
+-// ValueType describes the type and units of a value, with an optional aggregation temporality.
++// ValueType describes the type and units of a value.
+ message ValueType {
+   int32 type_strindex = 1; // Index into ProfilesDictionary.string_table.
+   int32 unit_strindex = 2; // Index into ProfilesDictionary.string_table.
+-
+-  AggregationTemporality aggregation_temporality = 3;
+ }
+ 
+ // Each Sample records values encountered in some program context. The program
diff --git a/contrib/libs/opentelemetry-proto/ya.make b/contrib/libs/opentelemetry-proto/ya.make
index 976ddf34fa3..f5d1a9fc312 100644
--- a/contrib/libs/opentelemetry-proto/ya.make
+++ b/contrib/libs/opentelemetry-proto/ya.make
@@ -32,6 +32,4 @@ SRCS(
     opentelemetry/proto/trace/v1/trace.proto
 )
 
-EXCLUDE_TAGS(GO_PROTO)
-
 END()