From f12f82e4f5832122c0aa2a0008ad1da2efb693c5 Mon Sep 17 00:00:00 2001 From: Eliott Bouhana <47679741+eliottness@users.noreply.github.com> Date: Wed, 13 Nov 2024 10:06:53 +0100 Subject: [PATCH] release: v0.9.4 (#390) Signed-off-by: Eliott Bouhana --------- Signed-off-by: Eliott Bouhana --- README.md | 84 +++++++++++++++++++++---------------- internal/pin/pin_test.go | 22 ++++------ internal/version/version.go | 2 +- 3 files changed, 58 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index d8bcd43d..efc25377 100644 --- a/README.md +++ b/README.md @@ -117,39 +117,46 @@ In addition to this, Orchestrion only supports projects using [Go modules][go-mo Orchestrion supports automatic tracing of the following libraries: -Library | Since | Notes ---------------------------------------|:--------:|----------------------------------------------- -`database/sql` | `v0.7.0` | [Aspect][db-sql] -`github.com/gin-gonic/gin` | `v0.7.0` | [Aspect][gin] -`github.com/go-chi/chi/v5` | `v0.7.0` | [Aspect][chi-v5] -`github.com/go-chi/chi` | `v0.7.0` | [Aspect][chi-v1] -`github.com/go-redis/redis/v7` | `v0.7.0` | [Aspect][go-redis-v7] -`github.com/go-redis/redis/v8` | `v0.7.0` | [Aspect][go-redis-v8] -`github.com/gofiber/fiber/v2` | `v0.7.0` | [Aspect][fiber-v2] -`github.com/gomodule/redigo/redis` | `v0.7.0` | [Aspect][redigo] -`github.com/gorilla/mux` | `v0.7.0` | [Aspect][gorilla]. Cannot be opted out of via `//dd:ignore` -`github.com/jinzhu/gorm` | `v0.7.0` | [Aspect][jinzhu-gorm] -`github.com/labstack/echo/v4` | `v0.7.0` | [Aspect][echo] -`google.golang.org/grpc` | `v0.7.0` | [Aspect][grpc] -`gorm.io/gorm` | `v0.7.0` | [Aspect][gorm] -`net/http` | `v0.7.0` | [Client][net-http.client] / [Server][net-http.server] -`go.mongodb.org/mongo-driver/mongo` | `v0.7.3` | [Aspect][mongo] -`github.com/aws-sdk-go/aws` | `v0.7.4` | [Aspect][aws-sdk-go] -`github.com/hashicorp/vault` | `v0.7.4` | [Aspect][hashicorp-vault] -`github.com/IBM/sarama` | `v0.7.4` | [Aspect][ibm-sarama] -`github.com/Shopify/sarama` | `v0.7.4` | [Aspect][shopify-sarama] -`k8s.io/client-go` | `v0.7.4` | [Aspect][k8s-client] -`log/slog` | `v0.7.4` | [Aspect][log-slog] -`os` | `v0.8.0` | [Aspect][os] -`github.com/aws/aws-sdk-go-v2` | `v0.8.0` | [Aspect][aws-sdk-go-v2] -`github.com/redis/go-redis/v9` | `v0.8.0` | [Aspect][go-redis-v9] -`github.com/gocql/gocql` | `v0.8.0` | [Aspect][gocql] -`cloud.google.com/go/pubsub` | `v0.9.0` | [Aspect][pubsub] -`github.com/99designs/gqlgen` | `v0.9.1` | [Aspect][gqlgen] -`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] +Library | Since | Notes +------------------------------------------------------|:--------:|------------------------------------------------------------ +`database/sql` | `v0.7.0` | [Aspect][db-sql] +`github.com/gin-gonic/gin` | `v0.7.0` | [Aspect][gin] +`github.com/go-chi/chi/v5` | `v0.7.0` | [Aspect][chi-v5] +`github.com/go-chi/chi` | `v0.7.0` | [Aspect][chi-v1] +`github.com/go-redis/redis/v7` | `v0.7.0` | [Aspect][go-redis-v7] +`github.com/go-redis/redis/v8` | `v0.7.0` | [Aspect][go-redis-v8] +`github.com/gofiber/fiber/v2` | `v0.7.0` | [Aspect][fiber-v2] +`github.com/gomodule/redigo/redis` | `v0.7.0` | [Aspect][redigo] +`github.com/gorilla/mux` | `v0.7.0` | [Aspect][gorilla]. Cannot be opted out of via `//dd:ignore` +`github.com/jinzhu/gorm` | `v0.7.0` | [Aspect][jinzhu-gorm] +`github.com/labstack/echo/v4` | `v0.7.0` | [Aspect][echo] +`google.golang.org/grpc` | `v0.7.0` | [Aspect][grpc] +`gorm.io/gorm` | `v0.7.0` | [Aspect][gorm] +`net/http` | `v0.7.0` | [Client][net-http.client] / [Server][net-http.server] +`go.mongodb.org/mongo-driver/mongo` | `v0.7.3` | [Aspect][mongo] +`github.com/aws-sdk-go/aws` | `v0.7.4` | [Aspect][aws-sdk-go] +`github.com/hashicorp/vault` | `v0.7.4` | [Aspect][hashicorp-vault] +`github.com/IBM/sarama` | `v0.7.4` | [Aspect][ibm-sarama] +`github.com/Shopify/sarama` | `v0.7.4` | [Aspect][shopify-sarama] +`k8s.io/client-go` | `v0.7.4` | [Aspect][k8s-client] +`log/slog` | `v0.7.4` | [Aspect][log-slog] +`os` | `v0.8.0` | [Aspect][os] +`github.com/aws/aws-sdk-go-v2` | `v0.8.0` | [Aspect][aws-sdk-go-v2] +`github.com/redis/go-redis/v9` | `v0.8.0` | [Aspect][go-redis-v9] +`github.com/gocql/gocql` | `v0.8.0` | [Aspect][gocql] +`cloud.google.com/go/pubsub` | `v0.9.0` | [Aspect][pubsub] +`github.com/99designs/gqlgen` | `v0.9.1` | [Aspect][gqlgen] +`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] +`github.com/elastic/go-elasticsearch` | `v0.9.4` | [Aspect][elasticsearch] +`github.com/twitchtv/twirp` | `v0.9.4` | [Aspect][twirp] +`github.com/segmentio/kafka-go` | `v0.9.4` | [Aspect][segmentio-kafka-go] +`github.com/confluentinc/confluent-kafka-go/kafka` | `v0.9.4` | [Aspect][confluent-kafka-go-v1] +`github.com/confluentinc/confluent-kafka-go/kafka/v2` | `v0.9.4` | [Aspect][confluent-kafka-go-v2] +`github.com/julienschmidt/httprouter` | `v0.9.4` | [Aspect][httprouter] +`github.com/sirupsen/logrus` | `v0.9.4` | [Aspect][logrus] [db-sql]: https://datadoghq.dev/orchestrion/docs/built-in/stdlib/database-sql/ [gin]: https://datadoghq.dev/orchestrion/docs/built-in/http/gin/ @@ -165,8 +172,8 @@ Library | Since | Notes [echo]: https://datadoghq.dev/orchestrion/docs/built-in/http/echo/ [grpc]: https://datadoghq.dev/orchestrion/docs/built-in/grpc/ [gorm]: https://datadoghq.dev/orchestrion/docs/built-in/databases/gorm/#gormiogorm -[net-http.Client]: https://datadoghq.dev/orchestrion/docs/built-in/stdlib/net-http.client/ -[net-http.Server]: https://datadoghq.dev/orchestrion/docs/built-in/stdlib/net-http.server/ +[net-http.client]: https://datadoghq.dev/orchestrion/docs/built-in/stdlib/net-http.client/ +[net-http.server]: https://datadoghq.dev/orchestrion/docs/built-in/stdlib/net-http.server/ [mongo]: https://datadoghq.dev/orchestrion/docs/built-in/databases/mongo/ [k8s-client]: https://datadoghq.dev/orchestrion/docs/built-in/k8s-client/ [hashicorp-vault]: https://datadoghq.dev/orchestrion/docs/built-in/api/vault/ @@ -183,6 +190,13 @@ Library | Since | Notes [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 +[elasticsearch]: https://datadoghq.dev/orchestrion/docs/built-in/databases/go-elasticsearch/ +[twirp]: https://datadoghq.dev/orchestrion/docs/built-in/rpc/twirp/ +[segmentio-kafka-go]: https://datadoghq.dev/orchestrion/docs/built-in/datastreams/segmentio_kafka_v0/ +[confluent-kafka-go-v1]: https://datadoghq.dev/orchestrion/docs/built-in/datastreams/confluentinc_kafka/#inject-kafka-library-version-v1 +[confluent-kafka-go-v2]: https://datadoghq.dev/orchestrion/docs/built-in/datastreams/confluentinc_kafka/#inject-kafka-library-version-v2 +[httprouter]: https://datadoghq.dev/orchestrion/docs/built-in/http/julienschmidt_httprouter/ +[logrus]: https://datadoghq.dev/orchestrion/docs/built-in/logs/logrus/ Calls to these libraries are instrumented with library-specific code adding tracing to them, including support for distributed traces. diff --git a/internal/pin/pin_test.go b/internal/pin/pin_test.go index e0445e8d..e2d1cd9d 100644 --- a/internal/pin/pin_test.go +++ b/internal/pin/pin_test.go @@ -134,9 +134,7 @@ var goModTemplate = template.Must(template.New("go-mod").Parse(`module github.co go {{ .GoVersion }} -{{ if .OrchestrionRequired }} replace github.com/DataDog/orchestrion {{ .OrchestrionVersion }} => {{ .OrchestrionPath }} -{{ end }} {{ range $path, $version := .Require }} require {{ $path }} {{ $version }} @@ -156,20 +154,16 @@ func scaffold(t *testing.T, requires map[string]string) string { defer goMod.Close() - _, orchestrionRequired := requires["github.com/DataDog/orchestrion"] - require.NoError(t, goModTemplate.Execute(goMod, struct { - GoVersion string - OrchestrionVersion string - OrchestrionPath string - OrchestrionRequired bool - Require map[string]string + GoVersion string + OrchestrionVersion string + OrchestrionPath string + Require map[string]string }{ - GoVersion: runtime.Version()[2:6], - OrchestrionVersion: version.Tag, - OrchestrionPath: rootDir, - OrchestrionRequired: orchestrionRequired, - Require: requires, + GoVersion: runtime.Version()[2:6], + OrchestrionVersion: version.Tag, + OrchestrionPath: rootDir, + Require: requires, })) return tmp diff --git a/internal/version/version.go b/internal/version/version.go index 66a7e9ea..85be7616 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.4-rc.1" +const Tag = "v0.9.4"