Skip to content

Update MemoryInformationRetriever to use the DocumentStore already configured HTTP Client #5275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mauroservienti wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Update MemoryInformationRetriever to use the DocumentStore already configured HTTP Client #5275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions src/ServiceControl.Audit.Persistence.RavenDB/MemoryInformationRetriever.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,8 @@ namespace ServiceControl.Audit.Persistence.RavenDB;
using System.Threading;
using System.Threading.Tasks;

class MemoryInformationRetriever(DatabaseConfiguration databaseConfiguration)
class MemoryInformationRetriever(IRavenDocumentStoreProvider documentStoreProvider)
{
// Connection string is composed of the server URL. The ?? operator is needed because ServerUrl
// is populated when running embedded and connection string when running in external mode.
// However, the tricky part is that when tests are run they behave like if it was external mode.
// Only one of ConnectionString and ServerUrl will be non-null, so we'll check ConnectionString first
// to be consistent with the error instance implementation, where ServerUrl always has a value.
readonly HttpClient client = new() { BaseAddress = new Uri(databaseConfiguration.ServerConfiguration.ConnectionString ?? databaseConfiguration.ServerConfiguration.ServerUrl) };

record ResponseDto
{
public MemoryInformation MemoryInformation { get; set; }
Expand All @@ -28,7 +21,10 @@ record MemoryInformation

public async Task<(bool IsHighDirty, string DirtyMemory)> GetMemoryInformation(CancellationToken cancellationToken = default)
{
var httpResponse = await client.GetAsync("/admin/debug/memory/stats?includeThreads=false&includeMappings=false", cancellationToken);
var documentStore = await documentStoreProvider.GetDocumentStore(cancellationToken);
Copy link
Member

@johnsimons johnsimons Jan 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
var documentStore = await documentStoreProvider.GetDocumentStore(cancellationToken);
using var documentStore = await documentStoreProvider.GetDocumentStore(cancellationToken);

Copy link
Member Author

@mauroservienti mauroservienti Jan 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't want to dispose it, IDcumentStore is a singleton and is disposed only when the persister is disposed at shutdown.

var client = documentStore.GetRequestExecutor().HttpClient;
var requestUrl = documentStore.Urls[0].TrimEnd('/') + "/admin/debug/memory/stats?includeThreads=false&includeMappings=false";
var httpResponse = await client.GetAsync(requestUrl, cancellationToken);
var responseDto = JsonSerializer.Deserialize<ResponseDto>(await httpResponse.Content.ReadAsStringAsync(cancellationToken));

return responseDto.MemoryInformation is null
Expand Down
14 changes: 5 additions & 9 deletions src/ServiceControl.Persistence.RavenDB/MemoryInformationRetriever.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,8 @@ namespace ServiceControl.Persistence.RavenDB;
using System.Threading;
using System.Threading.Tasks;

class MemoryInformationRetriever(RavenPersisterSettings persisterSettings)
class MemoryInformationRetriever(IRavenDocumentStoreProvider documentStoreProvider)
{
// Connection string is composed of the server URL. The ?? operator is needed because ServerUrl
// is populated when running embedded and connection string when running in external mode.
// However, the tricky part is that when tests are run they behave like if it was external mode.
// ServerUrl is always populated by the persister settings, hence the code first checks for the
// presence of a connection string, and if null, falls back to ServerUrl
readonly HttpClient client = new() { BaseAddress = new Uri(persisterSettings.ConnectionString ?? persisterSettings.ServerUrl) };

record ResponseDto
{
public MemoryInformation MemoryInformation { get; set; }
Expand All @@ -28,7 +21,10 @@ record MemoryInformation

public async Task<(bool IsHighDirty, string DirtyMemory)> GetMemoryInformation(CancellationToken cancellationToken = default)
{
var httpResponse = await client.GetAsync("/admin/debug/memory/stats?includeThreads=false&includeMappings=false", cancellationToken);
var documentStore = await documentStoreProvider.GetDocumentStore(cancellationToken);
var client = documentStore.GetRequestExecutor().HttpClient;
var requestUrl = documentStore.Urls[0].TrimEnd('/') + "/admin/debug/memory/stats?includeThreads=false&includeMappings=false";
var httpResponse = await client.GetAsync(requestUrl, cancellationToken);
var responseDto = JsonSerializer.Deserialize<ResponseDto>(await httpResponse.Content.ReadAsStringAsync(cancellationToken));

return responseDto.MemoryInformation is null
Expand Down