fix(shared): HAWNG-612 jmx tree should keep rendering even in presenc…

…e of malformed mbeans
hawtio · Apr 2, 2024 · 3ee4368 · 3ee4368
1 parent df6f7bb
commit 3ee4368
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/packages/hawtio/src/plugins/shared/tree/node.ts b/packages/hawtio/src/plugins/shared/tree/node.ts
@@ -125,7 +125,8 @@ export class MBeanNode implements TreeViewDataItem {
       // final mbean node
       const path = paths[0]
       if (!path) {
-        throw new Error('path should not be empty')
+        log.error('Failed to process MBean. Malformed ObjectName:', `"${props.objectName()}"`)
+        return
       }
       const mbeanNode = this.create(path, false)
       mbeanNode.configureMBean(props, mbean)
@@ -134,7 +135,8 @@ export class MBeanNode implements TreeViewDataItem {
 
     const path = paths.shift()
     if (path === undefined) {
-      throw new Error('path should not be empty')
+      log.error('Failed to process MBean. Malformed ObjectName:', `"${props.objectName()}"`)
+      return
     }
     const child = this.getOrCreate(path, true)
     child.createMBeanNode(paths, props, mbean)

diff --git a/packages/hawtio/src/plugins/shared/tree/tree.test.ts b/packages/hawtio/src/plugins/shared/tree/tree.test.ts
@@ -102,6 +102,34 @@ describe('MBeanTree', () => {
     expect(xnio2Addr.childCount()).toEqual(0)
   })
 
+  test('createFromDomains should be robust in presence of malformed mbeans', async () => {
+    const domains = {
+      'java.lang': { 'type=Memory': { desc: '' } },
+      'malformed.mbean': { '': { desc: '' } },
+    }
+    const tree = (await MBeanTree.createFromDomains('test', domains)).getTree()
+
+    expect(tree.length).toEqual(2)
+
+    const javaLang = tree[0] as MBeanNode
+    expect(javaLang.id).toEqual('java.lang-folder')
+    expect(javaLang.name).toEqual('java.lang')
+    expect(javaLang.mbean).toBeUndefined()
+    expect(javaLang.childCount()).toEqual(1)
+
+    const memory = javaLang.getChildren()[0] as MBeanNode
+    expect(memory.id).toEqual('java.lang-folder-Memory')
+    expect(memory.name).toEqual('Memory')
+    expect(memory.mbean).toBeDefined()
+    expect(memory.childCount()).toEqual(0)
+
+    const malformed = tree[1] as MBeanNode
+    expect(malformed.id).toEqual('malformed.mbean-folder')
+    expect(malformed.name).toEqual('malformed.mbean')
+    expect(malformed.mbean).toBeUndefined()
+    expect(malformed.childCount()).toEqual(0)
+  })
+
   test('flatten empty tree', () => {
     const tree = MBeanTree.createFromNodes('test', [])
     expect(tree.flatten()).toEqual({})

diff --git a/packages/hawtio/src/plugins/shared/workspace.ts b/packages/hawtio/src/plugins/shared/workspace.ts
@@ -74,8 +74,8 @@ class Workspace implements IWorkspace {
       this.maybeMonitorTree()
 
       return tree
-    } catch (response) {
-      log.error('A request to list the JMX tree failed: ' + response)
+    } catch (error) {
+      log.error('A request to list the JMX tree failed:', error)
       return MBeanTree.createEmpty(pluginName)
     }
   }