3 files changed, 19 insertions, 0 deletions
diff --git a/src/zenserver/main.cpp b/src/zenserver/main.cpp
index 6bab33d92..34848c831 100644
--- a/src/zenserver/main.cpp
+++ b/src/zenserver/main.cpp
@@ -18,6 +18,7 @@
 #include <zencore/string.h>
 #include <zencore/thread.h>
 #include <zencore/trace.h>
+#include <zentelemetry/otlptrace.h>
 #include <zenutil/service.h>
 
 #include "diag/logging.h"
@@ -102,6 +103,8 @@ AppMain(int argc, char* argv[])
 #endif	// ZEN_WITH_TRACE
 
 		{
+			ZEN_OTEL_SPAN("AppMain::Configure");
+
 			typename Main::Configurator Configurator(ServerOptions);
 			Configurator.Configure(argc, argv);
 		}
diff --git a/src/zenserver/storage/zenstorageserver.cpp b/src/zenserver/storage/zenstorageserver.cpp
index 827f22ecc..93a01d9d7 100644
--- a/src/zenserver/storage/zenstorageserver.cpp
+++ b/src/zenserver/storage/zenstorageserver.cpp
@@ -28,6 +28,7 @@
 #include <zenstore/scrubcontext.h>
 #include <zenstore/vfsimpl.h>
 #include <zenstore/workspaces.h>
+#include <zentelemetry/otlptrace.h>
 #include <zenutil/service.h>
 #include <zenutil/workerpools.h>
 #include <zenutil/zenserverprocess.h>
@@ -185,6 +186,8 @@ ZenStorageServer::RegisterServices()
 void
 ZenStorageServer::InitializeServices(const ZenStorageServerConfig& ServerOptions)
 {
+	ZEN_OTEL_SPAN("InitializeServices");
+
 	InitializeAuthentication(ServerOptions);
 
 	ZEN_INFO("initializing storage");
@@ -206,6 +209,8 @@ ZenStorageServer::InitializeServices(const ZenStorageServerConfig& ServerOptions
 
 	if (ServerOptions.WorksSpacesConfig.Enabled)
 	{
+		ZEN_OTEL_SPAN("InitializeWorkspaces");
+
 		m_Workspaces.reset(new Workspaces());
 		m_HttpWorkspacesService.reset(
 			new HttpWorkspacesService(m_StatusService,
@@ -239,6 +244,8 @@ ZenStorageServer::InitializeServices(const ZenStorageServerConfig& ServerOptions
 
 	if (ServerOptions.ObjectStoreEnabled)
 	{
+		ZEN_OTEL_SPAN("InitializeObjectStore");
+
 		ObjectStoreConfig ObjCfg;
 		ObjCfg.RootDirectory = m_DataRoot / "obj";
 
@@ -254,6 +261,8 @@ ZenStorageServer::InitializeServices(const ZenStorageServerConfig& ServerOptions
 
 	if (ServerOptions.BuildStoreConfig.Enabled)
 	{
+		ZEN_OTEL_SPAN("InitializeBuildStore");
+
 		m_BuildStoreService = std::make_unique<HttpBuildStoreService>(m_StatusService, m_StatsService, *m_BuildStore);
 	}
 
@@ -347,6 +356,7 @@ ZenStorageServer::InitializeAuthentication(const ZenStorageServerConfig& ServerO
 void
 ZenStorageServer::InitializeState(const ZenStorageServerConfig& ServerOptions)
 {
+	ZEN_OTEL_SPAN("InitializeState");
 	ZEN_TRACE_CPU("ZenStorageServer::InitializeState");
 
 	// Check root manifest to deal with schema versioning
@@ -451,6 +461,7 @@ ZenStorageServer::InitializeState(const ZenStorageServerConfig& ServerOptions)
 
 	if (WipeState)
 	{
+		ZEN_OTEL_SPAN("WipingState");
 		ZEN_WARN("Wiping state at '{}' - reason: '{}'", m_DataRoot, WipeReason);
 
 		std::error_code Ec;
@@ -517,6 +528,7 @@ ZenStorageServer::InitializeState(const ZenStorageServerConfig& ServerOptions)
 void
 ZenStorageServer::InitializeStructuredCache(const ZenStorageServerConfig& ServerOptions)
 {
+	ZEN_OTEL_SPAN("InitializeStructuredCache");
 	ZEN_TRACE_CPU("ZenStorageServer::InitializeStructuredCache");
 
 	using namespace std::literals;
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index e83624bbb..ab8dbb16b 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -23,6 +23,7 @@
 #include <zencore/trace.h>
 #include <zencore/workthreadpool.h>
 #include <zenhttp/httpserver.h>
+#include <zentelemetry/otlptrace.h>
 #include <zenutil/service.h>
 #include <zenutil/workerpools.h>
 #include <zenutil/zenserverprocess.h>
@@ -77,6 +78,7 @@ ZenServerBase::~ZenServerBase()
 int
 ZenServerBase::Initialize(const ZenServerConfig& ServerOptions, ZenServerState::ZenServerEntry* ServerEntry)
 {
+	ZEN_OTEL_SPAN("ZenServerBase::Initialize");
 	ZEN_TRACE_CPU("ZenServerBase::Initialize");
 	ZEN_MEMSCOPE(GetZenserverTag());
 
@@ -396,6 +398,8 @@ ZenServerMain::Run()
 
 	if (m_ServerOptions.SentryConfig.Disable == false)
 	{
+		ZEN_OTEL_SPAN("SentryInit");
+
 		std::string SentryDatabasePath	 = (m_ServerOptions.DataDir / ".sentry-native").string();
 		std::string SentryAttachmentPath = m_ServerOptions.AbsLogFile.string();