From 722fb65376c910de3b581d5738d5a27c34ba6000 Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Sat, 4 Jan 2025 00:05:46 -0500 Subject: [PATCH] Changing direction on trace. --- NTDLS.Katzebase.Engine/EngineCore.cs | 5 --- .../APIHandlers/DocumentAPIHandlers.cs | 6 --- .../APIHandlers/IndexAPIHandlers.cs | 12 ------ .../APIHandlers/QueryAPIHandlers.cs | 10 ----- .../APIHandlers/SchemaAPIHandlers.cs | 10 ----- .../APIHandlers/SessionAPIHandlers.cs | 19 +--------- .../APIHandlers/TransactionAPIHandlers.cs | 6 --- .../NTDLS.Katzebase.Engine.csproj | 3 -- NTDLS.Katzebase.Engine/Trace/TraceManager.cs | 24 ------------ NTDLS.Katzebase.Engine/Trace/TraceTracker.cs | 38 ------------------- 10 files changed, 1 insertion(+), 132 deletions(-) delete mode 100644 NTDLS.Katzebase.Engine/Trace/TraceManager.cs delete mode 100644 NTDLS.Katzebase.Engine/Trace/TraceTracker.cs diff --git a/NTDLS.Katzebase.Engine/EngineCore.cs b/NTDLS.Katzebase.Engine/EngineCore.cs index 9ef3e01f..61383711 100644 --- a/NTDLS.Katzebase.Engine/EngineCore.cs +++ b/NTDLS.Katzebase.Engine/EngineCore.cs @@ -3,7 +3,6 @@ using NTDLS.Katzebase.Engine.Health; using NTDLS.Katzebase.Engine.Interactions.Management; using NTDLS.Katzebase.Engine.Threading; -using NTDLS.Katzebase.Engine.Trace; using NTDLS.Katzebase.Shared; using NTDLS.Semaphore; using System.Diagnostics; @@ -19,7 +18,6 @@ public class EngineCore internal CacheManager Cache; internal HeartbeatManager Heartbeat; internal KatzebaseSettings Settings; - internal TraceManager Trace; public PolicyManager Policy; public SchemaManager Schemas; @@ -106,9 +104,6 @@ public EngineCore(KatzebaseSettings settings) LogManager.Information("Initializing heartbeat manager."); Heartbeat = new HeartbeatManager(this); - LogManager.Information("Initializing trace manager."); - Trace = new TraceManager(this); - Schemas.PostInitialization(); } diff --git a/NTDLS.Katzebase.Engine/Interactions/APIHandlers/DocumentAPIHandlers.cs b/NTDLS.Katzebase.Engine/Interactions/APIHandlers/DocumentAPIHandlers.cs index aaf61dfb..ac9c6469 100644 --- a/NTDLS.Katzebase.Engine/Interactions/APIHandlers/DocumentAPIHandlers.cs +++ b/NTDLS.Katzebase.Engine/Interactions/APIHandlers/DocumentAPIHandlers.cs @@ -31,9 +31,7 @@ public DocumentAPIHandlers(EngineCore core) public KbQueryDocumentSampleReply DocumentSample(RmContext context, KbQueryDocumentSample param) { - using var trace = _core.Trace.CreateTracker(TraceType.DocumentSample, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; @@ -75,9 +73,7 @@ public KbQueryDocumentSampleReply DocumentSample(RmContext context, KbQueryDocum /// public KbQueryDocumentListReply DocumentList(RmContext context, KbQueryDocumentList param) { - using var trace = _core.Trace.CreateTracker(TraceType.DocumentList, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; @@ -121,9 +117,7 @@ public KbQueryDocumentListReply DocumentList(RmContext context, KbQueryDocumentL /// public KbQueryDocumentStoreReply DocumentStore(RmContext context, KbQueryDocumentStore param) { - using var trace = _core.Trace.CreateTracker(TraceType.DocumentStore, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; diff --git a/NTDLS.Katzebase.Engine/Interactions/APIHandlers/IndexAPIHandlers.cs b/NTDLS.Katzebase.Engine/Interactions/APIHandlers/IndexAPIHandlers.cs index dc911c11..2f1a5b70 100644 --- a/NTDLS.Katzebase.Engine/Interactions/APIHandlers/IndexAPIHandlers.cs +++ b/NTDLS.Katzebase.Engine/Interactions/APIHandlers/IndexAPIHandlers.cs @@ -30,9 +30,7 @@ public IndexAPIHandlers(EngineCore core) public KbQueryIndexGetReply IndexGet(RmContext context, KbQueryIndexGet param) { - using var trace = _core.Trace.CreateTracker(TraceType.IndexGet, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; @@ -68,9 +66,7 @@ public KbQueryIndexGetReply IndexGet(RmContext context, KbQueryIndexGet param) public KbQueryIndexListReply IndexList(RmContext context, KbQueryIndexList param) { - using var trace = _core.Trace.CreateTracker(TraceType.IndexList, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; @@ -109,9 +105,7 @@ public KbQueryIndexListReply IndexList(RmContext context, KbQueryIndexList param public KbQueryIndexExistsReply IndexExist(RmContext context, KbQueryIndexExists param) { - using var trace = _core.Trace.CreateTracker(TraceType.IndexExist, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; @@ -144,9 +138,7 @@ public KbQueryIndexExistsReply IndexExist(RmContext context, KbQueryIndexExists public KbQueryIndexCreateReply IndexCreate(RmContext context, KbQueryIndexCreate param) { - using var trace = _core.Trace.CreateTracker(TraceType.IndexCreate, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; @@ -177,9 +169,7 @@ public KbQueryIndexCreateReply IndexCreate(RmContext context, KbQueryIndexCreate public KbQueryIndexRebuildReply IndexRebuild(RmContext context, KbQueryIndexRebuild param) { - using var trace = _core.Trace.CreateTracker(TraceType.IndexRebuild, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; @@ -208,9 +198,7 @@ public KbQueryIndexRebuildReply IndexRebuild(RmContext context, KbQueryIndexRebu public KbQueryIndexDropReply IndexDrop(RmContext context, KbQueryIndexDrop param) { - using var trace = _core.Trace.CreateTracker(TraceType.IndexDrop, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; diff --git a/NTDLS.Katzebase.Engine/Interactions/APIHandlers/QueryAPIHandlers.cs b/NTDLS.Katzebase.Engine/Interactions/APIHandlers/QueryAPIHandlers.cs index f82944fa..680758ed 100644 --- a/NTDLS.Katzebase.Engine/Interactions/APIHandlers/QueryAPIHandlers.cs +++ b/NTDLS.Katzebase.Engine/Interactions/APIHandlers/QueryAPIHandlers.cs @@ -30,9 +30,7 @@ public QueryAPIHandlers(EngineCore core) public KbQueryQueryExplainPlanReply ExecuteExplainPlan(RmContext context, KbQueryQueryExplainPlan param) { - using var trace = _core.Trace.CreateTracker(TraceType.ExecuteExplainPlan, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; @@ -65,9 +63,7 @@ public KbQueryQueryExplainPlanReply ExecuteExplainPlan(RmContext context, KbQuer public KbQueryQueryExplainOperationReply ExecuteExplainOperation(RmContext context, KbQueryQueryExplainOperation param) { - using var trace = _core.Trace.CreateTracker(TraceType.ExecuteExplainOperation, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; @@ -99,9 +95,7 @@ public KbQueryQueryExplainOperationReply ExecuteExplainOperation(RmContext conte public KbQueryProcedureExecuteReply ExecuteStatementProcedure(RmContext context, KbQueryProcedureExecute param) { - using var trace = _core.Trace.CreateTracker(TraceType.ExecuteStatementProcedure, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; @@ -124,9 +118,7 @@ public KbQueryProcedureExecuteReply ExecuteStatementProcedure(RmContext context, public KbQueryQueryExecuteQueryReply ExecuteStatementQuery(RmContext context, KbQueryQueryExecuteQuery param) { - using var trace = _core.Trace.CreateTracker(TraceType.ExecuteStatementQuery, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; @@ -158,9 +150,7 @@ public KbQueryQueryExecuteQueryReply ExecuteStatementQuery(RmContext context, Kb public KbQueryQueryExecuteNonQueryReply ExecuteStatementNonQuery(RmContext context, KbQueryQueryExecuteNonQuery param) { - using var trace = _core.Trace.CreateTracker(TraceType.ExecuteStatementNonQuery, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; diff --git a/NTDLS.Katzebase.Engine/Interactions/APIHandlers/SchemaAPIHandlers.cs b/NTDLS.Katzebase.Engine/Interactions/APIHandlers/SchemaAPIHandlers.cs index 11cad9fb..b348103b 100644 --- a/NTDLS.Katzebase.Engine/Interactions/APIHandlers/SchemaAPIHandlers.cs +++ b/NTDLS.Katzebase.Engine/Interactions/APIHandlers/SchemaAPIHandlers.cs @@ -33,9 +33,7 @@ public SchemaAPIHandlers(EngineCore core) public KbQuerySchemaListReply ListSchemas(RmContext context, KbQuerySchemaList param) { - using var trace = _core.Trace.CreateTracker(TraceType.ListSchemas, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; @@ -79,9 +77,7 @@ public KbQuerySchemaListReply ListSchemas(RmContext context, KbQuerySchemaList p public KbQuerySchemaFieldSampleReply SchemaFieldSample(RmContext context, KbQuerySchemaFieldSample param) { - using var trace = _core.Trace.CreateTracker(TraceType.SchemaFieldSample, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; @@ -128,9 +124,7 @@ public KbQuerySchemaFieldSampleReply SchemaFieldSample(RmContext context, KbQuer /// public KbQuerySchemaCreateReply CreateSchema(RmContext context, KbQuerySchemaCreate param) { - using var trace = _core.Trace.CreateTracker(TraceType.CreateSchema, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; @@ -173,9 +167,7 @@ public KbQuerySchemaCreateReply CreateSchema(RmContext context, KbQuerySchemaCre /// public KbQuerySchemaExistsReply DoesSchemaExist(RmContext context, KbQuerySchemaExists param) { - using var trace = _core.Trace.CreateTracker(TraceType.DoesSchemaExist, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; @@ -226,9 +218,7 @@ public KbQuerySchemaExistsReply DoesSchemaExist(RmContext context, KbQuerySchema /// public KbQuerySchemaDropReply DropSchema(RmContext context, KbQuerySchemaDrop param) { - using var trace = _core.Trace.CreateTracker(TraceType.DropSchema, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; diff --git a/NTDLS.Katzebase.Engine/Interactions/APIHandlers/SessionAPIHandlers.cs b/NTDLS.Katzebase.Engine/Interactions/APIHandlers/SessionAPIHandlers.cs index 34e5d486..d48cbb8f 100644 --- a/NTDLS.Katzebase.Engine/Interactions/APIHandlers/SessionAPIHandlers.cs +++ b/NTDLS.Katzebase.Engine/Interactions/APIHandlers/SessionAPIHandlers.cs @@ -33,8 +33,6 @@ public KbQueryServerStartSessionReply StartSession(RmContext context, KbQuerySer { SessionState? session = null; - using var trace = _core.Trace.CreateTracker(TraceType.SessionStart, context.ConnectionId); - #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{param.GetType().Name}"; LogManager.Debug(Thread.CurrentThread.Name); @@ -65,9 +63,6 @@ public KbQueryServerStartSessionReply StartSession(RmContext context, KbQuerySer ServerTimeUTC = DateTime.UtcNow }; - trace.SetSession(session); - trace.Result = TraceResult.Success; - return apiResults; } #endif @@ -85,7 +80,6 @@ public KbQueryServerStartSessionReply StartSession(RmContext context, KbQuerySer LogManager.Debug($"Logged in user [{param.Username}]."); session = _core.Sessions.CreateSession(context.ConnectionId, param.Username, param.ClientName); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; LogManager.Debug(Thread.CurrentThread.Name); @@ -97,8 +91,6 @@ public KbQueryServerStartSessionReply StartSession(RmContext context, KbQuerySer ServerTimeUTC = DateTime.UtcNow }; - trace.Result = TraceResult.Success; - return apiResults; } @@ -113,10 +105,7 @@ public KbQueryServerStartSessionReply StartSession(RmContext context, KbQuerySer public KbQueryServerCloseSessionReply CloseSession(RmContext context, KbQueryServerCloseSession param) { - using var trace = _core.Trace.CreateTracker(TraceType.SessionClose, context.ConnectionId); - var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; @@ -128,8 +117,6 @@ public KbQueryServerCloseSessionReply CloseSession(RmContext context, KbQuerySer var apiResults = new KbQueryServerCloseSessionReply(); - trace.Result = TraceResult.Success; - return apiResults; } catch (Exception ex) @@ -147,10 +134,8 @@ public void Heartbeat(RmContext context, KbNotifySessionHeartbeat param) public KbQueryServerTerminateProcessReply TerminateSession(RmContext context, KbQueryServerTerminateProcess param) { - using var trace = _core.Trace.CreateTracker(TraceType.SessionTerminate, context.ConnectionId); - var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); + #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; LogManager.Debug(Thread.CurrentThread.Name); @@ -161,8 +146,6 @@ public KbQueryServerTerminateProcessReply TerminateSession(RmContext context, Kb var apiResult = new KbQueryServerTerminateProcessReply(); - trace.Result = TraceResult.Success; - return apiResult; } catch (Exception ex) diff --git a/NTDLS.Katzebase.Engine/Interactions/APIHandlers/TransactionAPIHandlers.cs b/NTDLS.Katzebase.Engine/Interactions/APIHandlers/TransactionAPIHandlers.cs index c1991e55..f61b7aa6 100644 --- a/NTDLS.Katzebase.Engine/Interactions/APIHandlers/TransactionAPIHandlers.cs +++ b/NTDLS.Katzebase.Engine/Interactions/APIHandlers/TransactionAPIHandlers.cs @@ -29,9 +29,7 @@ public TransactionAPIHandlers(EngineCore core) public KbQueryTransactionBeginReply Begin(RmContext context, KbQueryTransactionBegin param) { - using var trace = _core.Trace.CreateTracker(TraceType.TransactionBegin, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; @@ -52,9 +50,7 @@ public KbQueryTransactionBeginReply Begin(RmContext context, KbQueryTransactionB public KbQueryTransactionCommitReply Commit(RmContext context, KbQueryTransactionCommit param) { - using var trace = _core.Trace.CreateTracker(TraceType.TransactionCommit, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; @@ -76,9 +72,7 @@ public KbQueryTransactionCommitReply Commit(RmContext context, KbQueryTransactio public KbQueryTransactionRollbackReply Rollback(RmContext context, KbQueryTransactionRollback param) { - using var trace = _core.Trace.CreateTracker(TraceType.TransactionRollback, context.ConnectionId); var session = _core.Sessions.GetSession(context.ConnectionId); - trace.SetSession(session); #if DEBUG Thread.CurrentThread.Name = $"KbAPI:{session.ProcessId}:{param.GetType().Name}"; diff --git a/NTDLS.Katzebase.Engine/NTDLS.Katzebase.Engine.csproj b/NTDLS.Katzebase.Engine/NTDLS.Katzebase.Engine.csproj index 411480f4..5348e526 100644 --- a/NTDLS.Katzebase.Engine/NTDLS.Katzebase.Engine.csproj +++ b/NTDLS.Katzebase.Engine/NTDLS.Katzebase.Engine.csproj @@ -68,9 +68,6 @@ - - - diff --git a/NTDLS.Katzebase.Engine/Trace/TraceManager.cs b/NTDLS.Katzebase.Engine/Trace/TraceManager.cs deleted file mode 100644 index 17f834dc..00000000 --- a/NTDLS.Katzebase.Engine/Trace/TraceManager.cs +++ /dev/null @@ -1,24 +0,0 @@ -using static NTDLS.Katzebase.Shared.EngineConstants; - -namespace NTDLS.Katzebase.Engine.Trace -{ - internal class TraceManager - { - private readonly EngineCore _core; - - public TraceManager(EngineCore core) - { - _core = core; - } - - public TraceTracker CreateTracker(TraceType traceType, Guid connectionId) - { - return new TraceTracker(this, traceType, connectionId); - } - - public void Write(TraceTracker tracker) - { - Console.WriteLine($"Trace: {tracker.TraceType} {tracker.ProcessId} {tracker.Timestamp}"); - } - } -} diff --git a/NTDLS.Katzebase.Engine/Trace/TraceTracker.cs b/NTDLS.Katzebase.Engine/Trace/TraceTracker.cs deleted file mode 100644 index e8eb794b..00000000 --- a/NTDLS.Katzebase.Engine/Trace/TraceTracker.cs +++ /dev/null @@ -1,38 +0,0 @@ -using NTDLS.Katzebase.Engine.Sessions; -using static NTDLS.Katzebase.Shared.EngineConstants; - -namespace NTDLS.Katzebase.Engine.Trace -{ - internal class TraceTracker : IDisposable - { - private TraceManager _manager; - - public TraceType TraceType { get; private set; } - public DateTime Timestamp { get; private set; } = DateTime.UtcNow; - - public TraceResult Result { get; set; } - public string? Username { get; private set; } - public string? ClientName { get; private set; } - public ulong ProcessId { get; private set; } - public Guid ConnectionId { get; private set; } - - public TraceTracker(TraceManager manager, TraceType traceType, Guid connectionId) - { - _manager = manager; - TraceType = traceType; - ConnectionId = connectionId; - } - - public void SetSession(SessionState state) - { - Username = state.Username; - ClientName = state.ClientName; - ProcessId = state.ProcessId; - } - - public void Dispose() - { - _manager.Write(this); - } - } -}