add toggle for tracking otel per ip

Author: skadefro

OpenFlow/src/Config.ts

@@ -209,7 +209,8 @@ export class Config {
 
         Config.otel_trace_pingclients = Config.parseBoolean(Config.getEnv("otel_trace_pingclients", "false"));
         Config.otel_trace_dashboardauth = Config.parseBoolean(Config.getEnv("otel_trace_dashboardauth", "false"));
-        Config.otel_trace_include_query = Config.parseBoolean(Config.getEnv("otel_trace_include_query", "true"));
+        Config.otel_trace_include_query = Config.parseBoolean(Config.getEnv("otel_trace_include_query", "false"));
+        Config.otel_trace_connection_ips = Config.parseBoolean(Config.getEnv("otel_trace_connection_ips", "false"));
 
         Config.validate_user_form = Config.getEnv("validate_user_form", "");
     }
@@ -407,6 +408,7 @@ export class Config {
     public static otel_trace_pingclients: boolean = Config.parseBoolean(Config.getEnv("otel_trace_pingclients", "false"));
     public static otel_trace_dashboardauth: boolean = Config.parseBoolean(Config.getEnv("otel_trace_dashboardauth", "false"));
     public static otel_trace_include_query: boolean = Config.parseBoolean(Config.getEnv("otel_trace_include_query", "false"));
+    public static otel_trace_connection_ips: boolean = Config.parseBoolean(Config.getEnv("otel_trace_connection_ips", "false"));
 
 
     public static validate_user_form: string = Config.getEnv("validate_user_form", "");

OpenFlow/src/WebSocketServer.ts

@@ -61,8 +61,11 @@ export class WebSocketServer {
             this._socketserver = new WebSocket.Server({ server: server });
             this._socketserver.on("connection", (socketObject: WebSocket, req: any): void => {
                 let remoteip: string = "unknown";
-                if (!NoderedUtil.IsNullUndefinded(req)) {
-                    remoteip = WebSocketServerClient.remoteip(req);
+                if (Config.otel_trace_connection_ips) {
+                    if (!NoderedUtil.IsNullUndefinded(req)) {
+                        remoteip = WebSocketServerClient.remoteip(req);
+                    }
+                    remoteip = remoteip.split(":").join("-");
                 }
                 if (!this.total_connections_count[remoteip]) this.total_connections_count[remoteip] = 0;
                 this.total_connections_count[remoteip]++;
@@ -225,9 +228,10 @@ export class WebSocketServer {
                 });
             }
             if (!NoderedUtil.IsNullUndefinded(WebSocketServer.websocket_connections_count)) {
-                WebSocketServer.p_all.clear();
-                const keys = Object.keys(p_all);
+                WebSocketServer.websocket_connections_count.clear();
+                const keys = Object.keys(WebSocketServer.websocket_connections_count);
                 keys.forEach(key => {
+                    key = key.split(":").join("-");
                     WebSocketServer.websocket_connections_count.bind({ ...Logger.otel.defaultlabels, remoteip: key }).update(this.total_connections_count[key]);
                 });
             }