Skip to content

Commit 2bcc17f

Browse files
asmyasnikovasmyasnikov
authored
Merge pull request #1558 from ydb-platform/function-id
rename call.FunctionID() to call.String()
2 parents 1aa7283 + 8e04db0 commit 2bcc17f

File tree

14 files changed

+107
-105
lines changed

14 files changed

+107
-105
lines changed

‎internal/stack/function_id.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package stack
22

33
type Caller interface {
4-
FunctionID() string
4+
String() string
55
}
66

77
var _ Caller = functionID("")
88

99
type functionID string
1010

11-
func (id functionID) FunctionID() string {
11+
func (id functionID) String() string {
1212
return string(id)
1313
}
1414

‎internal/stack/function_id_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ type genericType[T any] struct{}
1313
type starType struct{}
1414

1515
func (t genericType[T]) Call() string {
16-
return FunctionID("").FunctionID()
16+
return FunctionID("").String()
1717
}
1818

1919
func staticCall() string {
20-
return FunctionID("").FunctionID()
20+
return FunctionID("").String()
2121
}
2222

2323
func (e *starType) starredCall() string {
24-
return FunctionID("").FunctionID()
24+
return FunctionID("").String()
2525
}
2626

2727
func anonymousFunctionCall() string {
@@ -30,7 +30,7 @@ func anonymousFunctionCall() string {
3030
go func() {
3131
mu.Lock()
3232
defer mu.Unlock()
33-
result = FunctionID("").FunctionID()
33+
result = FunctionID("").String()
3434
}()
3535
time.Sleep(time.Second)
3636

‎internal/stack/record.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ func buildRecordString(
197197
return buffer.String()
198198
}
199199

200-
func (c call) FunctionID() string {
200+
func (c call) String() string {
201201
return c.Record(Lambda(false), FileName(false))
202202
}
203203

‎internal/stack/record_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,6 @@ func BenchmarkCallRecord(b *testing.B) {
339339
func BenchmarkCallFuncionID(b *testing.B) {
340340
b.ReportAllocs()
341341
for i := 0; i < b.N; i++ {
342-
_ = Call(0).FunctionID()
342+
_ = Call(0).String()
343343
}
344344
}

‎retry/retry.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (call callOption) ApplyRetryOption(opts *retryOptions) {
7575
}
7676

7777
type call interface {
78-
FunctionID() string
78+
String() string
7979
}
8080

8181
func withCaller(call call) callOption {

‎spans/discovery.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func discovery(adapter Adapter) (t trace.Discovery) {
1313
start := childSpanWithReplaceCtx(
1414
adapter,
1515
info.Context,
16-
info.Call.FunctionID(),
16+
info.Call.String(),
1717
kv.String("address", info.Address),
1818
kv.String("database", info.Database),
1919
)

‎spans/driver.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
3636
start := childSpanWithReplaceCtx(
3737
adapter,
3838
info.Context,
39-
info.Call.FunctionID(),
39+
info.Call.String(),
4040
)
4141

4242
return func(info trace.DriverRepeaterWakeUpDoneInfo) {
@@ -56,7 +56,7 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
5656
start := childSpanWithReplaceCtx(
5757
adapter,
5858
info.Context,
59-
info.Call.FunctionID(),
59+
info.Call.String(),
6060
)
6161

6262
return func(info trace.DriverConnDialDoneInfo) {
@@ -74,7 +74,7 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
7474
start := childSpanWithReplaceCtx(
7575
adapter,
7676
info.Context,
77-
info.Call.FunctionID(),
77+
info.Call.String(),
7878
kv.String("address", safeAddress(info.Endpoint)),
7979
kv.String("method", string(info.Method)),
8080
)
@@ -114,7 +114,7 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
114114
start := childSpanWithReplaceCtx(
115115
adapter,
116116
info.Context,
117-
info.Call.FunctionID(),
117+
info.Call.String(),
118118
kv.String("address", safeAddress(info.Endpoint)),
119119
kv.String("method", string(info.Method)),
120120
)
@@ -177,7 +177,7 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
177177

178178
return func(info trace.DriverConnStreamCloseSendDoneInfo) {
179179
if info.Error != nil {
180-
start.Log(call.FunctionID(), kv.Error(info.Error))
180+
start.Log(call.String(), kv.Error(info.Error))
181181
}
182182
}
183183
},
@@ -204,7 +204,7 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
204204
attributes = append(attributes, kv.Error(info.Error))
205205
}
206206

207-
start.Log(call.FunctionID(), attributes...)
207+
start.Log(call.String(), attributes...)
208208
},
209209
OnConnPark: func(info trace.DriverConnParkStartInfo) func(trace.DriverConnParkDoneInfo) {
210210
if adapter.Details()&trace.DriverConnEvents == 0 {
@@ -218,9 +218,9 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
218218

219219
return func(info trace.DriverConnParkDoneInfo) {
220220
if info.Error != nil {
221-
start.Log(call.FunctionID(), kv.Error(info.Error))
221+
start.Log(call.String(), kv.Error(info.Error))
222222
} else {
223-
start.Log(call.FunctionID())
223+
start.Log(call.String())
224224
}
225225
}
226226
},
@@ -236,9 +236,9 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
236236

237237
return func(info trace.DriverConnCloseDoneInfo) {
238238
if info.Error != nil {
239-
start.Log(call.FunctionID(), kv.Error(info.Error))
239+
start.Log(call.String(), kv.Error(info.Error))
240240
} else {
241-
start.Log(call.FunctionID())
241+
start.Log(call.String())
242242
}
243243
}
244244
},
@@ -247,7 +247,7 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
247247
return nil
248248
}
249249
s := adapter.SpanFromContext(*info.Context)
250-
s.Log(info.Call.FunctionID(),
250+
s.Log(info.Call.String(),
251251
kv.String("cause", safeError(info.Cause)),
252252
)
253253

@@ -259,7 +259,7 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
259259
}
260260
s := adapter.SpanFromContext(*info.Context)
261261
oldState := safeStringer(info.State)
262-
functionID := info.Call.FunctionID()
262+
functionID := info.Call.String()
263263

264264
return func(info trace.DriverConnStateChangeDoneInfo) {
265265
s.Log(functionID,
@@ -275,7 +275,7 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
275275
start := childSpanWithReplaceCtx(
276276
adapter,
277277
info.Context,
278-
info.Call.FunctionID(),
278+
info.Call.String(),
279279
kv.String("name", info.Name),
280280
)
281281

@@ -292,7 +292,7 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
292292
start := childSpanWithReplaceCtx(
293293
adapter,
294294
info.Context,
295-
info.Call.FunctionID(),
295+
info.Call.String(),
296296
kv.String("address", info.Address),
297297
)
298298

@@ -305,7 +305,7 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
305305
return nil
306306
}
307307
start := childSpanWithReplaceCtx(adapter, info.Context,
308-
info.Call.FunctionID(),
308+
info.Call.String(),
309309
kv.String("database", info.Database),
310310
kv.Bool("need_local_dc", info.NeedLocalDC),
311311
)
@@ -342,7 +342,7 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
342342
return nil
343343
}
344344
parent := adapter.SpanFromContext(*info.Context)
345-
functionID := info.Call.FunctionID()
345+
functionID := info.Call.String()
346346

347347
return func(info trace.DriverBalancerChooseEndpointDoneInfo) {
348348
if info.Error != nil {
@@ -360,7 +360,7 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
360360
return nil
361361
}
362362
parent := adapter.SpanFromContext(*info.Context)
363-
functionID := info.Call.FunctionID()
363+
functionID := info.Call.String()
364364

365365
return func(info trace.DriverGetCredentialsDoneInfo) {
366366
if info.Error != nil {
@@ -388,7 +388,7 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
388388
start := childSpanWithReplaceCtx(
389389
adapter,
390390
info.Context,
391-
info.Call.FunctionID(),
391+
info.Call.String(),
392392
kv.String("endpoint", info.Endpoint),
393393
kv.String("database", info.Database),
394394
kv.Bool("secure", info.Secure),
@@ -405,7 +405,7 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
405405
start := childSpanWithReplaceCtx(
406406
adapter,
407407
info.Context,
408-
info.Call.FunctionID(),
408+
info.Call.String(),
409409
)
410410

411411
return func(info trace.DriverCloseDoneInfo) {
@@ -419,7 +419,7 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
419419
start := childSpanWithReplaceCtx(
420420
adapter,
421421
info.Context,
422-
info.Call.FunctionID(),
422+
info.Call.String(),
423423
)
424424

425425
return func(info trace.DriverConnPoolNewDoneInfo) {

0 commit comments

Comments
 (0)