Apply gccl header for Spanner clients in Google.Cloud.Spanner.Data

googleapis · Mar 3, 2020 · 36f1e1e · 36f1e1e
1 parent 48773cc
commit 36f1e1e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/apis/Google.Cloud.Spanner.Data/Google.Cloud.Spanner.Data/SessionPoolManager.cs b/apis/Google.Cloud.Spanner.Data/Google.Cloud.Spanner.Data/SessionPoolManager.cs
@@ -71,9 +71,17 @@ static SessionPoolManager()
 
         /// <summary>
         /// The SpannerSettings used by this SessionPoolManager. These are expected to remain unaltered for the lifetime of the manager.
-        /// Currently the default settings are used in all cases.
+        /// Currently the default settings are used in all cases, but with the "gccl" version header added to specify the version of Google.Cloud.Spanner.Data
+        /// being used.
         /// </summary>
-        internal SpannerSettings SpannerSettings { get; } = SpannerSettings.GetDefault();
+        internal SpannerSettings SpannerSettings { get; } = CreateSpannerSettingsWithVersionHeader();
+
+        private static SpannerSettings CreateSpannerSettingsWithVersionHeader()
+        {
+            var settings = new SpannerSettings();
+            settings.VersionHeaderBuilder.AppendAssemblyVersion("gccl", typeof(SessionPoolManager));
+            return settings;
+        }
 
         /// <summary>
         /// Constructor for test purposes, allowing the SpannerClient creation to be customized (e.g. for

diff --git a/apis/Google.Cloud.Spanner.Data/Google.Cloud.Spanner.Data/SpannerCommand.ExecutableCommand.cs b/apis/Google.Cloud.Spanner.Data/Google.Cloud.Spanner.Data/SpannerCommand.ExecutableCommand.cs
@@ -44,6 +44,15 @@ private class ExecutableCommand
             private static readonly TransactionOptions s_partitionedDmlTransactionOptions = new TransactionOptions { PartitionedDml = new PartitionedDml() };
             private static readonly TransactionOptions s_readWriteOptions = new TransactionOptions { ReadWrite = new ReadWrite() };
 
+            private static readonly DatabaseAdminSettings s_databaseAdminSettings = CreateDatabaseAdminSettings();
+
+            private static DatabaseAdminSettings CreateDatabaseAdminSettings()
+            {
+                var settings = new DatabaseAdminSettings();
+                settings.VersionHeaderBuilder.AppendAssemblyVersion("gccl", typeof(SpannerCommand));
+                return settings;
+            }
+
             internal SpannerConnection Connection { get; }
             internal SpannerCommandTextBuilder CommandTextBuilder { get; }
             internal int CommandTimeout { get; }
@@ -203,7 +212,11 @@ private async Task<int> ExecuteDdlAsync(CancellationToken cancellationToken)
                 var channel = new Channel(channelOptions.Endpoint, credentials);
                 try
                 {
-                    var databaseAdminClient = new DatabaseAdminClientBuilder { CallInvoker = channel.CreateCallInvoker() }.Build();
+                    var databaseAdminClient = new DatabaseAdminClientBuilder
+                    {
+                        CallInvoker = channel.CreateCallInvoker(),
+                        Settings = s_databaseAdminSettings
+                    }.Build();
                     if (CommandTextBuilder.IsCreateDatabaseCommand)
                     {
                         var parent = new InstanceName(Connection.Project, Connection.SpannerInstance);