From 180a687f30861bfe347684c5e43f7ccd969ff7e4 Mon Sep 17 00:00:00 2001 From: Ethan Chiu Date: Thu, 18 Jun 2020 16:13:56 -0400 Subject: [PATCH] Clean up trace messages + add Trace debug in ActionManager --- src/Runner.Worker/ActionManager.cs | 3 ++- src/Runner.Worker/ExecutionContext.cs | 4 ---- src/Runner.Worker/Handlers/CompositeActionHandler.cs | 8 -------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/Runner.Worker/ActionManager.cs b/src/Runner.Worker/ActionManager.cs index 5b2fa3fda..d582a26e9 100644 --- a/src/Runner.Worker/ActionManager.cs +++ b/src/Runner.Worker/ActionManager.cs @@ -397,7 +397,8 @@ namespace GitHub.Runner.Worker } else if (definition.Data.Execution.ExecutionType == ActionExecutionType.Composite && !String.IsNullOrEmpty(Environment.GetEnvironmentVariable("TESTING_COMPOSITE_ACTIONS_ALPHA"))) { - // Don't do anything for now + var compositeAction = definition.Data.Execution as CompositeActionExecutionData; + Trace.Info($"Action steps: {compositeAction.Steps}."); } else { diff --git a/src/Runner.Worker/ExecutionContext.cs b/src/Runner.Worker/ExecutionContext.cs index a76ca3cd0..b99ff99cd 100644 --- a/src/Runner.Worker/ExecutionContext.cs +++ b/src/Runner.Worker/ExecutionContext.cs @@ -291,8 +291,6 @@ namespace GitHub.Runner.Worker // placed after the queued composite steps // This will take only O(n+m) time which would be just as efficient if we refactored the code of JobSteps to a PriorityQueue // This temp Queue is created in the CompositeActionHandler. - - Trace.Info("Adding Composite Action Step"); var newGuid = Guid.NewGuid(); step.ExecutionContext = Root.CreateChild(newGuid, step.DisplayName, newGuid.ToString("N"), null, null); step.ExecutionContext.ExpressionValues["inputs"] = inputsData; @@ -310,7 +308,6 @@ namespace GitHub.Runner.Worker Root.JobSteps.Clear(); foreach (var cs in steps) { - Trace.Info($"EnqueueAllCompositeSteps : Adding Composite action step {cs}"); Root.JobSteps.Enqueue(cs); } foreach (var s in temp) @@ -323,7 +320,6 @@ namespace GitHub.Runner.Worker Root.JobSteps = new Queue(); foreach (var cs in steps) { - Trace.Info($"EnqueueAllCompositeSteps : Adding Composite action step {cs}"); Root.JobSteps.Enqueue(cs); } } diff --git a/src/Runner.Worker/Handlers/CompositeActionHandler.cs b/src/Runner.Worker/Handlers/CompositeActionHandler.cs index 34f12270b..c29e6c10f 100644 --- a/src/Runner.Worker/Handlers/CompositeActionHandler.cs +++ b/src/Runner.Worker/Handlers/CompositeActionHandler.cs @@ -36,14 +36,6 @@ namespace GitHub.Runner.Worker.Handlers // Resolve action steps var actionSteps = Data.Steps; - if (actionSteps == null) - { - Trace.Error("Data.Steps in CompositeActionHandler is null"); - } - else - { - Trace.Info($"Data Steps Value for Composite Actions is: {actionSteps}."); - } // Create Context Data to reuse for each composite action step var inputsData = new DictionaryContextData();