Merge branch 'master' into fix-tx

CHANGELOG.md

@@ -1,5 +1,6 @@
 * Added option `ydb.WithSessionPoolSessionIdleTimeToLive` for restrict idle time of query sessions
 * Fixed bug with leak of query transactions
+* Changed `ydb_go_sdk_ydb_driver_conn_requests` metrics splitted to `ydb_go_sdk_ydb_driver_conn_request_statuses` and `ydb_go_sdk_ydb_driver_conn_request_methods`
 * Fixed metadata for operation service connection
 * Fixed composing query traces in call `db.Query.Do[Tx]` using option `query.WithTrace`
 

metrics/driver.go

@@ -18,7 +18,8 @@ func driver(config Config) (t trace.Driver) {
 	balancerUpdates := config.WithSystem("balancer").CounterVec("updates", "cause")
 	conns := config.GaugeVec("conns", "endpoint", "node_id")
 	banned := config.WithSystem("conn").GaugeVec("banned", "endpoint", "node_id", "cause")
-	requests := config.WithSystem("conn").CounterVec("requests", "status", "method", "endpoint", "node_id")
+	requestStatuses := config.WithSystem("conn").CounterVec("request_statuses", "status", "endpoint", "node_id")
+	requestMethods := config.WithSystem("conn").CounterVec("request_methods", "method", "endpoint", "node_id")
 	tli := config.CounterVec("transaction_locks_invalidated")
 
 	type endpointKey struct {
@@ -35,8 +36,12 @@ func driver(config Config) (t trace.Driver) {
 
 		return func(info trace.DriverConnInvokeDoneInfo) {
 			if config.Details()&trace.DriverConnEvents != 0 {
-				requests.With(map[string]string{
+				requestStatuses.With(map[string]string{
 					"status":   errorBrief(info.Error),
+					"endpoint": endpoint,
+					"node_id":  strconv.FormatUint(uint64(nodeID), 10),
+				}).Inc()
+				requestMethods.With(map[string]string{
 					"method":   string(method),
 					"endpoint": endpoint,
 					"node_id":  strconv.FormatUint(uint64(nodeID), 10),
@@ -58,7 +63,7 @@ func driver(config Config) (t trace.Driver) {
 
 		return func(info trace.DriverConnNewStreamDoneInfo) {
 			if config.Details()&trace.DriverConnStreamEvents != 0 {
-				requests.With(map[string]string{
+				requestStatuses.With(map[string]string{
 					"status":   errorBrief(info.Error),
 					"method":   string(method),
 					"endpoint": endpoint,