From 903890b67689a83b67ba2c3f01a6c44c264832de Mon Sep 17 00:00:00 2001 From: Alex Normand Date: Wed, 25 May 2022 22:15:18 -0700 Subject: [PATCH] Reorganize imports --- contrib/database/sql/sql_test.go | 7 ++++--- contrib/internal/sqltest/sqltest.go | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/contrib/database/sql/sql_test.go b/contrib/database/sql/sql_test.go index 5ccecf7a89..9022305927 100644 --- a/contrib/database/sql/sql_test.go +++ b/contrib/database/sql/sql_test.go @@ -16,13 +16,14 @@ import ( "testing" "time" + "gopkg.in/DataDog/dd-trace-go.v1/contrib/internal/sqltest" + "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext" + "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/mocktracer" + mssql "github.com/denisenkom/go-mssqldb" "github.com/go-sql-driver/mysql" "github.com/lib/pq" "github.com/stretchr/testify/assert" - "gopkg.in/DataDog/dd-trace-go.v1/contrib/internal/sqltest" - "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext" - "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/mocktracer" ) // tableName holds the SQL table that these tests will be run against. It must be unique cross-repo. diff --git a/contrib/internal/sqltest/sqltest.go b/contrib/internal/sqltest/sqltest.go index 0877d53ef1..93b0a344bb 100644 --- a/contrib/internal/sqltest/sqltest.go +++ b/contrib/internal/sqltest/sqltest.go @@ -12,11 +12,12 @@ import ( "log" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "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" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) // Prepare sets up a table with the given name in both the MySQL and Postgres databases and returns