move testing and observability code to zenhttp (#266)

18 files changed, 25 insertions, 27 deletions

diff --git a/src/zenserver/diag/diagsvcs.cpp b/src/zenhttp/diagsvcs.cpp
index 29ad5c3dd..8fa71b375 100644
--- a/src/zenserver/diag/diagsvcs.cpp
+++ b/src/zenhttp/diagsvcs.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "diagsvcs.h"
+#include "zenhttp/diagsvcs.h"
 
 #include <zencore/compactbinary.h>
 #include <zencore/compactbinarybuilder.h>
diff --git a/src/zenserver/diag/diagsvcs.h b/src/zenhttp/include/zenhttp/diagsvcs.h
index bd03f8023..bd03f8023 100644
--- a/src/zenserver/diag/diagsvcs.h
+++ b/src/zenhttp/include/zenhttp/diagsvcs.h
diff --git a/src/zenserver/diag/formatters.h b/src/zenhttp/include/zenhttp/formatters.h
index 759df58d3..759df58d3 100644
--- a/src/zenserver/diag/formatters.h
+++ b/src/zenhttp/include/zenhttp/formatters.h
diff --git a/src/zenserver/monitoring/httpstats.h b/src/zenhttp/include/zenhttp/httpstats.h
index 732815a9a..732815a9a 100644
--- a/src/zenserver/monitoring/httpstats.h
+++ b/src/zenhttp/include/zenhttp/httpstats.h
diff --git a/src/zenserver/monitoring/httpstatus.h b/src/zenhttp/include/zenhttp/httpstatus.h
index b04e45324..b04e45324 100644
--- a/src/zenserver/monitoring/httpstatus.h
+++ b/src/zenhttp/include/zenhttp/httpstatus.h
diff --git a/src/zenserver/testing/httptest.h b/src/zenhttp/include/zenhttp/httptest.h
index 57d2d63f3..57d2d63f3 100644
--- a/src/zenserver/testing/httptest.h
+++ b/src/zenhttp/include/zenhttp/httptest.h
diff --git a/src/zenserver/monitoring/httpstats.cpp b/src/zenhttp/monitoring/httpstats.cpp
index 4d985f8c2..a873b4977 100644
--- a/src/zenserver/monitoring/httpstats.cpp
+++ b/src/zenhttp/monitoring/httpstats.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "httpstats.h"
+#include "zenhttp/httpstats.h"
 
 namespace zen {
 
diff --git a/src/zenserver/monitoring/httpstatus.cpp b/src/zenhttp/monitoring/httpstatus.cpp
index 8b10601dd..9fecedb06 100644
--- a/src/zenserver/monitoring/httpstatus.cpp
+++ b/src/zenhttp/monitoring/httpstatus.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "httpstatus.h"
+#include "zenhttp/httpstatus.h"
 
 namespace zen {
 
diff --git a/src/zenserver/testing/httptest.cpp b/src/zenhttp/testing/httptest.cpp
index 349a95ab3..3e77e9c8c 100644
--- a/src/zenserver/testing/httptest.cpp
+++ b/src/zenhttp/testing/httptest.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "httptest.h"
+#include "zenhttp/httptest.h"
 
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/compactbinarypackage.h>
diff --git a/src/zenserver/cache/structuredcache.cpp b/src/zenserver/cache/structuredcache.cpp
index 90e905bf6..3c829f0e8 100644
--- a/src/zenserver/cache/structuredcache.cpp
+++ b/src/zenserver/cache/structuredcache.cpp
@@ -17,10 +17,10 @@
 #include <zencore/workthreadpool.h>
 #include <zenhttp/httpserver.h>
 #include <zenhttp/httpshared.h>
+#include <zenhttp/httpstats.h>
 #include <zenutil/cache/cache.h>
 #include <zenutil/cache/rpcrecording.h>
 
-#include "monitoring/httpstats.h"
 #include "structuredcachestore.h"
 #include "upstream/jupiter.h"
 #include "upstream/upstreamcache.h"
diff --git a/src/zenserver/cache/structuredcache.h b/src/zenserver/cache/structuredcache.h
index 4e7b98ac9..8309361f4 100644
--- a/src/zenserver/cache/structuredcache.h
+++ b/src/zenserver/cache/structuredcache.h
@@ -4,9 +4,8 @@
 
 #include <zencore/stats.h>
 #include <zenhttp/httpserver.h>
-
-#include "monitoring/httpstats.h"
-#include "monitoring/httpstatus.h"
+#include <zenhttp/httpstats.h>
+#include <zenhttp/httpstatus.h>
 
 #include <memory>
 #include <vector>
diff --git a/src/zenserver/config.cpp b/src/zenserver/config.cpp
index cff93d67b..d28262607 100644
--- a/src/zenserver/config.cpp
+++ b/src/zenserver/config.cpp
@@ -33,16 +33,16 @@ std::filesystem::path
 PickDefaultStateDirectory()
 {
 	// Pick sensible default
-	PWSTR	programDataDir = nullptr;
-	HRESULT hRes		   = SHGetKnownFolderPath(FOLDERID_ProgramData, 0, NULL, &programDataDir);
+	PWSTR	ProgramDataDir = nullptr;
+	HRESULT hRes		   = SHGetKnownFolderPath(FOLDERID_ProgramData, 0, NULL, &ProgramDataDir);
 
 	if (SUCCEEDED(hRes))
 	{
-		std::filesystem::path finalPath(programDataDir);
-		finalPath /= L"Epic\\Zen\\Data";
-		::CoTaskMemFree(programDataDir);
+		std::filesystem::path FinalPath(ProgramDataDir);
+		FinalPath /= L"Epic\\Zen\\Data";
+		::CoTaskMemFree(ProgramDataDir);
 
-		return finalPath;
+		return FinalPath;
 	}
 
 	return L"";
diff --git a/src/zenserver/cidstore.cpp b/src/zenserver/httpcidstore.cpp
index bce4f1dfb..233a45edb 100644
--- a/src/zenserver/cidstore.cpp
+++ b/src/zenserver/httpcidstore.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "cidstore.h"
+#include "httpcidstore.h"
 
 #include <zencore/compress.h>
 #include <zencore/fmtutils.h>
diff --git a/src/zenserver/cidstore.h b/src/zenserver/httpcidstore.h
index 8e7832b35..8e7832b35 100644
--- a/src/zenserver/cidstore.h
+++ b/src/zenserver/httpcidstore.h
diff --git a/src/zenserver/projectstore/projectstore.h b/src/zenserver/projectstore/projectstore.h
index e4f664b85..be3ee7075 100644
--- a/src/zenserver/projectstore/projectstore.h
+++ b/src/zenserver/projectstore/projectstore.h
@@ -5,10 +5,9 @@
 #include <zencore/uid.h>
 #include <zencore/xxhash.h>
 #include <zenhttp/httpserver.h>
+#include <zenhttp/httpstats.h>
 #include <zenstore/gc.h>
 
-#include "monitoring/httpstats.h"
-
 ZEN_THIRD_PARTY_INCLUDES_START
 #include <tsl/robin_map.h>
 ZEN_THIRD_PARTY_INCLUDES_END
diff --git a/src/zenserver/upstream/jupiter.cpp b/src/zenserver/upstream/jupiter.cpp
index dbb185bec..bd075a436 100644
--- a/src/zenserver/upstream/jupiter.cpp
+++ b/src/zenserver/upstream/jupiter.cpp
@@ -2,7 +2,6 @@
 
 #include "jupiter.h"
 
-#include "diag/formatters.h"
 #include "diag/logging.h"
 
 #include <zencore/compactbinary.h>
@@ -12,6 +11,7 @@
 #include <zencore/string.h>
 #include <zencore/thread.h>
 #include <zencore/trace.h>
+#include <zenhttp/formatters.h>
 
 ZEN_THIRD_PARTY_INCLUDES_START
 #include <cpr/cpr.h>
diff --git a/src/zenserver/upstream/zen.cpp b/src/zenserver/upstream/zen.cpp
index 9e1212834..8ae33597a 100644
--- a/src/zenserver/upstream/zen.cpp
+++ b/src/zenserver/upstream/zen.cpp
@@ -8,11 +8,11 @@
 #include <zencore/fmtutils.h>
 #include <zencore/session.h>
 #include <zencore/stream.h>
+#include <zenhttp/formatters.h>
 #include <zenhttp/httpcommon.h>
 #include <zenhttp/httpshared.h>
 
 #include "cache/structuredcachestore.h"
-#include "diag/formatters.h"
 #include "diag/logging.h"
 
 ZEN_THIRD_PARTY_INCLUDES_START
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index 3b81a3ada..9c79f9997 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -98,22 +98,22 @@ ZEN_THIRD_PARTY_INCLUDES_END
 // Services
 //
 
+#include <zenhttp/auth/authmgr.h>
+#include <zenhttp/auth/authservice.h>
+#include <zenhttp/diagsvcs.h>
+#include <zenhttp/httpstats.h>
+#include <zenhttp/httpstatus.h>
+#include <zenhttp/httptest.h>
+#include <zenstore/gc.h>
 #include "admin/admin.h"
 #include "cache/structuredcache.h"
 #include "cache/structuredcachestore.h"
-#include "cidstore.h"
 #include "compute/function.h"
-#include "diag/diagsvcs.h"
 #include "frontend/frontend.h"
-#include "monitoring/httpstats.h"
-#include "monitoring/httpstatus.h"
+#include "httpcidstore.h"
 #include "objectstore/objectstore.h"
 #include "projectstore/projectstore.h"
-#include "testing/httptest.h"
 #include "upstream/upstream.h"
-#include "zenhttp/auth/authmgr.h"
-#include "zenhttp/auth/authservice.h"
-#include "zenstore/gc.h"
 
 #define ZEN_APP_NAME "Zen store"