fix span name error

Author: skadefro

OpenFlow/src/Messages/Message.ts

@@ -178,7 +178,7 @@ export class Message {
                     await this.QueueMessage(cli);
                     break;
                 case "closequeue":
-                    await this.CloseQueue(cli);
+                    await this.CloseQueue(cli, span);
                     break;
                 case "ensurenoderedinstance":
                     await this.EnsureNoderedInstance(cli, span);
@@ -343,12 +343,12 @@ export class Message {
         }
         this.Send(cli);
     }
-    async CloseQueue(cli: WebSocketServerClient) {
+    async CloseQueue(cli: WebSocketServerClient, parent: Span) {
         this.Reply();
         let msg: CloseQueueMessage
         try {
             msg = CloseQueueMessage.assign(this.data);
-            await cli.CloseConsumer(msg.queuename);
+            await cli.CloseConsumer(msg.queuename, parent);
         } catch (error) {
             cli._logger.error(error);
             if (NoderedUtil.IsNullUndefinded(msg)) { (msg as any) = {}; }

OpenFlow/src/WebSocketServerClient.ts

@@ -184,23 +184,31 @@ export class WebSocketServerClient {
         }
         WebSocketServer.update_mongodb_watch_count(this);
     }
-    public async CloseConsumer(queuename: string): Promise<void> {
-        var old = this._queues.length;
-        for (let i = this._queues.length - 1; i >= 0; i--) {
-            const q = this._queues[i];
-            if (q && (q.queue == queuename || q.queuename == queuename)) {
-                try {
-                    await amqpwrapper.Instance().RemoveQueueConsumer(this._queues[i]);
-                    this._queues.splice(i, 1);
-                    if (!NoderedUtil.IsNullUndefinded(WebSocketServer.websocket_queue_count)) WebSocketServer.websocket_queue_count.bind({ ...otel.defaultlabels, clientid: this.id }).update(this._queues.length);
-                } catch (error) {
-                    this._logger.error("WebSocketclient::CloseConsumer " + error);
+    public async CloseConsumer(queuename: string, parent: Span): Promise<void> {
+        const span: Span = otel.startSubSpan("WebSocketServerClient.CreateConsumer", parent);
+        try {
+            var old = this._queues.length;
+            for (let i = this._queues.length - 1; i >= 0; i--) {
+                const q = this._queues[i];
+                if (q && (q.queue == queuename || q.queuename == queuename)) {
+                    try {
+                        await amqpwrapper.Instance().RemoveQueueConsumer(this._queues[i]);
+                        this._queues.splice(i, 1);
+                        if (!NoderedUtil.IsNullUndefinded(WebSocketServer.websocket_queue_count)) WebSocketServer.websocket_queue_count.bind({ ...otel.defaultlabels, clientid: this.id }).update(this._queues.length);
+                    } catch (error) {
+                        this._logger.error("WebSocketclient::CloseConsumer " + error);
+                    }
                 }
             }
+        } catch (error) {
+            span.recordException(error);
+            throw error;
+        } finally {
+            otel.endSpan(span);
         }
     }
     public async CreateConsumer(queuename: string, parent: Span): Promise<string> {
-        const span: Span = otel.startSubSpan("dbhelper.EnsureRole", parent);
+        const span: Span = otel.startSubSpan("WebSocketServerClient.CreateConsumer", parent);
         try {
             let autoDelete: boolean = false; // Should we keep the queue around ? for robots and roles
             let qname = queuename;
@@ -220,7 +228,7 @@ export class WebSocketServerClient {
                 }
             }
             await semaphore.down();
-            this.CloseConsumer(qname);
+            this.CloseConsumer(qname, span);
             let queue: amqpqueue = null;
             try {
                 const AssertQueueOptions: any = Object.assign({}, (amqpwrapper.Instance().AssertQueueOptions));

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/nodered",
-  "version": "1.2.38",
+  "version": "1.2.39",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {

VERSION

@@ -1 +1 @@
-1.2.38
+1.2.39

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/openflow",
-  "version": "1.2.38",
+  "version": "1.2.39",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {