@emartech/program-executor 3.12.1 → 3.13.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,8 @@
1
+ name: Dependabot Reviewer Poker
2
+ on:
3
+ pull_request:
4
+ types: [opened, reopened]
5
+ jobs:
6
+ assign-random-reviewer:
7
+ uses: Emartech/IntegrationCloud-DevOps-Workstream/.github/workflows/dependabot-random-review-poker.yml@main
8
+ secrets: inherit
package/package.json CHANGED
@@ -19,7 +19,7 @@
19
19
  "author": "team-shopify@emarsys.com",
20
20
  "license": "ISC",
21
21
  "dependencies": {
22
- "@emartech/json-logger": "3.4.0",
22
+ "@emartech/json-logger": "9.1.0",
23
23
  "@emartech/pubsub-client-js": "^1.2.7",
24
24
  "@emartech/rabbitmq-client": "5.9.1",
25
25
  "camelcase-keys": "^6.2.2",
@@ -39,5 +39,5 @@
39
39
  "pg": "^8.16.3",
40
40
  "semantic-release": "^24.2.0"
41
41
  },
42
- "version": "3.12.1"
42
+ "version": "3.13.0"
43
43
  }
@@ -1,7 +1,12 @@
1
1
  'use strict';
2
2
 
3
- const logger = require('@emartech/json-logger')('program-executor');
4
- const devLogger = require('@emartech/json-logger')('dev-program-executor');
3
+ const { createLogger } = require('@emartech/json-logger');
4
+ createLogger.configure({
5
+ outputFormat: 'legacy'
6
+ });
7
+
8
+ const logger = createLogger('program-executor');
9
+ const devLogger = createLogger('dev-program-executor');
5
10
  const RetryableError = require('../retryable-error');
6
11
  const JobHandler = require('../job-data-handler');
7
12
 
@@ -19,9 +24,11 @@ class ProgramExecutorProcessor {
19
24
  try {
20
25
  await this._executeNextJob(message);
21
26
  } catch (error) {
22
- devLogger.error('error in job', { run_id: runId, OSPID: process.pid,
27
+ devLogger.error('error in job', {
28
+ run_id: runId, OSPID: process.pid,
23
29
  error, errorMessage: error.message, errorCode: error.code,
24
- errorRetryable: error.retryable, errorIgnorable: error.ignorable });
30
+ errorRetryable: error.retryable, errorIgnorable: error.ignorable
31
+ });
25
32
  if (error.retryable) {
26
33
  await this._programHandler.incrementStepRetryCount(runId);
27
34
  await this._programHandler.setJobRetriableErrorMessage(runId, error.message);
@@ -71,8 +78,10 @@ class ProgramExecutorProcessor {
71
78
 
72
79
  log(action, { programData, jobs, runId, currentJob, level = 'info' }) {
73
80
  logger[level](action,
74
- { customer_id: programData.customerId, run_id: runId, OSPID: process.pid, msg: currentJob,
75
- executor: { current_job: currentJob, program_data: programData, jobs } });
81
+ {
82
+ customer_id: programData.customerId, run_id: runId, OSPID: process.pid, msg: currentJob,
83
+ executor: { current_job: currentJob, program_data: programData, jobs }
84
+ });
76
85
  }
77
86
 
78
87
  static create(programHandler, queueManager, jobLibrary) {
@@ -1,6 +1,11 @@
1
1
  'use strict';
2
2
 
3
- const devLogger = require('@emartech/json-logger')('dev-program-executor');
3
+ const { createLogger } = require('@emartech/json-logger');
4
+ createLogger.configure({
5
+ outputFormat: 'legacy'
6
+ });
7
+
8
+ const devLogger = createLogger('dev-program-executor');
4
9
  const RunIdGenerator = require('../runid-generator');
5
10
 
6
11
  class ProgramHandler {
@@ -1,7 +1,12 @@
1
1
  'use strict';
2
2
 
3
3
  const RabbitMq = require('@emartech/rabbitmq-client').RabbitMq;
4
- const logger = require('@emartech/json-logger')('program-executor-queue-manager');
4
+ const { createLogger } = require('@emartech/json-logger');
5
+ createLogger.configure({
6
+ outputFormat: 'legacy'
7
+ });
8
+
9
+ const logger = createLogger('program-executor-queue-manager');
5
10
 
6
11
  class QueueManager {
7
12
  constructor(amqpUrl, queueName) {
@@ -1,7 +1,12 @@
1
1
  'use strict';
2
2
 
3
3
  const PubSubClient = require('@emartech/pubsub-client-js').PubSubClient;
4
- const logger = require('@emartech/json-logger')('program-executor-queue-manager-pubsub');
4
+ const { createLogger } = require('@emartech/json-logger');
5
+ createLogger.configure({
6
+ outputFormat: 'legacy'
7
+ });
8
+
9
+ const logger = createLogger('program-executor-queue-manager-pubsub');
5
10
 
6
11
  class QueueManager {
7
12
  constructor(topicName, projectId, gcpKeyFileName) {