Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed
- Throw an error when http_middelware is processing a wrong handler [#199](https://github.com/tarantool/metrics/issues/199)
- cartridge issues metric fails before cartridge.cfg() call [#298](https://github.com/tarantool/metrics/issues/298)

## [0.10.0] - 2021-08-03
### Changed
Expand Down
1 change: 0 additions & 1 deletion metrics/cartridge.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ local metrics = require('metrics')

local cartridge_metrics = {
require('metrics.cartridge.issues'),
require('metrics.tarantool.clock'),
}

local function enable()
Expand Down
10 changes: 7 additions & 3 deletions metrics/cartridge/issues.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@ local fun = require('fun')

local collectors_list = {}

local function update_info_metrics()
local function update()
local list_on_instance = rawget(_G, '__cartridge_issues_list_on_instance')

if not list_on_instance then
return
end

local issues = list_on_instance()
local ok, issues = pcall(list_on_instance)

if not ok then
return
end

local levels = { 'warning', 'critical' }

Expand All @@ -22,6 +26,6 @@ local function update_info_metrics()
end

return {
update = update_info_metrics,
update = update,
list = collectors_list,
}
16 changes: 16 additions & 0 deletions test/unit/cartridge_issues_test.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
local helpers = require('test.helper')

local t = require('luatest')
local g = t.group()

g.before_all = function()
t.skip_if(type(helpers) ~= 'table', 'Skip cartridge test')
helpers.skip_cartridge_version_less('2.0.2')
end

g.test_cartridge_issues_before_cartridge_cfg = function()
require('cartridge.issues')
local issues = require('metrics.cartridge.issues')
local ok, error = pcall(issues.update)
t.assert(ok, error)
end