Merge pull request #140 from ydb-platform/fix-trace-compose

v3.11.9: fix composing of service traces + end-call of trace.Driver.OnConnStat…

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.11.9
+* Fixed composing of service traces
+* Fixed end-call of `trace.Driver.OnConnStateChange`
+
 ## 3.11.8
 * Added `trace.EndpointInfo.LastUpdated()` timestamp
 * Refactored `endpoint.Endpoint` (split to struct `endopint` and interface `Endpoint`)

coordination/config/config.go

@@ -48,7 +48,7 @@ type Option func(c *config)
 
 func WithTrace(trace trace.Coordination) Option {
 	return func(c *config) {
-		c.trace = trace
+		c.trace = c.trace.Compose(trace)
 	}
 }
 

discovery/config/config.go

@@ -105,7 +105,7 @@ func WithSecure(ssl bool) Option {
 
 func WithTrace(trace trace.Discovery) Option {
 	return func(c *config) {
-		c.trace = trace
+		c.trace = c.trace.Compose(trace)
 	}
 }
 

internal/conn/conn.go

@@ -91,12 +91,12 @@ func (c *conn) SetState(s State) State {
 }
 
 func (c *conn) setState(s State) State {
-	c.state = s
 	trace.DriverOnConnStateChange(
 		c.config.Trace(),
 		c.endpoint.Copy(),
 		c.state,
-	)
+	)(s)
+	c.state = s
 	return c.state
 }
 

internal/meta/version.go

@@ -1,5 +1,5 @@
 package meta
 
 const (
-	Version = "ydb-go-sdk/3.11.8"
+	Version = "ydb-go-sdk/3.11.9"
 )

ratelimiter/config/config.go

@@ -48,7 +48,7 @@ type Option func(c *config)
 
 func WithTrace(trace trace.Ratelimiter) Option {
 	return func(c *config) {
-		c.trace = trace
+		c.trace = c.trace.Compose(trace)
 	}
 }
 

scheme/config/config.go

@@ -48,7 +48,7 @@ type Option func(c *config)
 
 func WithTrace(trace trace.Scheme) Option {
 	return func(c *config) {
-		c.trace = trace
+		c.trace = c.trace.Compose(trace)
 	}
 }
 

scripting/config/config.go

@@ -48,7 +48,7 @@ type Option func(c *config)
 
 func WithTrace(trace trace.Scripting) Option {
 	return func(c *config) {
-		c.trace = trace
+		c.trace = c.trace.Compose(trace)
 	}
 }