fix request type headed constant + add cluster init and stop events

Author: asmyasnikov

config/config.go

@@ -54,7 +54,7 @@ type Config interface {
 	// That is, some balancing methods allow to be configured.
 	Balancer() balancer.Balancer
 
-	// RequestsType set an additional types hint to all requests.
+	// RequestsType set an additional type hint to all requests.
 	// It is needed only for debug purposes and advanced cases.
 	RequestsType() string
 

internal/cluster/cluster.go

@@ -103,6 +103,11 @@ func New(
 	config config.Config,
 	balancer balancer.Balancer,
 ) Cluster {
+	onDone := trace.DriverOnClusterInit(config.Trace(), &ctx)
+	defer func() {
+		onDone()
+	}()
+
 	return &cluster{
 		config:    config,
 		pool:      conn.NewPool(ctx, config),
@@ -118,6 +123,12 @@ func (c *cluster) Close(ctx context.Context) (err error) {
 		c.mu.Unlock()
 		return
 	}
+
+	onDone := trace.DriverOnClusterClose(c.config.Trace(), &ctx)
+	defer func() {
+		onDone(err)
+	}()
+
 	if c.explorer != nil {
 		c.explorer.Stop()
 	}

internal/meta/meta.go

@@ -16,7 +16,7 @@ const (
 	HeaderDatabase    = "x-ydb-database"
 	HeaderTicket      = "x-ydb-auth-ticket"
 	HeaderVersion     = "x-ydb-sdk-build-info"
-	HeaderRequestType = "x-ydb-request-types"
+	HeaderRequestType = "x-ydb-request-type"
 	HeaderTraceID     = "x-ydb-trace-id"
 	HeaderUserAgent   = "x-ydb-user-agent"
 

log/driver.go

@@ -332,6 +332,31 @@ func Driver(log Logger, details trace.Details) (t trace.Driver) {
 	if details&trace.DriverClusterEvents != 0 {
 		// nolint:govet
 		log := log.WithName(`cluster`)
+		t.OnClusterInit = func(info trace.ClusterInitStartInfo) func(trace.ClusterInitDoneInfo) {
+			log.Tracef(`init start`)
+			start := time.Now()
+			return func(info trace.ClusterInitDoneInfo) {
+				log.Debugf(`init done {latency:"%s"}`,
+					time.Since(start),
+				)
+			}
+		}
+		t.OnClusterClose = func(info trace.ClusterCloseStartInfo) func(trace.ClusterCloseDoneInfo) {
+			log.Tracef(`close start`)
+			start := time.Now()
+			return func(info trace.ClusterCloseDoneInfo) {
+				if info.Error == nil {
+					log.Tracef(`close done {latency:"%s"}`,
+						time.Since(start),
+					)
+				} else {
+					log.Errorf(`close failed {latency:"%s",error:"%s"}`,
+						time.Since(start),
+						info.Error,
+					)
+				}
+			}
+		}
 		t.OnClusterGet = func(info trace.ClusterGetStartInfo) func(trace.ClusterGetDoneInfo) {
 			log.Tracef(`get start`)
 			start := time.Now()

trace/driver.go

@@ -34,6 +34,8 @@ type (
 		OnConnRelease     func(ConnReleaseStartInfo) func(ConnReleaseDoneInfo)
 
 		// Cluster events
+		OnClusterInit   func(ClusterInitStartInfo) func(ClusterInitDoneInfo)
+		OnClusterClose  func(ClusterCloseStartInfo) func(ClusterCloseDoneInfo)
 		OnClusterGet    func(ClusterGetStartInfo) func(ClusterGetDoneInfo)
 		OnClusterInsert func(ClusterInsertStartInfo) func(ClusterInsertDoneInfo)
 		OnClusterUpdate func(ClusterUpdateStartInfo) func(ClusterUpdateDoneInfo)
@@ -228,6 +230,25 @@ type (
 		State ConnState
 		Error error
 	}
+	ClusterInitStartInfo struct {
+		// Context make available context in trace callback function.
+		// Pointer to context provide replacement of context in trace callback function.
+		// Warning: concurrent access to pointer on client side must be excluded.
+		// Safe replacement of context are provided only inside callback function
+		Context *context.Context
+	}
+	ClusterInitDoneInfo struct {
+	}
+	ClusterCloseStartInfo struct {
+		// Context make available context in trace callback function.
+		// Pointer to context provide replacement of context in trace callback function.
+		// Warning: concurrent access to pointer on client side must be excluded.
+		// Safe replacement of context are provided only inside callback function
+		Context *context.Context
+	}
+	ClusterCloseDoneInfo struct {
+		Error error
+	}
 	ClusterGetStartInfo struct {
 		// Context make available context in trace callback function.
 		// Pointer to context provide replacement of context in trace callback function.