Skip to content

feat: Specified OT attribute #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chenyme merged 1 commit into from
Jan 25, 2026
Merged

feat: Specified OT attribute #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions internal/db/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,16 @@ package db
import (
"context"
"fmt"
"log"
"net"
"strconv"
"time"

"github.com/linux-do/cdk/internal/config"
"go.opentelemetry.io/otel/attribute"
"gorm.io/driver/mysql"
"gorm.io/gorm"
"gorm.io/plugin/opentelemetry/tracing"
"log"
"time"
)

var (
Expand All @@ -46,6 +50,7 @@ func init() {
}

var err error
dbConfig := config.Config.Database

dsn := fmt.Sprintf(
"%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Local",
Expand All @@ -61,7 +66,17 @@ func init() {
}

// Trace 注入
if err := db.Use(tracing.NewPlugin(tracing.WithoutMetrics())); err != nil {
if err = db.Use(
tracing.NewPlugin(
tracing.WithoutMetrics(),
tracing.WithAttributes(
attribute.String("db.instance", dbConfig.Database),
attribute.String("db.ip", dbConfig.Host),
attribute.String("server.address", net.JoinHostPort(dbConfig.Host, strconv.Itoa(dbConfig.Port))),
attribute.String("db.system", "mysql"),
),
),
); err != nil {
log.Fatalf("[MySQL] init trace failed: %v\n", err)
}

Expand All @@ -72,7 +87,6 @@ func init() {
}

// 设置连接池参数
dbConfig := config.Config.Database
sqlDB.SetMaxIdleConns(dbConfig.MaxIdleConn)
sqlDB.SetMaxOpenConns(dbConfig.MaxOpenConn)
sqlDB.SetConnMaxLifetime(time.Duration(dbConfig.ConnMaxLifetime) * time.Second)
Expand Down
14 changes: 12 additions & 2 deletions internal/db/redis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,12 @@ package db
import (
"context"
"fmt"

"github.com/linux-do/cdk/internal/config"
"github.com/redis/go-redis/extra/redisotel/v9"
"github.com/redis/go-redis/v9"
"go.opentelemetry.io/otel/attribute"

"log"
"time"
)
Expand Down Expand Up @@ -62,8 +65,15 @@ func init() {
},
)

// Trace
if err := redisotel.InstrumentTracing(Redis); err != nil {
// OpenTelemetry 追踪（UniversalClient 兼容）
if err := redisotel.InstrumentTracing(
Redis,
redisotel.WithAttributes(
attribute.String("db.instance", fmt.Sprintf("%v", redisConfig.DB)),
attribute.String("db.ip", redisConfig.Host),
attribute.String("db.system", "redis"),
),
); err != nil {
log.Fatalf("[Redis] failed to init trace: %v\n", err)
}

Expand Down
Loading