teraslice 2.17.2 → 2.17.4

package/cluster-service.js

@@ -3,6 +3,7 @@ import { shutdownHandler } from './dist/src/lib/workers/helpers/worker-shutdown.
 import { makeTerafoundationContext } from './dist/src/lib/workers/context/terafoundation-context.js';
 import { ClusterMaster } from './dist/src/lib/cluster/cluster_master.js';
 import { AssetsService } from './dist/src/lib/cluster/services/index.js';
+import { makeLogger } from './dist/src/lib/workers/helpers/terafoundation.js';
 
 class Service {
     constructor(context) {
@@ -42,6 +43,7 @@ class Service {
 
 async function main() {
     const context = await makeTerafoundationContext();
+    context.logger = makeLogger(context, 'cluster-service');
     const cmd = new Service(context);
 
     cmd.shutdownHandler = shutdownHandler(context, () => {

package/dist/src/lib/cluster/services/api.js

@@ -6,7 +6,7 @@ import { RecoveryCleanupType } from '@terascope/job-components';
 import { parseErrorInfo, parseList, logError, TSError, startsWith, pWhile, isKey } from '@terascope/utils';
 import { ExecutionStatusEnum } from '@terascope/types';
 import { makeLogger } from '../../workers/helpers/terafoundation.js';
-import { makePrometheus, isPrometheusTerasliceRequest, makeTable, sendError, handleTerasliceRequest, getSearchOptions, createJobActiveQuery, addDeletedToQuery } from '../../utils/api_utils.js';
+import { makeTable, sendError, handleTerasliceRequest, getSearchOptions, createJobActiveQuery, addDeletedToQuery } from '../../utils/api_utils.js';
 import { getPackageJSON } from '../../utils/file_utils.js';
 const terasliceVersion = getPackageJSON().version;
 function validateCleanupType(cleanupType) {
@@ -391,14 +391,10 @@ export class ApiService {
             requestHandler(async () => executionService.getExecutionContext(exId));
         });
         v1routes.get('/cluster/stats', (req, res) => {
-            const { name: cluster } = this.context.sysconfig.teraslice;
             const requestHandler = handleTerasliceRequest(req, res, 'Could not get cluster statistics');
             requestHandler(async () => {
-                const stats = await executionService.getClusterAnalytics();
-                if (isPrometheusTerasliceRequest(req)) {
-                    return makePrometheus(stats, { cluster });
-                }
-                // for backwards compatability (unsupported for prometheus)
+                const stats = executionService.getClusterAnalytics();
+                // for backwards compatability
                 // @ts-expect-error
                 stats.slicer = stats.controllers;
                 return stats;

package/dist/src/lib/utils/api_utils.js

@@ -1,5 +1,5 @@
 import Table from 'easy-table';
-import { parseErrorInfo, parseList, logError, isString, get, toInteger, TSError, isKey, } from '@terascope/utils';
+import { parseErrorInfo, parseList, logError, isString, get, toInteger, TSError } from '@terascope/utils';
 export function makeTable(req, defaults, data, mappingFn) {
     const query = fieldsQuery(req.query, defaults);
     let emptyChar = 'N/A';
@@ -74,46 +74,6 @@ export function sendError(res, code, message, logger) {
         message
     });
 }
-// NOTE: This only works for counters, if you're trying to extend this, you
-// should probably switch to using prom-client.
-export function makePrometheus(stats, defaultLabels = {}) {
-    const metricMapping = {
-        processed: 'teraslice_slices_processed',
-        failed: 'teraslice_slices_failed',
-        queued: 'teraslice_slices_queued',
-        job_duration: '', // this isn't really useful, omitting
-        workers_joined: 'teraslice_workers_joined',
-        workers_disconnected: 'teraslice_workers_disconnected',
-        workers_reconnected: 'teraslice_workers_reconnected'
-    };
-    let returnString = '';
-    Object.entries(stats.controllers).forEach(([key, value]) => {
-        if (isKey(metricMapping, key)) {
-            const name = metricMapping[key];
-            if (name !== '') {
-                returnString += `# TYPE ${name} counter\n`;
-                const labels = makePrometheusLabels(defaultLabels);
-                returnString += `${name}${labels} ${value}\n`;
-            }
-        }
-    });
-    return returnString;
-}
-function makePrometheusLabels(defaults = {}) {
-    const labels = Object.assign({}, defaults);
-    const keys = Object.keys(labels);
-    if (!keys.length)
-        return '';
-    const labelsStr = keys.map((key) => {
-        const val = labels[key];
-        return `${key}="${val}"`;
-    }).join(',');
-    return `{${labelsStr}}`;
-}
-export function isPrometheusTerasliceRequest(req) {
-    const acceptHeader = get(req, 'headers.accept', '');
-    return acceptHeader && acceptHeader.indexOf('application/openmetrics-text;') > -1;
-}
 function parseQueryInt(req, key, defaultVal) {
     const val = req.query[key];
     if (val == null || val === '')

package/dist/test/utils/api_utils-spec.js

@@ -1,66 +1,5 @@
-import { makePrometheus, isPrometheusTerasliceRequest, createJobActiveQuery, addDeletedToQuery } from '../../src/lib/utils/api_utils.js';
+import { createJobActiveQuery, addDeletedToQuery } from '../../src/lib/utils/api_utils.js';
 describe('apiUtils', () => {
-    it('should be able make a prometheus text format', () => {
-        const stats = {
-            controllers: {
-                processed: 1000,
-                failed: 10,
-                queued: 5,
-                job_duration: 10,
-                workers_joined: 20,
-                workers_disconnected: 30,
-                workers_reconnected: 40
-            }
-        };
-        const r = `# TYPE teraslice_slices_processed counter
-teraslice_slices_processed ${stats.controllers.processed}
-# TYPE teraslice_slices_failed counter
-teraslice_slices_failed ${stats.controllers.failed}
-# TYPE teraslice_slices_queued counter
-teraslice_slices_queued ${stats.controllers.queued}
-# TYPE teraslice_workers_joined counter
-teraslice_workers_joined ${stats.controllers.workers_joined}
-# TYPE teraslice_workers_disconnected counter
-teraslice_workers_disconnected ${stats.controllers.workers_disconnected}
-# TYPE teraslice_workers_reconnected counter
-teraslice_workers_reconnected ${stats.controllers.workers_reconnected}
-`;
-        expect(makePrometheus(stats)).toEqual(r);
-    });
-    it('should be able make a prometheus text format with labels', () => {
-        const stats = {
-            controllers: {
-                processed: 1000,
-                failed: 10,
-                queued: 5,
-                job_duration: 10,
-                workers_joined: 20,
-                workers_disconnected: 30,
-                workers_reconnected: 40
-            }
-        };
-        const r = `# TYPE teraslice_slices_processed counter
-teraslice_slices_processed{foo="bar"} ${stats.controllers.processed}
-# TYPE teraslice_slices_failed counter
-teraslice_slices_failed{foo="bar"} ${stats.controllers.failed}
-# TYPE teraslice_slices_queued counter
-teraslice_slices_queued{foo="bar"} ${stats.controllers.queued}
-# TYPE teraslice_workers_joined counter
-teraslice_workers_joined{foo="bar"} ${stats.controllers.workers_joined}
-# TYPE teraslice_workers_disconnected counter
-teraslice_workers_disconnected{foo="bar"} ${stats.controllers.workers_disconnected}
-# TYPE teraslice_workers_reconnected counter
-teraslice_workers_reconnected{foo="bar"} ${stats.controllers.workers_reconnected}
-`;
-        expect(makePrometheus(stats, { foo: 'bar' })).toEqual(r);
-    });
-    it('should be able to detect if a request is prometheus', () => {
-        expect(isPrometheusTerasliceRequest({
-            headers: {
-                accept: 'blah application/openmetrics-text; blah blah'
-            }
-        })).toBeTruthy();
-    });
     it('should be able to create the proper job queries', () => {
         let query;
         query = createJobActiveQuery('true');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "teraslice",
   "displayName": "Teraslice",
-  "version": "2.17.2",
+  "version": "2.17.4",
   "description": "Distributed computing platform for processing JSON data",
   "homepage": "https://github.com/terascope/teraslice#readme",
   "bugs": {
@@ -35,16 +35,16 @@
     "test:watch": "TEST_ELASTICSEARCH='true' node ../scripts/bin/ts-scripts test --watch ../teraslice --"
   },
   "resolutions": {
-    "debug": "~4.4.1",
+    "debug": "~4.4.3",
     "ms": "~2.1.3"
   },
   "dependencies": {
     "@kubernetes/client-node": "~1.3.0",
-    "@terascope/elasticsearch-api": "~4.11.1",
-    "@terascope/job-components": "~1.11.4",
-    "@terascope/teraslice-messaging": "~1.12.3",
-    "@terascope/types": "~1.4.3",
-    "@terascope/utils": "~1.9.3",
+    "@terascope/elasticsearch-api": "~4.13.1",
+    "@terascope/job-components": "~1.12.4",
+    "@terascope/teraslice-messaging": "~1.13.4",
+    "@terascope/types": "~1.4.4",
+    "@terascope/utils": "~1.10.4",
     "async-mutex": "~0.5.0",
     "barbe": "~3.0.17",
     "body-parser": "~2.2.0",
@@ -55,7 +55,7 @@
     "fs-extra": "~11.3.1",
     "gc-stats": "1.4.1",
     "get-port": "~7.1.0",
-    "got": "~14.4.7",
+    "got": "~14.4.8",
     "ip": "~2.0.1",
     "kubernetes-client": "~9.0.0",
     "ms": "~2.1.3",
@@ -63,11 +63,11 @@
     "semver": "~7.7.2",
     "socket.io": "~1.7.4",
     "socket.io-client": "~1.7.4",
-    "terafoundation": "~1.14.1",
-    "uuid": "~11.1.0"
+    "terafoundation": "~1.15.4",
+    "uuid": "~13.0.0"
   },
   "devDependencies": {
-    "@terascope/opensearch-client": "~1.0.0",
+    "@terascope/opensearch-client": "~1.1.4",
     "@types/archiver": "~6.0.3",
     "@types/express": "~5.0.3",
     "@types/gc-stats": "~1.4.3",

package/worker-service.js

@@ -7,6 +7,7 @@ import { makeExecutionContext } from './dist/src/lib/workers/context/execution-c
 import { makeTerafoundationContext } from './dist/src/lib/workers/context/terafoundation-context.js';
 import { ExecutionController } from './dist/src/lib/workers/execution-controller/index.js';
 import { Worker } from './dist/src/lib/workers/worker/index.js';
+import { makeLogger } from './dist/src/lib/workers/helpers/terafoundation.js';
 
 class Service {
     constructor(context) {
@@ -69,6 +70,7 @@ class Service {
 
 async function main() {
     const context = await makeTerafoundationContext();
+    context.logger = makeLogger(context, 'worker-service');
     const cmd = new Service(context);
 
     cmd.shutdownHandler = shutdownHandler(context, (event, err) => {