From 3df63dc80dd970c037b05c9c5bf78e0a432f9db7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dario=20Casta=C3=B1=C3=A9?= Date: Thu, 24 Oct 2024 10:41:03 +0200 Subject: [PATCH 1/5] release: v0.9.4-rc.1 --- go.mod | 2 +- go.sum | 2 ++ internal/version/version.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 812fc66e..e37403e4 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( golang.org/x/sys v0.26.0 golang.org/x/term v0.25.0 golang.org/x/tools v0.26.0 - gopkg.in/DataDog/dd-trace-go.v1 v1.69.0 + gopkg.in/DataDog/dd-trace-go.v1 v1.69.1-rc.4 gopkg.in/yaml.v3 v3.0.1 gotest.tools/v3 v3.5.1 k8s.io/client-go v0.31.1 diff --git a/go.sum b/go.sum index 7e52f193..261c1c13 100644 --- a/go.sum +++ b/go.sum @@ -1340,6 +1340,8 @@ google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFyt google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/DataDog/dd-trace-go.v1 v1.69.0 h1:zSY6DDsFRMQDNQYKWCv/AEwJXoPpDf1FfMyw7I1B7M8= gopkg.in/DataDog/dd-trace-go.v1 v1.69.0/go.mod h1:U9AOeBHNAL95JXcd/SPf4a7O5GNeF/yD13sJtli/yaU= +gopkg.in/DataDog/dd-trace-go.v1 v1.69.1-rc.4 h1:WxbmK9/DjQ0p4cICkbPQ6MfEnsESZGqeZQN6LB5lZfo= +gopkg.in/DataDog/dd-trace-go.v1 v1.69.1-rc.4/go.mod h1:U9AOeBHNAL95JXcd/SPf4a7O5GNeF/yD13sJtli/yaU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/internal/version/version.go b/internal/version/version.go index a17594c5..66a7e9ea 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -6,4 +6,4 @@ package version // Tag specifies the current release tag. It needs to be manually updated. -const Tag = "v0.9.3" +const Tag = "v0.9.4-rc.1" From 8d8f11f761c8517788a19c5d10a2adcde46792df Mon Sep 17 00:00:00 2001 From: Romain Marcadier Date: Thu, 24 Oct 2024 10:44:03 +0200 Subject: [PATCH 2/5] chore: update generated files --- _integration-tests/go.mod | 2 +- _integration-tests/go.sum | 4 ++-- go.sum | 2 -- samples/go.mod | 2 +- samples/go.sum | 4 ++-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/_integration-tests/go.mod b/_integration-tests/go.mod index 00cbc403..e01b78c9 100644 --- a/_integration-tests/go.mod +++ b/_integration-tests/go.mod @@ -52,7 +52,7 @@ require ( google.golang.org/api v0.201.0 google.golang.org/grpc v1.67.1 google.golang.org/grpc/examples v0.0.0-20240816220358-f8d98a477c22 - gopkg.in/DataDog/dd-trace-go.v1 v1.69.0 + gopkg.in/DataDog/dd-trace-go.v1 v1.69.1-rc.4 gorm.io/driver/sqlite v1.5.6 gorm.io/gorm v1.25.12 gotest.tools/v3 v3.5.1 diff --git a/_integration-tests/go.sum b/_integration-tests/go.sum index 5ad852e5..8a396e07 100644 --- a/_integration-tests/go.sum +++ b/_integration-tests/go.sum @@ -2422,8 +2422,8 @@ google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= -gopkg.in/DataDog/dd-trace-go.v1 v1.69.0 h1:zSY6DDsFRMQDNQYKWCv/AEwJXoPpDf1FfMyw7I1B7M8= -gopkg.in/DataDog/dd-trace-go.v1 v1.69.0/go.mod h1:U9AOeBHNAL95JXcd/SPf4a7O5GNeF/yD13sJtli/yaU= +gopkg.in/DataDog/dd-trace-go.v1 v1.69.1-rc.4 h1:WxbmK9/DjQ0p4cICkbPQ6MfEnsESZGqeZQN6LB5lZfo= +gopkg.in/DataDog/dd-trace-go.v1 v1.69.1-rc.4/go.mod h1:U9AOeBHNAL95JXcd/SPf4a7O5GNeF/yD13sJtli/yaU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/go.sum b/go.sum index 261c1c13..2e586ca0 100644 --- a/go.sum +++ b/go.sum @@ -1338,8 +1338,6 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= -gopkg.in/DataDog/dd-trace-go.v1 v1.69.0 h1:zSY6DDsFRMQDNQYKWCv/AEwJXoPpDf1FfMyw7I1B7M8= -gopkg.in/DataDog/dd-trace-go.v1 v1.69.0/go.mod h1:U9AOeBHNAL95JXcd/SPf4a7O5GNeF/yD13sJtli/yaU= gopkg.in/DataDog/dd-trace-go.v1 v1.69.1-rc.4 h1:WxbmK9/DjQ0p4cICkbPQ6MfEnsESZGqeZQN6LB5lZfo= gopkg.in/DataDog/dd-trace-go.v1 v1.69.1-rc.4/go.mod h1:U9AOeBHNAL95JXcd/SPf4a7O5GNeF/yD13sJtli/yaU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/samples/go.mod b/samples/go.mod index 0af70abd..afc65416 100644 --- a/samples/go.mod +++ b/samples/go.mod @@ -329,7 +329,7 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect google.golang.org/grpc/stats/opentelemetry v0.0.0-20241018153737-98959d9a4904 // indirect google.golang.org/protobuf v1.35.1 // indirect - gopkg.in/DataDog/dd-trace-go.v1 v1.69.0 // indirect + gopkg.in/DataDog/dd-trace-go.v1 v1.69.1-rc.4 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/samples/go.sum b/samples/go.sum index e70c7e89..cc7f6b82 100644 --- a/samples/go.sum +++ b/samples/go.sum @@ -1331,8 +1331,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= -gopkg.in/DataDog/dd-trace-go.v1 v1.69.0 h1:zSY6DDsFRMQDNQYKWCv/AEwJXoPpDf1FfMyw7I1B7M8= -gopkg.in/DataDog/dd-trace-go.v1 v1.69.0/go.mod h1:U9AOeBHNAL95JXcd/SPf4a7O5GNeF/yD13sJtli/yaU= +gopkg.in/DataDog/dd-trace-go.v1 v1.69.1-rc.4 h1:WxbmK9/DjQ0p4cICkbPQ6MfEnsESZGqeZQN6LB5lZfo= +gopkg.in/DataDog/dd-trace-go.v1 v1.69.1-rc.4/go.mod h1:U9AOeBHNAL95JXcd/SPf4a7O5GNeF/yD13sJtli/yaU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 696a195300657e3675b9c7d64eb4d732b672429f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dario=20Casta=C3=B1=C3=A9?= Date: Thu, 24 Oct 2024 10:55:16 +0200 Subject: [PATCH 3/5] feat(README.md): document jackc/pgx support --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 850572b1..cb62fa32 100644 --- a/README.md +++ b/README.md @@ -149,6 +149,7 @@ Library | Since | Notes `github.com/redis/go-redis` | `v0.9.1` | [Aspect][go-redis] `github.com/graph-gophers/graphql-go` | `v0.9.1` | [Aspect][graph-gophers] `github.com/graphql-go/graphql` | `v0.9.1` | [Aspect][graphql] +`github.com/jackc/pgx` | `v0.9.4` | [Aspect][pgx] [db-sql]: https://datadoghq.dev/orchestrion/docs/built-in/stdlib/database-sql/ [gin]: https://datadoghq.dev/orchestrion/docs/built-in/http/gin/ From 47605ee8e2cf4f61606d375e29354ca3501a6e49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dario=20Casta=C3=B1=C3=A9?= Date: Thu, 24 Oct 2024 11:09:02 +0200 Subject: [PATCH 4/5] feat(README.md): fix jackc/pgx link --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cb62fa32..d8bcd43d 100644 --- a/README.md +++ b/README.md @@ -182,6 +182,7 @@ Library | Since | Notes [go-redis]: https://datadoghq.dev/orchestrion/docs/built-in/databases/go-redis/#wrap-v0-client [graph-gophers]: https://datadoghq.dev/orchestrion/docs/built-in/graphql/graph-gophers/ [graphql]: https://datadoghq.dev/orchestrion/docs/built-in/graphql/graphql-go/ +[pgx]: https://datadoghq.dev/orchestrion/docs/built-in/databases/pgx Calls to these libraries are instrumented with library-specific code adding tracing to them, including support for distributed traces. From 166b3bbe274d6444730b460c03f9f375ba875a8f Mon Sep 17 00:00:00 2001 From: Eliott Bouhana Date: Thu, 24 Oct 2024 11:25:52 +0200 Subject: [PATCH 5/5] fix(toolexec): don't try to go get orchestrion itself Signed-off-by: Eliott Bouhana --- internal/toolexec/version_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/toolexec/version_test.go b/internal/toolexec/version_test.go index 6b5baeb0..726fde16 100644 --- a/internal/toolexec/version_test.go +++ b/internal/toolexec/version_test.go @@ -39,7 +39,7 @@ func Test(t *testing.T) { getArgs := []string{"get"} for _, pkg := range builtin.InjectedPaths { // We don't want to try to "go get" standard library packages; these don't contain a ".". - if strings.Contains(pkg, ".") { + if strings.Contains(pkg, ".") && !strings.Contains(pkg, "github.com/DataDog/orchestrion") { getArgs = append(getArgs, pkg) } }