From e774850d06e9422d2bb9fa91bfa83acd14d4250d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Paj=C4=85k?= Date: Mon, 24 Jul 2023 11:20:56 +0200 Subject: [PATCH 1/2] Deprecate otelsarama --- CHANGELOG.md | 1 + instrumentation/README.md | 1 - instrumentation/github.com/Shopify/sarama/otelsarama/doc.go | 3 +++ .../Shopify/sarama/otelsarama/example/consumer/consumer.go | 2 +- .../Shopify/sarama/otelsarama/example/producer/producer.go | 2 +- .../github.com/Shopify/sarama/otelsarama/test/consumer_test.go | 2 +- .../github.com/Shopify/sarama/otelsarama/test/producer_test.go | 2 +- 7 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f820a5d037..e2dfe72357a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Deprecated - The `go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego` module is deprecated. (#4092) +- The `go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama` module is deprecated. (#4099) ### Removed diff --git a/instrumentation/README.md b/instrumentation/README.md index 80858b26865..c092017d648 100644 --- a/instrumentation/README.md +++ b/instrumentation/README.md @@ -50,7 +50,6 @@ The following instrumentation packages are provided for popular Go packages and | [github.com/gocql/gocql](./github.com/gocql/gocql/otelgocql) | ✓ | ✓ | | [github.com/gorilla/mux](./github.com/gorilla/mux/otelmux) | | ✓ | | [github.com/labstack/echo](./github.com/labstack/echo/otelecho) | | ✓ | -| [github.com/Shopify/sarama](./github.com/Shopify/sarama/otelsarama) | | ✓ | | [go.mongodb.org/mongo-driver](./go.mongodb.org/mongo-driver/mongo/otelmongo) | | ✓ | | [google.golang.org/grpc](./google.golang.org/grpc/otelgrpc) | ✓ | ✓ | | [gopkg.in/macaron.v1](./gopkg.in/macaron.v1/otelmacaron) | | ✓ | diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/doc.go b/instrumentation/github.com/Shopify/sarama/otelsarama/doc.go index 042dd56dfd3..e8fbd30efa9 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/doc.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/doc.go @@ -20,4 +20,7 @@ // (https://archive.apache.org/dist/kafka/0.11.0.0/RELEASE_NOTES.html) // // Based on: https://github.com/DataDog/dd-trace-go/tree/v1/contrib/Shopify/sarama +// +// Deprecated: This module is no longer supported. +// github.com/Shopify/sarama moved to github.com/IBM/sarama. package otelsarama // import "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama" diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/example/consumer/consumer.go b/instrumentation/github.com/Shopify/sarama/otelsarama/example/consumer/consumer.go index 299b384cec5..5b8dede80c0 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/example/consumer/consumer.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/example/consumer/consumer.go @@ -30,7 +30,7 @@ import ( semconv "go.opentelemetry.io/otel/semconv/v1.17.0" "go.opentelemetry.io/otel/trace" - "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama" + "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama" //nolint:staticcheck // This is deprecated and will be removed in the next release. "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama/example" ) diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/example/producer/producer.go b/instrumentation/github.com/Shopify/sarama/otelsarama/example/producer/producer.go index 74bc63b89fd..9aa6a2e944f 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/example/producer/producer.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/example/producer/producer.go @@ -29,7 +29,7 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" - "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama" + "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama" //nolint:staticcheck // This is deprecated and will be removed in the next release. "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama/example" ) diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/test/consumer_test.go b/instrumentation/github.com/Shopify/sarama/otelsarama/test/consumer_test.go index 90478348b3c..056a1bebb5a 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/test/consumer_test.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/test/consumer_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama" + "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama" //nolint:staticcheck // This is deprecated and will be removed in the next release. "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" sdktrace "go.opentelemetry.io/otel/sdk/trace" diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/test/producer_test.go b/instrumentation/github.com/Shopify/sarama/otelsarama/test/producer_test.go index 2c7d76f8f50..d4a97137e4a 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/test/producer_test.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/test/producer_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama" + "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama" //nolint:staticcheck // This is deprecated and will be removed in the next release. "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/propagation" From a7a5b5f2ab427f265852d491359010a8c8e8b630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Paj=C4=85k?= Date: Fri, 28 Jul 2023 09:04:27 +0200 Subject: [PATCH 2/2] Add deprecation notice to go.mod --- instrumentation/github.com/Shopify/sarama/otelsarama/go.mod | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/go.mod b/instrumentation/github.com/Shopify/sarama/otelsarama/go.mod index a9dd0b9bc2f..109c7bf02c2 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/go.mod +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/go.mod @@ -1,3 +1,5 @@ +// Deprecated: This module is no longer supported. +// github.com/Shopify/sarama moved to github.com/IBM/sarama. module go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama go 1.19