fix: version should be part of ui-config (#616)

lib/metrics.js

@@ -8,21 +8,16 @@ const {
     FEATURE_ARCHIVED,
     FEATURE_REVIVED,
 } = require('./event-type');
-const { version } = require('./routes/api-def');
 
 const THREE_HOURS = 3 * 60 * 60 * 1000;
 
-exports.startMonitoring = (
+exports.startMonitoring = ({ serverMetrics, eventBus, stores, version }) => {
-    enable,
+    if (!serverMetrics) {
-    eventBus,
-    eventStore,
-    clientMetricsStore,
-    featureToggleStore,
-) => {
-    if (!enable) {
         return;
     }
 
+    const { eventStore, clientMetricsStore, featureToggleStore } = stores;
+
     client.collectDefaultMetrics();
 
     const requestDuration = new client.Summary({

lib/metrics.test.js

@@ -15,13 +15,17 @@ test.before(() => {
     const featureToggleStore = {
         count: () => 123,
     };
-    startMonitoring(
+    const config = {
-        true,
+        serverMetrics: true,
         eventBus,
-        eventStore,
+        stores: {
-        clientMetricsStore,
+            eventStore,
-        featureToggleStore,
+            clientMetricsStore,
-    );
+            featureToggleStore,
+        },
+        version: '3.4.1',
+    };
+    startMonitoring(config);
 });
 
 test('should collect metrics for requests', t => {

lib/options.js

@@ -5,6 +5,7 @@ const parseDbUrl = require('parse-database-url');
 const merge = require('deepmerge');
 const { publicFolder } = require('unleash-frontend');
 const { defaultLogProvider, validateLogProvider } = require('./logger');
+const version = require('./util/version');
 
 const THIRTY_DAYS = 30 * 24 * 60 * 60 * 1000;
 
@@ -54,6 +55,7 @@ function defaultOptions() {
         start: true,
         keepAliveTimeout: 60 * 1000,
         headersTimeout: 61 * 1000,
+        version,
     };
 }
 

lib/routes/admin-api/api-def.json

@@ -1,5 +1,5 @@
 {
-  "version": 2,
+  "version": 3,
   "links": {
     "feature-toggles": {
       "uri": "/api/admin/features"

lib/routes/admin-api/config.js

@@ -5,7 +5,7 @@ const Controller = require('../controller');
 class ConfigController extends Controller {
     constructor(config) {
         super(config);
-        this.uiConfig = config.ui;
+        this.uiConfig = { ...config.ui, version: config.version };
 
         this.get('/', this.getUIConfig);
     }

lib/routes/api-def.js

@@ -1,11 +1,8 @@
 'use strict';
 
-// export module version
-require('pkginfo')(module, 'version');
-
-const { version } = module.exports;
 const clientApiDef = require('./client-api/api-def.json');
 const adminApiDef = require('./admin-api/api-def.json');
+const version = require('../util/version');
 
 const apiDef = {
     name: 'unleash-server',

lib/routes/client-api/api-def.json

@@ -1,5 +1,5 @@
 {
-  "version": 2,
+  "version": 3,
   "links": {
     "feature-toggles": {
       "uri": "/api/client/features"

lib/server-impl.js

@@ -31,13 +31,7 @@ async function createApp(options) {
     };
 
     const app = getApp(config);
-    startMonitoring(
+    startMonitoring(config);
-        options.serverMetrics,
-        eventBus,
-        stores.eventStore,
-        stores.clientMetricsStore,
-        stores.featureToggleStore,
-    );
 
     if (typeof config.eventHook === 'function') {
         addEventHook(config.eventHook, stores.eventStore);

lib/util/version.js

@@ -0,0 +1,7 @@
+'use strict';
+
+// export module version
+require('pkginfo')(module, 'version');
+
+const { version } = module.exports;
+module.exports = version;