lua: bump metrics module

Bump metrics package submodule. Commits from PRs [1-4] affect Tarantool, the other ones are related to module infrastructure. 1. tarantool/metrics#482 2. tarantool/metrics#483 3. tarantool/metrics#484 4. tarantool/metrics#491 NO_DOC=doc is a part of submodule
DifferentialOrange · Jul 16, 2024 · 2fcff2f · 2fcff2f
1 parent e5c4bd6
commit 2fcff2f
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 1 deletion.
diff --git a/changelogs/unreleased/bump-metrics-to-1.2.0.md 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
@@ -104,6 +104,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
@@ -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
@@ -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
@@ -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
@@ -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