@emartech/program-executor 3.12.1 → 3.14.0

package/.github/workflows/dependabot-random-reviewer-poker.yml

@@ -0,0 +1,8 @@
+name: Dependabot Reviewer Poker
+on:
+  pull_request:
+    types: [opened, reopened]
+jobs:
+  assign-random-reviewer:
+    uses: Emartech/IntegrationCloud-DevOps-Workstream/.github/workflows/dependabot-random-review-poker.yml@main
+    secrets: inherit

package/.github/workflows/main.yaml

@@ -1,6 +1,10 @@
 name: CI
 
-on: [push]
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
 
 env:
   NPM_TOKEN: ${{ secrets.NPM_PUBLISHER_TOKEN }}
@@ -56,6 +60,17 @@ jobs:
           PUBSUB_PROJECT_ID: some-project-id
           PUBSUB_TIMEOUT: 2000
 
+  dependabot-auto-merge:
+    needs: test
+    runs-on: ubuntu-latest
+
+    permissions:
+      pull-requests: write
+      contents: write
+    
+    steps:
+      - uses: fastify/github-action-merge-dependabot@v3
+
   deploy:
     name: deploy
     needs: [test]

package/package.json

@@ -19,7 +19,7 @@
   "author": "team-shopify@emarsys.com",
   "license": "ISC",
   "dependencies": {
-    "@emartech/json-logger": "3.4.0",
+    "@emartech/json-logger": "9.1.0",
     "@emartech/pubsub-client-js": "^1.2.7",
     "@emartech/rabbitmq-client": "5.9.1",
     "camelcase-keys": "^6.2.2",
@@ -39,5 +39,5 @@
     "pg": "^8.16.3",
     "semantic-release": "^24.2.0"
   },
-  "version": "3.12.1"
+  "version": "3.14.0"
 }

package/src/program-executor-processor/index.js

@@ -1,7 +1,12 @@
 'use strict';
 
-const logger = require('@emartech/json-logger')('program-executor');
-const devLogger = require('@emartech/json-logger')('dev-program-executor');
+const { createLogger } = require('@emartech/json-logger');
+createLogger.configure({
+  outputFormat: 'legacy'
+});
+
+const logger = createLogger('program-executor');
+const devLogger = createLogger('dev-program-executor');
 const RetryableError = require('../retryable-error');
 const JobHandler = require('../job-data-handler');
 
@@ -19,9 +24,11 @@ class ProgramExecutorProcessor {
     try {
       await this._executeNextJob(message);
     } catch (error) {
-      devLogger.error('error in job', { run_id: runId, OSPID: process.pid,
+      devLogger.error('error in job', {
+        run_id: runId, OSPID: process.pid,
         error, errorMessage: error.message, errorCode: error.code,
-        errorRetryable: error.retryable, errorIgnorable: error.ignorable });
+        errorRetryable: error.retryable, errorIgnorable: error.ignorable
+      });
       if (error.retryable) {
         await this._programHandler.incrementStepRetryCount(runId);
         await this._programHandler.setJobRetriableErrorMessage(runId, error.message);
@@ -71,8 +78,10 @@ class ProgramExecutorProcessor {
 
   log(action, { programData, jobs, runId, currentJob, level = 'info' }) {
     logger[level](action,
-      { customer_id: programData.customerId, run_id: runId, OSPID: process.pid, msg: currentJob,
-        executor: { current_job: currentJob, program_data: programData, jobs } });
+      {
+        customer_id: programData.customerId, run_id: runId, OSPID: process.pid, msg: currentJob,
+        executor: { current_job: currentJob, program_data: programData, jobs }
+      });
   }
 
   static create(programHandler, queueManager, jobLibrary) {

package/src/program-handler/index.js

@@ -1,6 +1,11 @@
 'use strict';
 
-const devLogger = require('@emartech/json-logger')('dev-program-executor');
+const { createLogger } = require('@emartech/json-logger');
+createLogger.configure({
+  outputFormat: 'legacy'
+});
+
+const devLogger = createLogger('dev-program-executor');
 const RunIdGenerator = require('../runid-generator');
 
 class ProgramHandler {

package/src/queue-manager/index.js

@@ -1,7 +1,12 @@
 'use strict';
 
 const RabbitMq = require('@emartech/rabbitmq-client').RabbitMq;
-const logger = require('@emartech/json-logger')('program-executor-queue-manager');
+const { createLogger } = require('@emartech/json-logger');
+createLogger.configure({
+  outputFormat: 'legacy'
+});
+
+const logger = createLogger('program-executor-queue-manager');
 
 class QueueManager {
   constructor(amqpUrl, queueName) {

package/src/queue-manager-pubsub/index.js

@@ -1,7 +1,12 @@
 'use strict';
 
 const PubSubClient = require('@emartech/pubsub-client-js').PubSubClient;
-const logger = require('@emartech/json-logger')('program-executor-queue-manager-pubsub');
+const { createLogger } = require('@emartech/json-logger');
+createLogger.configure({
+  outputFormat: 'legacy'
+});
+
+const logger = createLogger('program-executor-queue-manager-pubsub');
 
 class QueueManager {
   constructor(topicName, projectId, gcpKeyFileName) {