Renaming other stuff as per comments

Author: anna-git

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

@@ -469,7 +469,7 @@ private static string KeyToConstName(string key, string[]? productNames = null,
             foreach (var productName in productNames)
             {
                 if (pascalName.Length > productName.Length &&
-                    pascalName.StartsWith(productName, StringComparison.InvariantCulture))
+                    pascalName.StartsWith(productName, StringComparison.Ordinal))
                 {
                     pascalName = pascalName.Substring(productName.Length);
                     break;

tracer/src/Datadog.Trace/Util/EnvironmentHelpers.cs

@@ -59,6 +59,7 @@ public static void SetEnvironmentVariable(string key, string? value)
 
     /// <summary>
     /// Safe wrapper around Environment.GetEnvironmentVariable
+    /// -> Don't rename unless you adapt EnvironmentGetEnvironmentVariableAnalyzer
     /// </summary>
     /// <param name="key">Name of the environment variable to fetch</param>
     /// <param name="defaultValue">Value to return in case of error</param>

tracer/src/Datadog.Trace/Util/EnvironmentHelpersNoLogging.cs

@@ -6,8 +6,8 @@
 #nullable enable
 
 using System;
+using System.Runtime.CompilerServices;
 using Datadog.Trace.ClrProfiler;
-using Datadog.Trace.ClrProfiler.ServerlessInstrumentation;
 using Datadog.Trace.Configuration;
 
 namespace Datadog.Trace.Util;
@@ -22,18 +22,18 @@ internal static bool IsServerlessEnvironment(out Exception? exceptionInReading)
         // Track the first exception encountered while reading env vars
         Exception? firstException = null;
 
-        var isServerless = TryCheckEnvVar(PlatformKeys.Aws.FunctionName, ref firstException)
-                        || (TryCheckEnvVar(PlatformKeys.AzureAppService.SiteNameKey, ref firstException)
-                         && !TryCheckEnvVar(ConfigurationKeys.AzureAppService.AzureAppServicesContextKey, ref firstException))
-                        || (TryCheckEnvVar(PlatformKeys.GcpFunction.FunctionNameKey, ref firstException)
-                         && TryCheckEnvVar(PlatformKeys.GcpFunction.FunctionTargetKey, ref firstException))
-                        || (TryCheckEnvVar(PlatformKeys.GcpFunction.DeprecatedFunctionNameKey, ref firstException)
-                         && TryCheckEnvVar(PlatformKeys.GcpFunction.DeprecatedProjectKey, ref firstException));
+        var isServerless = EnvironmentVariableExists(PlatformKeys.Aws.FunctionName, ref firstException)
+                        || (EnvironmentVariableExists(PlatformKeys.AzureAppService.SiteNameKey, ref firstException)
+                         && !EnvironmentVariableExists(ConfigurationKeys.AzureAppService.AzureAppServicesContextKey, ref firstException))
+                        || (EnvironmentVariableExists(PlatformKeys.GcpFunction.FunctionNameKey, ref firstException)
+                         && EnvironmentVariableExists(PlatformKeys.GcpFunction.FunctionTargetKey, ref firstException))
+                        || (EnvironmentVariableExists(PlatformKeys.GcpFunction.DeprecatedFunctionNameKey, ref firstException)
+                         && EnvironmentVariableExists(PlatformKeys.GcpFunction.DeprecatedProjectKey, ref firstException));
         exceptionInReading = firstException;
         return isServerless;
     }
 
-    private static bool TryCheckEnvVar(string key, ref Exception? storedException)
+    private static bool EnvironmentVariableExists(string key, ref Exception? storedException)
     {
         try
         {
@@ -63,11 +63,13 @@ public static bool IsClrProfilerAttachedSafe()
         }
     }
 
-    public static string? InjectionEnabled() => GetEnvironmentVariable(ConfigurationKeys.SsiDeployed);
+    public static string? SsiDeployedEnvVar() => GetEnvironmentVariable(ConfigurationKeys.SsiDeployed);
 
     public static string? ProgramData() => GetEnvironmentVariable(PlatformKeys.ProgramData);
 
 #pragma warning disable RS0030
+// this access is allowed here as it's controlled by analyzer EnvironmentGetEnvironmentVariableAnalyzer making sure it's using a key from ConfigurationKeys/PlatformKeys
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static string? GetEnvironmentVariable(string key) => Environment.GetEnvironmentVariable(key);
 #pragma warning restore RS0030
 }

tracer/test/Datadog.Trace.TestHelpers/PlatformHelpers/AzureAppServiceHelper.cs

@@ -9,6 +9,7 @@
 using System.Collections.Specialized;
 using System.Runtime.InteropServices;
 using Datadog.Trace.Configuration;
+using Datadog.Trace.Util;
 
 namespace Datadog.Trace.TestHelpers.PlatformHelpers;
 
@@ -18,19 +19,7 @@ public static IConfigurationSource CreateMinimalAzureAppServiceConfiguration(str
     {
         var dict = new Dictionary<string, string>
         {
-            { "WEBSITE_SITE_NAME", siteName }
-        };
-
-        return new DictionaryConfigurationSource(dict);
-    }
-
-    public static IConfigurationSource CreateMinimalAzureFunctionsConfiguration(string siteName, string functionsWorkerRuntime, string functionsExtensionVersion)
-    {
-        var dict = new Dictionary<string, string>
-        {
-            { "WEBSITE_SITE_NAME", siteName },
-            { "FUNCTIONS_WORKER_RUNTIME", "dotnet-isolated" },
-            { "FUNCTIONS_EXTENSION_VERSION", "dotnet-isolated" }
+            { PlatformKeys.AzureAppService.SiteNameKey, siteName }
         };
 
         return new DictionaryConfigurationSource(dict);
@@ -48,7 +37,7 @@ public static IConfigurationSource GetRequiredAasConfigurationValues(
         string enableCustomMetrics = null,
         bool addContextKey = true)
     {
-        var vars = Environment.GetEnvironmentVariables();
+        var vars = EnvironmentHelpers.GetEnvironmentVariables();
 
         if (vars.Contains(PlatformKeys.AzureAppService.InstanceNameKey))
         {