add thrift version

Author: toddmeng-db

csharp/src/Drivers/Apache/Spark/SparkHttpConnection.cs

@@ -255,13 +255,33 @@ protected internal override Task<TRowSet> GetRowSetAsync(TGetPrimaryKeysResp res
 
         private string GetUserAgent()
         {
+            // Build the base user agent string with Thrift version
+            string thriftVersion = GetThriftVersion();
+            string thriftComponent = string.IsNullOrEmpty(thriftVersion) ? "Thrift" : $"Thrift/{thriftVersion}";
+            string baseUserAgent = $"{DriverName.Replace(" ", "")}/{ProductVersionDefault} {thriftComponent}"; // consider using ProductVersion instead of ProductVersionDefault
+            
             // Check if a client has provided a user-agent entry
             if (Properties.TryGetValue(SparkParameters.UserAgentEntry, out string? userAgentEntry) && !string.IsNullOrWhiteSpace(userAgentEntry))
             {
-                return $"{s_baseUserAgent} {userAgentEntry}";
+                return $"{baseUserAgent} {userAgentEntry}";
             }
 
-            return s_baseUserAgent;
+            return baseUserAgent;
+        }
+        
+        private string GetThriftVersion()
+        {
+            try
+            {
+                var thriftAssembly = typeof(TProtocol).Assembly;
+                var version = thriftAssembly.GetName().Version;
+                return version != null ? $"{version.Major}.{version.Minor}.{version.Build}" : "";
+            }
+            catch
+            {
+                // Return empty string if there's any issue retrieving the assembly version
+                return "";
+            }
         }
     }
 }

csharp/test/Drivers/Apache/Spark/SparkHttpConnectionUserAgentTest.cs

@@ -30,7 +30,7 @@ namespace Apache.Arrow.Adbc.Tests.Drivers.Apache.Spark
     public class SparkHttpConnectionUserAgentTest
     {
         [Fact]
-        public void UserAgentEntry_WhenNotProvided_UsesBaseUserAgent()
+        public void UserAgentEntry_WhenNotProvided_UsesBaseUserAgentWithThrift()
         {
             // Arrange
             var properties = new Dictionary<string, string>
@@ -45,7 +45,7 @@ public void UserAgentEntry_WhenNotProvided_UsesBaseUserAgent()
             string userAgent = GetUserAgentFromConnection(properties);
 
             // Assert
-            Assert.Equal("ADBCSparkDriver/1.0.0", userAgent);
+            Assert.Matches(@"ADBCSparkDriver/[\d\.]+ Thrift(/[\d\.]+)?", userAgent);
         }
 
         [Fact]
@@ -65,7 +65,7 @@ public void UserAgentEntry_WhenProvided_AppendsToBaseUserAgent()
             string userAgent = GetUserAgentFromConnection(properties);
 
             // Assert
-            Assert.Equal("ADBCSparkDriver/1.0.0 PowerBI", userAgent);
+            Assert.Matches(@"ADBCSparkDriver/[\d\.]+ Thrift(/[\d\.]+)? PowerBI", userAgent);
         }
 
         [Fact]
@@ -85,7 +85,7 @@ public void UserAgentEntry_WhenEmpty_UsesBaseUserAgent()
             string userAgent = GetUserAgentFromConnection(properties);
 
             // Assert
-            Assert.Equal("ADBCSparkDriver/1.0.0", userAgent);
+            Assert.Matches(@"ADBCSparkDriver/[\d\.]+ Thrift(/[\d\.]+)?", userAgent);
         }
 
         [Fact]
@@ -105,7 +105,26 @@ public void UserAgentEntry_WhenWhitespace_UsesBaseUserAgent()
             string userAgent = GetUserAgentFromConnection(properties);
 
             // Assert
-            Assert.Equal("ADBCSparkDriver/1.0.0", userAgent);
+            Assert.Matches(@"ADBCSparkDriver/[\d\.]+ Thrift(/[\d\.]+)?", userAgent);
+        }
+
+        [Fact]
+        public void UserAgent_IncludesThriftComponent()
+        {
+            // Arrange
+            var properties = new Dictionary<string, string>
+            {
+                [SparkParameters.Type] = SparkServerTypeConstants.Http,
+                [SparkParameters.HostName] = "valid.server.com",
+                [SparkParameters.Path] = "/path",
+                [SparkParameters.AuthType] = SparkAuthTypeConstants.None
+            };
+
+            // Act
+            string userAgent = GetUserAgentFromConnection(properties);
+
+            // Assert
+            Assert.Contains("Thrift", userAgent);
         }
 
         private string GetUserAgentFromConnection(Dictionary<string, string> properties)