Skip to content

Commit a7f32cf

Browse files
committed
Merge branch 'master' into uuid-fix
# Conflicts: # CHANGELOG.md
2 parents d81eeb4 + 90106e7 commit a7f32cf

35 files changed

+3663
-1329
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
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.0
4+
* Added experimental package `spans` with tracing adapter interfaces for OpenTelemetry, OpenTracing, etc.
35
* Added `db.Topic().DescribeTopicConsumer()` method for displaying consumer information
46
* Marked as deprecated options `ydb.WithDatabase(database)` and `ydb.WithEndpoint(endpoint)`
57

codecov.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# below in your own codecov.yml in your repository.
55
#
66
ignore:
7+
- spans
78
- trace
89
- testutil
910
- examples

internal/balancer/balancer.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,10 @@ func (b *Balancer) clusterDiscoveryAttempt(ctx context.Context) (err error) {
8888
onDone = trace.DriverOnBalancerClusterDiscoveryAttempt(
8989
b.driverConfig.Trace(), &ctx,
9090
stack.FunctionID(
91-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer.(*Balancer).clusterDiscoveryAttempt"),
91+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer.(*Balancer).clusterDiscoveryAttempt",
92+
),
9293
address,
94+
b.driverConfig.Database(),
9395
)
9496
endpoints []endpoint.Endpoint
9597
localDC string
@@ -130,6 +132,7 @@ func (b *Balancer) applyDiscoveredEndpoints(ctx context.Context, newest []endpoi
130132
stack.FunctionID(
131133
"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer.(*Balancer).applyDiscoveredEndpoints"),
132134
b.config.DetectNearestDC,
135+
b.driverConfig.Database(),
133136
)
134137
previous = b.connections().All()
135138
)

0 commit comments

Comments
 (0)