Merge branch 'rightlib' into merge-libs-250314-0050

12 files changed, 106 insertions, 73 deletions

diff --git a/build/conf/compilers/gnu_compiler.conf b/build/conf/compilers/gnu_compiler.conf
index 1c0b9df04d..045374757f 100644
--- a/build/conf/compilers/gnu_compiler.conf
+++ b/build/conf/compilers/gnu_compiler.conf
@@ -201,7 +201,6 @@ OBJECT_SUF=$OBJ_SUF$_CROSS_SUFFIX.o
 GCC_COMPILE_FLAGS=$EXTRA_C_FLAGS -c -o $_COMPILE_OUTPUTS ${pre=-I:_C__INCLUDE}
 EXTRA_COVERAGE_OUTPUT=${hide;noauto;output;suf=${OBJECT_SUF}.gcno:SRC}
 CLANG_TIDY_OUTPUT_FILE=${noauto;output;suf=${OBJECT_SUF}.tidyjson:SRC}
-YNDEXER_OUTPUT_FILE=${noauto;output;suf=${OBJECT_SUF}${COMPILE_OUT_SUFFIX}.ydx.pb2:SRC}
 
 when ($DUMP_COMPILER_DEPS == "yes") {
     DUMP_DEPS=-MD ${hide;noauto;output;suf=${OBJ_SUF}.o.d:SRC}
@@ -242,7 +241,7 @@ _CPP_ARGS_NEW=\
     $CLANG_STATIC_ANALYZER_OPTIONS_NEW && \
     $CLANG_TIDY_ARGS \
     $_C_CPP_WRAPPER \
-    $YNDEXER_ARGS \
+    $CPPYNDEXER_ARGS \
     $RETRY_ARGS \
     $CXX_COMPILER \
     $C_FLAGS_PLATFORM \
@@ -256,14 +255,14 @@ _CPP_ARGS_NEW=\
     $_LANG_CFLAGS_VALUE_NEW \
     ${input:SRC} \
     $TOOLCHAIN_ENV \
-    $YNDEXER_OUTPUT \
+    $CPPYNDEXER_OUTPUT \
     && $_COMPILER_TIME_TRACE_POSTPROCESS \
     $_C_CPP_KV_STYLE_NEW
 
 _C_ARGS_NEW=\
     $CLANG_TIDY_ARGS \
     $_C_CPP_WRAPPER \
-    $YNDEXER_ARGS \
+    $CPPYNDEXER_ARGS \
     $RETRY_ARGS \
     $C_COMPILER \
     $C_FLAGS_PLATFORM \
@@ -277,7 +276,7 @@ _C_ARGS_NEW=\
     $SRCFLAGS \
     ${input:SRC} \
     $TOOLCHAIN_ENV \
-    $YNDEXER_OUTPUT \
+    $CPPYNDEXER_OUTPUT \
     $_C_CPP_KV_STYLE_NEW \
     $SCU_NAME_KV_NEW
 
@@ -289,8 +288,8 @@ _C_ARGS_NEW=\
 ### $EXTRA_OUTPUT
 ### $EXTRA_COVERAGE_OUTPUT
 ### $SRCFLAGS
-### $YNDEXER_ARGS
-### $YNDEXER_OUTPUT
+### $CPPYNDEXER_ARGS
+### $CPPYNDEXER_OUTPUT
 ###
 ### $GCC_COMPILE_FLAGS is substituted for $EXTRA_C_FLAGS -c -o ${OUTFILE} ${SRC} ${pre=-I:INC}
 _SRC_C_NODEPS_CMD=\
diff --git a/build/conf/go.conf b/build/conf/go.conf
index 9776f39287..2618387419 100644
--- a/build/conf/go.conf
+++ b/build/conf/go.conf
@@ -202,7 +202,7 @@ _GO_TOOL_COMMON_FLAGS=\
 
 # tag:go-specific
 macro _GO_GEN_COVER_GO(GO_FILE, GO_COVER_OUTPUT, VAR_ID) {
-    .CMD=${hide:_GO_FAKEID} $GO_TOOLS_ROOT/pkg/tool/$_GO_TC_PATH/cover -mode set -var $VAR_ID -o ${output;noext;suf=.cover.go:GO_COVER_OUTPUT} ${input:GO_FILE}
+    .CMD=${hide:_GO_FAKEID} ${cwd;rootdir;input:GO_FILE} $GO_TOOLS_ROOT/pkg/tool/$_GO_TC_PATH/cover -mode set -var $VAR_ID -o ${output;noext;suf=.cover.go:GO_COVER_OUTPUT} ${rootrel;input:GO_FILE}
 }
 
 # tag:go-specific
diff --git a/build/conf/licenses.json b/build/conf/licenses.json
index 3a315c284d..8f525169f1 100644
--- a/build/conf/licenses.json
+++ b/build/conf/licenses.json
@@ -362,7 +362,9 @@
     "REQUIRE_MODIFICATIONS_DISCLOSURE": {
         "default": [
             "CDDL-1.0",
-            "CDDL-1.1"
+            "CDDL-1.1",
+            "EPL-1.0",
+            "EPL-2.0"
         ]
     },
     "SERVICE": {
@@ -414,14 +416,6 @@
         "LGPL-3.0-or-later": {
             "static": [ "REQUIRE_DERIVATIVE_DISCLOSURE" ],
             "dynamic": [ "REQUIRE_CITATION" ]
-        },
-        "EPL-1.0": {
-            "static": [ "REQUIRE_DERIVATIVE_DISCLOSURE" ],
-            "dynamic": [ "REQUIRE_MODIFICATIONS_DISCLOSURE" ]
-        },
-        "EPL-2.0": {
-            "static": [ "REQUIRE_DERIVATIVE_DISCLOSURE" ],
-            "dynamic": [ "REQUIRE_MODIFICATIONS_DISCLOSURE" ]
         }
     }
 }
diff --git a/build/conf/yndexing/cpp_instrumentation.conf b/build/conf/yndexing/cpp_instrumentation.conf
new file mode 100644
index 0000000000..c15c226479
--- /dev/null
+++ b/build/conf/yndexing/cpp_instrumentation.conf
@@ -0,0 +1,20 @@
+TOOL_CPPYNDEXER=
+
+CPPYNDEXER_ARGS=
+CPPYNDEXER_OUTPUT=
+
+macro POPULATE_CPP_YNDEXING() {
+    when ($CODENAVIGATION && $NOCODENAVIGATION != "yes" && $CPP_YNDEXING && $CPP_YNDEXING != "no") {
+        CPPYNDEXER_BIN=${CPPYNDEXER_RESOURCE_GLOBAL}/yndexer
+        when ($TOOL_CPPYNDEXER != "") {
+          CPPYNDEXER_BIN=$TOOL_CPPYNDEXER
+        }
+
+        CPPYNDEXER_ARGS=$YMAKE_PYTHON ${input:"build/scripts/yndexer.py"} $CPPYNDEXER_BIN 1500 $(SOURCE_ROOT) $ARCADIA_BUILD_ROOT ${input:SRC}
+        CPPYNDEXER_OUTPUT=${noauto;output;suf=${OBJ_CROSS_SUF}${COMPILE_OUT_SUFFIX}.ydx.pb2:SRC}
+    }
+    otherwise {
+        CPPYNDEXER_ARGS=
+        CPPYNDEXER_OUTPUT=
+    }
+}
diff --git a/build/export_generators/gradle/build.gradle.kts.jinja b/build/export_generators/gradle/build.gradle.kts.jinja
index ccf0a34e6e..c7df3e7588 100644
--- a/build/export_generators/gradle/build.gradle.kts.jinja
+++ b/build/export_generators/gradle/build.gradle.kts.jinja
@@ -34,41 +34,47 @@ java {
 }
 
 dependencies {
-{%  if has_junit5_test -%}
+{%- if has_junit5_test %}
     testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
     api("org.apache.commons:commons-math3:3.6.1")
     api("com.google.guava:guava:31.0.1-jre")
 {%  endif -%}
-{%  for library in target.consumer -%}
-{%      set classpath = library.classpath -%}
-{%      if classpath|replace('"','') == classpath -%}
-{%          set classpath = '"' + classpath + '"' -%}
-{%      endif -%}
-{%      if mainClass -%}
-{%          if library.excludes.consumer is defined %}
-    implementation({{ classpath }}) {
-{%              for exclude in library.excludes.consumer if exclude.classpath -%}
-{%                  set classpath = exclude.classpath|replace('"','') -%}
-{%                  set classpath_parts = split(classpath, ':') -%}
-        exclude(group = "{{ classpath_parts[0] }}", module = "{{ classpath_parts[1] }}")
-{%              endfor -%}
-    }
-{%          else -%}
+{%- for library in target.consumer if library.classpath -%}
+{%-     set classpath = library.classpath -%}
+{%-     if classpath|replace('"','') == classpath -%}
+{%-         set classpath = '"' + classpath + '"' -%}
+{%-     endif -%}
+{%-     if library.type != "contrib" %}
     implementation({{ classpath }})
-{%          endif -%}
-{%      else -%}
+{%-     else %}
     api({{ classpath }})
-{%      endif -%}
+{%-     endif -%}
+{%-     if library.excludes.consumer is defined %} {
+{%          for exclude in library.excludes.consumer if exclude.classpath -%}
+{%-             set classpath = exclude.classpath|replace('"','') -%}
+{%-             set classpath_parts = split(classpath, ':') -%}
+        exclude(group = "{{ classpath_parts[0] }}", module = "{{ classpath_parts[1] }}")
+{%          endfor -%}
+    }
+{%-     endif -%}
 {%  endfor -%}
-{%  for extra_target in extra_targets -%}
-{%      for library in extra_target.consumer -%}
-{%          set classpath = library.classpath -%}
-{%          if classpath|replace('"','') == classpath -%}
-{%              set classpath = '"' + classpath + '"' -%}
-{%          endif -%}
+{%- for extra_target in extra_targets -%}
+{%-     for library in extra_target.consumer if library.classpath -%}
+{%-         set classpath = library.classpath -%}
+{%-         if classpath|replace('"','') == classpath -%}
+{%-              set classpath = '"' + classpath + '"' -%}
+{%-         endif %}
     testImplementation({{ classpath }})
+{%-         if library.excludes.consumer is defined %} {
+{%              for exclude in library.excludes.consumer if exclude.classpath -%}
+{%-                 set classpath = exclude.classpath|replace('"','') -%}
+{%-                 set classpath_parts = split(classpath, ':') -%}
+        exclude(group = "{{ classpath_parts[0] }}", module = "{{ classpath_parts[1] }}")
+{%              endfor -%}
+    }
+{%-         endif -%}
 {%      endfor -%}
-{%  endfor -%}
+{%  endfor %}
 }
 
 {%  if has_junit5_test -%}
diff --git a/build/export_generators/gradle/build.gradle.kts.proto.jinja b/build/export_generators/gradle/build.gradle.kts.proto.jinja
index 1d84696c13..bdc805ded6 100644
--- a/build/export_generators/gradle/build.gradle.kts.proto.jinja
+++ b/build/export_generators/gradle/build.gradle.kts.proto.jinja
@@ -27,14 +27,27 @@ java {
 }
 
 dependencies {
-{%- for library in target.consumer -%}
-{%      set classpath = library.classpath -%}
-{%      if classpath|replace('"','') == classpath -%}
-{%          set classpath = '"' + classpath + '"' -%}
-{%      endif %}
-    api({{ classpath }})
-{%- endfor %}
-{%  if target.proto_namespace %}
+{%- for library in target.consumer if library.classpath -%}
+{%-     set classpath = library.classpath -%}
+{%-     if classpath|replace('"','') == classpath -%}
+{%-         set classpath = '"' + classpath + '"' -%}
+{%-     endif %}
+{%-     if library.type != "contrib" %}
+    implementation
+{%-     else %}
+    api
+{%-     endif -%}({{ classpath }})
+{%-     if library.excludes.consumer is defined %} {
+{%          for exclude in library.excludes.consumer -%}
+{%              set classpath = exclude.classpath|replace('"','') -%}
+{%              set classpath_parts = split(classpath, ':') -%}
+        exclude(group = "{{ classpath_parts[0] }}", module = "{{ classpath_parts[1] }}")
+{%          endfor -%}
+    }
+{%-     endif -%}
+{%- endfor -%}
+
+{%- if target.proto_namespace %}
     protobuf(files(File(buildProtoDir, "{{ target.proto_namespace }}")))
 {%- else %}
     protobuf(files(buildProtoDir))
diff --git a/build/export_generators/ide-gradle/a.yaml b/build/export_generators/ide-gradle/a.yaml
index 97dcfeaaa1..bfe911275a 100644
--- a/build/export_generators/ide-gradle/a.yaml
+++ b/build/export_generators/ide-gradle/a.yaml
@@ -26,10 +26,16 @@ ci:
           filters:
             - abs-paths:
                 - build/export_generators/ide-gradle/**
+                - build/ymake.core.conf
+                - build/ymake_conf.py
                 - build/conf/**
                 - build/internal/conf/**
+                - build/platform/**
+                - build/scripts/**
                 - devtools/ya/ide/gradle/**
                 - devtools/ya/build/sem_graph/**
+                - devtools/ya/ide/tests_gradle/test_prjs/**
+                - devtools/yexport/ci/gradle_cmake_docker/**
 
   on-demand-auto:
     - abs-paths: build/export_generators/ide-gradle/**
diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index 49d6658aac..579a752749 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -519,6 +519,7 @@
         "8182033807": "{registry_endpoint}/8182033807",
         "8193784322": "{registry_endpoint}/8193784322",
         "8225046385": "{registry_endpoint}/8225046385",
+        "8249001226": "{registry_endpoint}/8249001226",
         "5486731632": "{registry_endpoint}/5486731632",
         "5514350352": "{registry_endpoint}/5514350352",
         "5514360398": "{registry_endpoint}/5514360398",
@@ -1802,6 +1803,7 @@
         "8182033807": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "8193784322": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "8225046385": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
+        "8249001226": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
         "5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
         "5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
diff --git a/build/platform/test_tool/host.ya.make.inc b/build/platform/test_tool/host.ya.make.inc
index 9d453a9074..0c7c835961 100644
--- a/build/platform/test_tool/host.ya.make.inc
+++ b/build/platform/test_tool/host.ya.make.inc
@@ -1,12 +1,12 @@
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8225028004)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8249026737)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8225020453)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8249024352)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8225039215)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8249030911)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8225017029)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8249022852)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8225033698)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8249028803)
 
 ENDIF()
diff --git a/build/platform/test_tool/host_os.ya.make.inc b/build/platform/test_tool/host_os.ya.make.inc
index c459ea42f4..f4db676702 100644
--- a/build/platform/test_tool/host_os.ya.make.inc
+++ b/build/platform/test_tool/host_os.ya.make.inc
@@ -1,12 +1,12 @@
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8225035547)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8248997969)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8225031306)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8248995856)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8225046385)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8249001226)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8225026497)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8248993621)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8225041036)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8248999568)
 
 ENDIF()
diff --git a/build/plugins/_dart_fields.py b/build/plugins/_dart_fields.py
index 575fde15d2..bddac6c3ce 100644
--- a/build/plugins/_dart_fields.py
+++ b/build/plugins/_dart_fields.py
@@ -1150,6 +1150,7 @@ class TestFiles:
         'grut/libs/bigrt/profile',
         'grut/libs/bigrt/profiles',
         'grut/libs/bigrt/queue_info_config',
+        'grut/libs/bigrt/server',
         'grut/libs/shooter',
     )
 
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index a6c315b8e5..9d7c0e43a1 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -99,6 +99,8 @@ when ($LOCAL && $XCODE) {
 @import "${CONF_ROOT}/conf/project_specific/other.conf"
 @import "${CONF_ROOT}/conf/project_specific/yt.conf"
 
+@import "${CONF_ROOT}/conf/yndexing/cpp_instrumentation.conf"
+
 SO_OUTPUTS=no
 
 when ($USE_PYTHON) {
@@ -112,7 +114,6 @@ _TOOL_PROTOC_GEN_GO_GRPC_V2=vendor/google.golang.org/grpc/cmd/protoc-gen-go-grpc
 _TOOL_RESCOMPILER=tools/rescompiler
 _TOOL_RESCOMPRESSOR=tools/rescompressor
 _TOOL_RORESCOMPILER=tools/rorescompiler
-TOOL_CPPYNDEXER=
 
 when ($DISABLE_SEPARATE_AUX_CPP != "yes") {
     SEPARATE_AUX_CPP=yes
@@ -259,21 +260,10 @@ otherwise {
 
 # tag:codenav
 when ($CODENAVIGATION && $NOCODENAVIGATION != "yes") {
-    when ($TOOL_CPPYNDEXER == "") {
-        _TOOL_CPPYNDEXER_REAL=$CPPYNDEXER_RESOURCE_GLOBAL/yndexer
-    }
-    otherwise {
-        _TOOL_CPPYNDEXER_REAL=$TOOL_CPPYNDEXER
-    }
-
     PY_PROGRAM_LINK_EXE=$LINK_EXE && ${hide;kv:"pyndex $TARGET"}
-    YNDEXER_ARGS=$YMAKE_PYTHON ${input:"build/scripts/yndexer.py"} $_TOOL_CPPYNDEXER_REAL 1500 $(SOURCE_ROOT) $ARCADIA_BUILD_ROOT ${input:SRC}
-    YNDEXER_OUTPUT=${noauto;output;suf=${OBJ_CROSS_SUF}${COMPILE_OUT_SUFFIX}.ydx.pb2:SRC}
 }
 otherwise {
     PY_PROGRAM_LINK_EXE=$LINK_EXE
-    YNDEXER_ARGS=
-    YNDEXER_OUTPUT=
 }
 
 when ($RETRY == "yes") {
@@ -845,6 +835,8 @@ module _BASE_UNIT: _BARE_UNIT {
 
     ENABLE(USE_YASM_ASSEMBLER)
     ENABLE(_BISON_FLEX_SET_DEFAULTS)
+
+    POPULATE_CPP_YNDEXING()
 }
 
 _LINKER_ID=