remove empty classes, use dictionary instead of list of tuple

Author: ysolomchenko

src/OpenTelemetry.AutoInstrumentation/Configurations/FileBasedConfiguration/AlwaysOffSamplerConfig.cs

@@ -6,21 +6,17 @@
 
 namespace OpenTelemetry.AutoInstrumentation.Configurations.FileBasedConfiguration;
 
-[EmptyObjectOnEmptyYaml]
 internal class SamplerConfig
 {
     [YamlMember(Alias = "always_on")]
-    public AlwaysOnSamplerConfig? AlwaysOn { get; set; }
+    public object? AlwaysOn { get; set; }
 
     [YamlMember(Alias = "always_off")]
-    public AlwaysOffSamplerConfig? AlwaysOff { get; set; }
+    public object? AlwaysOff { get; set; }
 
     [YamlMember(Alias = "trace_id_ratio")]
     public TraceIdRatioSamplerConfig? TraceIdRatio { get; set; }
 
-    [YamlMember(Alias = "traceidratio")]
-    public TraceIdRatioSamplerConfig? TraceIdRatioLegacy { get; set; }
-
     [YamlMember(Alias = "parent_based")]
     public ParentBasedSamplerConfig? ParentBased { get; set; }
 }

src/OpenTelemetry.AutoInstrumentation/Configurations/FileBasedConfiguration/AlwaysOnSamplerConfig.cs

@@ -1,9 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using OpenTelemetry.AutoInstrumentation.Logging;
 using OpenTelemetry.Trace;
 
@@ -33,31 +30,26 @@ internal static class SamplerFactory
             return null;
         }
 
-        var configuredSamplers = new List<(string key, Sampler? sampler)>();
+        var configuredSamplers = new Dictionary<string, Sampler?>();
 
         if (samplerConfig.AlwaysOn != null)
         {
-            configuredSamplers.Add(("always_on", new AlwaysOnSampler()));
+            configuredSamplers.Add("always_on", new AlwaysOnSampler());
         }
 
         if (samplerConfig.AlwaysOff != null)
         {
-            configuredSamplers.Add(("always_off", new AlwaysOffSampler()));
+            configuredSamplers.Add("always_off", new AlwaysOffSampler());
         }
 
         if (samplerConfig.TraceIdRatio != null)
         {
-            configuredSamplers.Add(("trace_id_ratio", CreateTraceIdRatioSampler(samplerConfig.TraceIdRatio, failFast, path + ".trace_id_ratio")));
-        }
-
-        if (samplerConfig.TraceIdRatioLegacy != null)
-        {
-            configuredSamplers.Add(("traceidratio", CreateTraceIdRatioSampler(samplerConfig.TraceIdRatioLegacy, failFast, path + ".traceidratio")));
+            configuredSamplers.Add("trace_id_ratio", CreateTraceIdRatioSampler(samplerConfig.TraceIdRatio, failFast, path + ".trace_id_ratio"));
         }
 
         if (samplerConfig.ParentBased != null)
         {
-            configuredSamplers.Add(("parent_based", CreateParentBasedSampler(samplerConfig.ParentBased, failFast, path + ".parent_based")));
+            configuredSamplers.Add("parent_based", CreateParentBasedSampler(samplerConfig.ParentBased, failFast, path + ".parent_based"));
         }
 
         if (configuredSamplers.Count == 0)
@@ -75,7 +67,7 @@ internal static class SamplerFactory
 
         if (configuredSamplers.Count > 1)
         {
-            var configuredNames = string.Join(", ", configuredSamplers.Select(s => s.key));
+            var configuredNames = string.Join(", ", configuredSamplers.Keys);
             var message = $"Sampler configuration '{path}' specifies multiple sampler types ({configuredNames}). Only one sampler can be configured.";
             Logger.Error(message);
 
@@ -87,7 +79,7 @@ internal static class SamplerFactory
             return null;
         }
 
-        var configuredSampler = configuredSamplers[0].sampler;
+        var configuredSampler = configuredSamplers.Values.First();
         if (configuredSampler == null)
         {
             var message = $"Sampler configuration '{path}' is invalid.";

src/OpenTelemetry.AutoInstrumentation/Configurations/FileBasedConfiguration/SamplerConfig.cs

@@ -351,28 +351,18 @@ public void LoadMethod_SkipWrongExporterConfiguration(SkipConfigurationTestCase
         Assert.Empty(settings.TracesExporters);
     }
 
-    public class SkipConfigurationTestCase
-    {
-        internal SkipConfigurationTestCase(YamlConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        internal YamlConfiguration Configuration { get; }
-    }
-
     [Fact]
     public void LoadFile_ConfiguresParentBasedSampler()
     {
         var samplerConfig = new SamplerConfig
         {
             ParentBased = new ParentBasedSamplerConfig
             {
-                Root = new SamplerConfig { AlwaysOn = new AlwaysOnSamplerConfig() },
-                RemoteParentSampled = new SamplerConfig { AlwaysOn = new AlwaysOnSamplerConfig() },
-                RemoteParentNotSampled = new SamplerConfig { AlwaysOff = new AlwaysOffSamplerConfig() },
-                LocalParentSampled = new SamplerConfig { AlwaysOn = new AlwaysOnSamplerConfig() },
-                LocalParentNotSampled = new SamplerConfig { AlwaysOff = new AlwaysOffSamplerConfig() }
+                Root = new SamplerConfig { AlwaysOn = new object() },
+                RemoteParentSampled = new SamplerConfig { AlwaysOn = new object() },
+                RemoteParentNotSampled = new SamplerConfig { AlwaysOff = new object() },
+                LocalParentSampled = new SamplerConfig { AlwaysOn = new object() },
+                LocalParentNotSampled = new SamplerConfig { AlwaysOff = new object() }
             }
         };
 
@@ -407,6 +397,16 @@ public void LoadFile_ConfiguresParentBasedSampler()
 
     private static SamplingParameters CreateSamplingParameters(ActivityContext parentContext)
     {
-        return new SamplingParameters(parentContext, ActivityTraceId.CreateRandom(), "span", ActivityKind.Internal, new TagList(), new ActivityLink[] { });
+        return new SamplingParameters(parentContext, ActivityTraceId.CreateRandom(), "span", ActivityKind.Internal, default(TagList), new ActivityLink[] { });
+    }
+
+    public class SkipConfigurationTestCase
+    {
+        internal SkipConfigurationTestCase(YamlConfiguration configuration)
+        {
+            Configuration = configuration;
+        }
+
+        internal YamlConfiguration Configuration { get; }
     }
 }