Cleaning up code

Author: t-vvidyasaga

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/AzureAppConfigurationProvider.cs

@@ -630,7 +630,6 @@ private async Task<Dictionary<string, string>> PrepareData(Dictionary<string, Co
             if (_requestTracingEnabled && _requestTracingOptions != null)
             {
                 _requestTracingOptions.ResetAiConfigurationTracing();
-                _requestTracingOptions.UsesSnapshotReference = false;
             }
 
             foreach (KeyValuePair<string, ConfigurationSetting> kvp in data)
@@ -1028,15 +1027,13 @@ private async Task<Dictionary<KeyValueIdentifier, ConfigurationSetting>> LoadKey
                         {
                             existingSettings[resolvedSetting.Key] = resolvedSetting.Value;
                         }
-
-                        // Only track the snapshot reference itself for refresh monitoring, since snapshots are immutable
-                        watchedIndividualKvs[watchedKeyLabel] = new ConfigurationSetting(watchedKv.Key, watchedKv.Value, watchedKv.Label, watchedKv.ETag);
                     }
                     else
                     {
-                        watchedIndividualKvs[watchedKeyLabel] = new ConfigurationSetting(watchedKv.Key, watchedKv.Value, watchedKv.Label, watchedKv.ETag);
                         existingSettings[watchedKey] = watchedKv;
                     }
+
+                    watchedIndividualKvs[watchedKeyLabel] = new ConfigurationSetting(watchedKv.Key, watchedKv.Value, watchedKv.Label, watchedKv.ETag);
                 }
             }
 

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Constants/ErrorMessages.cs

@@ -13,8 +13,8 @@ internal class ErrorMessages
         public const string FeatureFlagInvalidFormat = "Invalid json format for feature flag. Key: '{0}'.";
         public const string InvalidKeyVaultReference = "Invalid Key Vault reference.";
         public const string SnapshotReferenceInvalidFormat = "Invalid snapshot reference format for key '{0}' (label: '{1}').";
-        public const string SnapshotReferenceInvalidJsonProperty = "Invalid snapshot reference format for key '{0}' (label: '{1}'). The '" + JsonFields.SnapshotName + "' property must be a string value, but found {2}.";
-        public const string SnapshotReferencePropertyMissing = "Invalid snapshot reference format for key '{0}' (label: '{1}'). The '" + JsonFields.SnapshotName + "' property is required.";
+        public const string SnapshotReferenceInvalidJsonProperty = "Invalid snapshot reference format for key '{0}' (label: '{1}'). The '{2}' property must be a string value, but found {3}.";
+        public const string SnapshotReferencePropertyMissing = "Invalid snapshot reference format for key '{0}' (label: '{1}'). The '{2}' property is required.";
         public const string SnapshotInvalidComposition = "{0} for the selected snapshot with name '{1}' must be 'key', found '{2}'.";
     }
 }

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/SnapshotReference/SnapshotReferenceParser.cs

@@ -51,22 +51,23 @@ public static SnapshotReference Parse(ConfigurationSetting setting)
                     {
                         if (reader.Read() && reader.TokenType == JsonTokenType.String)
                         {
-                            if (string.IsNullOrWhiteSpace(reader.GetString()))
+                            string snapshotName = reader.GetString();
+                            if (string.IsNullOrWhiteSpace(snapshotName))
                             {
                                 throw new FormatException(string.Format(ErrorMessages.SnapshotReferenceInvalidFormat, setting.Key, setting.Label));
                             }
 
-                            return new SnapshotReference { SnapshotName = reader.GetString() };
+                            return new SnapshotReference { SnapshotName = snapshotName };
                         }
 
-                        throw new FormatException(string.Format(ErrorMessages.SnapshotReferenceInvalidJsonProperty, setting.Key, setting.Label, reader.TokenType));
+                        throw new FormatException(string.Format(ErrorMessages.SnapshotReferenceInvalidJsonProperty, setting.Key, setting.Label, JsonFields.SnapshotName, reader.TokenType));
                     }
 
                     // Skip unknown properties
                     reader.Skip();
                 }
 
-                throw new FormatException(string.Format(ErrorMessages.SnapshotReferencePropertyMissing, setting.Key, setting.Label));
+                throw new FormatException(string.Format(ErrorMessages.SnapshotReferencePropertyMissing, setting.Key, setting.Label, JsonFields.SnapshotName));
             }
             catch (JsonException jsonEx)
             {