Skip to content

Commit f400f65

Browse files
committed
* Added trace.DriverConnStreamEvents details bit
1 parent d6ceff7 commit f400f65

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
* Added `trace.DriverConnStreamEvents` details bit
2+
13
## v3.66.1
24
* Added flush messages from buffer before close topic writer
35
* Added Flush method for topic writer

log/driver.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver { //nolint:gocyclo
216216
) func(
217217
trace.DriverConnNewStreamDoneInfo,
218218
) {
219-
if d.Details()&trace.DriverConnEvents == 0 {
219+
if d.Details()&trace.DriverConnStreamEvents == 0 {
220220
return nil
221221
}
222222
ctx := with(*info.Context, TRACE, "ydb", "driver", "conn", "stream", "New")
@@ -249,7 +249,7 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver { //nolint:gocyclo
249249
OnConnStreamCloseSend: func(info trace.DriverConnStreamCloseSendStartInfo) func(
250250
trace.DriverConnStreamCloseSendDoneInfo,
251251
) {
252-
if d.Details()&trace.DriverConnEvents == 0 {
252+
if d.Details()&trace.DriverConnStreamEvents == 0 {
253253
return nil
254254
}
255255
ctx := with(*info.Context, TRACE, "ydb", "driver", "conn", "stream", "CloseSend")
@@ -271,7 +271,7 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver { //nolint:gocyclo
271271
}
272272
},
273273
OnConnStreamSendMsg: func(info trace.DriverConnStreamSendMsgStartInfo) func(trace.DriverConnStreamSendMsgDoneInfo) {
274-
if d.Details()&trace.DriverConnEvents == 0 {
274+
if d.Details()&trace.DriverConnStreamEvents == 0 {
275275
return nil
276276
}
277277
ctx := with(*info.Context, TRACE, "ydb", "driver", "conn", "stream", "SendMsg")
@@ -293,7 +293,7 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver { //nolint:gocyclo
293293
}
294294
},
295295
OnConnStreamRecvMsg: func(info trace.DriverConnStreamRecvMsgStartInfo) func(trace.DriverConnStreamRecvMsgDoneInfo) {
296-
if d.Details()&trace.DriverConnEvents == 0 {
296+
if d.Details()&trace.DriverConnStreamEvents == 0 {
297297
return nil
298298
}
299299
ctx := with(*info.Context, TRACE, "ydb", "driver", "conn", "stream", "RecvMsg")

metrics/driver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func driver(config Config) (t trace.Driver) {
5555
)
5656

5757
return func(info trace.DriverConnNewStreamDoneInfo) {
58-
if config.Details()&trace.DriverConnEvents != 0 {
58+
if config.Details()&trace.DriverConnStreamEvents != 0 {
5959
requests.With(map[string]string{
6060
"status": errorBrief(info.Error),
6161
"method": string(method),

trace/details.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ func (d Details) String() string {
3131
const (
3232
DriverNetEvents Details = 1 << iota // for bitmask: 1, 2, 4, 8, 16, 32, ...
3333
DriverConnEvents
34+
DriverConnStreamEvents
3435
DriverBalancerEvents
3536
DriverResolverEvents
3637
DriverRepeaterEvents
@@ -79,6 +80,7 @@ const (
7980
CoordinationEvents
8081

8182
DriverEvents = DriverConnEvents |
83+
DriverConnStreamEvents |
8284
DriverBalancerEvents |
8385
DriverResolverEvents |
8486
DriverRepeaterEvents |
@@ -128,6 +130,7 @@ var (
128130
DriverResolverEvents: "ydb.driver.resolver",
129131
DriverRepeaterEvents: "ydb.driver.repeater",
130132
DriverConnEvents: "ydb.driver.conn",
133+
DriverConnStreamEvents: "ydb.driver.conn.stream",
131134
DriverCredentialsEvents: "ydb.driver.credentials",
132135

133136
DiscoveryEvents: "ydb.discovery",

0 commit comments

Comments
 (0)