Msg => Log+Warn+Error

otel/config.go

@@ -12,9 +12,11 @@ type (
 	Span     interface {
 		TraceID() string
 
-		Relation(span Span)
+		Link(link Span, attributes ...KeyValue)
 
-		Msg(msg string, attributes ...KeyValue)
+		Log(msg string, attributes ...KeyValue)
+		Warn(err error, attributes ...KeyValue)
+		Error(err error, attributes ...KeyValue)
 
 		End(attributes ...KeyValue)
 	}

otel/driver.go

@@ -219,7 +219,7 @@ func driver(cfg Config) trace.Driver { //nolint:gocyclo,funlen
 				return nil
 			}
 			s := cfg.SpanFromContext(*info.Context)
-			s.Msg(info.Call.FunctionID(),
+			s.Log(info.Call.FunctionID(),
 				kv.String("cause", safeError(info.Cause)),
 			)
 
@@ -234,7 +234,7 @@ func driver(cfg Config) trace.Driver { //nolint:gocyclo,funlen
 			functionID := info.Call.FunctionID()
 
 			return func(info trace.DriverConnStateChangeDoneInfo) {
-				s.Msg(functionID,
+				s.Log(functionID,
 					kv.String("old state", oldState),
 					kv.String("new state", safeStringer(info.State)),
 				)
@@ -318,11 +318,9 @@ func driver(cfg Config) trace.Driver { //nolint:gocyclo,funlen
 
 			return func(info trace.DriverBalancerChooseEndpointDoneInfo) {
 				if info.Error != nil {
-					parent.Msg(functionID,
-						kv.Error(info.Error),
-					)
+					parent.Error(info.Error)
 				} else {
-					parent.Msg(functionID,
+					parent.Log(functionID,
 						kv.String("address", safeAddress(info.Endpoint)),
 						kv.String("nodeID", safeNodeID(info.Endpoint)),
 					)
@@ -338,9 +336,7 @@ func driver(cfg Config) trace.Driver { //nolint:gocyclo,funlen
 
 			return func(info trace.DriverGetCredentialsDoneInfo) {
 				if info.Error != nil {
-					parent.Msg(functionID,
-						kv.Error(info.Error),
-					)
+					parent.Error(info.Error)
 				} else {
 					var mask bytes.Buffer
 					if len(info.Token) > 16 {
@@ -351,7 +347,7 @@ func driver(cfg Config) trace.Driver { //nolint:gocyclo,funlen
 						mask.WriteString("****")
 					}
 					mask.WriteString(fmt.Sprintf("(CRC-32c: %08X)", crc32.Checksum([]byte(info.Token), crc32.IEEETable)))
-					parent.Msg(functionID,
+					parent.Log(functionID,
 						kv.String("token", mask.String()),
 					)
 				}

otel/field.go

@@ -0,0 +1,18 @@
+package otel
+
+import (
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/kv"
+)
+
+type (
+	Field = kv.KeyValue
+)
+
+const (
+	IntType      = kv.IntType
+	Int64Type    = kv.Int64Type
+	StringType   = kv.StringType
+	BoolType     = kv.BoolType
+	StringsType  = kv.StringsType
+	StringerType = kv.StringerType
+)

otel/helpers.go

@@ -37,7 +37,7 @@ func finish(
 	fields ...KeyValue,
 ) {
 	if err != nil {
-		s.Msg(err.Error(), kv.Error(err))
+		s.Error(err)
 	}
 	s.End(fields...)
 }
@@ -50,12 +50,11 @@ func logError(
 	var ydbErr ydb.Error
 	if xerrors.As(err, &ydbErr) {
 		fields = append(fields,
-			kv.Error(err),
 			kv.Int("error.ydb.code", int(ydbErr.Code())),
 			kv.String("error.ydb.name", ydbErr.Name()),
 		)
 	}
-	s.Msg(err.Error(), fields...)
+	s.Error(err, fields...)
 }
 
 func logToParentSpan(
@@ -65,7 +64,7 @@ func logToParentSpan(
 	fields ...KeyValue, //nolint:unparam
 ) {
 	parent := cfg.SpanFromContext(ctx)
-	parent.Msg(msg, fields...)
+	parent.Log(msg, fields...)
 }
 
 func logToParentSpanError(

otel/noop.go

@@ -28,12 +28,14 @@ func (noopConfig) Start(ctx context.Context, _ string, _ ...KeyValue) (context.C
 	return ctx, noopSpan{}
 }
 
-func (noopSpan) Relation(Span) {}
+func (noopSpan) Link(Span, ...KeyValue) {}
 
 func (noopSpan) TraceID() string {
 	return ""
 }
 
-func (n noopSpan) Msg(string, ...KeyValue) {}
+func (n noopSpan) Log(string, ...KeyValue)  {}
+func (n noopSpan) Warn(error, ...KeyValue)  {}
+func (n noopSpan) Error(error, ...KeyValue) {}
 
 func (n noopSpan) End(...KeyValue) {}

otel/retry.go

@@ -75,7 +75,7 @@ func retry(cfg Config) (t trace.Retry) {
 				kv.Bool("idempotent", info.Idempotent),
 			)
 			if info.NestedCall {
-				start.Msg("nested call", kv.Error(errNestedCall))
+				start.Warn(errNestedCall)
 			}
 			ctx := *info.Context
 
@@ -87,7 +87,7 @@ func retry(cfg Config) (t trace.Retry) {
 					fields = append(fields, fieldsFromStore...)
 				}
 				if info.Error != nil {
-					fields = append(fields, kv.Error(info.Error))
+					start.Error(info.Error)
 				}
 				start.End(fields...)
 			}

otel/scripting.go

@@ -55,15 +55,15 @@ func scripting(cfg Config) (t trace.Scripting) {
 			) func(
 				trace.ScriptingStreamExecuteDoneInfo,
 			) {
-				start.Msg("", kv.Error(info.Error))
+				if info.Error != nil {
+					start.Warn(info.Error)
+				}
 
 				return func(info trace.ScriptingStreamExecuteDoneInfo) {
-					start.Msg("")
 					if info.Error != nil {
-						start.End(kv.Error(info.Error))
-					} else {
-						start.End()
+						start.Error(info.Error)
 					}
+					start.End()
 				}
 			}
 		}

otel/sql.go

@@ -212,7 +212,7 @@ func databaseSQL(cfg Config) (t trace.DatabaseSQL) {
 			)
 
 			if !isStmtCall(*info.Context) {
-				start.Relation(cfg.SpanFromContext(info.TxContext))
+				start.Link(cfg.SpanFromContext(info.TxContext))
 			}
 
 			return func(info trace.DatabaseSQLTxExecDoneInfo) {
@@ -235,7 +235,7 @@ func databaseSQL(cfg Config) (t trace.DatabaseSQL) {
 			)
 
 			if !isStmtCall(*info.Context) {
-				start.Relation(cfg.SpanFromContext(info.TxContext))
+				start.Link(cfg.SpanFromContext(info.TxContext))
 			}
 
 			return func(info trace.DatabaseSQLTxQueryDoneInfo) {
@@ -275,7 +275,7 @@ func databaseSQL(cfg Config) (t trace.DatabaseSQL) {
 				kv.String("query", info.Query),
 			)
 
-			start.Relation(cfg.SpanFromContext(info.StmtContext))
+			start.Link(cfg.SpanFromContext(info.StmtContext))
 
 			*info.Context = markStmtCall(*info.Context)
 
@@ -297,7 +297,7 @@ func databaseSQL(cfg Config) (t trace.DatabaseSQL) {
 				kv.String("query", info.Query),
 			)
 
-			start.Relation(cfg.SpanFromContext(info.StmtContext))
+			start.Link(cfg.SpanFromContext(info.StmtContext))
 
 			*info.Context = markStmtCall(*info.Context)
 

otel/table.go

@@ -51,15 +51,15 @@ func table(cfg Config) (t trace.Table) { //nolint:gocyclo
 				kv.Bool("idempotent", info.Idempotent),
 			)
 			if info.NestedCall {
-				start.Msg("nested call", kv.Error(errNestedCall))
+				start.Warn(errNestedCall)
 			}
 
 			return func(info trace.TableDoDoneInfo) {
 				fields := []KeyValue{
 					kv.Int("attempts", info.Attempts),
 				}
 				if info.Error != nil {
-					fields = append(fields, kv.Error(info.Error))
+					start.Error(info.Error)
 				}
 				start.End(fields...)
 			}
@@ -81,15 +81,15 @@ func table(cfg Config) (t trace.Table) { //nolint:gocyclo
 				kv.Bool("idempotent", info.Idempotent),
 			)
 			if info.NestedCall {
-				start.Msg("nested call", kv.Error(errNestedCall))
+				start.Warn(errNestedCall)
 			}
 
 			return func(info trace.TableDoTxDoneInfo) {
 				fields := []KeyValue{
 					kv.Int("attempts", info.Attempts),
 				}
 				if info.Error != nil {
-					fields = append(fields, kv.Error(info.Error))
+					start.Error(info.Error)
 				}
 				start.End(fields...)
 			}
@@ -247,10 +247,9 @@ func table(cfg Config) (t trace.Table) { //nolint:gocyclo
 
 			return func(info trace.TableSessionQueryStreamExecuteDoneInfo) {
 				if info.Error != nil {
-					start.End(kv.Error(info.Error))
-				} else {
-					start.End()
+					start.Error(info.Error)
 				}
+				start.End()
 			}
 		}
 
@@ -272,7 +271,7 @@ func table(cfg Config) (t trace.Table) { //nolint:gocyclo
 
 			return func(info trace.TableSessionQueryStreamReadDoneInfo) {
 				if info.Error != nil {
-					start.End(kv.Error(info.Error))
+					start.Error(info.Error)
 				} else {
 					start.End()
 				}