API for setting dynamic package data for the UserAgent header per HttpMessage (Azure#27079)

* API for SetUserAgentString

Author: christothes

sdk/core/Azure.Core/CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - Added `AddClassifier` methods to `RequestContext`. These methods allow callers to change the response classification behavior for a given method invocation.
 - Added type `RequestOptions` to the `Azure` namespace and made `RequestContext` a subclass of `RequestOptions`.  This enables `RequestOptions` to be exposed in methods that take `CancellationToken` without causing confusion regarding which cancellation token will take effect.
+- Added the `SetUserAgentString` extension method to `HttpMessage` accepting a `UserAgentValue` and an optional application Id string. This allows assembly specific user agent header information to be set with proper formatting on a per-message basis.
 
 ### Breaking Changes
 

sdk/core/Azure.Core/api/Azure.Core.net461.cs

@@ -891,6 +891,10 @@ public void Dispose() { }
         public override void Process(Azure.Core.HttpMessage message) { }
         public override System.Threading.Tasks.ValueTask ProcessAsync(Azure.Core.HttpMessage message) { throw null; }
     }
+    public static partial class HttpMessageExtensions
+    {
+        public static void SetUserAgentString(this Azure.Core.HttpMessage message, Azure.Core.Pipeline.UserAgentValue userAgentValue) { }
+    }
     public partial class HttpPipeline
     {
         public HttpPipeline(Azure.Core.Pipeline.HttpPipelineTransport transport, Azure.Core.Pipeline.HttpPipelinePolicy[]? policies = null, Azure.Core.ResponseClassifier? responseClassifier = null) { }
@@ -947,6 +951,12 @@ public ServerCertificateCustomValidationArgs(System.Security.Cryptography.X509Ce
         public System.Security.Cryptography.X509Certificates.X509Chain? CertificateAuthorityChain { get { throw null; } }
         public System.Net.Security.SslPolicyErrors SslPolicyErrors { get { throw null; } }
     }
+    public partial class UserAgentValue
+    {
+        public UserAgentValue(System.Type type, string? applicationId = null) { }
+        public static Azure.Core.Pipeline.UserAgentValue FromType<T>(string? applicationId = null) { throw null; }
+        public override string ToString() { throw null; }
+    }
 }
 namespace Azure.Core.Serialization
 {

sdk/core/Azure.Core/api/Azure.Core.net5.0.cs

@@ -891,6 +891,10 @@ public void Dispose() { }
         public override void Process(Azure.Core.HttpMessage message) { }
         public override System.Threading.Tasks.ValueTask ProcessAsync(Azure.Core.HttpMessage message) { throw null; }
     }
+    public static partial class HttpMessageExtensions
+    {
+        public static void SetUserAgentString(this Azure.Core.HttpMessage message, Azure.Core.Pipeline.UserAgentValue userAgentValue) { }
+    }
     public partial class HttpPipeline
     {
         public HttpPipeline(Azure.Core.Pipeline.HttpPipelineTransport transport, Azure.Core.Pipeline.HttpPipelinePolicy[]? policies = null, Azure.Core.ResponseClassifier? responseClassifier = null) { }
@@ -947,6 +951,12 @@ public ServerCertificateCustomValidationArgs(System.Security.Cryptography.X509Ce
         public System.Security.Cryptography.X509Certificates.X509Chain? CertificateAuthorityChain { get { throw null; } }
         public System.Net.Security.SslPolicyErrors SslPolicyErrors { get { throw null; } }
     }
+    public partial class UserAgentValue
+    {
+        public UserAgentValue(System.Type type, string? applicationId = null) { }
+        public static Azure.Core.Pipeline.UserAgentValue FromType<T>(string? applicationId = null) { throw null; }
+        public override string ToString() { throw null; }
+    }
 }
 namespace Azure.Core.Serialization
 {

sdk/core/Azure.Core/api/Azure.Core.netcoreapp2.1.cs

@@ -891,6 +891,10 @@ public void Dispose() { }
         public override void Process(Azure.Core.HttpMessage message) { }
         public override System.Threading.Tasks.ValueTask ProcessAsync(Azure.Core.HttpMessage message) { throw null; }
     }
+    public static partial class HttpMessageExtensions
+    {
+        public static void SetUserAgentString(this Azure.Core.HttpMessage message, Azure.Core.Pipeline.UserAgentValue userAgentValue) { }
+    }
     public partial class HttpPipeline
     {
         public HttpPipeline(Azure.Core.Pipeline.HttpPipelineTransport transport, Azure.Core.Pipeline.HttpPipelinePolicy[]? policies = null, Azure.Core.ResponseClassifier? responseClassifier = null) { }
@@ -947,6 +951,12 @@ public ServerCertificateCustomValidationArgs(System.Security.Cryptography.X509Ce
         public System.Security.Cryptography.X509Certificates.X509Chain? CertificateAuthorityChain { get { throw null; } }
         public System.Net.Security.SslPolicyErrors SslPolicyErrors { get { throw null; } }
     }
+    public partial class UserAgentValue
+    {
+        public UserAgentValue(System.Type type, string? applicationId = null) { }
+        public static Azure.Core.Pipeline.UserAgentValue FromType<T>(string? applicationId = null) { throw null; }
+        public override string ToString() { throw null; }
+    }
 }
 namespace Azure.Core.Serialization
 {

sdk/core/Azure.Core/api/Azure.Core.netstandard2.0.cs

@@ -891,6 +891,10 @@ public void Dispose() { }
         public override void Process(Azure.Core.HttpMessage message) { }
         public override System.Threading.Tasks.ValueTask ProcessAsync(Azure.Core.HttpMessage message) { throw null; }
     }
+    public static partial class HttpMessageExtensions
+    {
+        public static void SetUserAgentString(this Azure.Core.HttpMessage message, Azure.Core.Pipeline.UserAgentValue userAgentValue) { }
+    }
     public partial class HttpPipeline
     {
         public HttpPipeline(Azure.Core.Pipeline.HttpPipelineTransport transport, Azure.Core.Pipeline.HttpPipelinePolicy[]? policies = null, Azure.Core.ResponseClassifier? responseClassifier = null) { }
@@ -947,6 +951,12 @@ public ServerCertificateCustomValidationArgs(System.Security.Cryptography.X509Ce
         public System.Security.Cryptography.X509Certificates.X509Chain? CertificateAuthorityChain { get { throw null; } }
         public System.Net.Security.SslPolicyErrors SslPolicyErrors { get { throw null; } }
     }
+    public partial class UserAgentValue
+    {
+        public UserAgentValue(System.Type type, string? applicationId = null) { }
+        public static Azure.Core.Pipeline.UserAgentValue FromType<T>(string? applicationId = null) { throw null; }
+        public override string ToString() { throw null; }
+    }
 }
 namespace Azure.Core.Serialization
 {

sdk/core/Azure.Core/src/HttpMessage.cs

@@ -14,7 +14,12 @@ namespace Azure.Core
     /// </summary>
     public sealed class HttpMessage : IDisposable
     {
-        private Dictionary<string, object>? _properties;
+        /// <summary>
+        /// This dictionary is keyed with <c>Type</c> for a couple of reasons. Primarily, it allows values to be stored such that even if the accessor methods
+        /// become public, storing values keyed by internal types make them inaccessible to other assemblies. This protects internal values from being overwritten
+        /// by external code. See the <see cref="UserAgentValue"/> and <see cref="UserAgentValueKey"/> types for an example of this usage.
+        /// </summary>
+        private Dictionary<Type, object>? _typeProperties;
 
         private Response? _response;
 
@@ -112,7 +117,12 @@ internal void ApplyRequestContext(RequestContext? context, CoreResponseClassifie
         public bool TryGetProperty(string name, out object? value)
         {
             value = null;
-            return _properties?.TryGetValue(name, out value) == true;
+            if (_typeProperties == null || !_typeProperties.TryGetValue(typeof(MessagePropertyKey), out var rawValue))
+            {
+                return false;
+            }
+            var properties = (Dictionary<string, object>)rawValue!;
+            return properties.TryGetValue(name, out value);
         }
 
         /// <summary>
@@ -122,9 +132,42 @@ public bool TryGetProperty(string name, out object? value)
         /// <param name="value">The property value.</param>
         public void SetProperty(string name, object value)
         {
-            _properties ??= new Dictionary<string, object>();
+            _typeProperties ??= new Dictionary<Type, object>();
+            Dictionary<string, object> properties;
+            if (!_typeProperties.TryGetValue(typeof(MessagePropertyKey), out var rawValue))
+            {
+                properties = new Dictionary<string, object>();
+                _typeProperties[typeof(MessagePropertyKey)] = properties;
+            }
+            else
+            {
+                properties = (Dictionary<string, object>)rawValue!;
+            }
+            properties[name] = value;
+        }
+
+        /// <summary>
+        /// Gets a property that is stored with this <see cref="HttpMessage"/> instance and can be used for modifying pipeline behavior.
+        /// </summary>
+        /// <param name="type">The property type.</param>
+        /// <param name="value">The property value.</param>
+        /// <returns><c>true</c> if property exists, otherwise. <c>false</c>.</returns>
+        internal bool TryGetInternalProperty(Type type, out object? value)
+        {
+            value = null;
+            return _typeProperties?.TryGetValue(type, out value) == true;
+        }
 
-            _properties[name] = value;
+        /// <summary>
+        /// Sets a property that is stored with this <see cref="HttpMessage"/> instance and can be used for modifying pipeline behavior.
+        /// Internal properties can be keyed with internal types to prevent external code from overwriting these values.
+        /// </summary>
+        /// <param name="type">The key for the value.</param>
+        /// <param name="value">The property value.</param>
+        internal void SetInternalProperty(Type type, object value)
+        {
+            _typeProperties ??= new Dictionary<Type, object>();
+            _typeProperties[type] = value;
         }
 
         /// <summary>
@@ -204,5 +247,10 @@ public override long Position
                 set => throw CreateException();
             }
         }
+
+        /// <summary>
+        /// Exists as a private key entry into the <see cref="HttpMessage._typeProperties"/> dictionary for stashing string keyed entries in the Type keyed dictionary.
+        /// </summary>
+        private class MessagePropertyKey {}
     }
 }

sdk/core/Azure.Core/src/Pipeline/HttpMessageExtensions.cs

@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+namespace Azure.Core.Pipeline
+{
+    /// <summary>
+    /// Extension methods for <see cref="HttpMessage"/>.
+    /// </summary>
+    public static class HttpMessageExtensions
+    {
+        /// <summary>
+        /// Sets the package name and version portion of the UserAgent telemetry value.
+        /// Note: If <see cref="DiagnosticsOptions.IsTelemetryEnabled"/> is false, this value is never used.
+        /// </summary>
+        /// <param name="message">The <see cref="HttpMessage"/>.</param>
+        /// <param name="userAgentValue">The <see cref="SetUserAgentString"/>.</param>
+        public static void SetUserAgentString(this HttpMessage message, UserAgentValue userAgentValue)
+        {
+            message.SetInternalProperty(typeof(UserAgentValueKey), userAgentValue.ToString());
+        }
+    }
+}

sdk/core/Azure.Core/src/Pipeline/HttpPipelineBuilder.cs

@@ -176,31 +176,8 @@ void AddCustomerPolicies(HttpPipelinePosition position)
         // internal for testing
         internal static TelemetryPolicy CreateTelemetryPolicy(ClientOptions options)
         {
-            const string PackagePrefix = "Azure.";
-
-            Assembly clientAssembly = options.GetType().Assembly!;
-
-            AssemblyInformationalVersionAttribute? versionAttribute = clientAssembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
-            if (versionAttribute == null)
-            {
-                throw new InvalidOperationException($"{nameof(AssemblyInformationalVersionAttribute)} is required on client SDK assembly '{clientAssembly.FullName}' (inferred from the use of options type '{options.GetType().FullName}').");
-            }
-
-            string version = versionAttribute.InformationalVersion;
-
-            string assemblyName = clientAssembly.GetName().Name!;
-            if (assemblyName.StartsWith(PackagePrefix, StringComparison.Ordinal))
-            {
-                assemblyName = assemblyName.Substring(PackagePrefix.Length);
-            }
-
-            int hashSeparator = version.IndexOfOrdinal('+');
-            if (hashSeparator != -1)
-            {
-                version = version.Substring(0, hashSeparator);
-            }
-
-            return new TelemetryPolicy(assemblyName, version, options.Diagnostics.ApplicationId);
+            var userAgentValue = new UserAgentValue(options.GetType(), options.Diagnostics.ApplicationId);
+            return new TelemetryPolicy(userAgentValue);
         }
     }
 }

sdk/core/Azure.Core/src/Pipeline/Internal/TelemetryPolicy.cs

@@ -1,30 +1,27 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System.Runtime.InteropServices;
-
 namespace Azure.Core.Pipeline
 {
     internal class TelemetryPolicy : HttpPipelineSynchronousPolicy
     {
-        private readonly string _header;
+        private readonly string _defaultHeader;
 
-        public TelemetryPolicy(string componentName, string componentVersion, string? applicationId)
+        public TelemetryPolicy(UserAgentValue userAgentValue)
+        {
+            _defaultHeader = userAgentValue.ToString();
+        }
+
+        public override void OnSendingRequest(HttpMessage message)
         {
-            var platformInformation = $"({RuntimeInformation.FrameworkDescription}; {RuntimeInformation.OSDescription})";
-            if (applicationId != null)
+            if (message.TryGetInternalProperty(typeof(UserAgentValueKey), out var userAgent))
             {
-                _header = $"{applicationId} azsdk-net-{componentName}/{componentVersion} {platformInformation}";
+                message.Request.Headers.Add(HttpHeader.Names.UserAgent, ((string)userAgent!));
             }
             else
             {
-                _header = $"azsdk-net-{componentName}/{componentVersion} {platformInformation}";
+                message.Request.Headers.Add(HttpHeader.Names.UserAgent, _defaultHeader);
             }
         }
-
-        public override void OnSendingRequest(HttpMessage message)
-        {
-            message.Request.Headers.Add(HttpHeader.Names.UserAgent, _header);
-        }
     }
 }

sdk/core/Azure.Core/src/Pipeline/Internal/UserAgentValueKey.cs

@@ -0,0 +1,10 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+namespace Azure.Core.Pipeline
+{
+    /// <summary>
+    /// Class that serves as the key for <see cref="UserAgentValue"/> UserAgent strings on <see cref="HttpMessage"/>.
+    /// </summary>
+    internal class UserAgentValueKey { }
+}