Skip to content

Commit

Permalink
Add support for pg_go
Browse files Browse the repository at this point in the history
Signed-off-by: Patrik Helia <patashelia@gmail.com>
  • Loading branch information
patriczek committed Jun 9, 2020
1 parent 5dd3603 commit 11a3cc4
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 0 deletions.
52 changes: 52 additions & 0 deletions contrib/go-pg/go-pg/pg_go.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package pggo

import (
"context"
"github.com/go-pg/pg/v10"
"gopkg.in/DataDog/dd-trace-go.v1/ddtrace"
"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
"time"
)

const (
gopgStartSpan = "dd-trace-go:span"
)

func Wrap(db *pg.DB) *pg.DB {
db.AddQueryHook(&Hook{})
return db
}

type Hook struct {}

func (h *Hook) BeforeQuery(ctx context.Context,qe *pg.QueryEvent) (context.Context, error){
if qe.Stash == nil{
qe.Stash = make(map[interface{}]interface{})
}
qe.Stash[gopgStartSpan] = time.Now()
return ctx, qe.Err
}


func (h *Hook) AfterQuery(ctx context.Context,qe *pg.QueryEvent) error{
startSpan, ok := qe.Stash[gopgStartSpan]
if !ok{
return nil // TODO Return some error
}

spanStart := startSpan.(time.Time)
unformatedSql, _ := qe.UnformattedQuery()

opts := []ddtrace.StartSpanOption{
tracer.StartTime(spanStart),
//tracer.ServiceName(tracer), // Should be took from context, or consider if can be set through WithMethod
tracer.SpanType(ext.SpanTypeSQL),
tracer.ResourceName(string(unformatedSql)),
}

span, _ := tracer.StartSpanFromContext(ctx, "SELECT", opts...) // TODO Write sql scanner for operation name
span.Finish(tracer.WithError(qe.Err))

return qe.Err
}
43 changes: 43 additions & 0 deletions contrib/go-pg/go-pg/pg_go_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package pggo

import (
"context"
"github.com/go-pg/pg/v10"
"github.com/stretchr/testify/assert"
"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/mocktracer"
"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
"testing"
)


func GetPostgresConnection() *pg.DB{
db := pg.Connect(&pg.Options{
User: "postgres",
Password: "",
Database: "postgres",
})
return db
}

func TestSelect(t *testing.T){
assert := assert.New(t)
mt := mocktracer.Start()
defer mt.Stop()

conn := GetPostgresConnection()
Wrap(conn)

parentSpan, ctx := tracer.StartSpanFromContext(context.Background(), "http.request",
tracer.ServiceName("fake-http-server"),
tracer.SpanType(ext.SpanTypeWeb),
)

var n int
_, _ = conn.WithContext(ctx).QueryOne(pg.Scan(&n), "SELECT 1")
parentSpan.Finish()
spans := mt.FinishedSpans()

assert.True(len(spans) >= 2)
// TODO Complete tests
}

0 comments on commit 11a3cc4

Please sign in to comment.