normalize detector names

Author: matt-hensley

src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSEBSDetectorInitializer.cs

@@ -10,7 +10,7 @@ namespace Grafana.OpenTelemetry
 {
     internal class AWSEBSDetectorInitializer : ResourceDetectorInitializer
     {
-        public override ResourceDetector Id { get; } = ResourceDetector.AWSEBSDetector;
+        public override ResourceDetector Id { get; } = ResourceDetector.AWSEBS;
 
         protected override ResourceBuilder InitializeResourceDetector(ResourceBuilder builder)
         {

src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSEC2DetectorInitializer.cs

@@ -10,7 +10,7 @@ namespace Grafana.OpenTelemetry
 {
     internal class AWSEC2DetectorInitializer : ResourceDetectorInitializer
     {
-        public override ResourceDetector Id { get; } = ResourceDetector.AWSEC2Detector;
+        public override ResourceDetector Id { get; } = ResourceDetector.AWSEC2;
 
         protected override ResourceBuilder InitializeResourceDetector(ResourceBuilder builder)
         {

src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSECSDetectorInitializer.cs

@@ -10,7 +10,7 @@ namespace Grafana.OpenTelemetry
 {
     internal class AWSECSDetectorInitializer : ResourceDetectorInitializer
     {
-        public override ResourceDetector Id { get; } = ResourceDetector.AWSECSDetector;
+        public override ResourceDetector Id { get; } = ResourceDetector.AWSECS;
 
         protected override ResourceBuilder InitializeResourceDetector(ResourceBuilder builder)
         {

src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSEKSDetectorInitializer.cs

@@ -10,7 +10,7 @@ namespace Grafana.OpenTelemetry
 {
     internal class AWSEKSDetectorInitializer : ResourceDetectorInitializer
     {
-        public override ResourceDetector Id { get; } = ResourceDetector.AWSEKSDetector;
+        public override ResourceDetector Id { get; } = ResourceDetector.AWSEKS;
 
         protected override ResourceBuilder InitializeResourceDetector(ResourceBuilder builder)
         {

src/Grafana.OpenTelemetry.Base/ResourceDetectors/AzureAppServiceDetectorInitializer.cs

@@ -9,7 +9,7 @@ namespace Grafana.OpenTelemetry
 {
     internal class AzureAppServiceDetectorInitializer : ResourceDetectorInitializer
     {
-        public override ResourceDetector Id { get; } = ResourceDetector.AzureAppServiceDetector;
+        public override ResourceDetector Id { get; } = ResourceDetector.AzureAppService;
 
         protected override ResourceBuilder InitializeResourceDetector(ResourceBuilder builder)
         {

src/Grafana.OpenTelemetry.Base/ResourceDetectors/AzureContainerAppsDetectorInitializer.cs

@@ -9,7 +9,7 @@ namespace Grafana.OpenTelemetry
 {
     internal class AzureContainerAppsDetectorInitializer : ResourceDetectorInitializer
     {
-        public override ResourceDetector Id { get; } = ResourceDetector.AzureContainerAppsDetector;
+        public override ResourceDetector Id { get; } = ResourceDetector.AzureContainerApps;
 
         protected override ResourceBuilder InitializeResourceDetector(ResourceBuilder builder)
         {

src/Grafana.OpenTelemetry.Base/ResourceDetectors/AzureVMDetectorInitializer.cs

@@ -9,7 +9,7 @@ namespace Grafana.OpenTelemetry
 {
     internal class AzureVMDetectorInitializer : ResourceDetectorInitializer
     {
-        public override ResourceDetector Id { get; } = ResourceDetector.AzureVMDetector;
+        public override ResourceDetector Id { get; } = ResourceDetector.AzureVM;
 
         protected override ResourceBuilder InitializeResourceDetector(ResourceBuilder builder)
         {

src/Grafana.OpenTelemetry.Base/ResourceDetectors/ResourceDetector.cs

@@ -13,32 +13,32 @@ public enum ResourceDetector
         /// <summary>
         /// AWS EBS Resource Detector (OpenTelemetry.ResourceDetectors.AWS)
         /// </summary>
-        AWSEBSDetector,
+        AWSEBS,
         /// <summary>
         /// AWS EC2 Resource Detector (OpenTelemetry.ResourceDetectors.AWS)
         /// </summary>
-        AWSEC2Detector,
+        AWSEC2,
         /// <summary>
         /// AWS ECS Resource Detector (OpenTelemetry.ResourceDetectors.AWS)
         /// </summary>
-        AWSECSDetector,
+        AWSECS,
         /// <summary>
         /// AWS EKS Resource Detector (OpenTelemetry.ResourceDetectors.AWS)
         /// </summary>
-        AWSEKSDetector,
+        AWSEKS,
 
         /// <summary>
         /// Azure App Service Resource Detector (OpenTelemetry.ResourceDetectors.Azure)
         /// </summary>
-        AzureAppServiceDetector,
+        AzureAppService,
         /// <summary>
         /// Azure Virtual Machine Resource Detector (OpenTelemetry.ResourceDetectors.Azure)
         /// </summary>
-        AzureVMDetector,
+        AzureVM,
         /// <summary>
         /// Azure Container Apps Resource Detector (OpenTelemetry.ResourceDetectors.Azure)
         /// </summary>
-        AzureContainerAppsDetector,
+        AzureContainerApps,
 
         /// <summary>
         /// Container Resource Detector (OpenTelemetry.ResourceDetectors.Container)

tests/Grafana.OpenTelemetry.Tests/ResourceDetectorTest.cs

@@ -17,12 +17,12 @@ public void EnumMatchesInitializers()
         {
             var expected = new HashSet<ResourceDetector>((ResourceDetector[])Enum.GetValues(typeof(ResourceDetector)));
 #if NETSTANDARD
-            expected.Remove(ResourceDetector.AWSEBSDetector);
-            expected.Remove(ResourceDetector.AWSEC2Detector);
+            expected.Remove(ResourceDetector.AWSEBS);
+            expected.Remove(ResourceDetector.AWSEC2);
 #endif
 #if NETSTANDARD || NETFRAMEWORK
-            expected.Remove(ResourceDetector.AWSECSDetector);
-            expected.Remove(ResourceDetector.AWSEKSDetector);
+            expected.Remove(ResourceDetector.AWSECS);
+            expected.Remove(ResourceDetector.AWSEKS);
 #endif
 #if !NET6_0_OR_GREATER
             expected.Remove(ResourceDetector.Container);