@@ -5,11 +5,12 @@ import (
55 "fmt"
66 "net"
77 "runtime"
8+ "strconv"
89 "strings"
910
1011 "go.opentelemetry.io/otel/attribute"
1112 "go.opentelemetry.io/otel/codes"
12- semconv "go.opentelemetry.io/otel/semconv/v1.10 .0"
13+ semconv "go.opentelemetry.io/otel/semconv/v1.24 .0"
1314 "go.opentelemetry.io/otel/trace"
1415
1516 "github.com/redis/go-redis/extra/rediscmd/v9"
@@ -25,13 +26,15 @@ func InstrumentTracing(rdb redis.UniversalClient, opts ...TracingOption) error {
2526 case * redis.Client :
2627 opt := rdb .Options ()
2728 connString := formatDBConnString (opt .Network , opt .Addr )
29+ opts = addServerAttributes (opts , opt .Addr )
2830 rdb .AddHook (newTracingHook (connString , opts ... ))
2931 return nil
3032 case * redis.ClusterClient :
3133 rdb .AddHook (newTracingHook ("" , opts ... ))
3234
3335 rdb .OnNewNode (func (rdb * redis.Client ) {
3436 opt := rdb .Options ()
37+ opts = addServerAttributes (opts , opt .Addr )
3538 connString := formatDBConnString (opt .Network , opt .Addr )
3639 rdb .AddHook (newTracingHook (connString , opts ... ))
3740 })
@@ -41,6 +44,7 @@ func InstrumentTracing(rdb redis.UniversalClient, opts ...TracingOption) error {
4144
4245 rdb .OnNewNode (func (rdb * redis.Client ) {
4346 opt := rdb .Options ()
47+ opts = addServerAttributes (opts , opt .Addr )
4448 connString := formatDBConnString (opt .Network , opt .Addr )
4549 rdb .AddHook (newTracingHook (connString , opts ... ))
4650 })
@@ -72,7 +76,7 @@ func newTracingHook(connString string, opts ...TracingOption) *tracingHook {
7276 )
7377 }
7478 if connString != "" {
75- conf .attrs = append (conf .attrs , semconv .DBConnectionStringKey . String (connString ))
79+ conf .attrs = append (conf .attrs , semconv .DBConnectionString (connString ))
7680 }
7781
7882 return & tracingHook {
@@ -113,14 +117,14 @@ func (th *tracingHook) ProcessHook(hook redis.ProcessHook) redis.ProcessHook {
113117
114118 attrs := make ([]attribute.KeyValue , 0 , 8 )
115119 attrs = append (attrs ,
116- semconv .CodeFunctionKey . String (fn ),
117- semconv .CodeFilepathKey . String (file ),
118- semconv .CodeLineNumberKey . Int (line ),
120+ semconv .CodeFunction (fn ),
121+ semconv .CodeFilepath (file ),
122+ semconv .CodeLineNumber (line ),
119123 )
120124
121125 if th .conf .dbStmtEnabled {
122126 cmdString := rediscmd .CmdString (cmd )
123- attrs = append (attrs , semconv .DBStatementKey . String (cmdString ))
127+ attrs = append (attrs , semconv .DBStatement (cmdString ))
124128 }
125129
126130 opts := th .spanOpts
@@ -149,15 +153,15 @@ func (th *tracingHook) ProcessPipelineHook(
149153
150154 attrs := make ([]attribute.KeyValue , 0 , 8 )
151155 attrs = append (attrs ,
152- semconv .CodeFunctionKey . String (fn ),
153- semconv .CodeFilepathKey . String (file ),
154- semconv .CodeLineNumberKey . Int (line ),
156+ semconv .CodeFunction (fn ),
157+ semconv .CodeFilepath (file ),
158+ semconv .CodeLineNumber (line ),
155159 attribute .Int ("db.redis.num_cmd" , len (cmds )),
156160 )
157161
158162 summary , cmdsString := rediscmd .CmdsString (cmds )
159163 if th .conf .dbStmtEnabled {
160- attrs = append (attrs , semconv .DBStatementKey . String (cmdsString ))
164+ attrs = append (attrs , semconv .DBStatement (cmdsString ))
161165 }
162166
163167 opts := th .spanOpts
@@ -213,3 +217,28 @@ func funcFileLine(pkg string) (string, string, int) {
213217
214218 return fn , file , line
215219}
220+
221+ // Database span attributes semantic conventions recommended server address and port
222+ // https://opentelemetry.io/docs/specs/semconv/database/database-spans/#connection-level-attributes
223+ func addServerAttributes (opts []TracingOption , addr string ) []TracingOption {
224+ host , portString , err := net .SplitHostPort (addr )
225+ if err != nil {
226+ return opts
227+ }
228+
229+ opts = append (opts , WithAttributes (
230+ semconv .ServerAddress (host ),
231+ ))
232+
233+ // Parse the port string to an integer
234+ port , err := strconv .Atoi (portString )
235+ if err != nil {
236+ return opts
237+ }
238+
239+ opts = append (opts , WithAttributes (
240+ semconv .ServerPort (port ),
241+ ))
242+
243+ return opts
244+ }
0 commit comments