add delay

DataDog · Jul 13, 2023 · 8c3073d · 8c3073d
1 parent bd640f1
commit 8c3073d
Show file tree

Hide file tree

Showing 19 changed files with 106 additions and 38 deletions.
diff --git a/contrib/internal/validationtest/contrib/bradfitz/gomemcache/memcache/integration.go b/contrib/internal/validationtest/contrib/bradfitz/gomemcache/memcache/integration.go
@@ -18,6 +18,10 @@ func New() *Integration {
 	return &Integration{}
 }
 
+func (i *Integration) ResetNumSpans() {
+	i.numSpans = 0
+}
+
 func (i *Integration) Name() string {
 	return "contrib/bradfitz/gomemcache/memcache"
 }

diff --git a/contrib/internal/validationtest/contrib/garyburd/redigo/integration.go b/contrib/internal/validationtest/contrib/garyburd/redigo/integration.go
@@ -23,6 +23,10 @@ func New() *Integration {
 	return &Integration{}
 }
 
+func (i *Integration) ResetNumSpans() {
+	i.numSpans = 0
+}
+
 func (i *Integration) Name() string {
 	return "contrib/garyburd/redigo"
 }

diff --git a/contrib/internal/validationtest/contrib/globalsign/mgo/integration.go b/contrib/internal/validationtest/contrib/globalsign/mgo/integration.go
@@ -58,6 +58,10 @@ func (i *Integration) NumSpans() int {
 	return i.numSpans
 }
 
+func (i *Integration) ResetNumSpans() {
+	i.numSpans = 0
+}
+
 var entity = bson.D{
 	bson.DocElem{
 		Name: "entity_new",

diff --git a/contrib/internal/validationtest/contrib/go-pg/pg.v10/integration.go b/contrib/internal/validationtest/contrib/go-pg/pg.v10/integration.go
@@ -25,6 +25,10 @@ func New() *Integration {
 	return &Integration{}
 }
 
+func (i *Integration) ResetNumSpans() {
+	i.numSpans = 0
+}
+
 func (i *Integration) Name() string {
 	return "contrib/go-pg/pg.v10"
 }

diff --git a/contrib/internal/validationtest/contrib/go-redis/redis.v7/integration.go b/contrib/internal/validationtest/contrib/go-redis/redis.v7/integration.go
@@ -23,6 +23,10 @@ func New() *Integration {
 	return &Integration{}
 }
 
+func (i *Integration) ResetNumSpans() {
+	i.numSpans = 0
+}
+
 func (i *Integration) Name() string {
 	return "contrib/go-redis/redis.v7"
 }

diff --git a/contrib/internal/validationtest/contrib/go-redis/redis.v8/integration.go b/contrib/internal/validationtest/contrib/go-redis/redis.v8/integration.go
@@ -23,6 +23,10 @@ func New() *Integration {
 	return &Integration{}
 }
 
+func (i *Integration) ResetNumSpans() {
+	i.numSpans = 0
+}
+
 func (i *Integration) Name() string {
 	return "contrib/go-redis/redis.v8"
 }

diff --git a/contrib/internal/validationtest/contrib/go-redis/redis/integration.go b/contrib/internal/validationtest/contrib/go-redis/redis/integration.go
@@ -23,6 +23,10 @@ func New() *Integration {
 	return &Integration{}
 }
 
+func (i *Integration) ResetNumSpans() {
+	i.numSpans = 0
+}
+
 func (i *Integration) Name() string {
 	return "contrib/go-redis/redis"
 }

diff --git a/contrib/internal/validationtest/contrib/go.mongodb.org/mongo-driver/mongo/integration.go b/contrib/internal/validationtest/contrib/go.mongodb.org/mongo-driver/mongo/integration.go
@@ -26,6 +26,10 @@ func New() *Integration {
 	return &Integration{}
 }
 
+func (i *Integration) ResetNumSpans() {
+	i.numSpans = 0
+}
+
 func (i *Integration) Name() string {
 	return "contrib/go.mongodb.org/mongo-driver/mongo"
 }

diff --git a/contrib/internal/validationtest/contrib/gocql/gocql/integration.go b/contrib/internal/validationtest/contrib/gocql/gocql/integration.go
@@ -24,6 +24,10 @@ func New() *Integration {
 	return &Integration{}
 }
 
+func (i *Integration) ResetNumSpans() {
+	i.numSpans = 0
+}
+
 func (i *Integration) Name() string {
 	return "contrib/gocql/gocql"
 }
@@ -51,15 +55,15 @@ func (i *Integration) Init(t *testing.T) func() {
 func (i *Integration) GenSpans(t *testing.T) {
 	t.Helper()
 	q := i.session.Query("SELECT * from trace.person")
-	gocqltrace.WrapQuery(q, gocqltrace.WithServiceName("TestServiceName")).Exec()
+	gocqltrace.WrapQuery(q).Exec()
 	q2 := i.session.Query("SELECT * from trace.person")
-	gocqltrace.WrapQuery(q2, gocqltrace.WithServiceName("TestServiceName")).Exec()
+	gocqltrace.WrapQuery(q2).Exec()
 	q3 := i.session.Query("SELECT * from trace.person")
-	gocqltrace.WrapQuery(q3, gocqltrace.WithServiceName("TestServiceName")).Exec()
+	gocqltrace.WrapQuery(q3).Exec()
 	i.numSpans += 3
 
 	b := i.session.NewBatch(gocql.UnloggedBatch)
-	tb := gocqltrace.WrapBatch(b, gocqltrace.WithServiceName("TestServiceName"), gocqltrace.WithResourceName("BatchInsert"))
+	tb := gocqltrace.WrapBatch(b)
 
 	stmt := "INSERT INTO trace.person (name, age, description) VALUES (?, ?, ?)"
 	tb.Query(stmt, "Kate", 80, "Cassandra's sister running in kubernetes")

diff --git a/contrib/internal/validationtest/contrib/gomodule/redigo/integration.go b/contrib/internal/validationtest/contrib/gomodule/redigo/integration.go
@@ -23,6 +23,10 @@ func New() *Integration {
 	return &Integration{}
 }
 
+func (i *Integration) ResetNumSpans() {
+	i.numSpans = 0
+}
+
 func (i *Integration) Name() string {
 	return "contrib/garyburd/redigo"
 }

diff --git a/contrib/internal/validationtest/contrib/gopkg.in/jinzhu/gorm.v1/integration.go b/contrib/internal/validationtest/contrib/gopkg.in/jinzhu/gorm.v1/integration.go
@@ -34,8 +34,10 @@ func (i *Integration) Name() string {
 
 func (i *Integration) Init(t *testing.T) func() {
 	t.Helper()
-	defer sqltest.Prepare(gormtest.TableName)()
-	return func() {}
+	close_func := sqltest.Prepare(gormtest.TableName)
+	return func() {
+		close_func()
+	}
 }
 
 func (i *Integration) GenSpans(t *testing.T) {
@@ -46,6 +48,10 @@ func (i *Integration) NumSpans() int {
 	return i.numSpans
 }
 
+func (i *Integration) ResetNumSpans() {
+	i.numSpans = 0
+}
+
 func registerFunc(driverName string, driver driver.Driver) {
 	sqltrace.Register(driverName, driver)
 }

diff --git a/contrib/internal/validationtest/contrib/jinzhu/gorm/integration.go b/contrib/internal/validationtest/contrib/jinzhu/gorm/integration.go
@@ -34,8 +34,10 @@ func (i *Integration) Name() string {
 
 func (i *Integration) Init(t *testing.T) func() {
 	t.Helper()
-	defer sqltest.Prepare(gormtest.TableName)()
-	return func() {}
+	close_func := sqltest.Prepare(gormtest.TableName)
+	return func() {
+		close_func()
+	}
 }
 
 func (i *Integration) GenSpans(t *testing.T) {
@@ -55,6 +57,5 @@ func getDB(driverName string, connString string, _ func(*sql.DB) gorm.Dialector)
 	if err != nil {
 		log.Fatal(err)
 	}
-	defer db.Close()
 	return db.DB()
 }
diff --git a/contrib/internal/validationtest/contrib/jmoiron/sqlx/integration.go b/contrib/internal/validationtest/contrib/jmoiron/sqlx/integration.go
@@ -3,21 +3,20 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016 Datadog, Inc.
 
-package sqlx
+package gorm
 
 import (
 	"database/sql"
 	"database/sql/driver"
 	"log"
 	"testing"
 
-	_ "github.com/lib/pq"
 	gormtest "gopkg.in/DataDog/dd-trace-go.v1/contrib/internal/validationtest/contrib/shared/gorm"
 	sqltest "gopkg.in/DataDog/dd-trace-go.v1/contrib/internal/validationtest/contrib/shared/sql"
 	"gorm.io/gorm"
 
 	sqltrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/database/sql"
-	gormtrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/gopkg.in/jinzhu/gorm.v1"
+	sqlxtrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/jmoiron/sqlx"
 )
 
 type Integration struct {
@@ -29,7 +28,7 @@ func New() *Integration {
 }
 
 func (i *Integration) Name() string {
-	return "contrib/gopkg.in/jinzhu/gorm.v1"
+	return "contrib/jmoiron/sqlx"
 }
 
 func (i *Integration) Init(t *testing.T) func() {
@@ -50,11 +49,11 @@ func registerFunc(driverName string, driver driver.Driver) {
 	sqltrace.Register(driverName, driver)
 }
 
-func getDB(driverName string, connString string, dialectorFunc func(*sql.DB) gorm.Dialector) *sql.DB {
-	db, err := gormtrace.Open(driverName, connString)
+func getDB(driverName string, connString string, _ func(*sql.DB) gorm.Dialector) *sql.DB {
+	db, err := sqlxtrace.Open(driverName, connString)
 	if err != nil {
 		log.Fatal(err)
 	}
 	defer db.Close()
-	return db.DB()
+	return db.DB
 }
diff --git a/contrib/internal/validationtest/contrib/redis/go-redis.v9/integration.go b/contrib/internal/validationtest/contrib/redis/go-redis.v9/integration.go
@@ -23,6 +23,10 @@ func New() *Integration {
 	return &Integration{}
 }
 
+func (i *Integration) ResetNumSpans() {
+	i.numSpans = 0
+}
+
 func (i *Integration) Name() string {
 	return "contrib/redis/go-redis.v9"
 }

diff --git a/contrib/internal/validationtest/contrib/shared/gorm/integration.go b/contrib/internal/validationtest/contrib/shared/gorm/integration.go
@@ -7,11 +7,9 @@ import (
 
 	"github.com/go-sql-driver/mysql"
 	"github.com/jackc/pgx/v5/stdlib"
-	mssql "github.com/microsoft/go-mssqldb"
 	sqltest "gopkg.in/DataDog/dd-trace-go.v1/contrib/internal/validationtest/contrib/shared/sql"
 	mysqlgorm "gorm.io/driver/mysql"
 	"gorm.io/driver/postgres"
-	"gorm.io/driver/sqlserver"
 	"gorm.io/gorm"
 )
 
@@ -40,13 +38,13 @@ func RunAll(numSpans int, t *testing.T, registerFunc func(string, driver.Driver)
 			driver:        &stdlib.Driver{},
 			dialectorFunc: func(sqlDB *sql.DB) gorm.Dialector { return mysqlgorm.New(mysqlgorm.Config{Conn: sqlDB}) },
 		},
-		{
-			name:          "SQLServer",
-			connString:    sqlServerConnString,
-			driverName:    "sqlserver",
-			driver:        &mssql.Driver{},
-			dialectorFunc: func(sqlDB *sql.DB) gorm.Dialector { return sqlserver.New(sqlserver.Config{Conn: sqlDB}) },
-		},
+		// {
+		// 	name:          "SQLServer",
+		// 	connString:    sqlServerConnString,
+		// 	driverName:    "sqlserver",
+		// 	driver:        &mssql.Driver{},
+		// 	dialectorFunc: func(sqlDB *sql.DB) gorm.Dialector { return sqlserver.New(sqlserver.Config{Conn: sqlDB}) },
+		// },
 		{
 			name:          "MySQL",
 			connString:    mysqlConnString,

diff --git a/contrib/internal/validationtest/contrib/shared/sql/integration.go b/contrib/internal/validationtest/contrib/shared/sql/integration.go
@@ -26,30 +26,33 @@ func Prepare(tableName string) func() {
 	queryDrop := fmt.Sprintf("DROP TABLE IF EXISTS %s", tableName)
 	queryCreate := fmt.Sprintf("CREATE TABLE %s (id integer NOT NULL DEFAULT '0', name text)", tableName)
 	mysql, err := sql.Open("mysql", "test:test@tcp(127.0.0.1:3306)/test")
-	defer mysql.Close()
 	if err != nil {
 		log.Fatal(err)
 	}
 	mysql.Exec(queryDrop)
 	mysql.Exec(queryCreate)
+
 	postgres, err := sql.Open("postgres", "postgres://postgres:postgres@127.0.0.1:5432/postgres?sslmode=disable")
-	defer postgres.Close()
 	if err != nil {
 		log.Fatal(err)
 	}
 	postgres.Exec(queryDrop)
 	postgres.Exec(queryCreate)
+
 	// mssql, err := sql.Open("sqlserver", "sqlserver://sa:myPassw0rd@localhost:1433?database=master")
-	// defer mssql.Close()
 	// if err != nil {
 	// 	log.Fatal(err)
 	// }
 	// mssql.Exec(queryDrop)
 	// mssql.Exec(queryCreate)
+
 	return func() {
 		mysql.Exec(queryDrop)
 		postgres.Exec(queryDrop)
 		//mssql.Exec(queryDrop)
+		mysql.Close()
+		postgres.Close()
+		// mssql.Close()
 	}
 }
 

diff --git a/contrib/internal/validationtest/contrib/syndtr/goleveldb/leveldb/integration.go b/contrib/internal/validationtest/contrib/syndtr/goleveldb/leveldb/integration.go
@@ -26,6 +26,10 @@ func New() *Integration {
 	return &Integration{}
 }
 
+func (i *Integration) ResetNumSpans() {
+	i.numSpans = 0
+}
+
 func (i *Integration) Name() string {
 	return "contrib/syndtr/goleveldb/leveldb"
 }

diff --git a/contrib/internal/validationtest/contrib/tidwall/buntdb/integration.go b/contrib/internal/validationtest/contrib/tidwall/buntdb/integration.go
@@ -23,6 +23,10 @@ func New() *Integration {
 	return &Integration{}
 }
 
+func (i *Integration) ResetNumSpans() {
+	i.numSpans = 0
+}
+
 func (i *Integration) Name() string {
 	return "contrib/tidwall/buntdb"
 }