Skip to content

armgit / ax

Public Imported from GitHub
0

Agent Executor (AX) is Google's open agentic orchestration runtime

Go

Add traces to the SQL event log implementation (#234)

Jaana Doganb8c87febf06c
diff --git a/go.mod b/go.mod
index a631bfe..1aaf333 100644
--- a/go.mod
+++ b/go.mod
@@ -14,6 +14,7 @@ require (
go.opentelemetry.io/otel v1.44.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.44.0
go.opentelemetry.io/otel/sdk v1.44.0
+ go.opentelemetry.io/otel/trace v1.44.0
golang.org/x/oauth2 v0.36.0
google.golang.org/grpc v1.81.1
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af
@@ -59,7 +60,6 @@ require (
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.44.0 // indirect
go.opentelemetry.io/otel/metric v1.44.0 // indirect
- go.opentelemetry.io/otel/trace v1.44.0 // indirect
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
golang.org/x/net v0.55.0 // indirect
golang.org/x/sync v0.20.0 // indirect
diff --git a/internal/controller/eventlog/sql.go b/internal/controller/eventlog/sql.go
index 09be1e7..522b671 100644
--- a/internal/controller/eventlog/sql.go
+++ b/internal/controller/eventlog/sql.go
@@ -20,6 +20,10 @@ import (
"fmt"
"github.com/google/ax/proto"
+ "go.opentelemetry.io/otel"
+ "go.opentelemetry.io/otel/attribute"
+ "go.opentelemetry.io/otel/codes"
+ "go.opentelemetry.io/otel/trace"
)
// sqlEventLog is a database backed EventLog shared by the SQLite and
@@ -29,14 +33,17 @@ type sqlEventLog struct {
}
// Append serializes the event to JSON and inserts it into the database.
-func (l *sqlEventLog) Append(ctx context.Context, event *proto.ConversationEvent) (int32, error) {
+func (l *sqlEventLog) Append(ctx context.Context, event *proto.ConversationEvent) (seq int32, err error) {
+ ctx, endSpan := l.startSpan(ctx, "Append", event.ConversationId)
+ defer func() { endSpan(err) }()
+
tx, err := l.db.BeginTx(ctx, nil)
if err != nil {
return 0, fmt.Errorf("eventlog: begin tx: %w", err)
}
defer tx.Rollback()
- seq := event.Seq
+ seq = event.Seq
if seq == 0 {
if err := tx.QueryRowContext(ctx, "SELECT COALESCE(MAX(seq), 0) + 1 FROM conversation_log WHERE conversation_id = $1", event.ConversationId).Scan(&seq); err != nil {
return 0, fmt.Errorf("eventlog: compute seq: %w", err)
@@ -63,14 +70,16 @@ func (l *sqlEventLog) Append(ctx context.Context, event *proto.ConversationEvent
}
// Events retrieves all events from the database for a conversation, ordered by seq.
-func (l *sqlEventLog) Events(ctx context.Context, conversationID string) ([]*proto.ConversationEvent, error) {
+func (l *sqlEventLog) Events(ctx context.Context, conversationID string) (events []*proto.ConversationEvent, err error) {
+ ctx, endSpan := l.startSpan(ctx, "Events", conversationID)
+ defer func() { endSpan(err) }()
+
rows, err := l.db.QueryContext(ctx, "SELECT payload FROM conversation_log WHERE conversation_id = $1 ORDER BY seq", conversationID)
if err != nil {
return nil, fmt.Errorf("eventlog: query conversation: %w", err)
}
defer rows.Close()
- var events []*proto.ConversationEvent
for rows.Next() {
var payload string
if err := rows.Scan(&payload); err != nil {
@@ -92,7 +101,10 @@ func (l *sqlEventLog) Events(ctx context.Context, conversationID string) ([]*pro
}
// DeleteAll deletes all events for a specific conversation ID.
-func (l *sqlEventLog) DeleteAll(ctx context.Context, conversationID string) error {
+func (l *sqlEventLog) DeleteAll(ctx context.Context, conversationID string) (err error) {
+ ctx, endSpan := l.startSpan(ctx, "DeleteAll", conversationID)
+ defer func() { endSpan(err) }()
+
if _, err := l.db.ExecContext(ctx, "DELETE FROM conversation_log WHERE conversation_id = $1", conversationID); err != nil {
return fmt.Errorf("eventlog: delete conversation: %w", err)
}
@@ -103,3 +115,19 @@ func (l *sqlEventLog) DeleteAll(ctx context.Context, conversationID string) erro
func (l *sqlEventLog) Close() error {
return l.db.Close()
}
+
+func (l *sqlEventLog) startSpan(ctx context.Context, name string, conversationID string) (context.Context, func(err error)) {
+ const tracerName = "eventlog.sql"
+ tracer := otel.Tracer(tracerName)
+
+ ctx, span := tracer.Start(ctx, tracerName+"/"+name, trace.WithAttributes(
+ attribute.String("conversation_id", conversationID),
+ ))
+ return ctx, func(err error) {
+ if err != nil {
+ span.RecordError(err)
+ span.SetStatus(codes.Error, err.Error())
+ }
+ span.End()
+ }
+}