log cleanup (#969)

- Improvement: New `ZEN_SCOPED_LOG(Expr)` macro routes `ZEN_INFO`/`ZEN_WARN`/`ZEN_DEBUG` in the enclosing block through the given logger expression instead of the default
- Improvement: `BuildContainer`, `SaveOplog`, and `LoadOplogContext` now take a caller-provided `LoggerRef` so diagnostic messages route through the caller's logger

9 files changed, 53 insertions, 81 deletions

diff --git a/src/zenstore/buildstore/buildstore.cpp b/src/zenstore/buildstore/buildstore.cpp
index dff1c3c61..a08741d31 100644
--- a/src/zenstore/buildstore/buildstore.cpp
+++ b/src/zenstore/buildstore/buildstore.cpp
@@ -1052,7 +1052,7 @@ public:
 	{
 		ZEN_TRACE_CPU("Builds::PreCache");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
@@ -1107,7 +1107,7 @@ public:
 		ZEN_TRACE_CPU("Builds::GetUnusedReferences");
 		ZEN_MEMSCOPE(GetBuildstoreTag());
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		size_t InitialCount = IoCids.size();
 		size_t UsedCount	= InitialCount;
@@ -1152,7 +1152,7 @@ BuildStore::RemoveExpiredData(GcCtx& Ctx, GcStats& Stats)
 	ZEN_TRACE_CPU("Builds::RemoveExpiredData");
 	ZEN_MEMSCOPE(GetBuildstoreTag());
 
-	auto Log = [&Ctx]() { return Ctx.Logger; };
+	ZEN_SCOPED_LOG(Ctx.Logger);
 
 	Stopwatch  Timer;
 	const auto _ = MakeGuard([&] {
diff --git a/src/zenstore/cache/cachedisklayer.cpp b/src/zenstore/cache/cachedisklayer.cpp
index 4640309d9..45a4b6456 100644
--- a/src/zenstore/cache/cachedisklayer.cpp
+++ b/src/zenstore/cache/cachedisklayer.cpp
@@ -3083,7 +3083,7 @@ public:
 	{
 		ZEN_TRACE_CPU("Z$::Bucket::CompactStore");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
@@ -3338,7 +3338,7 @@ ZenCacheDiskLayer::CacheBucket::RemoveExpiredData(GcCtx& Ctx, GcStats& Stats)
 {
 	ZEN_TRACE_CPU("Z$::Bucket::RemoveExpiredData");
 
-	auto Log = [&Ctx]() { return Ctx.Logger; };
+	ZEN_SCOPED_LOG(Ctx.Logger);
 
 	size_t TotalEntries = 0;
 
@@ -3502,7 +3502,7 @@ ZenCacheDiskLayer::CacheBucket::GetReferences(const LoggerRef&	   Logger,
 {
 	ZEN_TRACE_CPU("Z$::Bucket::GetReferencesLocked");
 
-	auto Log = [&Logger]() { return Logger; };
+	ZEN_SCOPED_LOG(Logger);
 
 	auto GetAttachments = [&](const IoHash& RawHash, MemoryView Data) -> bool {
 		if (CbValidateError Error = ValidateCompactBinary(Data, CbValidateMode::Default); Error == CbValidateError::None)
@@ -3718,7 +3718,7 @@ public:
 	{
 		ZEN_TRACE_CPU("Z$::Bucket::PreCache");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
@@ -3753,7 +3753,7 @@ public:
 	{
 		ZEN_TRACE_CPU("Z$::Bucket::UpdateLockedState");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
@@ -3784,7 +3784,7 @@ public:
 	{
 		ZEN_TRACE_CPU("Z$::Bucket::GetUnusedReferences");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		const size_t InitialCount = IoCids.size();
 		size_t		 UsedCount	  = InitialCount;
@@ -3818,7 +3818,7 @@ ZenCacheDiskLayer::CacheBucket::CreateReferenceCheckers(GcCtx& Ctx)
 {
 	ZEN_TRACE_CPU("Z$::Bucket::CreateReferenceCheckers");
 
-	auto Log = [&Ctx]() { return Ctx.Logger; };
+	ZEN_SCOPED_LOG(Ctx.Logger);
 
 	Stopwatch  Timer;
 	const auto _ = MakeGuard([&] {
diff --git a/src/zenstore/cache/structuredcachestore.cpp b/src/zenstore/cache/structuredcachestore.cpp
index cff0e9a35..97b793083 100644
--- a/src/zenstore/cache/structuredcachestore.cpp
+++ b/src/zenstore/cache/structuredcachestore.cpp
@@ -468,7 +468,7 @@ ZenCacheStore::LogWorker()
 
 	LoggerRef ZCacheLog(logging::Get("z$"));
 
-	auto Log = [&ZCacheLog]() -> LoggerRef { return ZCacheLog; };
+	ZEN_SCOPED_LOG(ZCacheLog);
 
 	std::vector<AccessLogItem> Items;
 	while (true)
@@ -1086,11 +1086,9 @@ ZenCacheStore::GetBucketInfo(std::string_view NamespaceName, std::string_view Bu
 std::vector<RwLock::SharedLockScope>
 ZenCacheStore::LockState(GcCtx& Ctx)
 {
+	ZEN_UNUSED(Ctx);
 	ZEN_TRACE_CPU("CacheStore::LockState");
 
-	auto Log = [&Ctx]() { return Ctx.Logger; };
-	ZEN_UNUSED(Log);
-
 	std::vector<RwLock::SharedLockScope> Locks;
 	Locks.emplace_back(RwLock::SharedLockScope(m_NamespacesLock));
 	for (auto& NamespaceIt : m_Namespaces)
@@ -1211,7 +1209,7 @@ public:
 	{
 		ZEN_TRACE_CPU("Z$::UpdateLockedState");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		Stopwatch Timer;
 
@@ -1276,7 +1274,7 @@ public:
 	{
 		ZEN_TRACE_CPU("Z$::GetUnusedReferences");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		const size_t InitialCount = IoCids.size();
 		size_t		 UsedCount	  = InitialCount;
@@ -1309,7 +1307,7 @@ ZenCacheStore::CreateReferenceCheckers(GcCtx& Ctx)
 {
 	ZEN_TRACE_CPU("CacheStore::CreateReferenceCheckers");
 
-	auto Log = [&Ctx]() { return Ctx.Logger; };
+	ZEN_SCOPED_LOG(Ctx.Logger);
 
 	Stopwatch						 Timer;
 	const auto						 _ = MakeGuard([&] {
diff --git a/src/zenstore/compactcas.cpp b/src/zenstore/compactcas.cpp
index 815762e3b..6f1e1d701 100644
--- a/src/zenstore/compactcas.cpp
+++ b/src/zenstore/compactcas.cpp
@@ -698,7 +698,7 @@ public:
 
 		ZEN_TRACE_CPU("CasContainer::CompactStore");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
@@ -875,7 +875,7 @@ public:
 		ZEN_MEMSCOPE(GetCasContainerTag());
 		ZEN_TRACE_CPU("CasContainer::RemoveUnreferencedData");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
@@ -958,7 +958,7 @@ CasContainerStrategy::CreateReferencePruner(GcCtx& Ctx, GcReferenceStoreStats&)
 	ZEN_MEMSCOPE(GetCasContainerTag());
 	ZEN_TRACE_CPU("CasContainer::CreateReferencePruner");
 
-	auto Log = [&Ctx]() { return Ctx.Logger; };
+	ZEN_SCOPED_LOG(Ctx.Logger);
 
 	Stopwatch  Timer;
 	const auto _ = MakeGuard([&] {
diff --git a/src/zenstore/filecas.cpp b/src/zenstore/filecas.cpp
index 0088afe6e..3a7a72ee3 100644
--- a/src/zenstore/filecas.cpp
+++ b/src/zenstore/filecas.cpp
@@ -1231,7 +1231,7 @@ public:
 		ZEN_MEMSCOPE(GetFileCasTag());
 		ZEN_TRACE_CPU("FileCas::CompactStore");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
@@ -1375,7 +1375,7 @@ public:
 		ZEN_MEMSCOPE(GetFileCasTag());
 		ZEN_TRACE_CPU("FileCas::RemoveUnreferencedData");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
@@ -1458,7 +1458,7 @@ FileCasStrategy::CreateReferencePruner(GcCtx& Ctx, GcReferenceStoreStats&)
 
 	ZEN_TRACE_CPU("FileCas::CreateReferencePruner");
 
-	auto Log = [&Ctx]() { return Ctx.Logger; };
+	ZEN_SCOPED_LOG(Ctx.Logger);
 
 	Stopwatch			Timer;
 	const auto			_ = MakeGuard([&] {
diff --git a/src/zenstore/gc.cpp b/src/zenstore/gc.cpp
index 40ebb695c..928fc3f08 100644
--- a/src/zenstore/gc.cpp
+++ b/src/zenstore/gc.cpp
@@ -546,7 +546,7 @@ FilterReferences(GcCtx& Ctx, std::string_view Context, std::vector<IoHash>& InOu
 		return false;
 	}
 
-	auto Log = [&Ctx]() { return Ctx.Logger; };
+	ZEN_SCOPED_LOG(Ctx.Logger);
 
 	const bool Filter = Ctx.Settings.AttachmentRangeMax != IoHash::Max || Ctx.Settings.AttachmentRangeMin != IoHash::Zero;
 
diff --git a/src/zenstore/include/zenstore/projectstore.h b/src/zenstore/include/zenstore/projectstore.h
index 100a82907..cf53d0160 100644
--- a/src/zenstore/include/zenstore/projectstore.h
+++ b/src/zenstore/include/zenstore/projectstore.h
@@ -484,7 +484,7 @@ public:
 										 Project&								Project,
 										 Oplog&									Oplog,
 										 const std::unordered_set<std::string>& WantedFieldNames);
-	static CbObject GetChunkInfo(LoggerRef InLog, Project& Project, Oplog& Oplog, const Oid& ChunkId);
+	static CbObject GetChunkInfo(Project& Project, Oplog& Oplog, const Oid& ChunkId);
 	struct GetChunkRangeResult
 	{
 		enum class EError : uint8_t
@@ -502,8 +502,7 @@ public:
 		uint64_t		RawSize		= 0;
 		ZenContentType	ContentType = ZenContentType::kUnknownContentType;
 	};
-	static GetChunkRangeResult GetChunkRange(LoggerRef		InLog,
-											 Project&		Project,
+	static GetChunkRangeResult GetChunkRange(Project&		Project,
 											 Oplog&			Oplog,
 											 const Oid&		ChunkId,
 											 uint64_t		Offset,
diff --git a/src/zenstore/projectstore.cpp b/src/zenstore/projectstore.cpp
index 7cd6b9e37..38c609252 100644
--- a/src/zenstore/projectstore.cpp
+++ b/src/zenstore/projectstore.cpp
@@ -4739,7 +4739,7 @@ ProjectStore::GetProjectsList()
 CbObject
 ProjectStore::GetProjectFiles(LoggerRef InLog, Project& Project, Oplog& Oplog, const std::unordered_set<std::string>& WantedFieldNames)
 {
-	auto Log = [&InLog]() { return InLog; };
+	ZEN_SCOPED_LOG(InLog);
 
 	using namespace std::literals;
 
@@ -4894,7 +4894,7 @@ ProjectStore::GetProjectChunkInfos(LoggerRef InLog, Project& Project, Oplog& Opl
 	ZEN_MEMSCOPE(GetProjectstoreTag());
 	ZEN_TRACE_CPU("ProjectStore::GetProjectChunkInfos");
 
-	auto Log = [&InLog]() { return InLog; };
+	ZEN_SCOPED_LOG(InLog);
 
 	using namespace std::literals;
 
@@ -5051,16 +5051,13 @@ ProjectStore::GetProjectChunkInfos(LoggerRef InLog, Project& Project, Oplog& Opl
 }
 
 CbObject
-ProjectStore::GetChunkInfo(LoggerRef InLog, Project& Project, Oplog& Oplog, const Oid& ChunkId)
+ProjectStore::GetChunkInfo(Project& Project, Oplog& Oplog, const Oid& ChunkId)
 {
 	ZEN_MEMSCOPE(GetProjectstoreTag());
 	ZEN_TRACE_CPU("ProjectStore::GetChunkInfo");
 
 	using namespace std::literals;
 
-	auto Log = [&InLog]() { return InLog; };
-	ZEN_UNUSED(Log);
-
 	IoBuffer Chunk = Oplog.FindChunk(Project.RootDir, ChunkId, nullptr);
 	if (!Chunk)
 	{
@@ -5209,8 +5206,7 @@ ExtractRange(IoBuffer&& Chunk, uint64_t Offset, uint64_t Size, ZenContentType Ac
 }
 
 ProjectStore::GetChunkRangeResult
-ProjectStore::GetChunkRange(LoggerRef	   InLog,
-							Project&	   Project,
+ProjectStore::GetChunkRange(Project&	   Project,
 							Oplog&		   Oplog,
 							const Oid&	   ChunkId,
 							uint64_t	   Offset,
@@ -5222,9 +5218,6 @@ ProjectStore::GetChunkRange(LoggerRef	   InLog,
 
 	ZEN_TRACE_CPU("ProjectStore::GetChunkRange");
 
-	auto Log = [&InLog]() { return InLog; };
-	ZEN_UNUSED(Log);
-
 	uint64_t OldTag = OptionalInOutModificationTag == nullptr ? 0 : *OptionalInOutModificationTag;
 	IoBuffer Chunk	= Oplog.FindChunk(Project.RootDir, ChunkId, OptionalInOutModificationTag);
 	if (!Chunk)
@@ -5731,7 +5724,7 @@ public:
 		ZEN_TRACE_CPU("Store::CompactStore");
 		ZEN_MEMSCOPE(GetProjectstoreTag());
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
@@ -5867,7 +5860,7 @@ ProjectStore::RemoveExpiredData(GcCtx& Ctx, GcStats& Stats)
 	ZEN_TRACE_CPU("Store::RemoveExpiredData");
 	ZEN_MEMSCOPE(GetProjectstoreTag());
 
-	auto Log = [&Ctx]() { return Ctx.Logger; };
+	ZEN_SCOPED_LOG(Ctx.Logger);
 
 	Stopwatch  Timer;
 	const auto _ = MakeGuard([&] {
@@ -6020,7 +6013,7 @@ public:
 	{
 		ZEN_TRACE_CPU("Store::UpdateLockedState");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		Stopwatch Timer;
 
@@ -6097,7 +6090,7 @@ public:
 	{
 		ZEN_TRACE_CPU("Store::GetUnusedReferences");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		size_t InitialCount = IoCids.size();
 		size_t UsedCount	= InitialCount;
@@ -6121,6 +6114,7 @@ public:
 	}
 
 private:
+	LoggerRef			Log() { return m_ProjectStore.Log(); }
 	ProjectStore&		m_ProjectStore;
 	std::vector<IoHash> m_References;
 };
@@ -6165,7 +6159,7 @@ public:
 	{
 		ZEN_TRACE_CPU("Store::Oplog::PreCache");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
@@ -6283,7 +6277,7 @@ public:
 	{
 		ZEN_TRACE_CPU("Store::Oplog::UpdateLockedState");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
@@ -6391,7 +6385,7 @@ public:
 	{
 		ZEN_TRACE_CPU("Store::Oplog::GetUnusedReferences");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		const size_t InitialCount = IoCids.size();
 		size_t		 UsedCount	  = InitialCount;
@@ -6417,6 +6411,7 @@ public:
 		return UnusedReferences;
 	}
 
+	LoggerRef				   Log() { return m_Project->Log(); }
 	ProjectStore&			   m_ProjectStore;
 	Ref<ProjectStore::Project> m_Project;
 	std::string				   m_OplogId;
@@ -6432,7 +6427,7 @@ ProjectStore::CreateReferenceCheckers(GcCtx& Ctx)
 {
 	ZEN_TRACE_CPU("Store::CreateReferenceCheckers");
 
-	auto Log = [&Ctx]() { return Ctx.Logger; };
+	ZEN_SCOPED_LOG(Ctx.Logger);
 
 	size_t ProjectCount = 0;
 	size_t OplogCount	= 0;
@@ -6494,11 +6489,9 @@ ProjectStore::CreateReferenceCheckers(GcCtx& Ctx)
 std::vector<RwLock::SharedLockScope>
 ProjectStore::LockState(GcCtx& Ctx)
 {
+	ZEN_UNUSED(Ctx);
 	ZEN_TRACE_CPU("Store::LockState");
 
-	auto Log = [&Ctx]() { return Ctx.Logger; };
-	ZEN_UNUSED(Log);
-
 	std::vector<RwLock::SharedLockScope> Locks;
 	Locks.emplace_back(RwLock::SharedLockScope(m_ProjectsLock));
 	for (auto& ProjectIt : m_Projects)
@@ -6530,7 +6523,7 @@ public:
 	{
 		ZEN_TRACE_CPU("Store::Validate");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		ProjectStore::Oplog::ValidationResult Result;
 
@@ -6629,9 +6622,6 @@ ProjectStore::CreateReferenceValidators(GcCtx& Ctx)
 		return {};
 	}
 
-	auto Log = [&Ctx]() { return Ctx.Logger; };
-	ZEN_UNUSED(Log);
-
 	DiscoverProjects();
 
 	std::vector<std::pair<std::string, std::string>> Oplogs;
@@ -8246,8 +8236,7 @@ TEST_CASE("project.store.partial.read")
 	{
 		uint64_t ModificationTag = 0;
 
-		auto Result = ProjectStore.GetChunkRange(Log(),
-												 *Project1,
+		auto Result = ProjectStore.GetChunkRange(*Project1,
 												 *Oplog1,
 												 Attachments[OpIds[1]][0].first,
 												 0,
@@ -8262,8 +8251,7 @@ TEST_CASE("project.store.partial.read")
 		CompressedBuffer Attachment = CompressedBuffer::FromCompressed(Result.Chunk, RawHash, RawSize);
 		CHECK(RawSize == Attachments[OpIds[1]][0].second.DecodeRawSize());
 
-		auto Result2 = ProjectStore.GetChunkRange(Log(),
-												  *Project1,
+		auto Result2 = ProjectStore.GetChunkRange(*Project1,
 												  *Oplog1,
 												  Attachments[OpIds[1]][0].first,
 												  0,
@@ -8276,8 +8264,7 @@ TEST_CASE("project.store.partial.read")
 	{
 		uint64_t FullChunkModificationTag = 0;
 		{
-			auto Result = ProjectStore.GetChunkRange(Log(),
-													 *Project1,
+			auto Result = ProjectStore.GetChunkRange(*Project1,
 													 *Oplog1,
 													 Attachments[OpIds[2]][1].first,
 													 0,
@@ -8290,8 +8277,7 @@ TEST_CASE("project.store.partial.read")
 				  Attachments[OpIds[2]][1].second.DecodeRawSize());
 		}
 		{
-			auto Result = ProjectStore.GetChunkRange(Log(),
-													 *Project1,
+			auto Result = ProjectStore.GetChunkRange(*Project1,
 													 *Oplog1,
 													 Attachments[OpIds[2]][1].first,
 													 0,
@@ -8304,8 +8290,7 @@ TEST_CASE("project.store.partial.read")
 	{
 		uint64_t PartialChunkModificationTag = 0;
 		{
-			auto Result = ProjectStore.GetChunkRange(Log(),
-													 *Project1,
+			auto Result = ProjectStore.GetChunkRange(*Project1,
 													 *Oplog1,
 													 Attachments[OpIds[2]][1].first,
 													 5,
@@ -8328,8 +8313,7 @@ TEST_CASE("project.store.partial.read")
 		}
 
 		{
-			auto Result = ProjectStore.GetChunkRange(Log(),
-													 *Project1,
+			auto Result = ProjectStore.GetChunkRange(*Project1,
 													 *Oplog1,
 													 Attachments[OpIds[2]][1].first,
 													 0,
diff --git a/src/zenstore/workspaces.cpp b/src/zenstore/workspaces.cpp
index ad21bbc68..cfdcd294c 100644
--- a/src/zenstore/workspaces.cpp
+++ b/src/zenstore/workspaces.cpp
@@ -331,9 +331,6 @@ ScanFolder(LoggerRef InLog, const std::filesystem::path& Path, WorkerThreadPool&
 {
 	ZEN_TRACE_CPU("workspaces::ScanFolderImpl");
 
-	auto Log = [&InLog]() { return InLog; };
-	ZEN_UNUSED(Log);
-
 	FolderScanner Data(InLog, WorkerPool, Path);
 	Data.Traverse();
 	return std::make_unique<FolderStructure>(std::move(Data.FoundFiles), std::move(Data.FoundFileIds));
@@ -811,7 +808,7 @@ Workspaces::GetShareAlias(std::string_view Alias) const
 std::vector<Workspaces::WorkspaceConfiguration>
 Workspaces::ReadConfig(const LoggerRef& InLog, const std::filesystem::path& WorkspaceStatePath, std::string& OutError)
 {
-	auto Log = [&InLog]() { return InLog; };
+	ZEN_SCOPED_LOG(InLog);
 
 	using namespace std::literals;
 
@@ -835,7 +832,7 @@ Workspaces::WriteConfig(const LoggerRef&						   InLog,
 						const std::filesystem::path&			   WorkspaceStatePath,
 						const std::vector<WorkspaceConfiguration>& WorkspaceConfigurations)
 {
-	auto Log = [&InLog]() { return InLog; };
+	ZEN_SCOPED_LOG(InLog);
 
 	using namespace std::literals;
 
@@ -850,7 +847,7 @@ Workspaces::WriteConfig(const LoggerRef&						   InLog,
 std::vector<Workspaces::WorkspaceShareConfiguration>
 Workspaces::ReadWorkspaceConfig(const LoggerRef& InLog, const std::filesystem::path& WorkspaceRoot, std::string& OutError)
 {
-	auto Log = [&InLog]() { return InLog; };
+	ZEN_SCOPED_LOG(InLog);
 
 	using namespace std::literals;
 
@@ -874,7 +871,7 @@ Workspaces::WriteWorkspaceConfig(const LoggerRef&								 InLog,
 								 const std::filesystem::path&					 WorkspaceRoot,
 								 const std::vector<WorkspaceShareConfiguration>& WorkspaceShareConfigurations)
 {
-	auto Log = [&InLog]() { return InLog; };
+	ZEN_SCOPED_LOG(InLog);
 
 	using namespace std::literals;
 
@@ -1049,9 +1046,6 @@ Workspaces::RemoveWorkspaceShare(const LoggerRef& Log, const std::filesystem::pa
 Workspaces::WorkspaceConfiguration
 Workspaces::FindWorkspace(const LoggerRef& InLog, const std::filesystem::path& WorkspaceStatePath, const Oid& WorkspaceId)
 {
-	auto Log = [&InLog]() { return InLog; };
-	ZEN_UNUSED(Log);
-
 	std::string							Error;
 	std::vector<WorkspaceConfiguration> Workspaces = ReadConfig(InLog, WorkspaceStatePath, Error);
 	if (!Error.empty())
@@ -1075,9 +1069,6 @@ Workspaces::FindWorkspace(const LoggerRef&			   InLog,
 						  const std::filesystem::path& WorkspaceStatePath,
 						  const std::filesystem::path& WorkspaceRoot)
 {
-	auto Log = [&InLog]() { return InLog; };
-	ZEN_UNUSED(Log);
-
 	std::string							Error;
 	std::vector<WorkspaceConfiguration> Workspaces = ReadConfig(InLog, WorkspaceStatePath, Error);
 	if (!Error.empty())
@@ -1102,7 +1093,7 @@ Workspaces::FindWorkspaceShare(const LoggerRef&				InLog,
 							   std::string_view				ShareAlias,
 							   WorkspaceConfiguration&		OutWorkspace)
 {
-	auto Log = [&InLog]() { return InLog; };
+	ZEN_SCOPED_LOG(InLog);
 
 	std::string							Error;
 	std::vector<WorkspaceConfiguration> Workspaces = ReadConfig(InLog, WorkspaceStatePath, Error);
@@ -1151,7 +1142,7 @@ Workspaces::FindWorkspaceShare(const LoggerRef&				InLog,
 Workspaces::WorkspaceShareConfiguration
 Workspaces::FindWorkspaceShare(const LoggerRef& InLog, const std::filesystem::path& WorkspaceRoot, const Oid& WorkspaceShareId)
 {
-	auto									 Log = [&InLog]() { return InLog; };
+	ZEN_SCOPED_LOG(InLog);
 	std::string								 Error;
 	std::vector<WorkspaceShareConfiguration> Shares = ReadWorkspaceConfig(InLog, WorkspaceRoot, Error);
 	if (!Error.empty())
@@ -1174,7 +1165,7 @@ Workspaces::FindWorkspaceShare(const LoggerRef& InLog, const std::filesystem::pa
 Workspaces::WorkspaceShareConfiguration
 Workspaces::FindWorkspaceShare(const LoggerRef& InLog, const std::filesystem::path& WorkspaceRoot, const std::filesystem::path& SharePath)
 {
-	auto									 Log = [&InLog]() { return InLog; };
+	ZEN_SCOPED_LOG(InLog);
 	std::string								 Error;
 	std::vector<WorkspaceShareConfiguration> Shares = ReadWorkspaceConfig(InLog, WorkspaceRoot, Error);
 	if (!Error.empty())