Move JobTelemetry and StepsTelemetry into GlobalContext. #1680
Conversation
| @@ -52,8 +52,7 @@ public interface IExecutionContext : IRunnerService | |||
| Dictionary<string, string> IntraActionState { get; } | |||
| Dictionary<string, VariableValue> JobOutputs { get; } | |||
| ActionsEnvironmentReference ActionsEnvironment { get; } | |||
| List<ActionsStepTelemetry> ActionsStepsTelemetry { get; } | |||
| List<JobTelemetry> JobTelemetry { get; } | |||
| ActionsStepTelemetry StepTelemetry { get; } | |||
There was a problem hiding this comment.
Each ExecutionContext will hold a single ActionsStepTelemetry object, the object will get append to the GlobalContext.ActionsStepsTelemetry when ExecutionContext.Complete() is called.
There was a problem hiding this comment.
For composite child steps we don't call complete() so I don't think you will be getting that data currently
There was a problem hiding this comment.
thanks for pointing this out, i will take a look.
There was a problem hiding this comment.
Looks like we only call .Complete() in one place under composite action.
https://github.com/actions/runner/blob/main/src/Runner.Worker/Handlers/CompositeActionHandler.cs#L296
There was a problem hiding this comment.
I am adding a new PublishStepTelemetry() to executionContext, so composite actions can use that to publish step telemetry.
|
|
||
| var jobCompletedEvent = new JobCompletedEvent(message.RequestId, message.JobId, result, jobContext.JobOutputs, jobContext.ActionsEnvironment, jobContext.Global.StepsTelemetry, jobContext.Global.JobTelemetry); | ||
| Trace.Info($"Raising job completed event: {StringUtil.ConvertToJson(jobCompletedEvent)}"); |
There was a problem hiding this comment.
revert the trace after testing...
| @@ -150,6 +118,40 @@ public override void Initialize(IHostContext hostContext) | |||
| ActionCommandManager = hostContext.CreateService<IActionCommandManager>(); | |||
| } | |||
|
|
|||
| protected string GetActionRef() | |||
There was a problem hiding this comment.
this method is only get moved down and changed from public virtual to protected
We introduced
GlobalContexttoExecutionContextfor holding shared objects of allExecutionContext(Job + Steps).Both
ActionsStepsTelemetryandJobTelemetryfail into thisshared objectscategory, so I am moving both into theGlobalContext.Moving forward, you will not need to worry about which context (job vs. step) to use in order to get the right object.