Skip to content

Commit 53817cb

Browse files
committed
Merge branch 'master' into uuid-fix
# Conflicts: # CHANGELOG.md
2 parents 0144f86 + b958288 commit 53817cb

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
* Add workaround for bug in uuid send/receive from server. It is migration version. All native code and most database sql code worked with uuid continue to work.
22

3+
## v3.85.1
4+
* Added `spans.Retry` constructor of `trace.Retry`
5+
36
## v3.85.0
47
* Added experimental package `spans` with tracing adapter interfaces for OpenTelemetry, OpenTracing, etc.
58
* Added `db.Topic().DescribeTopicConsumer()` method for displaying consumer information

internal/version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package version
33
const (
44
Major = "3"
55
Minor = "85"
6-
Patch = "0"
6+
Patch = "1"
77

88
Package = "ydb-go-sdk"
99
)

spans/retry.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func fieldsFromStore(ctx context.Context) []kv.KeyValue {
5858
return nil
5959
}
6060

61-
func retry(adapter Adapter) (t trace.Retry) {
61+
func Retry(adapter Adapter) (t trace.Retry) {
6262
t.OnRetry = func(info trace.RetryLoopStartInfo) func(trace.RetryLoopDoneInfo) {
6363
if adapter.Details()&trace.RetryEvents != 0 && isTraceRetry(*info.Context) { //nolint:nestif
6464
operationName := info.Label

spans/traces.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ func WithTraces(adapter Adapter) ydb.Option {
1919
ydb.WithTraceRatelimiter(ratelimiter(adapter)),
2020
ydb.WithTraceDiscovery(discovery(adapter)),
2121
ydb.WithTraceDatabaseSQL(databaseSQL(adapter)),
22-
ydb.WithTraceRetry(retry(adapter)),
22+
ydb.WithTraceRetry(Retry(adapter)),
2323
)
2424
}

0 commit comments

Comments
 (0)