Skip to content
Draft
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
* Renamed `ydb_go_sdk_ydb_table_pool_node_hint_miss` and `ydb_go_sdk_ydb_query_pool_node_hint_miss` metrics to
`ydb_go_sdk_ydb_table_pool_node_hint` and `ydb_go_sdk_ydb_query_pool_node_hint`. Added `hit` label for them to
distinguish between hits and misses


## v3.124.0
* Fixed UUID scanning with `database/sql` when using types implementing `sql.Scanner` interface (like `uuid.UUID`)

Expand Down
6 changes: 6 additions & 0 deletions metrics/constants.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package metrics

const (
trueStr = "true"
falseStr = "false"
)
15 changes: 11 additions & 4 deletions metrics/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,21 @@ func query(config Config) (t trace.Query) {
}
}
{
nodeHintMiss := poolConfig.CounterVec("node_hint_miss", "preferred_node_id", "session_node_id")
nodeHint := poolConfig.CounterVec("node_hint", "preferred_node_id", "session_node_id", "hit")
t.OnPoolGet = func(info trace.QueryPoolGetStartInfo) func(trace.QueryPoolGetDoneInfo) {
return func(info trace.QueryPoolGetDoneInfo) {
if poolConfig.Details()&trace.QueryPoolEvents != 0 {
if info.NodeHintInfo != nil {
nodeHintMiss.With(map[string]string{
"preferred_node_id": idToString(info.NodeHintInfo.PreferredNodeID),
"session_node_id": idToString(info.NodeHintInfo.SessionNodeID),
preferred := idToString(info.NodeHintInfo.PreferredNodeID)
actual := idToString(info.NodeHintInfo.SessionNodeID)
hit := falseStr
if preferred == actual {
hit = trueStr
}
nodeHint.With(map[string]string{
"preferred_node_id": preferred,
"session_node_id": actual,
"hit": hit,
}).Inc()
}
}
Expand Down
15 changes: 11 additions & 4 deletions metrics/table.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func table(config Config) (t trace.Table) {
get := config.CounterVec("get")
put := config.CounterVec("put")
with := config.GaugeVec("with")
nodeHintMiss := config.CounterVec("node_hint_miss", "preferred_node_id", "session_node_id")
nodeHint := config.CounterVec("node_hint", "preferred_node_id", "session_node_id", "hit")
t.OnInit = func(info trace.TableInitStartInfo) func(trace.TableInitDoneInfo) {
return func(info trace.TableInitDoneInfo) {
if config.Details()&trace.TableEvents != 0 {
Expand Down Expand Up @@ -64,9 +64,16 @@ func table(config Config) (t trace.Table) {
get.With(nil).Inc()
}
if info.NodeHintInfo != nil {
nodeHintMiss.With(map[string]string{
"preferred_node_id": idToString(info.NodeHintInfo.PreferredNodeID),
"session_node_id": idToString(info.NodeHintInfo.SessionNodeID),
preferred := idToString(info.NodeHintInfo.PreferredNodeID)
actual := idToString(info.NodeHintInfo.SessionNodeID)
hit := falseStr
if preferred == actual {
hit = trueStr
}
nodeHint.With(map[string]string{
"preferred_node_id": preferred,
"session_node_id": actual,
"hit": hit,
}).Inc()
}
}
Expand Down