From faae7f2b84b7dbee7d9194a996621eddeed4283d Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Thu, 23 May 2024 11:19:22 -0700 Subject: [PATCH 1/4] Revert "Deprecate the AWS EC2 detector (#5636)" This reverts commit 6e707b30a56887239a4cecfdbb7979c5f95a3839. --- CHANGELOG.md | 3 --- detectors/aws/ec2/ec2.go | 9 --------- detectors/aws/ec2/go.mod | 1 - 3 files changed, 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c0e89d2a39..5fd61d0f91a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,8 +12,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - 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/detectors/aws/ec2` package is deprecated. - If you would like to become a Code Owner of this module and prevent it from being removed, see [#5542]. (#5636) - The `go.opentelemetry.io/contrib/detectors/aws/ecs` package is deprecated. If you would like to become a Code Owner of this module and prevent it from being removed, see [#5543]. (#5637) - The `go.opentelemetry.io/contrib/detectors/aws/eks` package is deprecated. @@ -21,7 +19,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - The `go.opentelemetry.io/contrib/detectors/aws/lambda` package is deprecated. If you would like to become a Code Owner of this module and prevent it from being removed, see [#5545]. (#5641) -[#5542]: /~https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5542 [#5543]: /~https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5543 [#5544]: /~https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5544 [#5545]: /~https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5545 diff --git a/detectors/aws/ec2/ec2.go b/detectors/aws/ec2/ec2.go index cce1f0db5a2..ee8aade2ed6 100644 --- a/detectors/aws/ec2/ec2.go +++ b/detectors/aws/ec2/ec2.go @@ -1,15 +1,6 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -// Package ec2 provide an OpenTelemetry resource detector for AWS EC2 -// instances. -// -// Deprecated: ec2 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/5542 package ec2 // import "go.opentelemetry.io/contrib/detectors/aws/ec2" import ( diff --git a/detectors/aws/ec2/go.mod b/detectors/aws/ec2/go.mod index 1d89a9b6ecc..3db0df5a117 100644 --- a/detectors/aws/ec2/go.mod +++ b/detectors/aws/ec2/go.mod @@ -1,4 +1,3 @@ -// Deprecated: ec2 has no Code Owner. module go.opentelemetry.io/contrib/detectors/aws/ec2 go 1.21 From 3f966e6df91b897d3df6acbe12f942662ae45329 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Thu, 23 May 2024 11:20:05 -0700 Subject: [PATCH 2/4] Revert "Deprecate the AWS ECS detector (#5638)" This reverts commit 8b96509f58656cd61bd393f5201fd25f0ff748b2. --- CHANGELOG.md | 3 --- detectors/aws/ecs/ecs.go | 9 --------- detectors/aws/ecs/go.mod | 1 - detectors/aws/ecs/test/ecs_test.go | 2 +- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fd61d0f91a..6bbe94b5a86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,14 +12,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - 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/detectors/aws/ecs` package is deprecated. - If you would like to become a Code Owner of this module and prevent it from being removed, see [#5543]. (#5637) - The `go.opentelemetry.io/contrib/detectors/aws/eks` package is deprecated. If you would like to become a Code Owner of this module and prevent it from being removed, see [#5544]. (#5640) - The `go.opentelemetry.io/contrib/detectors/aws/lambda` package is deprecated. If you would like to become a Code Owner of this module and prevent it from being removed, see [#5545]. (#5641) -[#5543]: /~https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5543 [#5544]: /~https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5544 [#5545]: /~https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5545 [#5551]: /~https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5551 diff --git a/detectors/aws/ecs/ecs.go b/detectors/aws/ecs/ecs.go index 1da3125a064..fe5c3423834 100644 --- a/detectors/aws/ecs/ecs.go +++ b/detectors/aws/ecs/ecs.go @@ -1,15 +1,6 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -// Package ecs provide an OpenTelemetry resource detector for AWS ECS -// instances. -// -// Deprecated: ecs 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/5543 package ecs // import "go.opentelemetry.io/contrib/detectors/aws/ecs" import ( diff --git a/detectors/aws/ecs/go.mod b/detectors/aws/ecs/go.mod index f31d52c3587..d5b13ea9017 100644 --- a/detectors/aws/ecs/go.mod +++ b/detectors/aws/ecs/go.mod @@ -1,4 +1,3 @@ -// Deprecated: ecs has no Code Owner. module go.opentelemetry.io/contrib/detectors/aws/ecs go 1.21 diff --git a/detectors/aws/ecs/test/ecs_test.go b/detectors/aws/ecs/test/ecs_test.go index 52543963bcf..a34b2da5ecd 100644 --- a/detectors/aws/ecs/test/ecs_test.go +++ b/detectors/aws/ecs/test/ecs_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - ecs "go.opentelemetry.io/contrib/detectors/aws/ecs" // nolint:staticcheck // deprecated. + ecs "go.opentelemetry.io/contrib/detectors/aws/ecs" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" semconv "go.opentelemetry.io/otel/semconv/v1.25.0" From 91b47b7ca7131b5f72f9949d80a9887b050ab4f1 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Thu, 23 May 2024 11:20:40 -0700 Subject: [PATCH 3/4] Revert "Deprecate the AWS EKS detector (#5640)" This reverts commit a31d69e4c3e443f59f93335fb6a25ffc872dcd40. --- CHANGELOG.md | 3 --- detectors/aws/eks/detector.go | 9 --------- detectors/aws/eks/go.mod | 1 - 3 files changed, 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bbe94b5a86..ee99e659ebf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,12 +12,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - 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/detectors/aws/eks` package is deprecated. - If you would like to become a Code Owner of this module and prevent it from being removed, see [#5544]. (#5640) - The `go.opentelemetry.io/contrib/detectors/aws/lambda` package is deprecated. If you would like to become a Code Owner of this module and prevent it from being removed, see [#5545]. (#5641) -[#5544]: /~https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5544 [#5545]: /~https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5545 [#5551]: /~https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5551 diff --git a/detectors/aws/eks/detector.go b/detectors/aws/eks/detector.go index 23289be84df..81202284c48 100644 --- a/detectors/aws/eks/detector.go +++ b/detectors/aws/eks/detector.go @@ -1,15 +1,6 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -// Package eks provide an OpenTelemetry resource detector for AWS EKS -// instances. -// -// Deprecated: eks 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/5544 package eks // import "go.opentelemetry.io/contrib/detectors/aws/eks" import ( diff --git a/detectors/aws/eks/go.mod b/detectors/aws/eks/go.mod index d3b45ec781b..cf9d11b50b8 100644 --- a/detectors/aws/eks/go.mod +++ b/detectors/aws/eks/go.mod @@ -1,4 +1,3 @@ -// Deprecated: eks has no Code Owner. module go.opentelemetry.io/contrib/detectors/aws/eks go 1.21 From f65128286eb9b8074a9078228dfd69fcc63c40e6 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Thu, 23 May 2024 11:23:38 -0700 Subject: [PATCH 4/4] Add @pyohannes as owner of EC2/ECS/EKS AWS detectors --- CODEOWNERS | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index dc6b156f72a..841831f1614 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -29,7 +29,10 @@ bridges/otelzap/ @open-te config/ @open-telemetry/go-approvers @MadVikingGod @pellared @codeboten -detectors/aws/ @open-telemetry/go-approvers +detectors/aws/ec2 @open-telemetry/go-approvers @pyohannes +detectors/aws/ecs @open-telemetry/go-approvers @pyohannes +detectors/aws/eks @open-telemetry/go-approvers @pyohannes +detectors/aws/lambda @open-telemetry/go-approvers detectors/gcp/ @open-telemetry/go-approvers @dashpole exporters/autoexport @open-telemetry/go-approvers @MikeGoldsmith @pellared