Answer to comments

rerere

Author: anna-git

tracer/src/Datadog.Trace.SourceGenerators/Configuration/ConfigKeyAliasesSwitcherGenerator.cs

@@ -248,52 +248,43 @@ private static CompilationUnitSyntax GenerateConfigurationKeyMatcher(Configurati
 
     private static MethodDeclarationSyntax GenerateGetAliasesMethod(ConfigurationAliases configurationAliases)
     {
-        var switchSections = new List<SwitchSectionSyntax>();
+        var switchArms = new List<SwitchExpressionArmSyntax>();
 
         // Add cases for keys that have aliases
         foreach (var alias in configurationAliases.Aliases.OrderBy(a => a.Key))
         {
             var mainKey = alias.Key;
             var aliasKeys = alias.Value;
 
-            var arrayElements = aliasKeys
-                               .OrderBy(a => a)
-                               .Select(aliasKey => LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(aliasKey)))
-                               .Cast<ExpressionSyntax>()
-                               .ToArray();
-
-            var arrayCreation = ArrayCreationExpression(
-                    ArrayType(PredefinedType(Token(SyntaxKind.StringKeyword)))
-                       .WithRankSpecifiers(SingletonList(ArrayRankSpecifier(SingletonSeparatedList<ExpressionSyntax>(OmittedArraySizeExpression())))))
-               .WithInitializer(InitializerExpression(SyntaxKind.ArrayInitializerExpression, SeparatedList(arrayElements)));
-
-            var switchSection = SwitchSection()
-                               .WithLabels(
-                                    SingletonList<SwitchLabelSyntax>(
-                                        CaseSwitchLabel(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(mainKey)))))
-                               .WithStatements(SingletonList<StatementSyntax>(ReturnStatement(arrayCreation)));
-            switchSections.Add(switchSection);
+            // Create collection expression elements
+            var collectionElements = aliasKeys
+                                    .OrderBy(a => a)
+                                    .Select(aliasKey => ExpressionElement(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(aliasKey))))
+                                    .Cast<CollectionElementSyntax>()
+                                    .ToArray();
+
+            // Create collection expression [ "alias1", "alias2" ]
+            var collectionExpression = CollectionExpression(SeparatedList(collectionElements));
+
+            // Create switch arm: "DD_AGENT_HOST" => [ "alias1", "alias2" ],
+            var switchArm = SwitchExpressionArm(
+                ConstantPattern(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(mainKey))),
+                collectionExpression);
+
+            switchArms.Add(switchArm);
         }
 
-        // Add default case
-        var defaultSection = SwitchSection()
-                            .WithLabels(SingletonList<SwitchLabelSyntax>(DefaultSwitchLabel()))
-                            .WithStatements(
-                                 SingletonList<StatementSyntax>(
-                                     ReturnStatement(
-                                         InvocationExpression(
-                                             MemberAccessExpression(
-                                                 SyntaxKind.SimpleMemberAccessExpression,
-                                                 IdentifierName("Array"),
-                                                 GenericName("Empty")
-                                                    .WithTypeArgumentList(
-                                                         TypeArgumentList(
-                                                             SingletonSeparatedList<TypeSyntax>(
-                                                                 PredefinedType(Token(SyntaxKind.StringKeyword))))))))));
-        switchSections.Add(defaultSection);
-
-        var switchStatement = SwitchStatement(IdentifierName(MainKeyParamName))
-           .WithSections(List(switchSections));
+        // Add default case: _ => []
+        var defaultArm = SwitchExpressionArm(
+            DiscardPattern(),
+            CollectionExpression());
+
+        switchArms.Add(defaultArm);
+
+        // Create switch expression: mainKey switch { ... }
+        var switchExpression = SwitchExpression(
+            IdentifierName(MainKeyParamName),
+            SeparatedList(switchArms));
 
         return MethodDeclaration(
                    ArrayType(PredefinedType(Token(SyntaxKind.StringKeyword)))
@@ -311,7 +302,8 @@ private static MethodDeclarationSyntax GenerateGetAliasesMethod(ConfigurationAli
                    Comment("/// </summary>"),
                    Comment($"/// <param name=\"{MainKeyParamName}\">The configuration key.</param>"),
                    Comment("/// <returns>An array of aliases for the key, or empty array if no aliases exist.</returns>"))
-              .WithBody(Block(switchStatement));
+              .WithExpressionBody(ArrowExpressionClause(switchExpression))
+              .WithSemicolonToken(Token(SyntaxKind.SemicolonToken));
     }
 
     private sealed class ConfigurationAliases(Dictionary<string, string[]> aliases) : IEquatable<ConfigurationAliases>

tracer/src/Datadog.Trace/Configuration/ConfigurationSources/Telemetry/ConfigurationBuilder.cs

@@ -468,61 +468,46 @@ public ClassConfigurationResultWithKey<IDictionary<string, string>> AsDictionary
             => new(Telemetry, Key, recordValue: true, configurationResult: GetDictionaryResult(parser));
 
         private ConfigurationResult<string> GetStringResult(Func<string, bool>? validator, Func<string, ParsingResult<string>>? converter, bool recordValue)
-            => converter is null
-                   ? GetResult(Selectors.AsString, validator, recordValue)
-                   : GetResult(Selectors.AsStringWithConverter, validator, converter, recordValue);
+        {
+            var source = Source;
+            var telemetry = Telemetry;
+            return converter is null
+                ? GetResultWithFallback(key => source.GetString(key, telemetry, validator, recordValue))
+                : GetResultWithFallback(key => source.GetAs(key, telemetry, converter, validator, recordValue));
+        }
 
         private ConfigurationResult<bool> GetBoolResult(Func<bool, bool>? validator, Func<string, ParsingResult<bool>>? converter)
-            => converter is null
-                   ? GetResult(Selectors.AsBool, validator, recordValue: true)
-                   : GetResult(Selectors.AsBoolWithConverter, validator, converter, recordValue: true);
+        {
+            var source = Source;
+            var telemetry = Telemetry;
+            return converter is null
+                ? GetResultWithFallback(key => source.GetBool(key, telemetry, validator))
+                : GetResultWithFallback(key => source.GetAs(key, telemetry, converter, validator, recordValue: true));
+        }
 
         private ConfigurationResult<int> GetInt32Result(Func<int, bool>? validator, Func<string, ParsingResult<int>>? converter)
-            => converter is null
-                   ? GetResult(Selectors.AsInt32, validator, recordValue: true)
-                   : GetResult(Selectors.AsInt32WithConverter, validator, converter, recordValue: true);
+        {
+            var source = Source;
+            var telemetry = Telemetry;
+            return converter is null
+                ? GetResultWithFallback(key => source.GetInt32(key, telemetry, validator))
+                : GetResultWithFallback(key => source.GetAs(key, telemetry, converter, validator, recordValue: true));
+        }
 
         private ConfigurationResult<double> GetDoubleResult(Func<double, bool>? validator, Func<string, ParsingResult<double>>? converter)
-            => converter is null
-                   ? GetResult(Selectors.AsDouble, validator, recordValue: true)
-                   : GetResult(Selectors.AsDoubleWithConverter, validator, converter, recordValue: true);
-
-        private ConfigurationResult<T> GetAs<T>(Func<T, bool>? validator, Func<string, ParsingResult<T>> converter)
-            => GetResult(
-                (source, key, telemetry, val, convert, recordValue) => source.GetAs(key, telemetry, convert!, val, recordValue),
-                validator,
-                converter,
-                recordValue: true);
-
-        /// <summary>
-        /// Gets the raw <see cref="ConfigurationResult{T}"/> from the configuration source, recording the access in telemetry
-        /// </summary>
-        /// <param name="selector">The method to invoke to retrieve the parameter</param>
-        /// <param name="validator">The validator to call to decide if a provided value is valid</param>
-        /// <param name="recordValue">If applicable, whether to record the value in configuration</param>
-        /// <typeparam name="T">The type being retrieved</typeparam>
-        /// <returns>The raw <see cref="ConfigurationResult{T}"/></returns>
-        private ConfigurationResult<T> GetResult<T>(Func<IConfigurationSource, string, IConfigurationTelemetry, Func<T, bool>?, bool, ConfigurationResult<T>> selector, Func<T, bool>? validator, bool recordValue)
         {
             var source = Source;
             var telemetry = Telemetry;
-            return GetResultWithFallback(key => selector(source, key, telemetry, validator, recordValue));
+            return converter is null
+                ? GetResultWithFallback(key => source.GetDouble(key, telemetry, validator))
+                : GetResultWithFallback(key => source.GetAs(key, telemetry, converter, validator, recordValue: true));
         }
 
-        /// <summary>
-        /// Gets the raw <see cref="ConfigurationResult{T}"/> from the configuration source, recording the access in telemetry
-        /// </summary>
-        /// <param name="selector">The method to invoke to retrieve the parameter</param>
-        /// <param name="validator">The validator to call to decide if a provided value is valid</param>
-        /// <param name="converter">The converter to run when calling <see cref="IConfigurationSource.GetAs{T}"/></param>
-        /// <param name="recordValue">If applicable, whether to record the value in configuration</param>
-        /// <typeparam name="T">The type being retrieved</typeparam>
-        /// <returns>The raw <see cref="ConfigurationResult{T}"/></returns>
-        private ConfigurationResult<T> GetResult<T>(Func<IConfigurationSource, string, IConfigurationTelemetry, Func<T, bool>?, Func<string, ParsingResult<T>>, bool, ConfigurationResult<T>> selector, Func<T, bool>? validator, Func<string, ParsingResult<T>> converter, bool recordValue)
+        private ConfigurationResult<T> GetAs<T>(Func<T, bool>? validator, Func<string, ParsingResult<T>> converter)
         {
             var source = Source;
             var telemetry = Telemetry;
-            return GetResultWithFallback(key => selector(source, key, telemetry, validator, converter, recordValue));
+            return GetResultWithFallback(key => source.GetAs(key, telemetry, converter, validator, recordValue: true));
         }
 
         private ConfigurationResult<IDictionary<string, string>> GetDictionaryResult(bool allowOptionalMappings, char separator)
@@ -553,7 +538,7 @@ private ConfigurationResult<T> GetResultWithFallback<T>(Func<string, Configurati
                 return result;
             }
 
-            string[] aliases = _providedAliases ?? ConfigKeyAliasesSwitcher.GetAliases(Key);
+            var aliases = _providedAliases ?? ConfigKeyAliasesSwitcher.GetAliases(Key);
 
             foreach (var alias in aliases)
             {
@@ -725,33 +710,4 @@ public T OverrideWith(in ClassConfigurationResultWithKey<T> otelConfig, IConfigu
             return defaultValue.Value.Result;
         }
     }
-
-    private static class Selectors
-    {
-        // static accessor functions
-        internal static readonly Func<IConfigurationSource, string, IConfigurationTelemetry, Func<string, bool>?, bool, ConfigurationResult<string>> AsString
-            = (source, key, telemetry, validator, recordValue) => source.GetString(key, telemetry, validator, recordValue);
-
-        internal static readonly Func<IConfigurationSource, string, IConfigurationTelemetry, Func<bool, bool>?, bool, ConfigurationResult<bool>> AsBool
-            = (source, key, telemetry, validator, _) => source.GetBool(key, telemetry, validator);
-
-        internal static readonly Func<IConfigurationSource, string, IConfigurationTelemetry, Func<int, bool>?, bool, ConfigurationResult<int>> AsInt32
-            = (source, key, telemetry, validator, _) => source.GetInt32(key, telemetry, validator);
-
-        internal static readonly Func<IConfigurationSource, string, IConfigurationTelemetry, Func<double, bool>?, bool, ConfigurationResult<double>> AsDouble
-            = (source, key, telemetry, validator, _) => source.GetDouble(key, telemetry, validator);
-
-        // static accessor functions with converters
-        internal static readonly Func<IConfigurationSource, string, IConfigurationTelemetry, Func<string, bool>?, Func<string, ParsingResult<string>>, bool, ConfigurationResult<string>> AsStringWithConverter
-            = (source, key, telemetry, validator, converter, recordValue) => source.GetAs(key, telemetry, converter, validator, recordValue);
-
-        internal static readonly Func<IConfigurationSource, string, IConfigurationTelemetry, Func<bool, bool>?, Func<string, ParsingResult<bool>>, bool, ConfigurationResult<bool>> AsBoolWithConverter
-            = (source, key, telemetry, validator, converter, _) => source.GetAs(key, telemetry, converter, validator, recordValue: true);
-
-        internal static readonly Func<IConfigurationSource, string, IConfigurationTelemetry, Func<int, bool>?, Func<string, ParsingResult<int>>, bool, ConfigurationResult<int>> AsInt32WithConverter
-            = (source, key, telemetry, validator, converter, _) => source.GetAs(key, telemetry, converter, validator, recordValue: true);
-
-        internal static readonly Func<IConfigurationSource, string, IConfigurationTelemetry, Func<double, bool>?, Func<string, ParsingResult<double>>, bool, ConfigurationResult<double>> AsDoubleWithConverter
-            = (source, key, telemetry, validator, converter, _) => source.GetAs(key, telemetry, converter, validator, recordValue: true);
-    }
 }

tracer/src/Datadog.Trace/Configuration/MutableSettings.cs

@@ -265,7 +265,7 @@ private MutableSettings(
 
     internal IConfigurationTelemetry Telemetry { get; }
 
-    internal static ReadOnlyDictionary<string, string>? InitializeHeaderTags(ConfigurationBuilder.HasKeys key, bool headerTagsNormalizationFixEnabled)
+    internal static ReadOnlyDictionary<string, string>? InitializeHeaderTags(in ConfigurationBuilder.HasKeys key, bool headerTagsNormalizationFixEnabled)
         => InitializeHeaderTags(
             key.AsDictionaryResult(allowOptionalMappings: true),
             headerTagsNormalizationFixEnabled);
@@ -1001,10 +1001,12 @@ public static MutableSettings CreateInitialMutableSettings(
                                                .AsBool(defaultValue: true);
 
         // Filter out tags with empty keys or empty values, and trim whitespaces
-        var headerTags = InitializeHeaderTags(config.WithKeys(ConfigurationKeys.HeaderTags), headerTagsNormalizationFixEnabled) ?? ReadOnlyDictionary.Empty;
+        var headerTagsConfig = config.WithKeys(ConfigurationKeys.HeaderTags);
+        var headerTags = InitializeHeaderTags(in headerTagsConfig, headerTagsNormalizationFixEnabled) ?? ReadOnlyDictionary.Empty;
 
         // Filter out tags with empty keys or empty values, and trim whitespaces
-        var grpcTags = InitializeHeaderTags(config.WithKeys(ConfigurationKeys.GrpcTags), headerTagsNormalizationFixEnabled: true) ?? ReadOnlyDictionary.Empty;
+        var grpcTagsConfig = config.WithKeys(ConfigurationKeys.GrpcTags);
+        var grpcTags = InitializeHeaderTags(in grpcTagsConfig, headerTagsNormalizationFixEnabled: true) ?? ReadOnlyDictionary.Empty;
 
         var customSamplingRules = config.WithKeys(ConfigurationKeys.CustomSamplingRules).AsString();
 

tracer/src/Datadog.Trace/Configuration/TracerSettings.cs

@@ -1377,16 +1377,6 @@ internal static string[] TrimSplitString(string? textValues, char[] separators)
             return list.ToArray();
         }
 
-        internal bool IsErrorStatusCode(int statusCode, bool serverStatusCode)
-            => MutableSettings.IsErrorStatusCode(statusCode, serverStatusCode);
-
-        internal bool IsIntegrationEnabled(IntegrationId integration, bool defaultValue = true)
-            => MutableSettings.IsIntegrationEnabled(integration, defaultValue);
-
-        [Obsolete(DeprecationMessages.AppAnalytics)]
-        internal double? GetIntegrationAnalyticsSampleRate(IntegrationId integration, bool enabledWithGlobalSetting)
-            => MutableSettings.GetIntegrationAnalyticsSampleRate(integration, enabledWithGlobalSetting);
-
         internal string GetDefaultHttpClientExclusions()
         {
             if (IsRunningInAzureAppService)