Skip to content

Commit 0549525

Browse files
committed
Improve user agent string construction in Marshaller.cs
Added a `using System.Diagnostics;` directive. Introduced a `retryMode` variable and added a `Debug.Assert` to ensure its correctness. Updated user agent string logic to use `retryMode` and `requestContext.IsAsync`. Changed initialization collections flag to `AWSConfigs.InitializeCollections`.
1 parent 1f0d477 commit 0549525

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

sdk/src/Core/Amazon.Runtime/Pipeline/Handlers/Marshaller.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
using System;
1717
using System.Collections.Generic;
18+
using System.Diagnostics;
1819
using System.Globalization;
1920
using System.Text;
2021
using Amazon.Util;
@@ -114,11 +115,13 @@ private static void SetUserAgentHeader(IRequestContext requestContext)
114115
if (!string.IsNullOrEmpty(clientAppId))
115116
sb.Append(" app/").Append(InternalSDKUtils.ReplaceInvalidUserAgentCharacters(clientAppId));
116117

117-
sb.Append(" cfg/retry-mode#}").Append(ToUserAgentHeaderString(requestContext.ClientConfig.RetryMode));
118+
var retryMode = ToUserAgentHeaderString(requestContext.ClientConfig.RetryMode);
119+
Debug.Assert(retryMode != requestContext.ClientConfig.RetryMode.ToString().ToLower(), "Invalid RetryMode string.");
120+
sb.Append(" cfg/retry-mode#}").Append(retryMode);
118121

119-
sb.Append(" md/").Append(IsAsync ? "ClientAsync" : "ClientSync");
122+
sb.Append(" md/").Append(requestContext.IsAsync ? "ClientAsync" : "ClientSync");
120123

121-
sb.Append(" cfg/init-coll#").Append(InitializeCollections ? '1' : '0');
124+
sb.Append(" cfg/init-coll#").Append(AWSConfigs.InitializeCollections ? '1' : '0');
122125

123126
var userAgentAddition = requestContext.OriginalRequest.UserAgentAddition;
124127
if (!string.IsNullOrEmpty(userAgentAddition))

0 commit comments

Comments
 (0)