From 3ecf0154f8a78199c2483c4c68c409636de3ad87 Mon Sep 17 00:00:00 2001
From: joegoldman2 <147369450+joegoldman@users.noreply.github.com>
Date: Thu, 23 May 2024 19:15:57 +0000
Subject: [PATCH 1/6] [Resources.AWS] Rename AWS detector namespace

---
 .github/ISSUE_TEMPLATE/bug_report.yml         |  2 +-
 .github/ISSUE_TEMPLATE/feature_request.yml    |  2 +-
 .github/component_owners.yml                  | 12 ++--
 .github/workflows/ci.yml                      | 24 ++++----
 opentelemetry-dotnet-contrib.sln              |  4 +-
 .../.publicApi/PublicAPI.Unshipped.txt        |  6 --
 .../.publicApi/net6.0/PublicAPI.Unshipped.txt |  6 --
 .../AssemblyInfo.cs                           | 10 ----
 .../.publicApi/PublicAPI.Shipped.txt          |  0
 .../.publicApi/PublicAPI.Unshipped.txt        |  3 +
 .../.publicApi/net6.0/PublicAPI.Shipped.txt   |  0
 .../.publicApi/net6.0/PublicAPI.Unshipped.txt |  2 +
 .../AWSEBSResourceDetector.cs                 | 11 ++--
 .../AWSEC2ResourceDetector.cs                 |  7 +--
 .../AWSECSResourceDetector.cs                 |  5 +-
 .../AWSEKSResourceDetector.cs                 | 10 ++--
 .../AWSResourceBuilderExtensions.cs           | 59 +++++++++++++++++++
 .../AWSResourcesEventSource.cs                |  2 +-
 .../AWSSemanticConventions.cs                 |  2 +-
 .../AssemblyInfo.cs                           | 10 ++++
 .../CHANGELOG.md                              |  0
 .../Models/AWSEBSMetadataModel.cs             |  2 +-
 .../Models/AWSEC2IdentityDocumentModel.cs     |  2 +-
 .../Models/AWSEKSClusterDataModel.cs          |  2 +-
 .../Models/AWSEKSClusterInformationModel.cs   |  2 +-
 .../OpenTelemetry.Resources.AWS.csproj}       |  2 +-
 .../README.md                                 | 12 ++--
 .../ResourceDetectorUtils.cs                  |  2 +-
 .../SourceGenerationContext.cs                |  4 +-
 ...IServerCertificateValidationEventSource.cs |  2 +-
 .../ServerCertificateValidationHandler.cs     |  2 +-
 .../ServerCertificateValidationProvider.cs    |  2 +-
 ...nTelemetry.AotCompatibility.TestApp.csproj |  2 +-
 .../AWSEBSResourceDetectorTests.cs            |  2 +-
 .../AWSEC2ResourceDetectorTests.cs            |  2 +-
 .../AWSECSResourceDetectorTests.cs            |  2 +-
 .../AWSEKSResourceDetectorTests.cs            |  2 +-
 .../Http/CertificateUploader.cs               |  2 +-
 ...pServerCertificateValidationEventSource.cs |  2 +-
 ...ServerCertificateValidationHandlerTests.cs |  2 +-
 ...erverCertificateValidationProviderTests.cs |  2 +-
 .../OpenTelemetry.Resources.AWS.Tests.csproj} |  2 +-
 .../SampleAWSEBSMetadataModel.cs              |  4 +-
 .../SampleAWSEC2IdentityDocumentModel.cs      |  4 +-
 .../SampleMetadataFiles/environment.conf      |  0
 .../SampleMetadataFiles/testcgroup            |  0
 .../SampleMetadataFiles/testekstoken          |  0
 .../metadatav4-response-container-ec2.json    |  0
 ...metadatav4-response-container-fargate.json |  0
 .../metadatav4-response-task-ec2.json         |  0
 .../metadatav4-response-task-fargate.json     |  0
 51 files changed, 143 insertions(+), 96 deletions(-)
 delete mode 100644 src/OpenTelemetry.ResourceDetectors.AWS/.publicApi/PublicAPI.Unshipped.txt
 delete mode 100644 src/OpenTelemetry.ResourceDetectors.AWS/.publicApi/net6.0/PublicAPI.Unshipped.txt
 delete mode 100644 src/OpenTelemetry.ResourceDetectors.AWS/AssemblyInfo.cs
 rename src/{OpenTelemetry.ResourceDetectors.AWS => OpenTelemetry.Resources.AWS}/.publicApi/PublicAPI.Shipped.txt (100%)
 create mode 100644 src/OpenTelemetry.Resources.AWS/.publicApi/PublicAPI.Unshipped.txt
 rename src/{OpenTelemetry.ResourceDetectors.AWS => OpenTelemetry.Resources.AWS}/.publicApi/net6.0/PublicAPI.Shipped.txt (100%)
 create mode 100644 src/OpenTelemetry.Resources.AWS/.publicApi/net6.0/PublicAPI.Unshipped.txt
 rename src/{OpenTelemetry.ResourceDetectors.AWS => OpenTelemetry.Resources.AWS}/AWSEBSResourceDetector.cs (90%)
 rename src/{OpenTelemetry.ResourceDetectors.AWS => OpenTelemetry.Resources.AWS}/AWSEC2ResourceDetector.cs (95%)
 rename src/{OpenTelemetry.ResourceDetectors.AWS => OpenTelemetry.Resources.AWS}/AWSECSResourceDetector.cs (98%)
 rename src/{OpenTelemetry.ResourceDetectors.AWS => OpenTelemetry.Resources.AWS}/AWSEKSResourceDetector.cs (96%)
 create mode 100644 src/OpenTelemetry.Resources.AWS/AWSResourceBuilderExtensions.cs
 rename src/{OpenTelemetry.ResourceDetectors.AWS => OpenTelemetry.Resources.AWS}/AWSResourcesEventSource.cs (98%)
 rename src/{OpenTelemetry.ResourceDetectors.AWS => OpenTelemetry.Resources.AWS}/AWSSemanticConventions.cs (97%)
 create mode 100644 src/OpenTelemetry.Resources.AWS/AssemblyInfo.cs
 rename src/{OpenTelemetry.ResourceDetectors.AWS => OpenTelemetry.Resources.AWS}/CHANGELOG.md (100%)
 rename src/{OpenTelemetry.ResourceDetectors.AWS => OpenTelemetry.Resources.AWS}/Models/AWSEBSMetadataModel.cs (88%)
 rename src/{OpenTelemetry.ResourceDetectors.AWS => OpenTelemetry.Resources.AWS}/Models/AWSEC2IdentityDocumentModel.cs (91%)
 rename src/{OpenTelemetry.ResourceDetectors.AWS => OpenTelemetry.Resources.AWS}/Models/AWSEKSClusterDataModel.cs (82%)
 rename src/{OpenTelemetry.ResourceDetectors.AWS => OpenTelemetry.Resources.AWS}/Models/AWSEKSClusterInformationModel.cs (82%)
 rename src/{OpenTelemetry.ResourceDetectors.AWS/OpenTelemetry.ResourceDetectors.AWS.csproj => OpenTelemetry.Resources.AWS/OpenTelemetry.Resources.AWS.csproj} (96%)
 rename src/{OpenTelemetry.ResourceDetectors.AWS => OpenTelemetry.Resources.AWS}/README.md (81%)
 rename src/{OpenTelemetry.ResourceDetectors.AWS => OpenTelemetry.Resources.AWS}/ResourceDetectorUtils.cs (98%)
 rename src/{OpenTelemetry.ResourceDetectors.AWS => OpenTelemetry.Resources.AWS}/SourceGenerationContext.cs (91%)
 rename test/{OpenTelemetry.ResourceDetectors.AWS.Tests => OpenTelemetry.Resources.AWS.Tests}/AWSEBSResourceDetectorTests.cs (97%)
 rename test/{OpenTelemetry.ResourceDetectors.AWS.Tests => OpenTelemetry.Resources.AWS.Tests}/AWSEC2ResourceDetectorTests.cs (98%)
 rename test/{OpenTelemetry.ResourceDetectors.AWS.Tests => OpenTelemetry.Resources.AWS.Tests}/AWSECSResourceDetectorTests.cs (99%)
 rename test/{OpenTelemetry.ResourceDetectors.AWS.Tests => OpenTelemetry.Resources.AWS.Tests}/AWSEKSResourceDetectorTests.cs (98%)
 rename test/{OpenTelemetry.ResourceDetectors.AWS.Tests => OpenTelemetry.Resources.AWS.Tests}/Http/CertificateUploader.cs (97%)
 rename test/{OpenTelemetry.ResourceDetectors.AWS.Tests => OpenTelemetry.Resources.AWS.Tests}/Http/NoopServerCertificateValidationEventSource.cs (91%)
 rename test/{OpenTelemetry.ResourceDetectors.AWS.Tests => OpenTelemetry.Resources.AWS.Tests}/Http/ServerCertificateValidationHandlerTests.cs (94%)
 rename test/{OpenTelemetry.ResourceDetectors.AWS.Tests => OpenTelemetry.Resources.AWS.Tests}/Http/ServerCertificateValidationProviderTests.cs (97%)
 rename test/{OpenTelemetry.ResourceDetectors.AWS.Tests/OpenTelemetry.ResourceDetectors.AWS.Tests.csproj => OpenTelemetry.Resources.AWS.Tests/OpenTelemetry.Resources.AWS.Tests.csproj} (96%)
 rename test/{OpenTelemetry.ResourceDetectors.AWS.Tests => OpenTelemetry.Resources.AWS.Tests}/SampleAWSEBSMetadataModel.cs (76%)
 rename test/{OpenTelemetry.ResourceDetectors.AWS.Tests => OpenTelemetry.Resources.AWS.Tests}/SampleAWSEC2IdentityDocumentModel.cs (81%)
 rename test/{OpenTelemetry.ResourceDetectors.AWS.Tests => OpenTelemetry.Resources.AWS.Tests}/SampleMetadataFiles/environment.conf (100%)
 rename test/{OpenTelemetry.ResourceDetectors.AWS.Tests => OpenTelemetry.Resources.AWS.Tests}/SampleMetadataFiles/testcgroup (100%)
 rename test/{OpenTelemetry.ResourceDetectors.AWS.Tests => OpenTelemetry.Resources.AWS.Tests}/SampleMetadataFiles/testekstoken (100%)
 rename test/{OpenTelemetry.ResourceDetectors.AWS.Tests => OpenTelemetry.Resources.AWS.Tests}/ecs_metadata/metadatav4-response-container-ec2.json (100%)
 rename test/{OpenTelemetry.ResourceDetectors.AWS.Tests => OpenTelemetry.Resources.AWS.Tests}/ecs_metadata/metadatav4-response-container-fargate.json (100%)
 rename test/{OpenTelemetry.ResourceDetectors.AWS.Tests => OpenTelemetry.Resources.AWS.Tests}/ecs_metadata/metadatav4-response-task-ec2.json (100%)
 rename test/{OpenTelemetry.ResourceDetectors.AWS.Tests => OpenTelemetry.Resources.AWS.Tests}/ecs_metadata/metadatav4-response-task-fargate.json (100%)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 2d9e8e82e6..8036657882 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -48,9 +48,9 @@ body:
         - OpenTelemetry.Instrumentation.Wcf
         - OpenTelemetry.PersistentStorage.Abstractions
         - OpenTelemetry.PersistentStorage.FileSystem
-        - OpenTelemetry.ResourceDetectors.AWS
         - OpenTelemetry.ResourceDetectors.Azure
         - OpenTelemetry.ResourceDetectors.Container
+        - OpenTelemetry.Resources.AWS
         - OpenTelemetry.Resources.Gcp
         - OpenTelemetry.Resources.Host
         - OpenTelemetry.Resources.Process
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 9e5b95ad58..6f1d647797 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -48,9 +48,9 @@ body:
         - OpenTelemetry.Instrumentation.Wcf
         - OpenTelemetry.PersistentStorage.Abstractions
         - OpenTelemetry.PersistentStorage.FileSystem
-        - OpenTelemetry.ResourceDetectors.AWS
         - OpenTelemetry.ResourceDetectors.Azure
         - OpenTelemetry.ResourceDetectors.Container
+        - OpenTelemetry.Resources.AWS
         - OpenTelemetry.Resources.Gcp
         - OpenTelemetry.Resources.Host
         - OpenTelemetry.Resources.Process
diff --git a/.github/component_owners.yml b/.github/component_owners.yml
index d9a50eb243..e3bfcc7d02 100644
--- a/.github/component_owners.yml
+++ b/.github/component_owners.yml
@@ -59,14 +59,14 @@ components:
     - vishweshbankwar
   src/OpenTelemetry.PersistentStorage.FileSystem/:
     - vishweshbankwar
-  src/OpenTelemetry.ResourceDetectors.AWS/:
-    - srprash
-    - ppittle
   src/OpenTelemetry.ResourceDetectors.Azure/:
     - rajkumar-rangaraj
     - vishweshbankwar
   src/OpenTelemetry.ResourceDetectors.Container/:
     - iskiselev
+  src/OpenTelemetry.Resources.AWS/:
+    - srprash
+    - ppittle
   src/OpenTelemetry.Resources.Host/:
     - Kielek
     - lachmatt
@@ -149,14 +149,14 @@ components:
     - codeblanch
   test/OpenTelemetry.PersistentStorage.FileSystem.Tests/:
     - vishweshbankwar
-  test/OpenTelemetry.ResourceDetectors.AWS.Tests/:
-    - srprash
-    - ppittle
   test/OpenTelemetry.ResourceDetectors.Azure.Tests/:
     - rajkumar-rangaraj
     - vishweshbankwar
   test/OpenTelemetry.ResourceDetectors.Container.Tests/:
     - iskiselev
+  test/OpenTelemetry.Resources.AWS.Tests/:
+    - srprash
+    - ppittle
   test/OpenTelemetry.Resources.Host.Tests/:
     - Kielek
     - lachmatt
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b647d2f63d..5c42612228 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,9 +51,9 @@ jobs:
           instrumentation-stackexchangeredis: ['*/OpenTelemetry.Instrumentation.StackExchangeRedis*/**', 'examples/redis/**', '!**/*.md']
           instrumentation-wcf: ['*/OpenTelemetry.Instrumentation.Wcf*/**', 'examples/wcf/**', '!**/*.md']
           persistentstorage: ['*/OpenTelemetry.PersistentStorage*/**', '!**/*.md']
-          resourcedetectors-aws: ['*/OpenTelemetry.ResourceDetectors.AWS*/**', '!**/*.md']
           resourcedetectors-azure: ['*/OpenTelemetry.ResourceDetectors.Azure*/**', '!**/*.md']
           resourcedetectors-container: ['*/OpenTelemetry.ResourceDetectors.Container*/**', '!**/*.md']
+          resources-aws: ['*/OpenTelemetry.Resources.AWS*/**', '!**/*.md']
           resources-gcp: ['*/OpenTelemetry.Resources.Gcp*/**', '!**/*.md']
           resources-host: ['*/OpenTelemetry.Resources.Host*/**', '!**/*.md']
           resources-process: ['*/OpenTelemetry.Resources.Process/**', '*/OpenTelemetry.Resources.Process.Tests/**', '!**/*.md']
@@ -398,17 +398,6 @@ jobs:
       project-name: OpenTelemetry.PersistentStorage
       code-cov-name: PersistentStorage
 
-  build-test-resourcedetectors-aws:
-    needs: detect-changes
-    if: |
-      contains(needs.detect-changes.outputs.changes, 'resourcedetectors-aws')
-      || contains(needs.detect-changes.outputs.changes, 'build')
-      || contains(needs.detect-changes.outputs.changes, 'shared')
-    uses: ./.github/workflows/Component.BuildTest.yml
-    with:
-      project-name: Component[OpenTelemetry.ResourceDetectors.AWS]
-      code-cov-name: ResourceDetectors.AWS
-
   build-test-resourcedetectors-azure:
     needs: detect-changes
     if: |
@@ -431,6 +420,17 @@ jobs:
       project-name: Component[OpenTelemetry.ResourceDetectors.Container]
       code-cov-name: ResourceDetectors.Container
 
+  build-test-resources-aws:
+    needs: detect-changes
+    if: |
+      contains(needs.detect-changes.outputs.changes, 'resources-aws')
+      || contains(needs.detect-changes.outputs.changes, 'build')
+      || contains(needs.detect-changes.outputs.changes, 'shared')
+    uses: ./.github/workflows/Component.BuildTest.yml
+    with:
+      project-name: Component[OpenTelemetry.Resources.AWS]
+      code-cov-name: Resources.AWS
+
   build-test-resources-gcp:
     needs: detect-changes
     if: |
diff --git a/opentelemetry-dotnet-contrib.sln b/opentelemetry-dotnet-contrib.sln
index a22def56b0..f99a0e859b 100644
--- a/opentelemetry-dotnet-contrib.sln
+++ b/opentelemetry-dotnet-contrib.sln
@@ -258,9 +258,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{1FCC8E
 		src\Shared\UriHelper.cs = src\Shared\UriHelper.cs
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.ResourceDetectors.AWS", "src\OpenTelemetry.ResourceDetectors.AWS\OpenTelemetry.ResourceDetectors.AWS.csproj", "{71BABAC0-E299-48BF-93E2-C11C3840B037}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Resources.AWS", "src\OpenTelemetry.Resources.AWS\OpenTelemetry.Resources.AWS.csproj", "{71BABAC0-E299-48BF-93E2-C11C3840B037}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.ResourceDetectors.AWS.Tests", "test\OpenTelemetry.ResourceDetectors.AWS.Tests\OpenTelemetry.ResourceDetectors.AWS.Tests.csproj", "{DE898A1E-920E-476F-B0DB-A98AFD6E3BF4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Resources.AWS.Tests", "test\OpenTelemetry.Resources.AWS.Tests\OpenTelemetry.Resources.AWS.Tests.csproj", "{DE898A1E-920E-476F-B0DB-A98AFD6E3BF4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.InfluxDB", "src\OpenTelemetry.Exporter.InfluxDB\OpenTelemetry.Exporter.InfluxDB.csproj", "{FD5E9AC8-DC05-4C64-BDC6-D26F5552808E}"
 EndProject
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/.publicApi/PublicAPI.Unshipped.txt b/src/OpenTelemetry.ResourceDetectors.AWS/.publicApi/PublicAPI.Unshipped.txt
deleted file mode 100644
index 2ca53c2ade..0000000000
--- a/src/OpenTelemetry.ResourceDetectors.AWS/.publicApi/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-OpenTelemetry.ResourceDetectors.AWS.AWSEBSResourceDetector
-OpenTelemetry.ResourceDetectors.AWS.AWSEBSResourceDetector.AWSEBSResourceDetector() -> void
-OpenTelemetry.ResourceDetectors.AWS.AWSEBSResourceDetector.Detect() -> OpenTelemetry.Resources.Resource!
-OpenTelemetry.ResourceDetectors.AWS.AWSEC2ResourceDetector
-OpenTelemetry.ResourceDetectors.AWS.AWSEC2ResourceDetector.AWSEC2ResourceDetector() -> void
-OpenTelemetry.ResourceDetectors.AWS.AWSEC2ResourceDetector.Detect() -> OpenTelemetry.Resources.Resource!
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/.publicApi/net6.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry.ResourceDetectors.AWS/.publicApi/net6.0/PublicAPI.Unshipped.txt
deleted file mode 100644
index 2ac5b3257b..0000000000
--- a/src/OpenTelemetry.ResourceDetectors.AWS/.publicApi/net6.0/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-OpenTelemetry.ResourceDetectors.AWS.AWSECSResourceDetector
-OpenTelemetry.ResourceDetectors.AWS.AWSECSResourceDetector.AWSECSResourceDetector() -> void
-OpenTelemetry.ResourceDetectors.AWS.AWSECSResourceDetector.Detect() -> OpenTelemetry.Resources.Resource!
-OpenTelemetry.ResourceDetectors.AWS.AWSEKSResourceDetector
-OpenTelemetry.ResourceDetectors.AWS.AWSEKSResourceDetector.AWSEKSResourceDetector() -> void
-OpenTelemetry.ResourceDetectors.AWS.AWSEKSResourceDetector.Detect() -> OpenTelemetry.Resources.Resource!
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/AssemblyInfo.cs b/src/OpenTelemetry.ResourceDetectors.AWS/AssemblyInfo.cs
deleted file mode 100644
index 85c339d6bd..0000000000
--- a/src/OpenTelemetry.ResourceDetectors.AWS/AssemblyInfo.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-using System.Runtime.CompilerServices;
-
-#if SIGNED
-[assembly: InternalsVisibleTo("OpenTelemetry.ResourceDetectors.AWS.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010051c1562a090fb0c9f391012a32198b5e5d9a60e9b80fa2d7b434c9e5ccb7259bd606e66f9660676afc6692b8cdc6793d190904551d2103b7b22fa636dcbb8208839785ba402ea08fc00c8f1500ccef28bbf599aa64ffb1e1d5dc1bf3420a3777badfe697856e9d52070a50c3ea5821c80bef17ca3acffa28f89dd413f096f898")]
-#else
-[assembly: InternalsVisibleTo("OpenTelemetry.ResourceDetectors.AWS.Tests")]
-#endif
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/.publicApi/PublicAPI.Shipped.txt b/src/OpenTelemetry.Resources.AWS/.publicApi/PublicAPI.Shipped.txt
similarity index 100%
rename from src/OpenTelemetry.ResourceDetectors.AWS/.publicApi/PublicAPI.Shipped.txt
rename to src/OpenTelemetry.Resources.AWS/.publicApi/PublicAPI.Shipped.txt
diff --git a/src/OpenTelemetry.Resources.AWS/.publicApi/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Resources.AWS/.publicApi/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..38b93830ad
--- /dev/null
+++ b/src/OpenTelemetry.Resources.AWS/.publicApi/PublicAPI.Unshipped.txt
@@ -0,0 +1,3 @@
+OpenTelemetry.Resources.AWSResourceBuilderExtensions
+static OpenTelemetry.Resources.AWSResourceBuilderExtensions.AddAWSEBSResourceDetector(this OpenTelemetry.Resources.ResourceBuilder! builder) -> OpenTelemetry.Resources.ResourceBuilder!
+static OpenTelemetry.Resources.AWSResourceBuilderExtensions.AddAWSEC2ResourceDetector(this OpenTelemetry.Resources.ResourceBuilder! builder) -> OpenTelemetry.Resources.ResourceBuilder!
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/.publicApi/net6.0/PublicAPI.Shipped.txt b/src/OpenTelemetry.Resources.AWS/.publicApi/net6.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/OpenTelemetry.ResourceDetectors.AWS/.publicApi/net6.0/PublicAPI.Shipped.txt
rename to src/OpenTelemetry.Resources.AWS/.publicApi/net6.0/PublicAPI.Shipped.txt
diff --git a/src/OpenTelemetry.Resources.AWS/.publicApi/net6.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Resources.AWS/.publicApi/net6.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..d744910a0c
--- /dev/null
+++ b/src/OpenTelemetry.Resources.AWS/.publicApi/net6.0/PublicAPI.Unshipped.txt
@@ -0,0 +1,2 @@
+static OpenTelemetry.Resources.AWSResourceBuilderExtensions.AddAWSECSResourceDetector(this OpenTelemetry.Resources.ResourceBuilder! builder) -> OpenTelemetry.Resources.ResourceBuilder!
+static OpenTelemetry.Resources.AWSResourceBuilderExtensions.AddAWSEKSResourceDetector(this OpenTelemetry.Resources.ResourceBuilder! builder) -> OpenTelemetry.Resources.ResourceBuilder!
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/AWSEBSResourceDetector.cs b/src/OpenTelemetry.Resources.AWS/AWSEBSResourceDetector.cs
similarity index 90%
rename from src/OpenTelemetry.ResourceDetectors.AWS/AWSEBSResourceDetector.cs
rename to src/OpenTelemetry.Resources.AWS/AWSEBSResourceDetector.cs
index 442ffe406c..45510ccc38 100644
--- a/src/OpenTelemetry.ResourceDetectors.AWS/AWSEBSResourceDetector.cs
+++ b/src/OpenTelemetry.Resources.AWS/AWSEBSResourceDetector.cs
@@ -6,15 +6,14 @@
 #if NET6_0_OR_GREATER
 using System.Runtime.InteropServices;
 #endif
-using OpenTelemetry.ResourceDetectors.AWS.Models;
-using OpenTelemetry.Resources;
+using OpenTelemetry.Resources.AWS.Models;
 
-namespace OpenTelemetry.ResourceDetectors.AWS;
+namespace OpenTelemetry.Resources.AWS;
 
 /// <summary>
-/// Resource detector for application running in AWS ElasticBeanstalk environment.
+/// Resource detector for application running in AWS Elastic Beanstalk environment.
 /// </summary>
-public sealed class AWSEBSResourceDetector : IResourceDetector
+internal sealed class AWSEBSResourceDetector : IResourceDetector
 {
     private const string AWSEBSMetadataWindowsFilePath = "C:\\Program Files\\Amazon\\XRay\\environment.conf";
 #if NET6_0_OR_GREATER
@@ -22,7 +21,7 @@ public sealed class AWSEBSResourceDetector : IResourceDetector
 #endif
 
     /// <summary>
-    /// Detector the required and optional resource attributes from AWS ElasticBeanstalk.
+    /// Detector the required and optional resource attributes from AWS Elastic Beanstalk.
     /// </summary>
     /// <returns>Resource with key-value pairs of resource attributes.</returns>
     public Resource Detect()
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/AWSEC2ResourceDetector.cs b/src/OpenTelemetry.Resources.AWS/AWSEC2ResourceDetector.cs
similarity index 95%
rename from src/OpenTelemetry.ResourceDetectors.AWS/AWSEC2ResourceDetector.cs
rename to src/OpenTelemetry.Resources.AWS/AWSEC2ResourceDetector.cs
index ce5e0bfffc..d00d0997a8 100644
--- a/src/OpenTelemetry.ResourceDetectors.AWS/AWSEC2ResourceDetector.cs
+++ b/src/OpenTelemetry.Resources.AWS/AWSEC2ResourceDetector.cs
@@ -3,15 +3,14 @@
 
 using System;
 using System.Collections.Generic;
-using OpenTelemetry.ResourceDetectors.AWS.Models;
-using OpenTelemetry.Resources;
+using OpenTelemetry.Resources.AWS.Models;
 
-namespace OpenTelemetry.ResourceDetectors.AWS;
+namespace OpenTelemetry.Resources.AWS;
 
 /// <summary>
 /// Resource detector for application running on AWS EC2 instance.
 /// </summary>
-public sealed class AWSEC2ResourceDetector : IResourceDetector
+internal sealed class AWSEC2ResourceDetector : IResourceDetector
 {
     private const string AWSEC2MetadataTokenTTLHeader = "X-aws-ec2-metadata-token-ttl-seconds";
     private const string AWSEC2MetadataTokenHeader = "X-aws-ec2-metadata-token";
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/AWSECSResourceDetector.cs b/src/OpenTelemetry.Resources.AWS/AWSECSResourceDetector.cs
similarity index 98%
rename from src/OpenTelemetry.ResourceDetectors.AWS/AWSECSResourceDetector.cs
rename to src/OpenTelemetry.Resources.AWS/AWSECSResourceDetector.cs
index 709c56560d..fe6019f5ff 100644
--- a/src/OpenTelemetry.ResourceDetectors.AWS/AWSECSResourceDetector.cs
+++ b/src/OpenTelemetry.Resources.AWS/AWSECSResourceDetector.cs
@@ -7,14 +7,13 @@
 using System.Net.Http;
 using System.Text.Json;
 using System.Text.RegularExpressions;
-using OpenTelemetry.Resources;
 
-namespace OpenTelemetry.ResourceDetectors.AWS;
+namespace OpenTelemetry.Resources.AWS;
 
 /// <summary>
 /// Resource detector for application running in AWS ECS.
 /// </summary>
-public sealed class AWSECSResourceDetector : IResourceDetector
+internal sealed class AWSECSResourceDetector : IResourceDetector
 {
     private const string AWSECSMetadataPath = "/proc/self/cgroup";
     private const string AWSECSMetadataURLKey = "ECS_CONTAINER_METADATA_URI";
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/AWSEKSResourceDetector.cs b/src/OpenTelemetry.Resources.AWS/AWSEKSResourceDetector.cs
similarity index 96%
rename from src/OpenTelemetry.ResourceDetectors.AWS/AWSEKSResourceDetector.cs
rename to src/OpenTelemetry.Resources.AWS/AWSEKSResourceDetector.cs
index c8a616f2b7..8efcafa656 100644
--- a/src/OpenTelemetry.ResourceDetectors.AWS/AWSEKSResourceDetector.cs
+++ b/src/OpenTelemetry.Resources.AWS/AWSEKSResourceDetector.cs
@@ -1,21 +1,19 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#if  !NETFRAMEWORK
-
+#if !NETFRAMEWORK
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Text;
-using OpenTelemetry.ResourceDetectors.AWS.Models;
-using OpenTelemetry.Resources;
+using OpenTelemetry.Resources.AWS.Models;
 
-namespace OpenTelemetry.ResourceDetectors.AWS;
+namespace OpenTelemetry.Resources.AWS;
 
 /// <summary>
 /// Resource detector for application running in AWS EKS.
 /// </summary>
-public sealed class AWSEKSResourceDetector : IResourceDetector
+internal sealed class AWSEKSResourceDetector : IResourceDetector
 {
     private const string AWSEKSCertificatePath = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt";
     private const string AWSEKSCredentialPath = "/var/run/secrets/kubernetes.io/serviceaccount/token";
diff --git a/src/OpenTelemetry.Resources.AWS/AWSResourceBuilderExtensions.cs b/src/OpenTelemetry.Resources.AWS/AWSResourceBuilderExtensions.cs
new file mode 100644
index 0000000000..572af5aba9
--- /dev/null
+++ b/src/OpenTelemetry.Resources.AWS/AWSResourceBuilderExtensions.cs
@@ -0,0 +1,59 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+using OpenTelemetry.Internal;
+using OpenTelemetry.Resources.AWS;
+
+namespace OpenTelemetry.Resources;
+
+/// <summary>
+/// Extension methods to simplify registering of AWS resource detectors.
+/// </summary>
+public static class AWSResourceBuilderExtensions
+{
+    /// <summary>
+    /// Enables AWS Elastic Beanstalk resource detector.
+    /// </summary>
+    /// <param name="builder"><see cref="ResourceBuilder" /> being configured.</param>
+    /// <returns>The instance of <see cref="ResourceBuilder" /> being configured.</returns>
+    public static ResourceBuilder AddAWSEBSResourceDetector(this ResourceBuilder builder)
+    {
+        Guard.ThrowIfNull(builder);
+        return builder.AddDetector(new AWSEBSResourceDetector());
+    }
+
+    /// <summary>
+    /// Enables AWS EC2 resource detector.
+    /// </summary>
+    /// <param name="builder"><see cref="ResourceBuilder" /> being configured.</param>
+    /// <returns>The instance of <see cref="ResourceBuilder" /> being configured.</returns>
+    public static ResourceBuilder AddAWSEC2ResourceDetector(this ResourceBuilder builder)
+    {
+        Guard.ThrowIfNull(builder);
+        return builder.AddDetector(new AWSEC2ResourceDetector());
+    }
+
+#if !NETFRAMEWORK
+    /// <summary>
+    /// Enables AWS ECS resource detector.
+    /// </summary>
+    /// <param name="builder"><see cref="ResourceBuilder" /> being configured.</param>
+    /// <returns>The instance of <see cref="ResourceBuilder" /> being configured.</returns>
+    public static ResourceBuilder AddAWSECSResourceDetector(this ResourceBuilder builder)
+    {
+        Guard.ThrowIfNull(builder);
+        return builder.AddDetector(new AWSECSResourceDetector());
+    }
+
+    /// <summary>
+    /// Enables AWS EKS resource detector.
+    /// </summary>
+    /// <param name="builder"><see cref="ResourceBuilder" /> being configured.</param>
+    /// <returns>The instance of <see cref="ResourceBuilder" /> being configured.</returns>
+    public static ResourceBuilder AddAWSEKSResourceDetector(this ResourceBuilder builder)
+    {
+        Guard.ThrowIfNull(builder);
+        return builder.AddDetector(new AWSEKSResourceDetector());
+    }
+#endif
+}
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/AWSResourcesEventSource.cs b/src/OpenTelemetry.Resources.AWS/AWSResourcesEventSource.cs
similarity index 98%
rename from src/OpenTelemetry.ResourceDetectors.AWS/AWSResourcesEventSource.cs
rename to src/OpenTelemetry.Resources.AWS/AWSResourcesEventSource.cs
index b956947a95..b3d4ebb864 100644
--- a/src/OpenTelemetry.ResourceDetectors.AWS/AWSResourcesEventSource.cs
+++ b/src/OpenTelemetry.Resources.AWS/AWSResourcesEventSource.cs
@@ -5,7 +5,7 @@
 using System.Diagnostics.Tracing;
 using OpenTelemetry.Internal;
 
-namespace OpenTelemetry.ResourceDetectors.AWS;
+namespace OpenTelemetry.Resources.AWS;
 
 [EventSource(Name = "OpenTelemetry-ResourceDetectors-AWS")]
 internal sealed class AWSResourcesEventSource : EventSource, IServerCertificateValidationEventSource
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/AWSSemanticConventions.cs b/src/OpenTelemetry.Resources.AWS/AWSSemanticConventions.cs
similarity index 97%
rename from src/OpenTelemetry.ResourceDetectors.AWS/AWSSemanticConventions.cs
rename to src/OpenTelemetry.Resources.AWS/AWSSemanticConventions.cs
index 850e6f4a44..1f5cd829d8 100644
--- a/src/OpenTelemetry.ResourceDetectors.AWS/AWSSemanticConventions.cs
+++ b/src/OpenTelemetry.Resources.AWS/AWSSemanticConventions.cs
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-namespace OpenTelemetry.ResourceDetectors.AWS;
+namespace OpenTelemetry.Resources.AWS;
 
 internal static class AWSSemanticConventions
 {
diff --git a/src/OpenTelemetry.Resources.AWS/AssemblyInfo.cs b/src/OpenTelemetry.Resources.AWS/AssemblyInfo.cs
new file mode 100644
index 0000000000..3fb32600ed
--- /dev/null
+++ b/src/OpenTelemetry.Resources.AWS/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+using System.Runtime.CompilerServices;
+
+#if SIGNED
+[assembly: InternalsVisibleTo("OpenTelemetry.Resources.AWS.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010051c1562a090fb0c9f391012a32198b5e5d9a60e9b80fa2d7b434c9e5ccb7259bd606e66f9660676afc6692b8cdc6793d190904551d2103b7b22fa636dcbb8208839785ba402ea08fc00c8f1500ccef28bbf599aa64ffb1e1d5dc1bf3420a3777badfe697856e9d52070a50c3ea5821c80bef17ca3acffa28f89dd413f096f898")]
+#else
+[assembly: InternalsVisibleTo("OpenTelemetry.Resources.AWS.Tests")]
+#endif
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/CHANGELOG.md b/src/OpenTelemetry.Resources.AWS/CHANGELOG.md
similarity index 100%
rename from src/OpenTelemetry.ResourceDetectors.AWS/CHANGELOG.md
rename to src/OpenTelemetry.Resources.AWS/CHANGELOG.md
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/Models/AWSEBSMetadataModel.cs b/src/OpenTelemetry.Resources.AWS/Models/AWSEBSMetadataModel.cs
similarity index 88%
rename from src/OpenTelemetry.ResourceDetectors.AWS/Models/AWSEBSMetadataModel.cs
rename to src/OpenTelemetry.Resources.AWS/Models/AWSEBSMetadataModel.cs
index a806fb8f69..223e5f9b47 100644
--- a/src/OpenTelemetry.ResourceDetectors.AWS/Models/AWSEBSMetadataModel.cs
+++ b/src/OpenTelemetry.Resources.AWS/Models/AWSEBSMetadataModel.cs
@@ -3,7 +3,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace OpenTelemetry.ResourceDetectors.AWS.Models;
+namespace OpenTelemetry.Resources.AWS.Models;
 
 internal class AWSEBSMetadataModel
 {
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/Models/AWSEC2IdentityDocumentModel.cs b/src/OpenTelemetry.Resources.AWS/Models/AWSEC2IdentityDocumentModel.cs
similarity index 91%
rename from src/OpenTelemetry.ResourceDetectors.AWS/Models/AWSEC2IdentityDocumentModel.cs
rename to src/OpenTelemetry.Resources.AWS/Models/AWSEC2IdentityDocumentModel.cs
index 4bd2f4dfef..665318c356 100644
--- a/src/OpenTelemetry.ResourceDetectors.AWS/Models/AWSEC2IdentityDocumentModel.cs
+++ b/src/OpenTelemetry.Resources.AWS/Models/AWSEC2IdentityDocumentModel.cs
@@ -3,7 +3,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace OpenTelemetry.ResourceDetectors.AWS.Models;
+namespace OpenTelemetry.Resources.AWS.Models;
 
 internal class AWSEC2IdentityDocumentModel
 {
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/Models/AWSEKSClusterDataModel.cs b/src/OpenTelemetry.Resources.AWS/Models/AWSEKSClusterDataModel.cs
similarity index 82%
rename from src/OpenTelemetry.ResourceDetectors.AWS/Models/AWSEKSClusterDataModel.cs
rename to src/OpenTelemetry.Resources.AWS/Models/AWSEKSClusterDataModel.cs
index 0284548085..06c7e7c6ce 100644
--- a/src/OpenTelemetry.ResourceDetectors.AWS/Models/AWSEKSClusterDataModel.cs
+++ b/src/OpenTelemetry.Resources.AWS/Models/AWSEKSClusterDataModel.cs
@@ -3,7 +3,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace OpenTelemetry.ResourceDetectors.AWS.Models;
+namespace OpenTelemetry.Resources.AWS.Models;
 
 internal sealed class AWSEKSClusterDataModel
 {
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/Models/AWSEKSClusterInformationModel.cs b/src/OpenTelemetry.Resources.AWS/Models/AWSEKSClusterInformationModel.cs
similarity index 82%
rename from src/OpenTelemetry.ResourceDetectors.AWS/Models/AWSEKSClusterInformationModel.cs
rename to src/OpenTelemetry.Resources.AWS/Models/AWSEKSClusterInformationModel.cs
index b732eb7795..3fe0f39482 100644
--- a/src/OpenTelemetry.ResourceDetectors.AWS/Models/AWSEKSClusterInformationModel.cs
+++ b/src/OpenTelemetry.Resources.AWS/Models/AWSEKSClusterInformationModel.cs
@@ -3,7 +3,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace OpenTelemetry.ResourceDetectors.AWS.Models;
+namespace OpenTelemetry.Resources.AWS.Models;
 
 internal sealed class AWSEKSClusterInformationModel
 {
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/OpenTelemetry.ResourceDetectors.AWS.csproj b/src/OpenTelemetry.Resources.AWS/OpenTelemetry.Resources.AWS.csproj
similarity index 96%
rename from src/OpenTelemetry.ResourceDetectors.AWS/OpenTelemetry.ResourceDetectors.AWS.csproj
rename to src/OpenTelemetry.Resources.AWS/OpenTelemetry.Resources.AWS.csproj
index b8d2ea3cd7..102b4946b0 100644
--- a/src/OpenTelemetry.ResourceDetectors.AWS/OpenTelemetry.ResourceDetectors.AWS.csproj
+++ b/src/OpenTelemetry.Resources.AWS/OpenTelemetry.Resources.AWS.csproj
@@ -5,7 +5,7 @@
     <TargetFrameworks>net6.0</TargetFrameworks>
     <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
     <Description>OpenTelemetry Extensions - AWS Resource Detectors for ElasticBeanstalk, EC2, ECS, EKS.</Description>
-    <MinVerTagPrefix>ResourceDetectors.AWS-</MinVerTagPrefix>
+    <MinVerTagPrefix>Resources.AWS-</MinVerTagPrefix>
   </PropertyGroup>
 
   <!--Do not run Package Baseline Validation as this package has never released a stable version.
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/README.md b/src/OpenTelemetry.Resources.AWS/README.md
similarity index 81%
rename from src/OpenTelemetry.ResourceDetectors.AWS/README.md
rename to src/OpenTelemetry.Resources.AWS/README.md
index 75b1d1d365..994bfa519e 100644
--- a/src/OpenTelemetry.ResourceDetectors.AWS/README.md
+++ b/src/OpenTelemetry.Resources.AWS/README.md
@@ -1,20 +1,20 @@
 # AWS Resource Detectors
 
-[![NuGet version badge](https://img.shields.io/nuget/v/OpenTelemetry.ResourceDetectors.AWS)](https://www.nuget.org/packages/OpenTelemetry.ResourceDetectors.AWS)
-[![NuGet download count badge](https://img.shields.io/nuget/dt/OpenTelemetry.ResourceDetectors.AWS)](https://www.nuget.org/packages/OpenTelemetry.ResourceDetectors.AWS)
+[![NuGet version badge](https://img.shields.io/nuget/v/OpenTelemetry.Resources.AWS)](https://www.nuget.org/packages/OpenTelemetry.Resources.AWS)
+[![NuGet download count badge](https://img.shields.io/nuget/dt/OpenTelemetry.Resources.AWS)](https://www.nuget.org/packages/OpenTelemetry.Resources.AWS)
 [![codecov.io](https://codecov.io/gh/open-telemetry/opentelemetry-dotnet-contrib/branch/main/graphs/badge.svg?flag=unittests-ResourceDetectors.AWS)](https://app.codecov.io/gh/open-telemetry/opentelemetry-dotnet-contrib?flags[0]=unittests-ResourceDetectors.AWS)
 
 ## Getting Started
 
 You need to install the
-`OpenTelemetry.ResourceDetectors.AWS` to be able to use the
+`OpenTelemetry.Resources.AWS` to be able to use the
 AWS Resource Detectors.
 
 The ADOT .NET SDK supports automatically recording metadata in
 EC2, Elastic Beanstalk, ECS, and EKS environments.
 
 ```shell
-dotnet add package OpenTelemetry.ResourceDetectors.AWS
+dotnet add package OpenTelemetry.Resources.AWS
 ```
 
 ## Usage
@@ -24,13 +24,13 @@ the `TracerProvider` with the following EC2 example below.
 
 ```csharp
 using OpenTelemetry;
-using OpenTelemetry.ResourceDetectors.AWS;
+using OpenTelemetry.Resources;
 
 var tracerProvider = Sdk.CreateTracerProviderBuilder()
                         // other configurations
                         .SetResourceBuilder(ResourceBuilder
                             .CreateEmpty()
-                            .AddDetector(new AWSEC2ResourceDetector()))
+                            .AddAWSEC2ResourceDetector())
                         .Build();
 ```
 
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/ResourceDetectorUtils.cs b/src/OpenTelemetry.Resources.AWS/ResourceDetectorUtils.cs
similarity index 98%
rename from src/OpenTelemetry.ResourceDetectors.AWS/ResourceDetectorUtils.cs
rename to src/OpenTelemetry.Resources.AWS/ResourceDetectorUtils.cs
index 331f8d86dd..7dad0b5bcb 100644
--- a/src/OpenTelemetry.ResourceDetectors.AWS/ResourceDetectorUtils.cs
+++ b/src/OpenTelemetry.Resources.AWS/ResourceDetectorUtils.cs
@@ -12,7 +12,7 @@
 #endif
 using System.Threading.Tasks;
 
-namespace OpenTelemetry.ResourceDetectors.AWS;
+namespace OpenTelemetry.Resources.AWS;
 
 /// <summary>
 /// Class for resource detector utils.
diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/SourceGenerationContext.cs b/src/OpenTelemetry.Resources.AWS/SourceGenerationContext.cs
similarity index 91%
rename from src/OpenTelemetry.ResourceDetectors.AWS/SourceGenerationContext.cs
rename to src/OpenTelemetry.Resources.AWS/SourceGenerationContext.cs
index 003f5b1d5d..3c14a8df70 100644
--- a/src/OpenTelemetry.ResourceDetectors.AWS/SourceGenerationContext.cs
+++ b/src/OpenTelemetry.Resources.AWS/SourceGenerationContext.cs
@@ -3,9 +3,9 @@
 
 #if NET6_0_OR_GREATER
 using System.Text.Json.Serialization;
-using OpenTelemetry.ResourceDetectors.AWS.Models;
+using OpenTelemetry.Resources.AWS.Models;
 
-namespace OpenTelemetry.ResourceDetectors.AWS;
+namespace OpenTelemetry.Resources.AWS;
 
 /// <summary>
 /// "Source Generation" is feature added to System.Text.Json in .NET 6.0.
diff --git a/src/Shared/IServerCertificateValidationEventSource.cs b/src/Shared/IServerCertificateValidationEventSource.cs
index abca33b5aa..4128996702 100644
--- a/src/Shared/IServerCertificateValidationEventSource.cs
+++ b/src/Shared/IServerCertificateValidationEventSource.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace OpenTelemetry.ResourceDetectors;
+namespace OpenTelemetry.Resources;
 
 internal interface IServerCertificateValidationEventSource
 {
diff --git a/src/Shared/ServerCertificateValidationHandler.cs b/src/Shared/ServerCertificateValidationHandler.cs
index de55e39a2c..121a3a23db 100644
--- a/src/Shared/ServerCertificateValidationHandler.cs
+++ b/src/Shared/ServerCertificateValidationHandler.cs
@@ -6,7 +6,7 @@
 using System;
 using System.Net.Http;
 
-namespace OpenTelemetry.ResourceDetectors;
+namespace OpenTelemetry.Resources;
 
 internal static class ServerCertificateValidationHandler
 {
diff --git a/src/Shared/ServerCertificateValidationProvider.cs b/src/Shared/ServerCertificateValidationProvider.cs
index 6591100e95..5cfa9ec22d 100644
--- a/src/Shared/ServerCertificateValidationProvider.cs
+++ b/src/Shared/ServerCertificateValidationProvider.cs
@@ -9,7 +9,7 @@
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 
-namespace OpenTelemetry.ResourceDetectors;
+namespace OpenTelemetry.Resources;
 
 internal class ServerCertificateValidationProvider
 {
diff --git a/test/OpenTelemetry.AotCompatibility.TestApp/OpenTelemetry.AotCompatibility.TestApp.csproj b/test/OpenTelemetry.AotCompatibility.TestApp/OpenTelemetry.AotCompatibility.TestApp.csproj
index 129fc41b84..1351236613 100644
--- a/test/OpenTelemetry.AotCompatibility.TestApp/OpenTelemetry.AotCompatibility.TestApp.csproj
+++ b/test/OpenTelemetry.AotCompatibility.TestApp/OpenTelemetry.AotCompatibility.TestApp.csproj
@@ -32,9 +32,9 @@
     <TrimmerRootAssembly Include="OpenTelemetry.Instrumentation.Runtime" />
     <TrimmerRootAssembly Include="OpenTelemetry.Instrumentation.SqlClient" />
     <TrimmerRootAssembly Include="OpenTelemetry.Instrumentation.StackExchangeRedis" />
-    <TrimmerRootAssembly Include="OpenTelemetry.ResourceDetectors.AWS" />
     <TrimmerRootAssembly Include="OpenTelemetry.ResourceDetectors.Azure" />
     <TrimmerRootAssembly Include="OpenTelemetry.ResourceDetectors.Container" />
+    <TrimmerRootAssembly Include="OpenTelemetry.Resources.AWS" />
     <TrimmerRootAssembly Include="OpenTelemetry.Resources.Host" />
     <TrimmerRootAssembly Include="OpenTelemetry.Resources.Process" />
     <TrimmerRootAssembly Include="OpenTelemetry.Resources.ProcessRuntime" />
diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/AWSEBSResourceDetectorTests.cs b/test/OpenTelemetry.Resources.AWS.Tests/AWSEBSResourceDetectorTests.cs
similarity index 97%
rename from test/OpenTelemetry.ResourceDetectors.AWS.Tests/AWSEBSResourceDetectorTests.cs
rename to test/OpenTelemetry.Resources.AWS.Tests/AWSEBSResourceDetectorTests.cs
index 69822cf28b..17569c1a48 100644
--- a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/AWSEBSResourceDetectorTests.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/AWSEBSResourceDetectorTests.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using Xunit;
 
-namespace OpenTelemetry.ResourceDetectors.AWS.Tests;
+namespace OpenTelemetry.Resources.AWS.Tests;
 
 public class AWSEBSResourceDetectorTests
 {
diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/AWSEC2ResourceDetectorTests.cs b/test/OpenTelemetry.Resources.AWS.Tests/AWSEC2ResourceDetectorTests.cs
similarity index 98%
rename from test/OpenTelemetry.ResourceDetectors.AWS.Tests/AWSEC2ResourceDetectorTests.cs
rename to test/OpenTelemetry.Resources.AWS.Tests/AWSEC2ResourceDetectorTests.cs
index a30cb1549e..1c086b4f99 100644
--- a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/AWSEC2ResourceDetectorTests.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/AWSEC2ResourceDetectorTests.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using Xunit;
 
-namespace OpenTelemetry.ResourceDetectors.AWS.Tests;
+namespace OpenTelemetry.Resources.AWS.Tests;
 
 public class AWSEC2ResourceDetectorTests
 {
diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/AWSECSResourceDetectorTests.cs b/test/OpenTelemetry.Resources.AWS.Tests/AWSECSResourceDetectorTests.cs
similarity index 99%
rename from test/OpenTelemetry.ResourceDetectors.AWS.Tests/AWSECSResourceDetectorTests.cs
rename to test/OpenTelemetry.Resources.AWS.Tests/AWSECSResourceDetectorTests.cs
index 476c5ecb5d..9842e285f7 100644
--- a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/AWSECSResourceDetectorTests.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/AWSECSResourceDetectorTests.cs
@@ -15,7 +15,7 @@
 using Microsoft.AspNetCore.Http;
 using Xunit;
 
-namespace OpenTelemetry.ResourceDetectors.AWS.Tests;
+namespace OpenTelemetry.Resources.AWS.Tests;
 
 public class AWSECSResourceDetectorTests : IDisposable
 {
diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/AWSEKSResourceDetectorTests.cs b/test/OpenTelemetry.Resources.AWS.Tests/AWSEKSResourceDetectorTests.cs
similarity index 98%
rename from test/OpenTelemetry.ResourceDetectors.AWS.Tests/AWSEKSResourceDetectorTests.cs
rename to test/OpenTelemetry.Resources.AWS.Tests/AWSEKSResourceDetectorTests.cs
index d5b7dac37b..52e5e77086 100644
--- a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/AWSEKSResourceDetectorTests.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/AWSEKSResourceDetectorTests.cs
@@ -6,7 +6,7 @@
 using System.Linq;
 using Xunit;
 
-namespace OpenTelemetry.ResourceDetectors.AWS.Tests;
+namespace OpenTelemetry.Resources.AWS.Tests;
 
 public class AWSEKSResourceDetectorTests
 {
diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/Http/CertificateUploader.cs b/test/OpenTelemetry.Resources.AWS.Tests/Http/CertificateUploader.cs
similarity index 97%
rename from test/OpenTelemetry.ResourceDetectors.AWS.Tests/Http/CertificateUploader.cs
rename to test/OpenTelemetry.Resources.AWS.Tests/Http/CertificateUploader.cs
index 8c5a35aedd..7ede26c7ee 100644
--- a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/Http/CertificateUploader.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/Http/CertificateUploader.cs
@@ -9,7 +9,7 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 
-namespace OpenTelemetry.ResourceDetectors.AWS.Tests.Http;
+namespace OpenTelemetry.Resources.AWS.Tests.Http;
 
 internal class CertificateUploader : IDisposable
 {
diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/Http/NoopServerCertificateValidationEventSource.cs b/test/OpenTelemetry.Resources.AWS.Tests/Http/NoopServerCertificateValidationEventSource.cs
similarity index 91%
rename from test/OpenTelemetry.ResourceDetectors.AWS.Tests/Http/NoopServerCertificateValidationEventSource.cs
rename to test/OpenTelemetry.Resources.AWS.Tests/Http/NoopServerCertificateValidationEventSource.cs
index 2aa5db8fb9..fd290fab31 100644
--- a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/Http/NoopServerCertificateValidationEventSource.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/Http/NoopServerCertificateValidationEventSource.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace OpenTelemetry.ResourceDetectors.AWS.Tests.Http;
+namespace OpenTelemetry.Resources.AWS.Tests.Http;
 
 internal sealed class NoopServerCertificateValidationEventSource : IServerCertificateValidationEventSource
 {
diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/Http/ServerCertificateValidationHandlerTests.cs b/test/OpenTelemetry.Resources.AWS.Tests/Http/ServerCertificateValidationHandlerTests.cs
similarity index 94%
rename from test/OpenTelemetry.ResourceDetectors.AWS.Tests/Http/ServerCertificateValidationHandlerTests.cs
rename to test/OpenTelemetry.Resources.AWS.Tests/Http/ServerCertificateValidationHandlerTests.cs
index 5c77a6c00d..762c04ca02 100644
--- a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/Http/ServerCertificateValidationHandlerTests.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/Http/ServerCertificateValidationHandlerTests.cs
@@ -5,7 +5,7 @@
 
 using Xunit;
 
-namespace OpenTelemetry.ResourceDetectors.AWS.Tests.Http;
+namespace OpenTelemetry.Resources.AWS.Tests.Http;
 
 public class ServerCertificateValidationHandlerTests
 {
diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/Http/ServerCertificateValidationProviderTests.cs b/test/OpenTelemetry.Resources.AWS.Tests/Http/ServerCertificateValidationProviderTests.cs
similarity index 97%
rename from test/OpenTelemetry.ResourceDetectors.AWS.Tests/Http/ServerCertificateValidationProviderTests.cs
rename to test/OpenTelemetry.Resources.AWS.Tests/Http/ServerCertificateValidationProviderTests.cs
index 21adccc11a..c3164353be 100644
--- a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/Http/ServerCertificateValidationProviderTests.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/Http/ServerCertificateValidationProviderTests.cs
@@ -6,7 +6,7 @@
 using System.Security.Cryptography.X509Certificates;
 using Xunit;
 
-namespace OpenTelemetry.ResourceDetectors.AWS.Tests.Http;
+namespace OpenTelemetry.Resources.AWS.Tests.Http;
 
 public class ServerCertificateValidationProviderTests
 {
diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/OpenTelemetry.ResourceDetectors.AWS.Tests.csproj b/test/OpenTelemetry.Resources.AWS.Tests/OpenTelemetry.Resources.AWS.Tests.csproj
similarity index 96%
rename from test/OpenTelemetry.ResourceDetectors.AWS.Tests/OpenTelemetry.ResourceDetectors.AWS.Tests.csproj
rename to test/OpenTelemetry.Resources.AWS.Tests/OpenTelemetry.Resources.AWS.Tests.csproj
index 95a6483545..4ad0a9c779 100644
--- a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/OpenTelemetry.ResourceDetectors.AWS.Tests.csproj
+++ b/test/OpenTelemetry.Resources.AWS.Tests/OpenTelemetry.Resources.AWS.Tests.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.ResourceDetectors.AWS\OpenTelemetry.ResourceDetectors.AWS.csproj" />
+    <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Resources.AWS\OpenTelemetry.Resources.AWS.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != '$(NetFrameworkMinimumSupportedVersion)'">
diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/SampleAWSEBSMetadataModel.cs b/test/OpenTelemetry.Resources.AWS.Tests/SampleAWSEBSMetadataModel.cs
similarity index 76%
rename from test/OpenTelemetry.ResourceDetectors.AWS.Tests/SampleAWSEBSMetadataModel.cs
rename to test/OpenTelemetry.Resources.AWS.Tests/SampleAWSEBSMetadataModel.cs
index 90470886ce..6a97e70879 100644
--- a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/SampleAWSEBSMetadataModel.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/SampleAWSEBSMetadataModel.cs
@@ -1,9 +1,9 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using OpenTelemetry.ResourceDetectors.AWS.Models;
+using OpenTelemetry.Resources.AWS.Models;
 
-namespace OpenTelemetry.ResourceDetectors.AWS.Tests;
+namespace OpenTelemetry.Resources.AWS.Tests;
 
 internal class SampleAWSEBSMetadataModel : AWSEBSMetadataModel
 {
diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/SampleAWSEC2IdentityDocumentModel.cs b/test/OpenTelemetry.Resources.AWS.Tests/SampleAWSEC2IdentityDocumentModel.cs
similarity index 81%
rename from test/OpenTelemetry.ResourceDetectors.AWS.Tests/SampleAWSEC2IdentityDocumentModel.cs
rename to test/OpenTelemetry.Resources.AWS.Tests/SampleAWSEC2IdentityDocumentModel.cs
index 4e44a4e717..e2c2e8ffcd 100644
--- a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/SampleAWSEC2IdentityDocumentModel.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/SampleAWSEC2IdentityDocumentModel.cs
@@ -1,9 +1,9 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using OpenTelemetry.ResourceDetectors.AWS.Models;
+using OpenTelemetry.Resources.AWS.Models;
 
-namespace OpenTelemetry.ResourceDetectors.AWS.Tests;
+namespace OpenTelemetry.Resources.AWS.Tests;
 
 internal class SampleAWSEC2IdentityDocumentModel : AWSEC2IdentityDocumentModel
 {
diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/SampleMetadataFiles/environment.conf b/test/OpenTelemetry.Resources.AWS.Tests/SampleMetadataFiles/environment.conf
similarity index 100%
rename from test/OpenTelemetry.ResourceDetectors.AWS.Tests/SampleMetadataFiles/environment.conf
rename to test/OpenTelemetry.Resources.AWS.Tests/SampleMetadataFiles/environment.conf
diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/SampleMetadataFiles/testcgroup b/test/OpenTelemetry.Resources.AWS.Tests/SampleMetadataFiles/testcgroup
similarity index 100%
rename from test/OpenTelemetry.ResourceDetectors.AWS.Tests/SampleMetadataFiles/testcgroup
rename to test/OpenTelemetry.Resources.AWS.Tests/SampleMetadataFiles/testcgroup
diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/SampleMetadataFiles/testekstoken b/test/OpenTelemetry.Resources.AWS.Tests/SampleMetadataFiles/testekstoken
similarity index 100%
rename from test/OpenTelemetry.ResourceDetectors.AWS.Tests/SampleMetadataFiles/testekstoken
rename to test/OpenTelemetry.Resources.AWS.Tests/SampleMetadataFiles/testekstoken
diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/ecs_metadata/metadatav4-response-container-ec2.json b/test/OpenTelemetry.Resources.AWS.Tests/ecs_metadata/metadatav4-response-container-ec2.json
similarity index 100%
rename from test/OpenTelemetry.ResourceDetectors.AWS.Tests/ecs_metadata/metadatav4-response-container-ec2.json
rename to test/OpenTelemetry.Resources.AWS.Tests/ecs_metadata/metadatav4-response-container-ec2.json
diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/ecs_metadata/metadatav4-response-container-fargate.json b/test/OpenTelemetry.Resources.AWS.Tests/ecs_metadata/metadatav4-response-container-fargate.json
similarity index 100%
rename from test/OpenTelemetry.ResourceDetectors.AWS.Tests/ecs_metadata/metadatav4-response-container-fargate.json
rename to test/OpenTelemetry.Resources.AWS.Tests/ecs_metadata/metadatav4-response-container-fargate.json
diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/ecs_metadata/metadatav4-response-task-ec2.json b/test/OpenTelemetry.Resources.AWS.Tests/ecs_metadata/metadatav4-response-task-ec2.json
similarity index 100%
rename from test/OpenTelemetry.ResourceDetectors.AWS.Tests/ecs_metadata/metadatav4-response-task-ec2.json
rename to test/OpenTelemetry.Resources.AWS.Tests/ecs_metadata/metadatav4-response-task-ec2.json
diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/ecs_metadata/metadatav4-response-task-fargate.json b/test/OpenTelemetry.Resources.AWS.Tests/ecs_metadata/metadatav4-response-task-fargate.json
similarity index 100%
rename from test/OpenTelemetry.ResourceDetectors.AWS.Tests/ecs_metadata/metadatav4-response-task-fargate.json
rename to test/OpenTelemetry.Resources.AWS.Tests/ecs_metadata/metadatav4-response-task-fargate.json

From 7d19550d4ca32b1844bfde8e868e5aaa31f4d21c Mon Sep 17 00:00:00 2001
From: joegoldman2 <147369450+joegoldman@users.noreply.github.com>
Date: Thu, 23 May 2024 19:25:07 +0000
Subject: [PATCH 2/6] Update CHANGELOG

---
 src/OpenTelemetry.Resources.AWS/CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/OpenTelemetry.Resources.AWS/CHANGELOG.md b/src/OpenTelemetry.Resources.AWS/CHANGELOG.md
index b2e7f28f2e..d5d72f4bbb 100644
--- a/src/OpenTelemetry.Resources.AWS/CHANGELOG.md
+++ b/src/OpenTelemetry.Resources.AWS/CHANGELOG.md
@@ -9,6 +9,15 @@
   ([#1576](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1576))
 * Update OpenTelemetry SDK version to `1.8.1`.
   ([#1668](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1668))
+* **Breaking Change**: Renamed package from `OpenTelemetry.ResourceDetectors.AWS`
+  to `OpenTelemetry.Resources.AWS`.
+  ([#1820](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1839))
+* **Breaking Change**: `AWSEBSResourceDetector`, `AWSEC2ResourceDetector`,
+`AWSECSResourceDetector` and `AWSEKSResourceDetector` types are now internal,
+use `ResourceBuilder` extension methods `AddAWSEBSResourceDetector`,
+`AddAWSEC2ResourceDetector`, `AddAWSECSResourceDetector`
+and `AddAWSEKSResourceDetector` respectively to enable the detectors.
+  ([#1820](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1839))
 
 ## 1.4.0-beta.1
 

From b39ca807a8682d642606c263b5c956b11c62865b Mon Sep 17 00:00:00 2001
From: joegoldman2 <147369450+joegoldman@users.noreply.github.com>
Date: Thu, 23 May 2024 19:45:28 +0000
Subject: [PATCH 3/6] ResourceDetector -> Detector

---
 .github/workflows/ci.yml                         |  4 ++--
 .../.publicApi/PublicAPI.Unshipped.txt           |  4 ++--
 .../.publicApi/net6.0/PublicAPI.Unshipped.txt    |  4 ++--
 ...SEBSResourceDetector.cs => AWSEBSDetector.cs} |  4 ++--
 ...SEC2ResourceDetector.cs => AWSEC2Detector.cs} |  4 ++--
 ...SECSResourceDetector.cs => AWSECSDetector.cs} | 12 ++++++------
 ...SEKSResourceDetector.cs => AWSEKSDetector.cs} | 10 +++++-----
 .../AWSResourceBuilderExtensions.cs              | 16 ++++++++--------
 src/OpenTelemetry.Resources.AWS/CHANGELOG.md     | 14 +++++++-------
 src/OpenTelemetry.Resources.AWS/README.md        | 10 +++++-----
 src/OpenTelemetry.Sampler.AWS/README.md          |  2 +-
 ...ceDetectorTests.cs => AWSEBSDetectorTests.cs} |  8 ++++----
 ...ceDetectorTests.cs => AWSEC2DetectorTests.cs} |  8 ++++----
 ...ceDetectorTests.cs => AWSECSDetectorTests.cs} | 14 +++++++-------
 ...ceDetectorTests.cs => AWSEKSDetectorTests.cs} | 16 ++++++++--------
 15 files changed, 65 insertions(+), 65 deletions(-)
 rename src/OpenTelemetry.Resources.AWS/{AWSEBSResourceDetector.cs => AWSEBSDetector.cs} (96%)
 rename src/OpenTelemetry.Resources.AWS/{AWSEC2ResourceDetector.cs => AWSEC2Detector.cs} (97%)
 rename src/OpenTelemetry.Resources.AWS/{AWSECSResourceDetector.cs => AWSECSDetector.cs} (94%)
 rename src/OpenTelemetry.Resources.AWS/{AWSEKSResourceDetector.cs => AWSEKSDetector.cs} (93%)
 rename test/OpenTelemetry.Resources.AWS.Tests/{AWSEBSResourceDetectorTests.cs => AWSEBSDetectorTests.cs} (78%)
 rename test/OpenTelemetry.Resources.AWS.Tests/{AWSEC2ResourceDetectorTests.cs => AWSEC2DetectorTests.cs} (84%)
 rename test/OpenTelemetry.Resources.AWS.Tests/{AWSECSResourceDetectorTests.cs => AWSECSDetectorTests.cs} (93%)
 rename test/OpenTelemetry.Resources.AWS.Tests/{AWSEKSResourceDetectorTests.cs => AWSEKSDetectorTests.cs} (81%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5c42612228..fa012e3a10 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -524,9 +524,9 @@ jobs:
       || contains(needs.detect-changes.outputs.changes, 'instrumentation-runtime')
       || contains(needs.detect-changes.outputs.changes, 'instrumentation-sqlclient')
       || contains(needs.detect-changes.outputs.changes, 'instrumentation-stackexchangeredis')
-      || contains(needs.detect-changes.outputs.changes, 'resourcedetectors-aws')
       || contains(needs.detect-changes.outputs.changes, 'resourcedetectors-azure')
       || contains(needs.detect-changes.outputs.changes, 'resourcedetectors-container')
+      || contains(needs.detect-changes.outputs.changes, 'resources-aws')
       || contains(needs.detect-changes.outputs.changes, 'resources-host')
       || contains(needs.detect-changes.outputs.changes, 'resources-process')
       || contains(needs.detect-changes.outputs.changes, 'resources-processruntime')
@@ -573,8 +573,8 @@ jobs:
       build-test-instrumentation-wcf,
       build-test-persistentstorage,
       build-test-resourcedetectors-azure,
-      build-test-resourcedetectors-aws,
       build-test-resourcedetectors-container,
+      build-test-resources-aws,
       build-test-resources-gcp,
       build-test-resources-host,
       build-test-resources-process,
diff --git a/src/OpenTelemetry.Resources.AWS/.publicApi/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Resources.AWS/.publicApi/PublicAPI.Unshipped.txt
index 38b93830ad..a6dd3ce0c5 100644
--- a/src/OpenTelemetry.Resources.AWS/.publicApi/PublicAPI.Unshipped.txt
+++ b/src/OpenTelemetry.Resources.AWS/.publicApi/PublicAPI.Unshipped.txt
@@ -1,3 +1,3 @@
 OpenTelemetry.Resources.AWSResourceBuilderExtensions
-static OpenTelemetry.Resources.AWSResourceBuilderExtensions.AddAWSEBSResourceDetector(this OpenTelemetry.Resources.ResourceBuilder! builder) -> OpenTelemetry.Resources.ResourceBuilder!
-static OpenTelemetry.Resources.AWSResourceBuilderExtensions.AddAWSEC2ResourceDetector(this OpenTelemetry.Resources.ResourceBuilder! builder) -> OpenTelemetry.Resources.ResourceBuilder!
+static OpenTelemetry.Resources.AWSResourceBuilderExtensions.AddAWSEBSDetector(this OpenTelemetry.Resources.ResourceBuilder! builder) -> OpenTelemetry.Resources.ResourceBuilder!
+static OpenTelemetry.Resources.AWSResourceBuilderExtensions.AddAWSEC2Detector(this OpenTelemetry.Resources.ResourceBuilder! builder) -> OpenTelemetry.Resources.ResourceBuilder!
diff --git a/src/OpenTelemetry.Resources.AWS/.publicApi/net6.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Resources.AWS/.publicApi/net6.0/PublicAPI.Unshipped.txt
index d744910a0c..dd8d0109c1 100644
--- a/src/OpenTelemetry.Resources.AWS/.publicApi/net6.0/PublicAPI.Unshipped.txt
+++ b/src/OpenTelemetry.Resources.AWS/.publicApi/net6.0/PublicAPI.Unshipped.txt
@@ -1,2 +1,2 @@
-static OpenTelemetry.Resources.AWSResourceBuilderExtensions.AddAWSECSResourceDetector(this OpenTelemetry.Resources.ResourceBuilder! builder) -> OpenTelemetry.Resources.ResourceBuilder!
-static OpenTelemetry.Resources.AWSResourceBuilderExtensions.AddAWSEKSResourceDetector(this OpenTelemetry.Resources.ResourceBuilder! builder) -> OpenTelemetry.Resources.ResourceBuilder!
+static OpenTelemetry.Resources.AWSResourceBuilderExtensions.AddAWSECSDetector(this OpenTelemetry.Resources.ResourceBuilder! builder) -> OpenTelemetry.Resources.ResourceBuilder!
+static OpenTelemetry.Resources.AWSResourceBuilderExtensions.AddAWSEKSDetector(this OpenTelemetry.Resources.ResourceBuilder! builder) -> OpenTelemetry.Resources.ResourceBuilder!
diff --git a/src/OpenTelemetry.Resources.AWS/AWSEBSResourceDetector.cs b/src/OpenTelemetry.Resources.AWS/AWSEBSDetector.cs
similarity index 96%
rename from src/OpenTelemetry.Resources.AWS/AWSEBSResourceDetector.cs
rename to src/OpenTelemetry.Resources.AWS/AWSEBSDetector.cs
index 45510ccc38..4540259143 100644
--- a/src/OpenTelemetry.Resources.AWS/AWSEBSResourceDetector.cs
+++ b/src/OpenTelemetry.Resources.AWS/AWSEBSDetector.cs
@@ -13,7 +13,7 @@ namespace OpenTelemetry.Resources.AWS;
 /// <summary>
 /// Resource detector for application running in AWS Elastic Beanstalk environment.
 /// </summary>
-internal sealed class AWSEBSResourceDetector : IResourceDetector
+internal sealed class AWSEBSDetector : IResourceDetector
 {
     private const string AWSEBSMetadataWindowsFilePath = "C:\\Program Files\\Amazon\\XRay\\environment.conf";
 #if NET6_0_OR_GREATER
@@ -48,7 +48,7 @@ public Resource Detect()
         }
         catch (Exception ex)
         {
-            AWSResourcesEventSource.Log.ResourceAttributesExtractException(nameof(AWSEBSResourceDetector), ex);
+            AWSResourcesEventSource.Log.ResourceAttributesExtractException(nameof(AWSEBSDetector), ex);
         }
 
         return Resource.Empty;
diff --git a/src/OpenTelemetry.Resources.AWS/AWSEC2ResourceDetector.cs b/src/OpenTelemetry.Resources.AWS/AWSEC2Detector.cs
similarity index 97%
rename from src/OpenTelemetry.Resources.AWS/AWSEC2ResourceDetector.cs
rename to src/OpenTelemetry.Resources.AWS/AWSEC2Detector.cs
index d00d0997a8..e0c605b984 100644
--- a/src/OpenTelemetry.Resources.AWS/AWSEC2ResourceDetector.cs
+++ b/src/OpenTelemetry.Resources.AWS/AWSEC2Detector.cs
@@ -10,7 +10,7 @@ namespace OpenTelemetry.Resources.AWS;
 /// <summary>
 /// Resource detector for application running on AWS EC2 instance.
 /// </summary>
-internal sealed class AWSEC2ResourceDetector : IResourceDetector
+internal sealed class AWSEC2Detector : IResourceDetector
 {
     private const string AWSEC2MetadataTokenTTLHeader = "X-aws-ec2-metadata-token-ttl-seconds";
     private const string AWSEC2MetadataTokenHeader = "X-aws-ec2-metadata-token";
@@ -34,7 +34,7 @@ public Resource Detect()
         }
         catch (Exception ex)
         {
-            AWSResourcesEventSource.Log.ResourceAttributesExtractException(nameof(AWSEC2ResourceDetector), ex);
+            AWSResourcesEventSource.Log.ResourceAttributesExtractException(nameof(AWSEC2Detector), ex);
         }
 
         return Resource.Empty;
diff --git a/src/OpenTelemetry.Resources.AWS/AWSECSResourceDetector.cs b/src/OpenTelemetry.Resources.AWS/AWSECSDetector.cs
similarity index 94%
rename from src/OpenTelemetry.Resources.AWS/AWSECSResourceDetector.cs
rename to src/OpenTelemetry.Resources.AWS/AWSECSDetector.cs
index fe6019f5ff..054f82c1b8 100644
--- a/src/OpenTelemetry.Resources.AWS/AWSECSResourceDetector.cs
+++ b/src/OpenTelemetry.Resources.AWS/AWSECSDetector.cs
@@ -13,7 +13,7 @@ namespace OpenTelemetry.Resources.AWS;
 /// <summary>
 /// Resource detector for application running in AWS ECS.
 /// </summary>
-internal sealed class AWSECSResourceDetector : IResourceDetector
+internal sealed class AWSECSDetector : IResourceDetector
 {
     private const string AWSECSMetadataPath = "/proc/self/cgroup";
     private const string AWSECSMetadataURLKey = "ECS_CONTAINER_METADATA_URI";
@@ -46,7 +46,7 @@ public Resource Detect()
         }
         catch (Exception ex)
         {
-            AWSResourcesEventSource.Log.ResourceAttributesExtractException(nameof(AWSECSResourceDetector), ex);
+            AWSResourcesEventSource.Log.ResourceAttributesExtractException(nameof(AWSECSDetector), ex);
         }
 
         try
@@ -55,7 +55,7 @@ public Resource Detect()
         }
         catch (Exception ex)
         {
-            AWSResourcesEventSource.Log.ResourceAttributesExtractException(nameof(AWSECSResourceDetector), ex);
+            AWSResourcesEventSource.Log.ResourceAttributesExtractException(nameof(AWSECSDetector), ex);
         }
 
         return new Resource(resourceAttributes);
@@ -79,14 +79,14 @@ internal static List<KeyValuePair<string, object>> ExtractMetadataV4ResourceAttr
         if (!containerResponse.RootElement.TryGetProperty("ContainerARN", out var containerArnElement)
             || containerArnElement.GetString() is not string containerArn)
         {
-            AWSResourcesEventSource.Log.ResourceAttributesExtractException(nameof(AWSECSResourceDetector), new ArgumentException("The ECS Metadata V4 response did not contain the 'ContainerARN' field"));
+            AWSResourcesEventSource.Log.ResourceAttributesExtractException(nameof(AWSECSDetector), new ArgumentException("The ECS Metadata V4 response did not contain the 'ContainerARN' field"));
             return new List<KeyValuePair<string, object>>();
         }
 
         if (!taskResponse.RootElement.TryGetProperty("Cluster", out var clusterArnElement)
             || clusterArnElement.GetString() is not string clusterArn)
         {
-            AWSResourcesEventSource.Log.ResourceAttributesExtractException(nameof(AWSECSResourceDetector), new ArgumentException("The ECS Metadata V4 response did not contain the 'Cluster' field"));
+            AWSResourcesEventSource.Log.ResourceAttributesExtractException(nameof(AWSECSDetector), new ArgumentException("The ECS Metadata V4 response did not contain the 'Cluster' field"));
             return new List<KeyValuePair<string, object>>();
         }
 
@@ -128,7 +128,7 @@ internal static List<KeyValuePair<string, object>> ExtractMetadataV4ResourceAttr
         }
         else
         {
-            AWSResourcesEventSource.Log.ResourceAttributesExtractException(nameof(AWSECSResourceDetector), new ArgumentException($"The ECS Metadata V4 response contained the unrecognized launch type '{launchTypeElement}'"));
+            AWSResourcesEventSource.Log.ResourceAttributesExtractException(nameof(AWSECSDetector), new ArgumentException($"The ECS Metadata V4 response contained the unrecognized launch type '{launchTypeElement}'"));
         }
 
         if (taskResponse.RootElement.TryGetProperty("TaskARN", out var taskArnElement) && taskArnElement.ValueKind == JsonValueKind.String)
diff --git a/src/OpenTelemetry.Resources.AWS/AWSEKSResourceDetector.cs b/src/OpenTelemetry.Resources.AWS/AWSEKSDetector.cs
similarity index 93%
rename from src/OpenTelemetry.Resources.AWS/AWSEKSResourceDetector.cs
rename to src/OpenTelemetry.Resources.AWS/AWSEKSDetector.cs
index 8efcafa656..597ccc86a1 100644
--- a/src/OpenTelemetry.Resources.AWS/AWSEKSResourceDetector.cs
+++ b/src/OpenTelemetry.Resources.AWS/AWSEKSDetector.cs
@@ -13,7 +13,7 @@ namespace OpenTelemetry.Resources.AWS;
 /// <summary>
 /// Resource detector for application running in AWS EKS.
 /// </summary>
-internal sealed class AWSEKSResourceDetector : IResourceDetector
+internal sealed class AWSEKSDetector : IResourceDetector
 {
     private const string AWSEKSCertificatePath = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt";
     private const string AWSEKSCredentialPath = "/var/run/secrets/kubernetes.io/serviceaccount/token";
@@ -81,7 +81,7 @@ internal static List<KeyValuePair<string, object>> ExtractResourceAttributes(str
         }
         catch (Exception ex)
         {
-            AWSResourcesEventSource.Log.ResourceAttributesExtractException($"{nameof(AWSEKSResourceDetector)} : Failed to load client token", ex);
+            AWSResourcesEventSource.Log.ResourceAttributesExtractException($"{nameof(AWSEKSDetector)} : Failed to load client token", ex);
         }
 
         return null;
@@ -105,7 +105,7 @@ internal static List<KeyValuePair<string, object>> ExtractResourceAttributes(str
         }
         catch (Exception ex)
         {
-            AWSResourcesEventSource.Log.ResourceAttributesExtractException($"{nameof(AWSEKSResourceDetector)} : Failed to get Container Id", ex);
+            AWSResourcesEventSource.Log.ResourceAttributesExtractException($"{nameof(AWSEKSDetector)} : Failed to get Container Id", ex);
         }
 
         return null;
@@ -129,7 +129,7 @@ internal static List<KeyValuePair<string, object>> ExtractResourceAttributes(str
         }
         catch (Exception ex)
         {
-            AWSResourcesEventSource.Log.ResourceAttributesExtractException($"{nameof(AWSEKSResourceDetector)} : Failed to get cluster information", ex);
+            AWSResourcesEventSource.Log.ResourceAttributesExtractException($"{nameof(AWSEKSDetector)} : Failed to get cluster information", ex);
         }
 
         return null;
@@ -144,7 +144,7 @@ private static bool IsEKSProcess(string credentials, HttpClientHandler? httpClie
         }
         catch (Exception ex)
         {
-            AWSResourcesEventSource.Log.ResourceAttributesExtractException($"{nameof(AWSEKSResourceDetector)} : Failed to get EKS information", ex);
+            AWSResourcesEventSource.Log.ResourceAttributesExtractException($"{nameof(AWSEKSDetector)} : Failed to get EKS information", ex);
         }
 
         return !string.IsNullOrEmpty(awsAuth);
diff --git a/src/OpenTelemetry.Resources.AWS/AWSResourceBuilderExtensions.cs b/src/OpenTelemetry.Resources.AWS/AWSResourceBuilderExtensions.cs
index 572af5aba9..8ac475c773 100644
--- a/src/OpenTelemetry.Resources.AWS/AWSResourceBuilderExtensions.cs
+++ b/src/OpenTelemetry.Resources.AWS/AWSResourceBuilderExtensions.cs
@@ -16,10 +16,10 @@ public static class AWSResourceBuilderExtensions
     /// </summary>
     /// <param name="builder"><see cref="ResourceBuilder" /> being configured.</param>
     /// <returns>The instance of <see cref="ResourceBuilder" /> being configured.</returns>
-    public static ResourceBuilder AddAWSEBSResourceDetector(this ResourceBuilder builder)
+    public static ResourceBuilder AddAWSEBSDetector(this ResourceBuilder builder)
     {
         Guard.ThrowIfNull(builder);
-        return builder.AddDetector(new AWSEBSResourceDetector());
+        return builder.AddDetector(new AWSEBSDetector());
     }
 
     /// <summary>
@@ -27,10 +27,10 @@ public static ResourceBuilder AddAWSEBSResourceDetector(this ResourceBuilder bui
     /// </summary>
     /// <param name="builder"><see cref="ResourceBuilder" /> being configured.</param>
     /// <returns>The instance of <see cref="ResourceBuilder" /> being configured.</returns>
-    public static ResourceBuilder AddAWSEC2ResourceDetector(this ResourceBuilder builder)
+    public static ResourceBuilder AddAWSEC2Detector(this ResourceBuilder builder)
     {
         Guard.ThrowIfNull(builder);
-        return builder.AddDetector(new AWSEC2ResourceDetector());
+        return builder.AddDetector(new AWSEC2Detector());
     }
 
 #if !NETFRAMEWORK
@@ -39,10 +39,10 @@ public static ResourceBuilder AddAWSEC2ResourceDetector(this ResourceBuilder bui
     /// </summary>
     /// <param name="builder"><see cref="ResourceBuilder" /> being configured.</param>
     /// <returns>The instance of <see cref="ResourceBuilder" /> being configured.</returns>
-    public static ResourceBuilder AddAWSECSResourceDetector(this ResourceBuilder builder)
+    public static ResourceBuilder AddAWSECSDetector(this ResourceBuilder builder)
     {
         Guard.ThrowIfNull(builder);
-        return builder.AddDetector(new AWSECSResourceDetector());
+        return builder.AddDetector(new AWSECSDetector());
     }
 
     /// <summary>
@@ -50,10 +50,10 @@ public static ResourceBuilder AddAWSECSResourceDetector(this ResourceBuilder bui
     /// </summary>
     /// <param name="builder"><see cref="ResourceBuilder" /> being configured.</param>
     /// <returns>The instance of <see cref="ResourceBuilder" /> being configured.</returns>
-    public static ResourceBuilder AddAWSEKSResourceDetector(this ResourceBuilder builder)
+    public static ResourceBuilder AddAWSEKSDetector(this ResourceBuilder builder)
     {
         Guard.ThrowIfNull(builder);
-        return builder.AddDetector(new AWSEKSResourceDetector());
+        return builder.AddDetector(new AWSEKSDetector());
     }
 #endif
 }
diff --git a/src/OpenTelemetry.Resources.AWS/CHANGELOG.md b/src/OpenTelemetry.Resources.AWS/CHANGELOG.md
index d5d72f4bbb..94646587b5 100644
--- a/src/OpenTelemetry.Resources.AWS/CHANGELOG.md
+++ b/src/OpenTelemetry.Resources.AWS/CHANGELOG.md
@@ -11,13 +11,13 @@
   ([#1668](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1668))
 * **Breaking Change**: Renamed package from `OpenTelemetry.ResourceDetectors.AWS`
   to `OpenTelemetry.Resources.AWS`.
-  ([#1820](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1839))
-* **Breaking Change**: `AWSEBSResourceDetector`, `AWSEC2ResourceDetector`,
-`AWSECSResourceDetector` and `AWSEKSResourceDetector` types are now internal,
-use `ResourceBuilder` extension methods `AddAWSEBSResourceDetector`,
-`AddAWSEC2ResourceDetector`, `AddAWSECSResourceDetector`
-and `AddAWSEKSResourceDetector` respectively to enable the detectors.
-  ([#1820](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1839))
+  ([#1839](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1839))
+* **Breaking Change**: `AWSEBSDetector`, `AWSEC2Detector`,
+`AWSECSDetector` and `AWSEKSDetector` types are now internal,
+use `ResourceBuilder` extension methods `AddAWSEBSDetector`,
+`AddAWSEC2Detector`, `AddAWSECSDetector`
+and `AddAWSEKSDetector` respectively to enable the detectors.
+  ([#1839](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1839))
 
 ## 1.4.0-beta.1
 
diff --git a/src/OpenTelemetry.Resources.AWS/README.md b/src/OpenTelemetry.Resources.AWS/README.md
index 994bfa519e..bcf098e587 100644
--- a/src/OpenTelemetry.Resources.AWS/README.md
+++ b/src/OpenTelemetry.Resources.AWS/README.md
@@ -30,22 +30,22 @@ var tracerProvider = Sdk.CreateTracerProviderBuilder()
                         // other configurations
                         .SetResourceBuilder(ResourceBuilder
                             .CreateEmpty()
-                            .AddAWSEC2ResourceDetector())
+                            .AddAWSEC2Detector())
                         .Build();
 ```
 
 The resource detectors will record the following metadata based on where
 your application is running:
 
-- **AWSEC2ResourceDetector**: cloud provider, cloud platform, account id,
+- **AWSEC2Detector**: cloud provider, cloud platform, account id,
 cloud availability zone, host id, host type, aws region, host name.
-- **AWSEBSResourceDetector**: cloud provider, cloud platform, service name,
+- **AWSEBSDetector**: cloud provider, cloud platform, service name,
 service namespace, instance id, service version.
-- **AWSECSResourceDetector**: cloud provider, cloud platform, cloud resource id,
+- **AWSECSDetector**: cloud provider, cloud platform, cloud resource id,
 account id, cloud availability zone, cloud region, container id, cluster arn,
 task arn, task family, task revision, launch type, container arn, log group names,
 log group ids, log stream names, log stream ids.
-- **AWSEKSResourceDetector**: cloud provider, cloud platform, cluster name,
+- **AWSEKSDetector**: cloud provider, cloud platform, cluster name,
 container id.
 
 ## References
diff --git a/src/OpenTelemetry.Sampler.AWS/README.md b/src/OpenTelemetry.Sampler.AWS/README.md
index daf3924c23..cb7218aab3 100644
--- a/src/OpenTelemetry.Sampler.AWS/README.md
+++ b/src/OpenTelemetry.Sampler.AWS/README.md
@@ -33,7 +33,7 @@ var serviceName = "MyServiceName";
 var resourceBuilder = ResourceBuilder
     .CreateDefault()
     .AddService(serviceName: serviceName)
-    .AddDetector(new AWSEC2ResourceDetector());
+    .AddAWSEC2Detector();
 
 using var tracerProvider = Sdk.CreateTracerProviderBuilder()
     .AddSource(serviceName)
diff --git a/test/OpenTelemetry.Resources.AWS.Tests/AWSEBSResourceDetectorTests.cs b/test/OpenTelemetry.Resources.AWS.Tests/AWSEBSDetectorTests.cs
similarity index 78%
rename from test/OpenTelemetry.Resources.AWS.Tests/AWSEBSResourceDetectorTests.cs
rename to test/OpenTelemetry.Resources.AWS.Tests/AWSEBSDetectorTests.cs
index 17569c1a48..06a911f0f4 100644
--- a/test/OpenTelemetry.Resources.AWS.Tests/AWSEBSResourceDetectorTests.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/AWSEBSDetectorTests.cs
@@ -6,14 +6,14 @@
 
 namespace OpenTelemetry.Resources.AWS.Tests;
 
-public class AWSEBSResourceDetectorTests
+public class AWSEBSDetectorTests
 {
     private const string AWSEBSMetadataFilePath = "SampleMetadataFiles/environment.conf";
 
     [Fact]
     public void TestDetect()
     {
-        Assert.Empty(new AWSEBSResourceDetector().Detect().Attributes); // will be null as it's not in ebs environment
+        Assert.Empty(new AWSEBSDetector().Detect().Attributes); // will be null as it's not in ebs environment
     }
 
     [Fact]
@@ -21,7 +21,7 @@ public void TestExtractResourceAttributes()
     {
         var sampleModel = new SampleAWSEBSMetadataModel();
 
-        var resourceAttributes = AWSEBSResourceDetector.ExtractResourceAttributes(sampleModel).ToDictionary(x => x.Key, x => x.Value);
+        var resourceAttributes = AWSEBSDetector.ExtractResourceAttributes(sampleModel).ToDictionary(x => x.Key, x => x.Value);
 
         Assert.Equal("aws", resourceAttributes[AWSSemanticConventions.AttributeCloudProvider]);
         Assert.Equal("aws_elastic_beanstalk", resourceAttributes[AWSSemanticConventions.AttributeCloudPlatform]);
@@ -34,7 +34,7 @@ public void TestExtractResourceAttributes()
     [Fact]
     public void TestGetEBSMetadata()
     {
-        var ebsMetadata = AWSEBSResourceDetector.GetEBSMetadata(AWSEBSMetadataFilePath);
+        var ebsMetadata = AWSEBSDetector.GetEBSMetadata(AWSEBSMetadataFilePath);
 
         Assert.NotNull(ebsMetadata);
         Assert.Equal("1234567890", ebsMetadata.DeploymentId);
diff --git a/test/OpenTelemetry.Resources.AWS.Tests/AWSEC2ResourceDetectorTests.cs b/test/OpenTelemetry.Resources.AWS.Tests/AWSEC2DetectorTests.cs
similarity index 84%
rename from test/OpenTelemetry.Resources.AWS.Tests/AWSEC2ResourceDetectorTests.cs
rename to test/OpenTelemetry.Resources.AWS.Tests/AWSEC2DetectorTests.cs
index 1c086b4f99..b884904a42 100644
--- a/test/OpenTelemetry.Resources.AWS.Tests/AWSEC2ResourceDetectorTests.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/AWSEC2DetectorTests.cs
@@ -6,12 +6,12 @@
 
 namespace OpenTelemetry.Resources.AWS.Tests;
 
-public class AWSEC2ResourceDetectorTests
+public class AWSEC2DetectorTests
 {
     [Fact]
     public void TestDetect()
     {
-        Assert.Empty(new AWSEC2ResourceDetector().Detect().Attributes); // will be null as it's not in ec2 environment
+        Assert.Empty(new AWSEC2Detector().Detect().Attributes); // will be null as it's not in ec2 environment
     }
 
     [Fact]
@@ -19,7 +19,7 @@ public void TestExtractResourceAttributes()
     {
         var sampleEC2IdentityDocumentModel = new SampleAWSEC2IdentityDocumentModel();
         var hostName = "Test host name";
-        var resourceAttributes = AWSEC2ResourceDetector.ExtractResourceAttributes(sampleEC2IdentityDocumentModel, hostName).ToDictionary(x => x.Key, x => x.Value);
+        var resourceAttributes = AWSEC2Detector.ExtractResourceAttributes(sampleEC2IdentityDocumentModel, hostName).ToDictionary(x => x.Key, x => x.Value);
 
         Assert.Equal("aws", resourceAttributes[AWSSemanticConventions.AttributeCloudProvider]);
         Assert.Equal("aws_ec2", resourceAttributes[AWSSemanticConventions.AttributeCloudPlatform]);
@@ -36,7 +36,7 @@ public void TestDeserializeResponse()
     {
         var ec2IdentityDocument = "{\"accountId\": \"123456789012\", \"architecture\": \"x86_64\", \"availabilityZone\": \"us-east-1a\", \"billingProducts\": null, \"devpayProductCodes\": null, \"marketplaceProductCodes\": null, \"imageId\": \"ami-12345678901234567\", \"instanceId\": \"i-12345678901234567\", \"instanceType\": \"t2.micro\", \"kernelId\": null, \"pendingTime\": \"2021-08-11T22:41:54Z\", \"privateIp\": \"123.456.789.123\", \"ramdiskId\": null, \"region\": \"us-east-1\", \"version\": \"2021-08-11\"}";
 
-        var ec2IdentityDocumentModel = AWSEC2ResourceDetector.DeserializeResponse(ec2IdentityDocument);
+        var ec2IdentityDocumentModel = AWSEC2Detector.DeserializeResponse(ec2IdentityDocument);
 
         Assert.NotNull(ec2IdentityDocumentModel);
         Assert.Equal("123456789012", ec2IdentityDocumentModel.AccountId);
diff --git a/test/OpenTelemetry.Resources.AWS.Tests/AWSECSResourceDetectorTests.cs b/test/OpenTelemetry.Resources.AWS.Tests/AWSECSDetectorTests.cs
similarity index 93%
rename from test/OpenTelemetry.Resources.AWS.Tests/AWSECSResourceDetectorTests.cs
rename to test/OpenTelemetry.Resources.AWS.Tests/AWSECSDetectorTests.cs
index 9842e285f7..adf8ff8437 100644
--- a/test/OpenTelemetry.Resources.AWS.Tests/AWSECSResourceDetectorTests.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/AWSECSDetectorTests.cs
@@ -17,13 +17,13 @@
 
 namespace OpenTelemetry.Resources.AWS.Tests;
 
-public class AWSECSResourceDetectorTests : IDisposable
+public class AWSECSDetectorTests : IDisposable
 {
     private const string AWSECSMetadataFilePath = "SampleMetadataFiles/testcgroup";
     private const string AWSECSMetadataURLKey = "ECS_CONTAINER_METADATA_URI";
     private const string AWSECSMetadataURLV4Key = "ECS_CONTAINER_METADATA_URI_V4";
 
-    public AWSECSResourceDetectorTests()
+    public AWSECSDetectorTests()
     {
         this.ResetEnvironment();
     }
@@ -36,7 +36,7 @@ public void Dispose()
     [Fact]
     public void TestNotOnEcs()
     {
-        var ecsResourceDetector = new AWSECSResourceDetector();
+        var ecsResourceDetector = new AWSECSDetector();
         var resourceAttributes = ecsResourceDetector.Detect();
 
         Assert.NotNull(resourceAttributes);
@@ -46,7 +46,7 @@ public void TestNotOnEcs()
     [Fact]
     public void TestGetECSContainerId()
     {
-        Assert.Equal("a4d00c9dd675d67f866c786181419e1b44832d4696780152e61afd44a3e02856", AWSECSResourceDetector.GetECSContainerId(AWSECSMetadataFilePath));
+        Assert.Equal("a4d00c9dd675d67f866c786181419e1b44832d4696780152e61afd44a3e02856", AWSECSDetector.GetECSContainerId(AWSECSMetadataFilePath));
     }
 
     [Fact]
@@ -54,7 +54,7 @@ public void TestEcsMetadataV3()
     {
         Environment.SetEnvironmentVariable(AWSECSMetadataURLKey, "TestECSURIKey");
 
-        var resourceAttributes = new AWSECSResourceDetector().Detect().Attributes.ToDictionary(x => x.Key, x => x.Value);
+        var resourceAttributes = new AWSECSDetector().Detect().Attributes.ToDictionary(x => x.Key, x => x.Value);
 
         Assert.Equal(resourceAttributes[AWSSemanticConventions.AttributeCloudProvider], "aws");
         Assert.Equal(resourceAttributes[AWSSemanticConventions.AttributeCloudPlatform], "aws_ecs");
@@ -69,7 +69,7 @@ public async void TestEcsMetadataV4Ec2()
         await using (var metadataEndpoint = new MockEcsMetadataEndpoint("ecs_metadata/metadatav4-response-container-ec2.json", "ecs_metadata/metadatav4-response-task-ec2.json"))
         {
             Environment.SetEnvironmentVariable(AWSECSMetadataURLV4Key, metadataEndpoint.Address.ToString());
-            var resourceAttributes = new AWSECSResourceDetector().Detect().Attributes.ToDictionary(x => x.Key, x => x.Value);
+            var resourceAttributes = new AWSECSDetector().Detect().Attributes.ToDictionary(x => x.Key, x => x.Value);
 
             Assert.Equal(resourceAttributes[AWSSemanticConventions.AttributeCloudProvider], "aws");
             Assert.Equal(resourceAttributes[AWSSemanticConventions.AttributeCloudPlatform], "aws_ecs");
@@ -101,7 +101,7 @@ public async void TestEcsMetadataV4Fargate()
         {
             Environment.SetEnvironmentVariable(AWSECSMetadataURLV4Key, metadataEndpoint.Address.ToString());
 
-            var resourceAttributes = new AWSECSResourceDetector().Detect().Attributes.ToDictionary(x => x.Key, x => x.Value);
+            var resourceAttributes = new AWSECSDetector().Detect().Attributes.ToDictionary(x => x.Key, x => x.Value);
 
             Assert.Equal(resourceAttributes[AWSSemanticConventions.AttributeCloudProvider], "aws");
             Assert.Equal(resourceAttributes[AWSSemanticConventions.AttributeCloudPlatform], "aws_ecs");
diff --git a/test/OpenTelemetry.Resources.AWS.Tests/AWSEKSResourceDetectorTests.cs b/test/OpenTelemetry.Resources.AWS.Tests/AWSEKSDetectorTests.cs
similarity index 81%
rename from test/OpenTelemetry.Resources.AWS.Tests/AWSEKSResourceDetectorTests.cs
rename to test/OpenTelemetry.Resources.AWS.Tests/AWSEKSDetectorTests.cs
index 52e5e77086..ceb1b56870 100644
--- a/test/OpenTelemetry.Resources.AWS.Tests/AWSEKSResourceDetectorTests.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/AWSEKSDetectorTests.cs
@@ -8,7 +8,7 @@
 
 namespace OpenTelemetry.Resources.AWS.Tests;
 
-public class AWSEKSResourceDetectorTests
+public class AWSEKSDetectorTests
 {
     private const string AWSEKSCredentialsPath = "SampleMetadataFiles/testekstoken";
     private const string AWSEKSMetadataFilePath = "SampleMetadataFiles/testcgroup";
@@ -16,7 +16,7 @@ public class AWSEKSResourceDetectorTests
     [Fact]
     public void TestDetect()
     {
-        var eksResourceDetector = new AWSEKSResourceDetector();
+        var eksResourceDetector = new AWSEKSDetector();
         var resourceAttributes = eksResourceDetector.Detect();
 
         Assert.NotNull(resourceAttributes);
@@ -29,7 +29,7 @@ public void TestExtractResourceAttributes()
         var clusterName = "Test cluster name";
         var containerId = "Test container id";
 
-        var resourceAttributes = AWSEKSResourceDetector.ExtractResourceAttributes(clusterName, containerId).ToDictionary(x => x.Key, x => x.Value);
+        var resourceAttributes = AWSEKSDetector.ExtractResourceAttributes(clusterName, containerId).ToDictionary(x => x.Key, x => x.Value);
 
         Assert.Equal(4, resourceAttributes.Count);
         Assert.Equal("aws", resourceAttributes[AWSSemanticConventions.AttributeCloudProvider]);
@@ -43,7 +43,7 @@ public void TestExtractResourceAttributesWithEmptyClusterName()
     {
         var containerId = "Test container id";
 
-        var resourceAttributes = AWSEKSResourceDetector.ExtractResourceAttributes(string.Empty, containerId).ToDictionary(x => x.Key, x => x.Value);
+        var resourceAttributes = AWSEKSDetector.ExtractResourceAttributes(string.Empty, containerId).ToDictionary(x => x.Key, x => x.Value);
 
         // Validate the count of resourceAttributes -> Excluding cluster name, there will be only three resourceAttributes
         Assert.Equal(3, resourceAttributes.Count);
@@ -57,7 +57,7 @@ public void TestExtractResourceAttributesWithEmptyContainerId()
     {
         var clusterName = "Test cluster name";
 
-        var resourceAttributes = AWSEKSResourceDetector.ExtractResourceAttributes(clusterName, string.Empty).ToDictionary(x => x.Key, x => x.Value);
+        var resourceAttributes = AWSEKSDetector.ExtractResourceAttributes(clusterName, string.Empty).ToDictionary(x => x.Key, x => x.Value);
 
         // Validate the count of resourceAttributes -> Excluding container id, there will be only three resourceAttributes
         Assert.Equal(3, resourceAttributes.Count);
@@ -69,7 +69,7 @@ public void TestExtractResourceAttributesWithEmptyContainerId()
     [Fact]
     public void TestGetEKSCredentials()
     {
-        var eksCredentials = AWSEKSResourceDetector.GetEKSCredentials(AWSEKSCredentialsPath);
+        var eksCredentials = AWSEKSDetector.GetEKSCredentials(AWSEKSCredentialsPath);
 
         Assert.Equal("Bearer Test AWS EKS Token", eksCredentials);
     }
@@ -77,7 +77,7 @@ public void TestGetEKSCredentials()
     [Fact]
     public void TestGetEKSContainerId()
     {
-        var eksContainerId = AWSEKSResourceDetector.GetEKSContainerId(AWSEKSMetadataFilePath);
+        var eksContainerId = AWSEKSDetector.GetEKSContainerId(AWSEKSMetadataFilePath);
 
         Assert.Equal("a4d00c9dd675d67f866c786181419e1b44832d4696780152e61afd44a3e02856", eksContainerId);
     }
@@ -87,7 +87,7 @@ public void TestDeserializeResponse()
     {
         var awsEKSClusterInformation = "{\"kind\": \"ConfigMap\", \"apiVersion\": \"v1\", \"metadata\": {\"name\": \"cluster-info\", \"namespace\": \"amazon-cloudwatch\", \"selfLink\": \"/api/v1/namespaces/amazon-cloudwatch/configmaps/cluster-info\", \"uid\": \"0734438c-48f4-45c3-b06d-b6f16f7f0e1e\", \"resourceVersion\": \"25911\", \"creationTimestamp\": \"2021-07-23T18:41:56Z\", \"annotations\": {\"kubectl.kubernetes.io/last-applied-configuration\": \"{\\\"apiVersion\\\":\\\"v1\\\",\\\"data\\\":{\\\"cluster.name\\\":\\\"Test\\\",\\\"logs.region\\\":\\\"us-west-2\\\"},\\\"kind\\\":\\\"ConfigMap\\\",\\\"metadata\\\":{\\\"annotations\\\":{},\\\"name\\\":\\\"cluster-info\\\",\\\"namespace\\\":\\\"amazon-cloudwatch\\\"}}\\n\"}}, \"data\": {\"cluster.name\": \"Test\", \"logs.region\": \"us-west-2\"}}";
 
-        var eksClusterInformation = AWSEKSResourceDetector.DeserializeResponse(awsEKSClusterInformation);
+        var eksClusterInformation = AWSEKSDetector.DeserializeResponse(awsEKSClusterInformation);
 
         Assert.NotNull(eksClusterInformation);
         Assert.NotNull(eksClusterInformation.Data);

From e9eb3fe0f7b51aa6da8abf51b0059aeaa04a6b04 Mon Sep 17 00:00:00 2001
From: joegoldman2 <147369450+joegoldman@users.noreply.github.com>
Date: Mon, 27 May 2024 06:16:07 +0000
Subject: [PATCH 4/6] Fix codecov badge

---
 src/OpenTelemetry.Resources.AWS/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenTelemetry.Resources.AWS/README.md b/src/OpenTelemetry.Resources.AWS/README.md
index bcf098e587..0be07390c8 100644
--- a/src/OpenTelemetry.Resources.AWS/README.md
+++ b/src/OpenTelemetry.Resources.AWS/README.md
@@ -2,7 +2,7 @@
 
 [![NuGet version badge](https://img.shields.io/nuget/v/OpenTelemetry.Resources.AWS)](https://www.nuget.org/packages/OpenTelemetry.Resources.AWS)
 [![NuGet download count badge](https://img.shields.io/nuget/dt/OpenTelemetry.Resources.AWS)](https://www.nuget.org/packages/OpenTelemetry.Resources.AWS)
-[![codecov.io](https://codecov.io/gh/open-telemetry/opentelemetry-dotnet-contrib/branch/main/graphs/badge.svg?flag=unittests-ResourceDetectors.AWS)](https://app.codecov.io/gh/open-telemetry/opentelemetry-dotnet-contrib?flags[0]=unittests-ResourceDetectors.AWS)
+[![codecov.io](https://codecov.io/gh/open-telemetry/opentelemetry-dotnet-contrib/branch/main/graphs/badge.svg?flag=unittests-Resources.AWS)](https://app.codecov.io/gh/open-telemetry/opentelemetry-dotnet-contrib?flags[0]=unittests-Resources.AWS)
 
 ## Getting Started
 

From 18bffa9a40a4d3bc093b9ca2ff199fc4de689bf6 Mon Sep 17 00:00:00 2001
From: joegoldman2 <147369450+joegoldman@users.noreply.github.com>
Date: Wed, 29 May 2024 16:56:24 +0000
Subject: [PATCH 5/6] Rename EventSource

---
 src/OpenTelemetry.Resources.AWS/AWSResourcesEventSource.cs | 2 +-
 src/OpenTelemetry.Resources.AWS/CHANGELOG.md               | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/OpenTelemetry.Resources.AWS/AWSResourcesEventSource.cs b/src/OpenTelemetry.Resources.AWS/AWSResourcesEventSource.cs
index b3d4ebb864..b352ab5515 100644
--- a/src/OpenTelemetry.Resources.AWS/AWSResourcesEventSource.cs
+++ b/src/OpenTelemetry.Resources.AWS/AWSResourcesEventSource.cs
@@ -7,7 +7,7 @@
 
 namespace OpenTelemetry.Resources.AWS;
 
-[EventSource(Name = "OpenTelemetry-ResourceDetectors-AWS")]
+[EventSource(Name = "OpenTelemetry-Resources-AWS")]
 internal sealed class AWSResourcesEventSource : EventSource, IServerCertificateValidationEventSource
 {
     public static AWSResourcesEventSource Log = new();
diff --git a/src/OpenTelemetry.Resources.AWS/CHANGELOG.md b/src/OpenTelemetry.Resources.AWS/CHANGELOG.md
index 94646587b5..d30c3180b4 100644
--- a/src/OpenTelemetry.Resources.AWS/CHANGELOG.md
+++ b/src/OpenTelemetry.Resources.AWS/CHANGELOG.md
@@ -18,6 +18,10 @@ use `ResourceBuilder` extension methods `AddAWSEBSDetector`,
 `AddAWSEC2Detector`, `AddAWSECSDetector`
 and `AddAWSEKSDetector` respectively to enable the detectors.
   ([#1839](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1839))
+* **Breaking Change**: Renamed EventSource
+from `OpenTelemetry-ResourceDetectors-AWS`
+to `OpenTelemetry-Resources-AWS`.
+  ([#1839](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1839))
 
 ## 1.4.0-beta.1
 

From a557ce190cc60d7bf015f0a6c7e98b48f5c72545 Mon Sep 17 00:00:00 2001
From: joegoldman2 <147369450+joegoldman@users.noreply.github.com>
Date: Wed, 29 May 2024 16:58:18 +0000
Subject: [PATCH 6/6] Update CHANGELOG

---
 src/OpenTelemetry.Resources.AWS/CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/OpenTelemetry.Resources.AWS/CHANGELOG.md b/src/OpenTelemetry.Resources.AWS/CHANGELOG.md
index d30c3180b4..32a9d6e0d5 100644
--- a/src/OpenTelemetry.Resources.AWS/CHANGELOG.md
+++ b/src/OpenTelemetry.Resources.AWS/CHANGELOG.md
@@ -12,8 +12,8 @@
 * **Breaking Change**: Renamed package from `OpenTelemetry.ResourceDetectors.AWS`
   to `OpenTelemetry.Resources.AWS`.
   ([#1839](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1839))
-* **Breaking Change**: `AWSEBSDetector`, `AWSEC2Detector`,
-`AWSECSDetector` and `AWSEKSDetector` types are now internal,
+* **Breaking Change**: `AWSEBSResourceDetector`, `AWSEC2ResourceDetector`,
+`AWSECSResourceDetector` and `AWSEKSResourceDetector` types are now internal,
 use `ResourceBuilder` extension methods `AddAWSEBSDetector`,
 `AddAWSEC2Detector`, `AddAWSECSDetector`
 and `AddAWSEKSDetector` respectively to enable the detectors.