fix: cache details panel

Author: SteKoe

spring-boot-admin-server-ui/package-lock.json

@@ -76,11 +76,7 @@ sbaConfig.extensions.css.forEach((extension) => {
 moment.locale(navigator.language.split('-')[0]);
 
 if (process.env.NODE_ENV === 'development') {
-  worker.start({
-    serviceWorker: {
-      url: './mockServiceWorker.js',
-    },
-  });
+  await worker.start();
 }
 
 const installables = [Notifications, ...views];

spring-boot-admin-server-ui/src/main/frontend/index.ts

@@ -4,12 +4,14 @@ import auditEventsEndpoint from './instance/auditevents/index.js';
 import flywayEndpoints from './instance/flyway/index.js';
 import liquibaseEndpoints from './instance/liquibase/index.js';
 import mappingsEndpoint from './instance/mappings/index.js';
+import metricsEndpoint from './instance/metrics/index.js';
 
 const handler = [
   ...mappingsEndpoint,
   ...liquibaseEndpoints,
   ...flywayEndpoints,
   ...auditEventsEndpoint,
+  ...metricsEndpoint,
 ];
 
 export const worker = setupWorker(...handler);

spring-boot-admin-server-ui/src/main/frontend/mocks/browser.ts

@@ -19,6 +19,114 @@ const metricsEntpoints = [
       return HttpResponse.json(memoryCommittedResponse);
     },
   ),
+  http.get('/instances/:instanceId/actuator/metrics', () => {
+    return HttpResponse.json({
+      names: ['cache.gets', 'jdbc.connections.active'],
+    });
+  }),
+  http.get('/instances/:instanceId/actuator/metrics/cache.gets', () => {
+    return HttpResponse.json({
+      name: 'cache.gets',
+      description: 'The number of cache gets',
+      baseUnit: 'none',
+      measurements: [
+        {
+          statistic: 'COUNT',
+          value: 150,
+        },
+        {
+          statistic: 'TOTAL_TIME',
+          value: 120.5,
+        },
+        {
+          statistic: 'MAX',
+          value: 5.2,
+        },
+      ],
+      availableTags: [
+        {
+          tag: 'name',
+          values: ['myCache'],
+        },
+        {
+          tag: 'cache',
+          values: ['myCache'],
+        },
+        {
+          tag: 'result',
+          values: ['hit', 'miss'],
+        },
+      ],
+    });
+  }),
+  http.get(
+    '/instances/:instanceId/actuator/metrics/jdbc.connections.active',
+    () => {
+      return HttpResponse.json({
+        name: 'jdbc.connections.active',
+        description: 'The number of active JDBC connections',
+        baseUnit: 'connections',
+        measurements: [
+          {
+            statistic: 'VALUE',
+            value: 5,
+          },
+        ],
+        availableTags: [
+          {
+            tag: 'name',
+            values: ['HikariPool-1'],
+          },
+          {
+            tag: 'pool',
+            values: ['HikariPool-1'],
+          },
+          {
+            tag: 'min',
+            values: 1,
+          },
+        ],
+      });
+    },
+  ),
+  http.get('/instances/:instanceId/actuator/metrics/jdbc.connections.min', () =>
+    HttpResponse.json({
+      name: 'jdbc.connections.min',
+      description: 'The minimum number of idle JDBC connections in the pool',
+      baseUnit: 'connections',
+      measurements: [
+        {
+          statistic: 'VALUE',
+          value: 10,
+        },
+      ],
+      availableTags: [
+        {
+          tag: 'pool',
+          values: ['HikariPool-1'],
+        },
+      ],
+    }),
+  ),
+  http.get('/instances/:instanceId/actuator/metrics/jdbc.connections.max', () =>
+    HttpResponse.json({
+      name: 'jdbc.connections.max',
+      description: 'The minimum number of idle JDBC connections in the pool',
+      baseUnit: 'connections',
+      measurements: [
+        {
+          statistic: 'VALUE',
+          value: 10,
+        },
+      ],
+      availableTags: [
+        {
+          tag: 'pool',
+          values: ['HikariPool-1'],
+        },
+      ],
+    }),
+  ),
 ];
 
 export default metricsEntpoints;

spring-boot-admin-server-ui/src/main/frontend/mocks/instance/metrics/index.ts

@@ -8,8 +8,8 @@
  * - Please do NOT serve this file on production.
  */
 
-const PACKAGE_VERSION = '2.6.4'
-const INTEGRITY_CHECKSUM = 'ca7800994cc8bfb5eb961e037c877074'
+const PACKAGE_VERSION = '2.7.3'
+const INTEGRITY_CHECKSUM = '00729d72e3b82faf54ca8b9621dbb96f'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()
 
@@ -199,7 +199,19 @@ async function getResponse(event, client, requestId) {
     // Remove the "accept" header value that marked this request as passthrough.
     // This prevents request alteration and also keeps it compliant with the
     // user-defined CORS policies.
-    headers.delete('accept', 'msw/passthrough')
+    const acceptHeader = headers.get('accept')
+    if (acceptHeader) {
+      const values = acceptHeader.split(',').map((value) => value.trim())
+      const filteredValues = values.filter(
+        (value) => value !== 'msw/passthrough',
+      )
+
+      if (filteredValues.length > 0) {
+        headers.set('accept', filteredValues.join(', '))
+      } else {
+        headers.delete('accept')
+      }
+    }
 
     return fetch(requestClone, { headers })
   }