Compare commits
No commits in common. "master" and "v1.1.11" have entirely different histories.
35
save.go
35
save.go
|
@ -13,7 +13,6 @@ import (
|
||||||
"go.opentelemetry.io/otel"
|
"go.opentelemetry.io/otel"
|
||||||
"go.opentelemetry.io/otel/attribute"
|
"go.opentelemetry.io/otel/attribute"
|
||||||
"go.opentelemetry.io/otel/codes"
|
"go.opentelemetry.io/otel/codes"
|
||||||
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
|
|
||||||
"go.opentelemetry.io/otel/trace"
|
"go.opentelemetry.io/otel/trace"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -90,10 +89,10 @@ func SaveRow(ctx context.Context, db *db.DBC, dataItem meta.IMetaStruct) error {
|
||||||
sqlSmt := createInsertSQLForFields(ctx, tableName, fields, 1 /*one_row*/)
|
sqlSmt := createInsertSQLForFields(ctx, tableName, fields, 1 /*one_row*/)
|
||||||
|
|
||||||
span.SetAttributes(
|
span.SetAttributes(
|
||||||
semconv.DBSystemKey.String("mysql"),
|
attribute.String("table", tableName),
|
||||||
semconv.DBSQLTableKey.String(tableName),
|
attribute.String("sql", sqlSmt),
|
||||||
semconv.DBStatementKey.String(sqlSmt),
|
//semconv.DBSQLTableKey.String(tableName),
|
||||||
semconv.DBOperationKey.String("INSERT"),
|
//semconv.DBStatementKey.String(sqlSmt),
|
||||||
)
|
)
|
||||||
|
|
||||||
updateBuilder := db.UpdateBySQL(sqlSmt, params...)
|
updateBuilder := db.UpdateBySQL(sqlSmt, params...)
|
||||||
|
@ -104,18 +103,6 @@ func SaveRow(ctx context.Context, db *db.DBC, dataItem meta.IMetaStruct) error {
|
||||||
sqlSmt = sqlSmt[0:200]
|
sqlSmt = sqlSmt[0:200]
|
||||||
}
|
}
|
||||||
|
|
||||||
span.SetAttributes(
|
|
||||||
attribute.Int("sql_param_amount", len(params)),
|
|
||||||
)
|
|
||||||
|
|
||||||
// Convert SQL request parameters to slice of strings.
|
|
||||||
paramStrs := convertInterfacesToStrings(ctx, params)
|
|
||||||
if len(paramStrs) > 0 {
|
|
||||||
span.SetAttributes(
|
|
||||||
attribute.StringSlice("sql_params", paramStrs),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
resultErr := errors.Errorf("Can not execute SaveRow. Got error from updateBuilder.ExecContext. %s (%s)", err.Error(), sqlSmt)
|
resultErr := errors.Errorf("Can not execute SaveRow. Got error from updateBuilder.ExecContext. %s (%s)", err.Error(), sqlSmt)
|
||||||
span.RecordError(resultErr)
|
span.RecordError(resultErr)
|
||||||
span.SetStatus(codes.Error, resultErr.Error())
|
span.SetStatus(codes.Error, resultErr.Error())
|
||||||
|
@ -130,20 +117,6 @@ func SaveRow(ctx context.Context, db *db.DBC, dataItem meta.IMetaStruct) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func convertInterfacesToStrings(ctx context.Context, items []interface{}) []string {
|
|
||||||
itemAmount := len(items)
|
|
||||||
if itemAmount == 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
strs := make([]string, itemAmount)
|
|
||||||
for i, item := range items {
|
|
||||||
strs[i] = fmt.Sprint(item)
|
|
||||||
}
|
|
||||||
|
|
||||||
return strs
|
|
||||||
}
|
|
||||||
|
|
||||||
func SaveMetaRootStruct(
|
func SaveMetaRootStruct(
|
||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
db *db.DBC,
|
db *db.DBC,
|
||||||
|
|
Loading…
Reference in New Issue