From efde8311a75763e6634b0c0715b45b731a681d4a Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Tue, 2 Jul 2024 13:27:51 -0700 Subject: [PATCH] Remove `otelmongo` deprecation while we onboard a Code Owner (#5840) [We are in the process of on-boarding a Code Owner for this package](https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5551#issuecomment-2153111519). Remove the deprecation notice for the time being. --------- Co-authored-by: Aaron Clawson <3766680+MadVikingGod@users.noreply.github.com> --- CHANGELOG.md | 3 --- .../go.mongodb.org/mongo-driver/mongo/otelmongo/doc.go | 7 ------- .../go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod | 1 - .../mongo-driver/mongo/otelmongo/test/doc.go | 7 ------- .../mongo-driver/mongo/otelmongo/test/go.mod | 1 - .../mongo-driver/mongo/otelmongo/test/mongo_test.go | 2 +- 6 files changed, 1 insertion(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9276b3ddd13..65a8a63cc48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,8 +31,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Deprecated -- The `go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo` package is deprecated. - If you would like to become a Code Owner of this module and prevent it from being removed, see [#5551]. (#5598) - The `go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho` package is deprecated. If you would like to become a Code Owner of this module and prevent it from being removed, see [#5550]. (#5645) - The `go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron` package is deprecated. @@ -47,7 +45,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm The returned type still implements the interface. [#5550]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5550 -[#5551]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5551 [#5552]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5552 [#5554]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5554 diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/doc.go b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/doc.go index 8df3cb766c8..f8d53a53918 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/doc.go +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/doc.go @@ -12,11 +12,4 @@ // This code was originally based on the following: // - https://github.com/DataDog/dd-trace-go/tree/02f0449efa3cb382d499fadc873957385dcb2192/contrib/go.mongodb.org/mongo-driver/mongo // - https://github.com/DataDog/dd-trace-go/tree/v1.23.3/ddtrace/ext -// -// Deprecated: otelmongo has no Code Owner. -// After August 21, 2024, it may no longer be supported and may stop -// receiving new releases unless a new Code Owner is found. See -// [this issue] if you would like to become the Code Owner of this module. -// -// [this issue]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5551 package otelmongo // import "go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo" diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod index 9ecad9db05b..1608ea5ebe6 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod @@ -1,4 +1,3 @@ -// Deprecated: otelmongo has no Code Owner. module go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo go 1.21 diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/doc.go b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/doc.go index 90730b832a2..532c75d9a5b 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/doc.go +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/doc.go @@ -7,12 +7,5 @@ Package test validates the otelmongo instrumentation with the default SDK. This package is in a separate module from the instrumentation it tests to isolate the dependency of the default SDK and not impose this as a transitive dependency for users. - -Deprecated: otelmongo has no Code Owner. -After August 21, 2024, it may no longer be supported and may stop -receiving new releases unless a new Code Owner is found. See -[this issue] if you would like to become the Code Owner of this module. - -[this issue]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5551 */ package test // import "go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test" diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod index 1010ce15c3f..5c71effb769 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod @@ -1,4 +1,3 @@ -// Deprecated: otelmongo has no Code Owner. module go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test go 1.21 diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/mongo_test.go b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/mongo_test.go index 8fe95e6ca3e..21b6eaa97e9 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/mongo_test.go +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/mongo_test.go @@ -14,7 +14,7 @@ import ( "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" - "go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo" // nolint:staticcheck // deprecated. + "go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo" "go.opentelemetry.io/contrib/internal/util" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes"