Revert the 'instantiates' field change (#5436)

* Revert "Populating 'instantiates' field of CapabilityStatement. (#5241)"

This reverts commit ba6f9fb.

* Removing E2E for instantiates field.

Author: v-isyamauchi-gh

src/Microsoft.Health.Fhir.Core/Features/Conformance/IVolatileProvideCapability.cs

@@ -62,7 +62,5 @@ public ListedCapabilityStatement()
         public IDictionary<string, JToken> AdditionalData { get; }
 
         public ICollection<ReferenceComponent> Profile { get; }
-
-        public ICollection<string> Instantiates { get; internal set; }
     }
 }

src/Microsoft.Health.Fhir.Core/Features/Conformance/Models/ListedCapabilityStatement.cs

@@ -246,23 +246,28 @@ public async Task BackgroudLoop()
                     // If the sync profile is requested or the rebuild interval has elapsed, then we will rebuild the capability statement and update in-memory metadata.
                     if (_builder != null)
                     {
-                        var cancellationToken = _cancellationTokenSource.Token;
-
                         // Update search params.
                         _builder.SyncSearchParameters();
 
                         // Update supported profiles.
-                        await _builder.SyncProfilesAsync(cancellationToken);
-
-                        // Update other fields populated by providers.
-                        await UpdateMetadataAsync(cancellationToken);
+                        await _builder.SyncProfilesAsync(_cancellationTokenSource.Token);
                     }
                 }
                 catch (Exception e)
                 {
                     // Do not let exceptions escape the background loop.
                     _logger.LogError(e, "SystemConformanceProvider: Unexpected error during background capability statement rebuild.");
                 }
+
+                await (_metadataSemaphore?.WaitAsync(_cancellationTokenSource.Token) ?? Task.CompletedTask);
+                try
+                {
+                    _metadata = null;
+                }
+                finally
+                {
+                    _metadataSemaphore?.Release();
+                }
             }
         }
 
@@ -346,6 +351,16 @@ public async Task Handle(RebuildCapabilityStatement notification, CancellationTo
                         break;
                 }
             }
+
+            await (_metadataSemaphore?.WaitAsync(cancellationToken) ?? Task.CompletedTask);
+            try
+            {
+                _metadata = null;
+            }
+            finally
+            {
+                _metadataSemaphore?.Release();
+            }
         }
 
         public override async Task<ResourceElement> GetMetadata(CancellationToken cancellationToken = default)
@@ -356,16 +371,27 @@ public override async Task<ResourceElement> GetMetadata(CancellationToken cancel
             }
 
             // There is a chance that the BackgroundLoop handler sets _metadata to null between when it is checked and returned, so the value is stored in a local variable.
-            ResourceElement metadata = await UpdateMetadataAsync(cancellationToken);
-            if (metadata == null)
+            ResourceElement metadata;
+            if ((metadata = _metadata) != null)
             {
-                metadata = await GetCapabilityStatementOnStartup(cancellationToken);
+                return metadata;
             }
 
+            _ = await GetCapabilityStatementOnStartup(cancellationToken);
+
             // The semaphore is only used for building the metadata because claiming it before the GetCapabilityStatementOnStartup was leading to deadlocks where the creation
             // of metadata could trigger a rebuild. The rebuild handler had to wait on the metadata semaphore, which wouldn't be released until the metadata could be built.
             // But the metadata builder was waiting on the rebuild handler.
-            return await SetMetadataAsync(metadata);
+            await (_metadataSemaphore?.WaitAsync(cancellationToken) ?? Task.CompletedTask);
+            try
+            {
+                _metadata = _builder.Build().ToResourceElement();
+                return _metadata;
+            }
+            finally
+            {
+                _metadataSemaphore?.Release();
+            }
         }
 
         private void LogVersioningPolicyConfiguration()
@@ -383,69 +409,5 @@ private void LogVersioningPolicyConfiguration()
                 _logger.LogInformation(versioning.ToString());
             }
         }
-
-        private async Task<ResourceElement> UpdateMetadataAsync(CancellationToken cancellationToken)
-        {
-            await (_metadataSemaphore?.WaitAsync(_cancellationTokenSource.Token) ?? Task.CompletedTask);
-            try
-            {
-                // Note: the method will update non-static sections of the metadata only; thus, it does nothing
-                //       when the full metadata is not yet built.
-                if (_builder != null && _metadata != null)
-                {
-                    _logger.LogInformation("SystemConformanceProvider: Updating the metadata.");
-
-                    using (IScoped<IEnumerable<IProvideCapability>> providerFactory = _capabilityProviders())
-                    {
-                        var providers = providerFactory.Value?
-                            .Where(x => x is IVolatileProvideCapability)?
-                            .Select(x => (IVolatileProvideCapability)x)
-                            .ToList()
-                            ?? new List<IVolatileProvideCapability>();
-                        foreach (var provider in providers)
-                        {
-                            Stopwatch watch = Stopwatch.StartNew();
-
-                            try
-                            {
-                                _logger.LogInformation("SystemConformanceProvider: Updating the metadata with '{ProviderName}'.", provider.ToString());
-                                await provider.UpdateAsync(_builder, cancellationToken);
-                            }
-                            catch (Exception e)
-                            {
-                                _logger.LogWarning(e, "Failed to update Capability Statement.");
-                                throw;
-                            }
-                            finally
-                            {
-                                _logger.LogInformation("SystemConformanceProvider: Updating the metadata with '{ProviderName}' completed. Elapsed time {ElapsedTime}.", provider.ToString(), watch.Elapsed);
-                            }
-                        }
-                    }
-
-                    _metadata = _builder.Build().ToResourceElement();
-                }
-
-                return _metadata;
-            }
-            finally
-            {
-                _metadataSemaphore?.Release();
-            }
-        }
-
-        private async Task<ResourceElement> SetMetadataAsync(ResourceElement metadata)
-        {
-            await (_metadataSemaphore?.WaitAsync(_cancellationTokenSource.Token) ?? Task.CompletedTask);
-            try
-            {
-                _metadata = metadata;
-                return _metadata;
-            }
-            finally
-            {
-                _metadataSemaphore?.Release();
-            }
-        }
     }
 }

src/Microsoft.Health.Fhir.Core/Features/Conformance/SystemConformanceProvider.cs

@@ -211,12 +211,6 @@ ResourceElement SetMetadata(Resource resource, string versionId, DateTimeOffset
             services.AddTransient(typeof(IScopeProvider<>), typeof(ScopeProvider<>));
 
             services.AddScoped<IDocRefRequestConverter, DocRefRequestConverter>();
-
-            services.TypesInSameAssembly(KnownAssemblies.All)
-                .AssignableTo<IInstantiateCapability>()
-                .Transient()
-                .AsService<IInstantiateCapability>();
-            services.AddFactory<IScoped<IEnumerable<IInstantiateCapability>>>();
         }
     }
 }