[Parser] Default Naming Convention for Development (#4676)

Author: ysolomchenko

src/OpenTelemetry.AutoInstrumentation/Configurations/FileBasedConfiguration/Parser/EnvVarTypeConverter.cs

@@ -15,11 +15,13 @@ internal partial class EnvVarTypeConverter : IYamlTypeConverter
     [
         typeof(string),
         typeof(int),
+        typeof(uint),
         typeof(long),
         typeof(float),
         typeof(double),
         typeof(bool),
         typeof(int?),
+        typeof(uint?),
         typeof(object),
     ];
 
@@ -54,11 +56,13 @@ public bool Accepts(Type type)
             {
                 Type t when t == typeof(string) => replacedValue,
                 Type t when t == typeof(int) => int.Parse(replacedValue),
+                Type t when t == typeof(uint) => uint.Parse(replacedValue),
                 Type t when t == typeof(long) => long.Parse(replacedValue),
                 Type t when t == typeof(float) => float.Parse(replacedValue, CultureInfo.InvariantCulture),
                 Type t when t == typeof(double) => double.Parse(replacedValue, CultureInfo.InvariantCulture),
                 Type t when t == typeof(bool) => bool.Parse(replacedValue),
                 Type t when t == typeof(int?) => int.Parse(replacedValue),
+                Type t when t == typeof(uint?) => uint.Parse(replacedValue),
                 Type t when t == typeof(object) => replacedValue,
                 _ => throw new NotSupportedException($"Type {type.FullName} is not supported by the converter")
             };

src/OpenTelemetry.AutoInstrumentation/Configurations/FileBasedConfiguration/Parser/OtelDefaultNamingConvention.cs

@@ -0,0 +1,35 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+using Vendors.YamlDotNet.Serialization;
+using Vendors.YamlDotNet.Serialization.Utilities;
+
+namespace OpenTelemetry.AutoInstrumentation.Configurations.FileBasedConfiguration.Parser;
+
+internal sealed class OtelDefaultNamingConvention : INamingConvention
+{
+    public static readonly INamingConvention Instance = new OtelDefaultNamingConvention();
+
+    private OtelDefaultNamingConvention()
+    {
+    }
+
+    public string Apply(string value)
+    {
+        // If the string ends with "Development", replace the ending with "/development"
+        const string target = "Development";
+        if (value.EndsWith(target, StringComparison.Ordinal) && value.Length > target.Length)
+        {
+            var prefix = value.Substring(0, value.Length - target.Length);
+            value = prefix + "/development";
+        }
+
+        return value.FromCamelCase("_");
+    }
+
+    public string Reverse(string value)
+    {
+        var result = value.ToPascalCase();
+        return result;
+    }
+}

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

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using Vendors.YamlDotNet.Serialization;
-using Vendors.YamlDotNet.Serialization.NamingConventions;
 using Vendors.YamlDotNet.Serialization.NodeDeserializers;
 
 namespace OpenTelemetry.AutoInstrumentation.Configurations.FileBasedConfiguration.Parser;
@@ -14,7 +13,7 @@ public static T ParseYaml<T>(string filePath)
         var deserializer = new DeserializerBuilder()
             .WithNodeDeserializer(existing => new ConditionalDeserializer(existing), s => s.InsteadOf<NullNodeDeserializer>())
             .WithTypeConverter(new EnvVarTypeConverter())
-            .WithNamingConvention(UnderscoredNamingConvention.Instance)
+            .WithNamingConvention(OtelDefaultNamingConvention.Instance)
             .IgnoreUnmatchedProperties()
             .Build();
 

test/OpenTelemetry.AutoInstrumentation.Tests/Configurations/FileBased/Files/DefaultNamingConvention.yaml

@@ -0,0 +1,2 @@
+under_score: true
+under_score/development: true

test/OpenTelemetry.AutoInstrumentation.Tests/Configurations/FileBased/Files/TestGeneralFile.yaml

@@ -2,4 +2,3 @@ file_format: "1.0-rc.1"
 disabled: false
 fail_fast: false
 flush_on_unhandled_exception: false
-

test/OpenTelemetry.AutoInstrumentation.Tests/Configurations/FileBased/Parser/DefaultNamingConventionTests.cs

@@ -0,0 +1,26 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+using Xunit;
+using YamlParser = OpenTelemetry.AutoInstrumentation.Configurations.FileBasedConfiguration.Parser.Parser;
+
+namespace OpenTelemetry.AutoInstrumentation.Tests.Configurations.FileBased.Parser;
+
+public class DefaultNamingConventionTests
+{
+    [Fact]
+    public void Test_UnderScore()
+    {
+        var config = YamlParser.ParseYaml<DefaultNamingConvention>("Configurations/FileBased/Files/DefaultNamingConvention.yaml");
+
+        Assert.True(config.UnderScore);
+        Assert.True(config.UnderScoreDevelopment);
+    }
+
+    public class DefaultNamingConvention
+    {
+        public bool UnderScore { get; set; } = false;
+
+        public bool UnderScoreDevelopment { get; set; } = false;
+    }
+}

test/OpenTelemetry.AutoInstrumentation.Tests/OpenTelemetry.AutoInstrumentation.Tests.csproj

@@ -67,6 +67,9 @@
     <None Update="Configurations\FileBased\Files\TestResourceFileEnvVars.yaml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="Configurations\FileBased\Files\DefaultNamingConvention.yaml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>