From 2f85370b593b5b0388a91cf1b01a5676a15b123d Mon Sep 17 00:00:00 2001 From: Alex Normand Date: Wed, 4 May 2022 22:02:45 -0700 Subject: [PATCH] Force close rows for more deterministic test --- contrib/database/sql/conn.go | 2 +- contrib/internal/sqltest/sqltest.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/database/sql/conn.go b/contrib/database/sql/conn.go index 912887e3c7..7dae0c20c7 100644 --- a/contrib/database/sql/conn.go +++ b/contrib/database/sql/conn.go @@ -221,7 +221,7 @@ func (tp *traceParams) tryStartTrace(ctx context.Context, qtype queryType, query // optional interface method is not implemented. There is // nothing to trace here. // See: https://github.com/DataDog/dd-trace-go/issues/270 - return + return nil } if _, exists := tracer.SpanFromContext(ctx); tp.cfg.childSpansOnly && !exists { return nil diff --git a/contrib/internal/sqltest/sqltest.go b/contrib/internal/sqltest/sqltest.go index 0d236285c9..0b4dde0983 100644 --- a/contrib/internal/sqltest/sqltest.go +++ b/contrib/internal/sqltest/sqltest.go @@ -122,15 +122,15 @@ func testQuery(cfg *Config) func(*testing.T) { cfg.mockTracer.Reset() assert := assert.New(t) rows, err := cfg.DB.Query(query) - defer rows.Close() + rows.Close() assert.Nil(err) spans := cfg.mockTracer.FinishedSpans() var querySpan mocktracer.Span if cfg.DriverName == "sqlserver" { //The mssql driver doesn't support non-prepared queries so there are 3 spans - //connect, prepare, and query - assert.Len(spans, 3) + //connect, prepare, query and close + assert.Len(spans, 4) span := spans[1] cfg.ExpectTags["sql.query_type"] = "Prepare" assert.Equal(cfg.ExpectName, span.OperationName())