From e79982e7d782e31453fdc03730efe0c3661b2665 Mon Sep 17 00:00:00 2001
From: Georgy Moiseev <moiseev.georgii@gmail.com>
Date: Wed, 10 Jul 2024 14:29:22 +0300
Subject: [PATCH] lua: bump metrics module
Bump metrics package submodule. Commits from PRs [1-4] affect
Tarantool, the other ones are related to module infrastructure.
1. https://github.com/tarantool/metrics/pull/482
2. https://github.com/tarantool/metrics/pull/483
3. https://github.com/tarantool/metrics/pull/484
4. https://github.com/tarantool/metrics/pull/491
NO_DOC=doc is a part of submodule
---
changelogs/unreleased/bump-metrics-to-1.2.0.md | 8 ++++++++
src/CMakeLists.txt | 1 +
src/box/lua/init.c | 3 +++
test/app-luatest/tnt_debug_getsources_test.lua | 1 +
test/metrics-luatest/helper.lua | 3 +++
test/metrics-luatest/tarantool_config_metrics_test.lua | 3 +++
third_party/metrics | 2 +-
7 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 changelogs/unreleased/bump-metrics-to-1.2.0.md
create mode 100644 test/metrics-luatest/tarantool_config_metrics_test.lua
diff --git a/changelogs/unreleased/bump-metrics-to-1.2.0.md b/changelogs/unreleased/bump-metrics-to-1.2.0.md
new file mode 100644
index 0000000000..7199b25895
--- /dev/null
+++ b/changelogs/unreleased/bump-metrics-to-1.2.0.md
@@ -0,0 +1,8 @@
+## feature/lua
+
+* Deprecated using `cdata` values with `metrics` module `histogram:observe`.
+* Updated memtx metrics descriptions from `metrics` module to be consistent.
+* Added new metrics to `metrics` module: `tnt_memtx_tuples_data_total`,
+ `tnt_memtx_tuples_data_read_view`, `tnt_memtx_tuples_data_garbage`,
+ `tnt_memtx_index_total`, `tnt_memtx_index_read_view`, `tnt_vinyl_memory_tuple`,
+ `tnt_config_alerts`, `tnt_config_status`.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9beffc1e39..6b9d2ef098 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -106,6 +106,7 @@ lua_source(lua_sources ../third_party/metrics/metrics/quantile.lua metrics_quant
lua_source(lua_sources ../third_party/metrics/metrics/registry.lua metrics_registry_lua)
lua_source(lua_sources ../third_party/metrics/metrics/stash.lua metrics_stash_lua)
lua_source(lua_sources ../third_party/metrics/metrics/tarantool/clock.lua metrics_tarantool_clock_lua)
+lua_source(lua_sources ../third_party/metrics/metrics/tarantool/config.lua metrics_tarantool_config_lua)
lua_source(lua_sources ../third_party/metrics/metrics/tarantool/cpu.lua metrics_tarantool_cpu_lua)
lua_source(lua_sources ../third_party/metrics/metrics/tarantool/event_loop.lua metrics_tarantool_event_loop_lua)
lua_source(lua_sources ../third_party/metrics/metrics/tarantool/fibers.lua metrics_tarantool_fibers_lua)
diff --git a/src/box/lua/init.c b/src/box/lua/init.c
index b8cbcc6884..364a7c950c 100644
--- a/src/box/lua/init.c
+++ b/src/box/lua/init.c
@@ -129,6 +129,7 @@ extern char session_lua[],
metrics_registry_lua[],
metrics_stash_lua[],
metrics_tarantool_clock_lua[],
+ metrics_tarantool_config_lua[],
metrics_tarantool_cpu_lua[],
metrics_tarantool_event_loop_lua[],
metrics_tarantool_fibers_lua[],
@@ -281,6 +282,8 @@ static const char *lua_sources[] = {
"metrics.psutils.cpu", metrics_psutils_cpu_lua,
"third_party/metrics/metrics/tarantool/clock",
"metrics.tarantool.clock", metrics_tarantool_clock_lua,
+ "third_party/metrics/metrics/tarantool/config",
+ "metrics.tarantool.config", metrics_tarantool_config_lua,
"third_party/metrics/metrics/tarantool/cpu",
"metrics.tarantool.cpu", metrics_tarantool_cpu_lua,
"third_party/metrics/metrics/tarantool/event_loop",
diff --git a/test/app-luatest/tnt_debug_getsources_test.lua b/test/app-luatest/tnt_debug_getsources_test.lua
index 73c8a3d518..f8d6bbdd31 100644
--- a/test/app-luatest/tnt_debug_getsources_test.lua
+++ b/test/app-luatest/tnt_debug_getsources_test.lua
@@ -46,6 +46,7 @@ local files = {
'third_party/metrics/metrics/registry',
'third_party/metrics/metrics/stash',
'third_party/metrics/metrics/tarantool/clock',
+ 'third_party/metrics/metrics/tarantool/config',
'third_party/metrics/metrics/tarantool/cpu',
'third_party/metrics/metrics/tarantool/event_loop',
'third_party/metrics/metrics/tarantool/fibers',
diff --git a/test/metrics-luatest/helper.lua b/test/metrics-luatest/helper.lua
index d6d6164933..54c2b7591f 100644
--- a/test/metrics-luatest/helper.lua
+++ b/test/metrics-luatest/helper.lua
@@ -118,3 +118,6 @@ local test_root = fio.dirname(
package.loaded['test.utils'].LUA_PATH = os.getenv('LUA_PATH') ..
test_root .. '/?.lua;' ..
test_root .. '/?/init.lua;'
+
+workaround_requires('test.tarantool3_helpers.server')
+workaround_requires('test.tarantool3_helpers.treegen')
diff --git a/test/metrics-luatest/tarantool_config_metrics_test.lua b/test/metrics-luatest/tarantool_config_metrics_test.lua
new file mode 100644
index 0000000000..6756c2a4ab
--- /dev/null
+++ b/test/metrics-luatest/tarantool_config_metrics_test.lua
@@ -0,0 +1,3 @@
+require('test.metrics-luatest.helper')
+
+require('third_party.metrics.test.tarantool.config_metrics_test')
diff --git a/third_party/metrics b/third_party/metrics
index 3370f856ef..7cb67bba1f 160000
--- a/third_party/metrics
+++ b/third_party/metrics
@@ -1 +1 @@
-Subproject commit 3370f856efd4172bf24916e66e3846eeb01550a8
+Subproject commit 7cb67bba1fda5f0ae44236fb4fb972ce19d27f8b
--
GitLab