Skip to content

Commit 449f668

Browse files
rekbyrekby
committed
remove all ydb prefixes
1 parent 4ec85ff commit 449f668

File tree

7 files changed

+270
-270
lines changed

7 files changed

+270
-270
lines changed

‎log/driver.go‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
2828
ctx := with(context.Background(), TRACE, "ydb", "driver", "resolver", "update")
2929
target := info.Target
3030
addresses := info.Resolved
31-
l.Log(ctx, "ydb driver starting resolve...",
31+
l.Log(ctx, "driver starting resolve...",
3232
kv.String("target", target),
3333
kv.Strings("resolved", addresses),
3434
)
3535

3636
return func(info trace.DriverResolveDoneInfo) {
3737
if info.Error == nil {
38-
l.Log(ctx, "ydb driver resolve done",
38+
l.Log(ctx, "driver resolve done",
3939
kv.String("target", target),
4040
kv.Strings("resolved", addresses),
4141
)
@@ -57,7 +57,7 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
5757
database := info.Database
5858
secure := info.Secure
5959
ctx := with(*info.Context, DEBUG, "ydb", "driver", "resolver", "init")
60-
l.Log(ctx, "ydb driver starting init...",
60+
l.Log(ctx, "driver starting init...",
6161
kv.String("endpoint", endpoint),
6262
kv.String("database", database),
6363
kv.Bool("secure", secure),
@@ -66,14 +66,14 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
6666

6767
return func(info trace.DriverInitDoneInfo) {
6868
if info.Error == nil {
69-
l.Log(ctx, "ydb driver init done",
69+
l.Log(ctx, "driver init done",
7070
kv.String("endpoint", endpoint),
7171
kv.String("database", database),
7272
kv.Bool("secure", secure),
7373
kv.Latency(start),
7474
)
7575
} else {
76-
l.Log(WithLevel(ctx, ERROR), "ydb driver init failed",
76+
l.Log(WithLevel(ctx, ERROR), "driver init failed",
7777
kv.Error(info.Error),
7878
kv.String("endpoint", endpoint),
7979
kv.String("database", database),
@@ -89,16 +89,16 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
8989
return nil
9090
}
9191
ctx := with(*info.Context, TRACE, "ydb", "driver", "resolver", "close")
92-
l.Log(ctx, "ydb driver starting close...")
92+
l.Log(ctx, "driver starting close...")
9393
start := time.Now()
9494

9595
return func(info trace.DriverCloseDoneInfo) {
9696
if info.Error == nil {
97-
l.Log(ctx, "ydb driver close done",
97+
l.Log(ctx, "driver close done",
9898
kv.Latency(start),
9999
)
100100
} else {
101-
l.Log(WithLevel(ctx, WARN), "ydb driver close failed",
101+
l.Log(WithLevel(ctx, WARN), "driver close failed",
102102
kv.Error(info.Error),
103103
kv.Latency(start),
104104
kv.Version(),
@@ -112,19 +112,19 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
112112
}
113113
ctx := with(*info.Context, TRACE, "ydb", "driver", "conn", "dial")
114114
endpoint := info.Endpoint
115-
l.Log(ctx, "ydb driver starting dial...",
115+
l.Log(ctx, "driver starting dial...",
116116
kv.Stringer("endpoint", endpoint),
117117
)
118118
start := time.Now()
119119

120120
return func(info trace.DriverConnDialDoneInfo) {
121121
if info.Error == nil {
122-
l.Log(ctx, "ydb driver dial done",
122+
l.Log(ctx, "driver dial done",
123123
kv.Stringer("endpoint", endpoint),
124124
kv.Latency(start),
125125
)
126126
} else {
127-
l.Log(WithLevel(ctx, WARN), "ydb driver dial failed",
127+
l.Log(WithLevel(ctx, WARN), "driver dial failed",
128128
kv.Error(info.Error),
129129
kv.Stringer("endpoint", endpoint),
130130
kv.Latency(start),
@@ -139,14 +139,14 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
139139
}
140140
ctx := with(context.Background(), TRACE, "ydb", "driver", "conn", "state", "change")
141141
endpoint := info.Endpoint
142-
l.Log(ctx, "ydb driver starting state change...",
142+
l.Log(ctx, "driver starting state change...",
143143
kv.Stringer("endpoint", endpoint),
144144
kv.Stringer("state", info.State),
145145
)
146146
start := time.Now()
147147

148148
return func(info trace.DriverConnStateChangeDoneInfo) {
149-
l.Log(ctx, "ydb driver state change done",
149+
l.Log(ctx, "driver state change done",
150150
kv.Stringer("endpoint", endpoint),
151151
kv.Latency(start),
152152
kv.Stringer("state", info.State),
@@ -159,19 +159,19 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
159159
}
160160
ctx := with(*info.Context, TRACE, "ydb", "driver", "conn", "close")
161161
endpoint := info.Endpoint
162-
l.Log(ctx, "ydb driver starting connection close...",
162+
l.Log(ctx, "driver starting connection close...",
163163
kv.Stringer("endpoint", endpoint),
164164
)
165165
start := time.Now()
166166

167167
return func(info trace.DriverConnCloseDoneInfo) {
168168
if info.Error == nil {
169-
l.Log(ctx, "ydb driver connection close done",
169+
l.Log(ctx, "driver connection close done",
170170
kv.Stringer("endpoint", endpoint),
171171
kv.Latency(start),
172172
)
173173
} else {
174-
l.Log(WithLevel(ctx, WARN), "ydb driver connection close failed",
174+
l.Log(WithLevel(ctx, WARN), "driver connection close failed",
175175
kv.Error(info.Error),
176176
kv.Stringer("endpoint", endpoint),
177177
kv.Latency(start),
@@ -187,22 +187,22 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
187187
ctx := with(*info.Context, TRACE, "ydb", "driver", "conn", "invoke")
188188
endpoint := info.Endpoint
189189
method := string(info.Method)
190-
l.Log(ctx, "ydb driver starting connection invoke...",
190+
l.Log(ctx, "driver starting connection invoke...",
191191
kv.Stringer("endpoint", endpoint),
192192
kv.String("method", method),
193193
)
194194
start := time.Now()
195195

196196
return func(info trace.DriverConnInvokeDoneInfo) {
197197
if info.Error == nil {
198-
l.Log(ctx, "ydb driver connection invoke done",
198+
l.Log(ctx, "driver connection invoke done",
199199
kv.Stringer("endpoint", endpoint),
200200
kv.String("method", method),
201201
kv.Latency(start),
202202
kv.Stringer("metadata", kv.Metadata(info.Metadata)),
203203
)
204204
} else {
205-
l.Log(WithLevel(ctx, WARN), "ydb driver connection invoke failed",
205+
l.Log(WithLevel(ctx, WARN), "driver connection invoke failed",
206206
kv.Error(info.Error),
207207
kv.Stringer("endpoint", endpoint),
208208
kv.String("method", method),
@@ -224,21 +224,21 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
224224
ctx := with(*info.Context, TRACE, "ydb", "driver", "conn", "stream", "New")
225225
endpoint := info.Endpoint
226226
method := string(info.Method)
227-
l.Log(ctx, "ydb driver starting new connection stream...",
227+
l.Log(ctx, "driver starting new connection stream...",
228228
kv.Stringer("endpoint", endpoint),
229229
kv.String("method", method),
230230
)
231231
start := time.Now()
232232

233233
return func(info trace.DriverConnNewStreamDoneInfo) {
234234
if info.Error == nil {
235-
l.Log(ctx, "ydb driver connection new stream done",
235+
l.Log(ctx, "driver connection new stream done",
236236
kv.Stringer("endpoint", endpoint),
237237
kv.String("method", method),
238238
kv.Latency(start),
239239
)
240240
} else {
241-
l.Log(WithLevel(ctx, WARN), "ydb driver connection new stream failed",
241+
l.Log(WithLevel(ctx, WARN), "driver connection new stream failed",
242242
kv.Error(info.Error),
243243
kv.Stringer("endpoint", endpoint),
244244
kv.String("method", method),
@@ -255,16 +255,16 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
255255
return nil
256256
}
257257
ctx := with(*info.Context, TRACE, "ydb", "driver", "conn", "stream", "CloseSend")
258-
l.Log(ctx, "ydb driver starting send stream close...")
258+
l.Log(ctx, "driver starting send stream close...")
259259
start := time.Now()
260260

261261
return func(info trace.DriverConnStreamCloseSendDoneInfo) {
262262
if info.Error == nil {
263-
l.Log(ctx, "ydb driver connection stream closed done",
263+
l.Log(ctx, "driver connection stream closed done",
264264
kv.Latency(start),
265265
)
266266
} else {
267-
l.Log(WithLevel(ctx, WARN), "ydb driver connection stream closed failed",
267+
l.Log(WithLevel(ctx, WARN), "driver connection stream closed failed",
268268
kv.Error(info.Error),
269269
kv.Latency(start),
270270
kv.Version(),
@@ -277,16 +277,16 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
277277
return nil
278278
}
279279
ctx := with(*info.Context, TRACE, "ydb", "driver", "conn", "stream", "SendMsg")
280-
l.Log(ctx, "ydb driver starting send stream msg...")
280+
l.Log(ctx, "driver starting send stream msg...")
281281
start := time.Now()
282282

283283
return func(info trace.DriverConnStreamSendMsgDoneInfo) {
284284
if info.Error == nil {
285-
l.Log(ctx, "ydb driver send stream msg done",
285+
l.Log(ctx, "driver send stream msg done",
286286
kv.Latency(start),
287287
)
288288
} else {
289-
l.Log(WithLevel(ctx, WARN), "ydb driver send stream msg failed",
289+
l.Log(WithLevel(ctx, WARN), "driver send stream msg failed",
290290
kv.Error(info.Error),
291291
kv.Latency(start),
292292
kv.Version(),
@@ -299,16 +299,16 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
299299
return nil
300300
}
301301
ctx := with(*info.Context, TRACE, "ydb", "driver", "conn", "stream", "RecvMsg")
302-
l.Log(ctx, "ydb driver starting receive stream msg...")
302+
l.Log(ctx, "driver starting receive stream msg...")
303303
start := time.Now()
304304

305305
return func(info trace.DriverConnStreamRecvMsgDoneInfo) {
306306
if xerrors.HideEOF(info.Error) == nil {
307-
l.Log(ctx, "ydb driver receive stream msg done",
307+
l.Log(ctx, "driver receive stream msg done",
308308
kv.Latency(start),
309309
)
310310
} else {
311-
l.Log(WithLevel(ctx, WARN), "ydb driver receive stream msg failed",
311+
l.Log(WithLevel(ctx, WARN), "driver receive stream msg failed",
312312
kv.Error(info.Error),
313313
kv.Latency(start),
314314
kv.Version(),
@@ -323,14 +323,14 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
323323
ctx := with(*info.Context, TRACE, "ydb", "driver", "conn", "ban")
324324
endpoint := info.Endpoint
325325
cause := info.Cause
326-
l.Log(ctx, "ydb driver starting connection ban...",
326+
l.Log(ctx, "driver starting connection ban...",
327327
kv.Stringer("endpoint", endpoint),
328328
kv.NamedError("cause", cause),
329329
)
330330
start := time.Now()
331331

332332
return func(info trace.DriverConnBanDoneInfo) {
333-
l.Log(WithLevel(ctx, WARN), "ydb driver connection ban done",
333+
l.Log(WithLevel(ctx, WARN), "driver connection ban done",
334334
kv.Stringer("endpoint", endpoint),
335335
kv.Latency(start),
336336
kv.Stringer("state", info.State),
@@ -345,13 +345,13 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
345345
}
346346
ctx := with(*info.Context, TRACE, "ydb", "driver", "conn", "allow")
347347
endpoint := info.Endpoint
348-
l.Log(ctx, "ydb driver starting connection allow...",
348+
l.Log(ctx, "driver starting connection allow...",
349349
kv.Stringer("endpoint", endpoint),
350350
)
351351
start := time.Now()
352352

353353
return func(info trace.DriverConnAllowDoneInfo) {
354-
l.Log(ctx, "ydb driver connection allow done",
354+
l.Log(ctx, "driver connection allow done",
355355
kv.Stringer("endpoint", endpoint),
356356
kv.Latency(start),
357357
kv.Stringer("state", info.State),
@@ -365,21 +365,21 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
365365
ctx := with(*info.Context, TRACE, "ydb", "driver", "repeater", "wake", "up")
366366
name := info.Name
367367
event := info.Event
368-
l.Log(ctx, "ydb driver starting repeater wakeup...",
368+
l.Log(ctx, "driver starting repeater wakeup...",
369369
kv.String("name", name),
370370
kv.String("event", event),
371371
)
372372
start := time.Now()
373373

374374
return func(info trace.DriverRepeaterWakeUpDoneInfo) {
375375
if info.Error == nil {
376-
l.Log(ctx, "ydb driver repeater wakeup done",
376+
l.Log(ctx, "driver repeater wakeup done",
377377
kv.String("name", name),
378378
kv.String("event", event),
379379
kv.Latency(start),
380380
)
381381
} else {
382-
l.Log(WithLevel(ctx, ERROR), "ydb driver repeater wakeup failed",
382+
l.Log(WithLevel(ctx, ERROR), "driver repeater wakeup failed",
383383
kv.Error(info.Error),
384384
kv.String("name", name),
385385
kv.String("event", event),
@@ -394,11 +394,11 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
394394
return nil
395395
}
396396
ctx := with(*info.Context, TRACE, "ydb", "driver", "balancer", "init")
397-
l.Log(ctx, "ydb driver starting balancer init...")
397+
l.Log(ctx, "driver starting balancer init...")
398398
start := time.Now()
399399

400400
return func(info trace.DriverBalancerInitDoneInfo) {
401-
l.Log(WithLevel(ctx, INFO), "ydb driver balancer init done",
401+
l.Log(WithLevel(ctx, INFO), "driver balancer init done",
402402
kv.Latency(start),
403403
)
404404
}
@@ -408,16 +408,16 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
408408
return nil
409409
}
410410
ctx := with(*info.Context, TRACE, "ydb", "driver", "balancer", "close")
411-
l.Log(ctx, "ydb driver starting balancer close...")
411+
l.Log(ctx, "driver starting balancer close...")
412412
start := time.Now()
413413

414414
return func(info trace.DriverBalancerCloseDoneInfo) {
415415
if info.Error == nil {
416-
l.Log(ctx, "ydb driver balancer close done",
416+
l.Log(ctx, "driver balancer close done",
417417
kv.Latency(start),
418418
)
419419
} else {
420-
l.Log(WithLevel(ctx, WARN), "ydb driver balancer close failed",
420+
l.Log(WithLevel(ctx, WARN), "driver balancer close failed",
421421
kv.Error(info.Error),
422422
kv.Latency(start),
423423
kv.Version(),
@@ -434,17 +434,17 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
434434
return nil
435435
}
436436
ctx := with(*info.Context, TRACE, "ydb", "driver", "balancer", "choose", "endpoint")
437-
l.Log(ctx, "ydb driver starting balancer choose endpoint...")
437+
l.Log(ctx, "driver starting balancer choose endpoint...")
438438
start := time.Now()
439439

440440
return func(info trace.DriverBalancerChooseEndpointDoneInfo) {
441441
if info.Error == nil {
442-
l.Log(ctx, "ydb driver balancer choose endpoint done",
442+
l.Log(ctx, "driver balancer choose endpoint done",
443443
kv.Latency(start),
444444
kv.Stringer("endpoint", info.Endpoint),
445445
)
446446
} else {
447-
l.Log(WithLevel(ctx, ERROR), "ydb driver balancer choose endpoint failed",
447+
l.Log(WithLevel(ctx, ERROR), "driver balancer choose endpoint failed",
448448
kv.Error(info.Error),
449449
kv.Latency(start),
450450
kv.Version(),
@@ -461,14 +461,14 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
461461
return nil
462462
}
463463
ctx := with(*info.Context, TRACE, "ydb", "driver", "balancer", "update")
464-
l.Log(ctx, "ydb driver starting balancer update...",
464+
l.Log(ctx, "driver starting balancer update...",
465465
kv.Bool("needLocalDC", info.NeedLocalDC),
466466
kv.String("database", info.Database),
467467
)
468468
start := time.Now()
469469

470470
return func(info trace.DriverBalancerUpdateDoneInfo) {
471-
l.Log(ctx, "ydb driver balancer update done",
471+
l.Log(ctx, "driver balancer update done",
472472
kv.Latency(start),
473473
kv.Stringer("endpoints", kv.Endpoints(info.Endpoints)),
474474
kv.Stringer("added", kv.Endpoints(info.Added)),
@@ -482,17 +482,17 @@ func internalDriver(l Logger, d trace.Detailer) trace.Driver {
482482
return nil
483483
}
484484
ctx := with(*info.Context, TRACE, "ydb", "driver", "credentials", "get")
485-
l.Log(ctx, "ydb driver starting get credentials...")
485+
l.Log(ctx, "driver starting get credentials...")
486486
start := time.Now()
487487

488488
return func(info trace.DriverGetCredentialsDoneInfo) {
489489
if info.Error == nil {
490-
l.Log(ctx, "ydb driver get credentials done",
490+
l.Log(ctx, "driver get credentials done",
491491
kv.Latency(start),
492492
kv.String("token", info.Token),
493493
)
494494
} else {
495-
l.Log(WithLevel(ctx, ERROR), "ydb driver get credentials failed",
495+
l.Log(WithLevel(ctx, ERROR), "driver get credentials failed",
496496
kv.Error(info.Error),
497497
kv.Latency(start),
498498
kv.String("token", info.Token),

0 commit comments

Comments
 (0)