Additional trace instrumentation (#312)

* added trace instrumentation to upstreamcache
* added asio trace instrumentation
* added trace annotations for project store
* added trace annotations for BlockStore
* added trace annotations for HttpClient
* added trace annotations for CAS/GC

1 files changed, 18 insertions, 8 deletions

diff --git a/src/zenserver/upstream/upstreamcache.cpp b/src/zenserver/upstream/upstreamcache.cpp
index 2a9e67c06..ca3cde778 100644
--- a/src/zenserver/upstream/upstreamcache.cpp
+++ b/src/zenserver/upstream/upstreamcache.cpp
@@ -120,12 +120,14 @@ namespace detail {
 			m_Client = new CloudCacheClient(Options, std::move(TokenProvider));
 		}
 
-		virtual ~JupiterUpstreamEndpoint() = default;
+		virtual ~JupiterUpstreamEndpoint() {}
 
 		virtual const UpstreamEndpointInfo& GetEndpointInfo() const override { return m_Info; }
 
 		virtual UpstreamEndpointStatus Initialize() override
 		{
+			ZEN_TRACE_CPU("Upstream::Jupiter::Initialize");
+
 			try
 			{
 				if (m_Status.EndpointState() == UpstreamEndpointState::kOk)
@@ -185,7 +187,7 @@ namespace detail {
 															const CacheKey&	 CacheKey,
 															ZenContentType	 Type) override
 		{
-			ZEN_TRACE_CPU("Upstream::Horde::GetSingleCacheRecord");
+			ZEN_TRACE_CPU("Upstream::Jupiter::GetSingleCacheRecord");
 
 			try
 			{
@@ -303,7 +305,7 @@ namespace detail {
 													   std::span<CacheKeyRequest*> Requests,
 													   OnCacheRecordGetComplete&&  OnComplete) override
 		{
-			ZEN_TRACE_CPU("Upstream::Horde::GetCacheRecords");
+			ZEN_TRACE_CPU("Upstream::Jupiter::GetCacheRecords");
 
 			CloudCacheSession	   Session(m_Client);
 			GetUpstreamCacheResult Result;
@@ -366,7 +368,7 @@ namespace detail {
 														   const CacheKey&,
 														   const IoHash& ValueContentId) override
 		{
-			ZEN_TRACE_CPU("Upstream::Horde::GetSingleCacheChunk");
+			ZEN_TRACE_CPU("Upstream::Jupiter::GetSingleCacheChunk");
 
 			try
 			{
@@ -399,7 +401,7 @@ namespace detail {
 													  std::span<CacheChunkRequest*> CacheChunkRequests,
 													  OnCacheChunksGetComplete&&	OnComplete) override final
 		{
-			ZEN_TRACE_CPU("Upstream::Horde::GetCacheChunks");
+			ZEN_TRACE_CPU("Upstream::Jupiter::GetCacheChunks");
 
 			CloudCacheSession	   Session(m_Client);
 			GetUpstreamCacheResult Result;
@@ -454,7 +456,7 @@ namespace detail {
 													  std::span<CacheValueRequest*> CacheValueRequests,
 													  OnCacheValueGetComplete&&		OnComplete) override final
 		{
-			ZEN_TRACE_CPU("Upstream::Horde::GetCacheValues");
+			ZEN_TRACE_CPU("Upstream::Jupiter::GetCacheValues");
 
 			CloudCacheSession	   Session(m_Client);
 			GetUpstreamCacheResult Result;
@@ -529,7 +531,7 @@ namespace detail {
 													  IoBuffer					 RecordValue,
 													  std::span<IoBuffer const>	 Values) override
 		{
-			ZEN_TRACE_CPU("Upstream::Horde::PutCacheRecord");
+			ZEN_TRACE_CPU("Upstream::Jupiter::PutCacheRecord");
 
 			ZEN_ASSERT(CacheRecord.ValueContentIds.size() == Values.size());
 			const int32_t MaxAttempts = 3;
@@ -788,12 +790,14 @@ namespace detail {
 			}
 		}
 
-		~ZenUpstreamEndpoint() = default;
+		~ZenUpstreamEndpoint() {}
 
 		virtual const UpstreamEndpointInfo& GetEndpointInfo() const override { return m_Info; }
 
 		virtual UpstreamEndpointStatus Initialize() override
 		{
+			ZEN_TRACE_CPU("Upstream::Zen::Initialize");
+
 			try
 			{
 				if (m_Status.EndpointState() == UpstreamEndpointState::kOk)
@@ -1488,6 +1492,8 @@ public:
 
 	virtual void Initialize() override
 	{
+		ZEN_TRACE_CPU("Upstream::Initialize");
+
 		for (uint32_t Idx = 0; Idx < m_Options.ThreadCount; Idx++)
 		{
 			m_UpstreamThreads.emplace_back(&UpstreamCacheImpl::ProcessUpstreamQueue, this, Idx + 1);
@@ -1499,6 +1505,8 @@ public:
 
 	virtual void RegisterEndpoint(std::unique_ptr<UpstreamEndpoint> Endpoint) override
 	{
+		ZEN_TRACE_CPU("Upstream::RegisterEndpoint");
+
 		const UpstreamEndpointStatus Status = Endpoint->Initialize();
 		const UpstreamEndpointInfo&	 Info	= Endpoint->GetEndpointInfo();
 
@@ -1840,6 +1848,8 @@ public:
 
 	virtual void GetStatus(CbObjectWriter& Status) override
 	{
+		ZEN_TRACE_CPU("Upstream::GetStatus");
+
 		Status << "reading" << m_Options.ReadUpstream;
 		Status << "writing" << m_Options.WriteUpstream;
 		Status << "worker_threads" << m_Options.ThreadCount;