From 90a1449a77648631c5d8291702cd5b8030086b8d Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Fri, 31 May 2024 08:22:04 -0700 Subject: [PATCH] Add @pyohannes as owner of EC2/ECS/EKS AWS detectors (#5656) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #5542 Closes #5543 Closes #5544 @pyohannes please be sure to review our [CODEOWNER policy](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CONTRIBUTING.md#code-owners). If you are okay with accepting the responsibilities, please approve this PR. --------- Co-authored-by: Robert Pająk --- CHANGELOG.md | 9 --------- CODEOWNERS | 5 ++++- detectors/aws/ec2/ec2.go | 9 --------- detectors/aws/ec2/go.mod | 1 - detectors/aws/ecs/ecs.go | 9 --------- detectors/aws/ecs/go.mod | 1 - detectors/aws/ecs/test/ecs_test.go | 2 +- detectors/aws/eks/detector.go | 9 --------- detectors/aws/eks/go.mod | 1 - 9 files changed, 5 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5e9d73b4bb..3a97a8eb1a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,12 +21,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. - 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) - The `go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda` package is deprecated. @@ -44,9 +38,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - The `go.opentelemetry.io/contrib/samplers/aws/xray` package is deprecated. If you would like to become a Code Owner of this module and prevent it from being removed, see [#5554]. (#5647) -[#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 [#5546]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5546 [#5547]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5547 diff --git a/CODEOWNERS b/CODEOWNERS index 23e7f61b6c8..a6a04c63225 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -32,7 +32,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 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 8a904e81270..d2693e6d403 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 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" 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 001e7bb139e..a4b924c8c3d 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