Skip to content

Commit b6b4fa3

Browse files
committed
fix: add logging context to runner lambda (#1399)
* fix(logging): Add context to scale logs Signed-off-by: Nathaniel McAuliffe <[email protected]> * Remove testing Signed-off-by: Nathaniel McAuliffe <[email protected]> * Remove unnecessary import Signed-off-by: Nathaniel McAuliffe <[email protected]> * Moving log fields to end, adjusting format
1 parent 5fb7237 commit b6b4fa3

File tree

1 file changed

+11
-2
lines changed
  • modules/runners/lambdas/runners/src/scale-runners

1 file changed

+11
-2
lines changed

modules/runners/lambdas/runners/src/scale-runners/scale-up.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { listEC2Runners, createRunner, RunnerInputParameters } from './runners';
22
import { createOctoClient, createGithubAppAuth, createGithubInstallationAuth } from './gh-auth';
33
import yn from 'yn';
44
import { Octokit } from '@octokit/rest';
5-
import { logger as rootLogger, LogFields } from './logger';
5+
import { LogFields, logger as rootLogger } from './logger';
66
import ScaleError from './ScaleError';
77

88
const logger = rootLogger.getChildLogger({ name: 'scale-up' });
@@ -27,7 +27,6 @@ export async function scaleUp(eventSource: string, payload: ActionRequestMessage
2727
const ghesBaseUrl = process.env.GHES_URL;
2828
const ephemeralEnabled = yn(process.env.ENABLE_EPHEMERAL_RUNNERS, { default: false });
2929

30-
// TODO: handle case event is check_run and ephemeralEnabled = true
3130
if (ephemeralEnabled && payload.eventType != 'workflow_job') {
3231
logger.warn(`${payload.eventType} even is not supported in combination with ephemeral runners.`);
3332
throw Error(
@@ -36,6 +35,16 @@ export async function scaleUp(eventSource: string, payload: ActionRequestMessage
3635
);
3736
}
3837
const ephemeral = ephemeralEnabled && payload.eventType === 'workflow_job';
38+
const runnerType = enableOrgLevel ? 'Org' : 'Repo';
39+
const runnerOwner = enableOrgLevel ? payload.repositoryOwner : `${payload.repositoryOwner}/${payload.repositoryName}`;
40+
41+
LogFields.fields = {};
42+
LogFields.fields.runnerType = runnerType;
43+
LogFields.fields.runnerOwner = runnerOwner;
44+
LogFields.fields.event = payload.eventType;
45+
LogFields.fields.id = payload.id.toString();
46+
47+
logger.info(`Received event`, LogFields.print());
3948

4049
const runnerType = enableOrgLevel ? 'Org' : 'Repo';
4150
const runnerOwner = enableOrgLevel ? payload.repositoryOwner : `${payload.repositoryOwner}/${payload.repositoryName}`;

0 commit comments

Comments
 (0)