diff options
Diffstat (limited to 'worker/scripts')
-rwxr-xr-x | worker/scripts/ansible_playbook | 6 | ||||
-rwxr-xr-x | worker/scripts/build_docker_image | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/worker/scripts/ansible_playbook b/worker/scripts/ansible_playbook index f2cd4b9..026f892 100755 --- a/worker/scripts/ansible_playbook +++ b/worker/scripts/ansible_playbook @@ -5,6 +5,7 @@ import { getRequiredEnvVars, getStdout, type IEither, + LogTraceable, LogMetricTraceable, Metric, prependWith, @@ -28,9 +29,8 @@ const eitherVault = Bitwarden.getConfigFromEnvironment() .mapRight((config) => new Bitwarden(config)); const playbookMetric = Metric.fromName("ansiblePlaybook.playbook"); -await LogMetricTraceable.from(eitherJob) - .bimap(TraceUtil.withTrace("ansible_playbook")) - .bimap(TraceUtil.withMetricTrace(playbookMetric)) +const _logJob = LogTraceable.of(eitherJob).bimap(TraceUtil.withTrace("ansible_playbook")); +await LogMetricTraceable.ofLogTraceable(_logJob).bimap(TraceUtil.withMetricTrace(playbookMetric)) .peek((tEitherJob) => tEitherJob.trace.trace("starting ansible playbook job! (⑅˘꒳˘)") ) diff --git a/worker/scripts/build_docker_image b/worker/scripts/build_docker_image index 2e19111..f2fa522 100755 --- a/worker/scripts/build_docker_image +++ b/worker/scripts/build_docker_image @@ -4,6 +4,7 @@ import { getRequiredEnvVars, getStdout, LogLevel, + LogTraceable, LogMetricTraceable, Metric, TraceUtil, @@ -34,14 +35,14 @@ const eitherVault = Bitwarden.getConfigFromEnvironment() const buildImageMetric = Metric.fromName("dockerImage.build"); const loginMetric = Metric.fromName("dockerRegistry.login"); -await LogMetricTraceable.from(eitherJob) - .bimap( +const _logJob = LogTraceable.of(eitherJob).bimap( (tEitherJob) => { const trace = "build_docker_image." + tEitherJob.get().fold(({ isRight, value }) => isRight ? value.arguments.buildTarget : ""); return [tEitherJob.get(), trace]; }, - ) + ); +await LogMetricTraceable.ofLogTraceable(_logJob) .bimap(TraceUtil.withMetricTrace(buildImageMetric)) .bimap(TraceUtil.withMetricTrace(loginMetric)) .peek((tEitherJob) => |