rewrite culture handling

Author: xingsy97

src/Microsoft.Azure.SignalR.AspNet/Middleware/NegotiateMiddleware.cs

@@ -160,7 +160,7 @@ private Task ProcessNegotiationRequest(IOwinContext owinContext, HostContext con
             // add OriginalPath and QueryString when the clients protocol is higher than 2.0, earlier ASP.NET SignalR clients does not support redirect URL with query parameters
             if (!string.IsNullOrEmpty(clientProtocol) && Version.TryParse(clientProtocol, out var version) && version >= ClientSupportQueryStringVersion)
             {
-                var clientRequestId = _connectionRequestIdProvider.GetRequestId();
+                var clientRequestId = _connectionRequestIdProvider.GetRequestId("aspnet");
                 if (clientRequestId != null)
                 {
                     // remove system preserved query strings

src/Microsoft.Azure.SignalR.Common/Auth/AuthUtility.cs

@@ -65,8 +65,8 @@ public static string GenerateAccessToken(byte[] keyBytes,
         return jwtToken.Length > MaxTokenLength ? throw new AzureSignalRAccessTokenTooLongException() : jwtToken;
     }
 
-    public static string GenerateRequestId()
+    public static string GenerateRequestId(string traceIdentifier)
     {
-        return Convert.ToBase64String(BitConverter.GetBytes(Stopwatch.GetTimestamp()));
+        return $"{traceIdentifier}-{Convert.ToBase64String(BitConverter.GetBytes(Stopwatch.GetTimestamp()))}";
     }
 }

src/Microsoft.Azure.SignalR.Common/Constants.cs

@@ -112,10 +112,6 @@ public static class QueryParameter
         public const string OriginalPath = "asrs.op";
 
         public const string ConnectionRequestId = "asrs_request_id";
-
-        public const string RequestCulture = "asrs_lang";
-
-        public const string RequestUICulture = "asrs_ui_lang";
     }
 
     public static class CustomizedPingTimer

src/Microsoft.Azure.SignalR.Common/DefaultCultureFeatureManager.cs

@@ -55,4 +55,4 @@ private record RequestCultureFeatureWithTimestamp(IRequestCultureFeature Feature
     {
     }
 }
-#endif
+#endif

src/Microsoft.Azure.SignalR.Common/Interfaces/IClientConnectionManager.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
+using System.Globalization;
 using System.Threading.Tasks;
 
 namespace Microsoft.Azure.SignalR;

src/Microsoft.Azure.SignalR.Common/Interfaces/IConnectionRequestIdProvider.cs

@@ -5,13 +5,13 @@ namespace Microsoft.Azure.SignalR;
 
 internal interface IConnectionRequestIdProvider
 {
-    string GetRequestId();
+    string GetRequestId(string traceIdentifier);
 }
 
 internal class DefaultConnectionRequestIdProvider : IConnectionRequestIdProvider
 {
-    public string GetRequestId()
+    public string GetRequestId(string traceIdentifier)
     {
-        return AuthUtility.GenerateRequestId();
+        return AuthUtility.GenerateRequestId(traceIdentifier);
     }
 }

src/Microsoft.Azure.SignalR.Common/Interfaces/ICultureFeatureManager.cs

@@ -15,4 +15,4 @@ internal interface ICultureFeatureManager
 
     public void Cleanup();
 }
-#endif
+#endif

src/Microsoft.Azure.SignalR.Common/Microsoft.Azure.SignalR.Common.csproj

@@ -9,7 +9,7 @@
     <TargetFrameworks>netstandard2.0;net6.0;net8.0;net462;</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Azure.SignalR.Protocols\Microsoft.Azure.SignalR.Protocols.csproj" />
   </ItemGroup>

src/Microsoft.Azure.SignalR/ClientConnections/ClientConnectionContext.cs

@@ -140,6 +140,8 @@ public bool AbortOnClose
 
     private CancellationToken OutgoingAborted => _abortOutgoingCts.Token;
 
+    public string RequestId { get; set; }
+
     public ClientConnectionContext(OpenConnectionMessage serviceMessage,
                                    Action<HttpContext> configureContext = null,
                                    PipeOptions transportPipeOptions = null,
@@ -492,22 +494,17 @@ internal void ClearBufferedMessages()
         _bufferedMessages.Clear();
     }
 
-    private static void ProcessQuery(string queryString, out string originalPath)
+    private void ProcessQuery(string queryString, out string originalPath)
     {
         originalPath = string.Empty;
         var query = QueryHelpers.ParseNullableQuery(queryString);
         if (query == null)
         {
             return;
         }
-
-        if (query.TryGetValue(Constants.QueryParameter.RequestCulture, out var culture))
-        {
-            SetCurrentThreadCulture(culture.FirstOrDefault());
-        }
-        if (query.TryGetValue(Constants.QueryParameter.RequestUICulture, out var uiCulture))
+        if (query.TryGetValue(Constants.QueryParameter.ConnectionRequestId, out var connectionRequestId))
         {
-            SetCurrentThreadUiCulture(uiCulture.FirstOrDefault());
+            RequestId = connectionRequestId;
         }
         if (query.TryGetValue(Constants.QueryParameter.OriginalPath, out var path))
         {

src/Microsoft.Azure.SignalR/DependencyInjectionExtensions.cs

@@ -100,6 +100,7 @@ private static ISignalRServerBuilder AddAzureSignalRCore(this ISignalRServerBuil
                 .AddSingleton(typeof(IServerNameProvider), typeof(DefaultServerNameProvider))
                 .AddSingleton(typeof(IBlazorDetector), typeof(DefaultBlazorDetector))
                 .AddSingleton(typeof(IConnectionFactory), typeof(ConnectionFactory))
+                .AddSingleton(typeof(ICultureFeatureManager), typeof(DefaultCultureFeatureManager))
                 .AddSingleton(typeof(ServiceHubDispatcher<>))
                 .AddSingleton(typeof(ServerLifetimeManager))
                 .AddSingleton(typeof(AzureSignalRMarkerService))