From 97e8f42d51055ad520a2b0997cf63b026eb2c362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dario=20Casta=C3=B1=C3=A9?= Date: Mon, 18 Dec 2023 14:55:36 +0100 Subject: [PATCH 1/6] go.mod: update gotraceui to v0.3.0 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b0335cf1fe..6d2dd1daee 100644 --- a/go.mod +++ b/go.mod @@ -102,7 +102,7 @@ require ( gorm.io/driver/postgres v1.4.6 gorm.io/driver/sqlserver v1.4.2 gorm.io/gorm v1.25.3 - honnef.co/go/gotraceui v0.2.0 + honnef.co/go/gotraceui v0.3.0 k8s.io/apimachinery v0.23.17 k8s.io/client-go v0.23.17 ) diff --git a/go.sum b/go.sum index 148b7254b9..cd05b78d5e 100644 --- a/go.sum +++ b/go.sum @@ -3021,8 +3021,8 @@ gotest.tools/gotestsum v1.8.2/go.mod h1:6JHCiN6TEjA7Kaz23q1bH0e2Dc3YJjDUZ0DmctFZ gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= gotest.tools/v3 v3.3.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A= -honnef.co/go/gotraceui v0.2.0 h1:dmNsfQ9Vl3GwbiVD7Z8d/osC6WtGGrasyrC2suc4ZIQ= -honnef.co/go/gotraceui v0.2.0/go.mod h1:qHo4/W75cA3bX0QQoSvDjbJa4R8mAyyFjbWAj63XElc= +honnef.co/go/gotraceui v0.3.0 h1:+AAnS8W70Zg5LPNFprv0Vp47T1+n6wrHdUi3HFiLLGM= +honnef.co/go/gotraceui v0.3.0/go.mod h1:NSZZ7eph/Pw7oML0LB7bURivs55YCwgFPwU6fDsMR4A= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From 2c06c24c4c65679be640afcb0b8390887ac748bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dario=20Casta=C3=B1=C3=A9?= Date: Mon, 18 Dec 2023 14:59:23 +0100 Subject: [PATCH 2/6] contrib/database/sql: remove build constraint for Go 1.21 --- contrib/database/sql/exec_trace_test.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/contrib/database/sql/exec_trace_test.go b/contrib/database/sql/exec_trace_test.go index ffeffb0907..00df3bac70 100644 --- a/contrib/database/sql/exec_trace_test.go +++ b/contrib/database/sql/exec_trace_test.go @@ -3,14 +3,6 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2023 Datadog, Inc. -// TODO: gotraceui does not currently handle Go 1.21 execution tracer changes, -// so we need to skip this test for that version. We still have coverage for -// older Go versions due to our support policy, and Go 1.21 shouldn't fundamentally -// change the behavior this test is covering. Remove this build constraint -// once gotraceui supports Go 1.21 -// -//go:build !go1.21 - package sql import ( From d1e435d14dbfec9dda2a93547c9595c8e2dfe731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dario=20Casta=C3=B1=C3=A9?= Date: Mon, 18 Dec 2023 15:16:48 +0100 Subject: [PATCH 3/6] contrib/database/sql: add build constraint for Go 1.22 --- contrib/database/sql/exec_trace_test.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/contrib/database/sql/exec_trace_test.go b/contrib/database/sql/exec_trace_test.go index 00df3bac70..e804166f80 100644 --- a/contrib/database/sql/exec_trace_test.go +++ b/contrib/database/sql/exec_trace_test.go @@ -3,6 +3,14 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2023 Datadog, Inc. +// Each gotraceui does not handle next Go versions execution tracer changes, +// so we need to skip this test for future versions. We still have coverage for +// older Go versions due to our support policy, and Go 1.22 shouldn't fundamentally +// change the behavior this test is covering. Update this build constraint +// once gotraceui supports next Go version supported in our support policy. +// +//go:build !go1.22 + package sql import ( From 7f4ac404fb08f03940602c349529166adfbd7b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dario=20Casta=C3=B1=C3=A9?= Date: Mon, 18 Dec 2023 15:59:17 +0100 Subject: [PATCH 4/6] contrib/database/sql: improve build constraint comment --- contrib/database/sql/exec_trace_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/database/sql/exec_trace_test.go b/contrib/database/sql/exec_trace_test.go index e804166f80..0e746958a7 100644 --- a/contrib/database/sql/exec_trace_test.go +++ b/contrib/database/sql/exec_trace_test.go @@ -3,7 +3,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2023 Datadog, Inc. -// Each gotraceui does not handle next Go versions execution tracer changes, +// Each gotraceui release does not handle next Go versions execution tracer changes, // so we need to skip this test for future versions. We still have coverage for // older Go versions due to our support policy, and Go 1.22 shouldn't fundamentally // change the behavior this test is covering. Update this build constraint From d48ce660bcf20464ce18e656467173c9287c9942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dario=20Casta=C3=B1=C3=A9?= Date: Tue, 19 Dec 2023 17:29:45 +0100 Subject: [PATCH 5/6] contrib/database/sql: isolate test to avoid import cycle --- contrib/database/sql/exec_trace_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/database/sql/exec_trace_test.go b/contrib/database/sql/exec_trace_test.go index 0e746958a7..5201697a0d 100644 --- a/contrib/database/sql/exec_trace_test.go +++ b/contrib/database/sql/exec_trace_test.go @@ -11,7 +11,7 @@ // //go:build !go1.22 -package sql +package sql_test import ( "bytes" @@ -22,6 +22,7 @@ import ( "testing" "time" + sqltrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/database/sql" "gopkg.in/DataDog/dd-trace-go.v1/contrib/database/sql/internal" "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer" "gopkg.in/DataDog/dd-trace-go.v1/internal/httpmem" @@ -53,12 +54,12 @@ func TestExecutionTraceAnnotations(t *testing.T) { // jitter, etc., but we know that they should be at least this long. const sleepDuration = 10 * time.Millisecond - Register("mock", &internal.MockDriver{ + sqltrace.Register("mock", &internal.MockDriver{ Hook: func() { time.Sleep(sleepDuration) }, }) - db, err := Open("mock", "") + db, err := sqltrace.Open("mock", "") require.NoError(t, err, "opening mock db") span, ctx := tracer.StartSpanFromContext(context.Background(), "parent") From b117980cd8d50363c1e790c825569640dc89fba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dario=20Casta=C3=B1=C3=A9?= Date: Wed, 20 Dec 2023 16:18:21 +0100 Subject: [PATCH 6/6] contrib/database/sql: revert build tag to exclude 1.21 --- contrib/database/sql/exec_trace_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/database/sql/exec_trace_test.go b/contrib/database/sql/exec_trace_test.go index 5201697a0d..4583397fcb 100644 --- a/contrib/database/sql/exec_trace_test.go +++ b/contrib/database/sql/exec_trace_test.go @@ -9,7 +9,7 @@ // change the behavior this test is covering. Update this build constraint // once gotraceui supports next Go version supported in our support policy. // -//go:build !go1.22 +//go:build !go1.21 package sql_test