Filter out some options in command line metrics

Having some options in this metrics can be awkward (URI with password)
or useless (metrics-related options), so this commit filter out
the URI option and all metrics-related options from the tag
of this specific metrics.

References #319

Author: acogoluegnes

src/main/java/com/rabbitmq/perf/BaseMetrics.java

@@ -25,7 +25,11 @@
 import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
 import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
@@ -72,7 +76,7 @@ public void configure(ConfigurationContext context) {
             if (args == null || args.length == 0) {
                tags = Tags.of("command_line", "");
             } else {
-               tags = Tags.of("command_line", String.join(" ", args));
+               tags = Tags.of("command_line", commandLineMetrics(args, context.metricsOptions()));
             }
             meterRegistry.gauge(metricsPrefix + "args", tags, argumentsGauge);
         }
@@ -114,4 +118,29 @@ static Collection<Tag> parseTags(String argument) {
             return tags;
         }
     }
+
+    static String commandLineMetrics(String [] args, Options metricsOptions) {
+        Map<String, Boolean> filteredOptions = new HashMap<>();
+        filteredOptions.put("--uri", true);
+        filteredOptions.put("-h", true);
+        for (Option option : metricsOptions.getOptions()) {
+            filteredOptions.put("-" + option.getOpt(), option.hasArg());
+            if (option.hasLongOpt()) {
+                filteredOptions.put("--" + option.getLongOpt(), option.hasArg());
+            }
+        }
+        Collection<String> filtered = new ArrayList<>();
+        Iterator<String> iterator = Arrays.stream(args).iterator();
+        while(iterator.hasNext()) {
+            String option = iterator.next();
+            if (filteredOptions.containsKey(option)) {
+                if (filteredOptions.get(option)) {
+                    iterator.next();
+                }
+            } else {
+                filtered.add(option);
+            }
+        }
+        return String.join(" ", filtered);
+    }
 }

src/main/java/com/rabbitmq/perf/Metrics.java

@@ -48,15 +48,18 @@ class ConfigurationContext {
         private final ConnectionFactory factory;
         private final String [] args;
         private final String metricsPrefix;
+        private final Options metricsOptions;
 
         public ConfigurationContext(CommandLineProxy cmd,
             CompositeMeterRegistry meterRegistry, ConnectionFactory factory,
-            String[] args, String metricsPrefix) {
+            String[] args, String metricsPrefix,
+            Options metricsOptions) {
             this.cmd = cmd;
             this.meterRegistry = meterRegistry;
             this.factory = factory;
             this.args = args;
             this.metricsPrefix = metricsPrefix;
+            this.metricsOptions = metricsOptions;
         }
 
         public CommandLineProxy cmd() {
@@ -78,6 +81,10 @@ public String[] args() {
         public String metricsPrefix() {
             return metricsPrefix;
         }
+
+        public Options metricsOptions() {
+            return metricsOptions;
+        }
     }
 
 }

src/main/java/com/rabbitmq/perf/PerfTest.java

@@ -254,7 +254,8 @@ public static void main(String [] args, PerfTestOptions perfTestOptions) {
             shutdownService.wrap(() -> registry.close());
 
             String metricsPrefix = strArg(cmd, "mpx", "perftest_");
-            metrics.configure(new ConfigurationContext(cmd, registry, factory, args, metricsPrefix));
+            metrics.configure(new ConfigurationContext(cmd, registry, factory, args,
+                metricsPrefix, metricsOptions));
 
             PrintWriter output;
             if (outputFile != null) {

src/main/java/com/rabbitmq/perf/PrometheusMetrics.java

@@ -49,6 +49,7 @@ public Options options() {
         options.addOption(new Option("mpr", "metrics-prometheus", false, "enable Prometheus metrics"));
         options.addOption(new Option("mpe", "metrics-prometheus-endpoint", true, "the HTTP metrics endpoint, default is /metrics"));
         options.addOption(new Option("mpp", "metrics-prometheus-port", true, "the port to launch the HTTP metrics endpoint on, default is 8080"));
+
         return options;
     }
 

src/test/java/com/rabbitmq/perf/BaseMetricsTest.java

@@ -15,10 +15,12 @@
 
 package com.rabbitmq.perf;
 
+import static com.rabbitmq.perf.BaseMetrics.commandLineMetrics;
 import static com.rabbitmq.perf.BaseMetrics.parseTags;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.micrometer.core.instrument.Tag;
+import org.apache.commons.cli.Options;
 import org.junit.jupiter.api.Test;
 
 public class BaseMetricsTest {
@@ -39,4 +41,39 @@ void parseTagsTest() {
         .hasSize(1)
         .contains(tag("args", "--queue-args \"x-max-length=100000\""));
   }
+
+  @Test
+  void commandLineMetricsTest() {
+    Options metricsOptions = new Options();
+    new BaseMetrics().options().getOptions().forEach(metricsOptions::addOption);
+    new PrometheusMetrics().options().getOptions().forEach(metricsOptions::addOption);
+    assertThat(
+            commandLineMetrics(
+                ("--uri amqp://default_user_kdId_cNrxfdolc5V7WJ:K8IYrRjh1NGqdVsaxfFa-r0KR1vGuPHB@cqv2 "
+                        + "--metrics-prometheus --use-millis --servers-startup-timeout 300 "
+                        + "--metrics-command-line-arguments "
+                        + "-mt rabbitmq_cluster=cqv2,workload_name=test-new "
+                        + "-x 1 -y 2 -u cq -c 1000 -A 1000 -q 1000 -f persistent -s 1000 "
+                        + "--queue-args x-queue-version=2,x-queue-mode=lazy --auto-delete false")
+                    .split(" "),
+                metricsOptions))
+        .isEqualTo(
+            "--use-millis --servers-startup-timeout 300 "
+                + "-x 1 -y 2 -u cq -c 1000 -A 1000 -q 1000 -f persistent -s 1000 "
+                + "--queue-args x-queue-version=2,x-queue-mode=lazy --auto-delete false");
+    assertThat(
+            commandLineMetrics(
+                ("-h amqp://default_user_kdId_cNrxfdolc5V7WJ:K8IYrRjh1NGqdVsaxfFa-r0KR1vGuPHB@cqv2 "
+                        + "-mpr --use-millis --servers-startup-timeout 300 "
+                        + "-mcla "
+                        + "-mt rabbitmq_cluster=cqv2,workload_name=test-new "
+                        + "-x 1 -y 2 -u cq -c 1000 -A 1000 -q 1000 -f persistent -s 1000 "
+                        + "--queue-args x-queue-version=2,x-queue-mode=lazy --auto-delete false")
+                    .split(" "),
+                metricsOptions))
+        .isEqualTo(
+            "--use-millis --servers-startup-timeout 300 "
+                + "-x 1 -y 2 -u cq -c 1000 -A 1000 -q 1000 -f persistent -s 1000 "
+                + "--queue-args x-queue-version=2,x-queue-mode=lazy --auto-delete false");
+  }
 }

src/test/java/com/rabbitmq/perf/DatadogMetricsTest.java

@@ -91,7 +91,7 @@ public void metricsShouldBeSentToDatadogHttpEndpoint() throws Exception {
         registry.config().commonTags("host", "test");
         AtomicInteger gauge = new AtomicInteger(42);
         Gauge.builder("dummy", gauge, g -> g.doubleValue()).description("this is a dummy meter").register(registry);
-        metrics.configure(new ConfigurationContext(cmd, registry, null, null, null));
+        metrics.configure(new ConfigurationContext(cmd, registry, null, null, null, null));
 
         assertTrue(latch.await(10, TimeUnit.SECONDS), NB_REQUESTS + " metrics requests should have been sent by now");
 

src/test/java/com/rabbitmq/perf/JmxMetricsTest.java

@@ -55,7 +55,7 @@ public void metricsShouldBeExposedAsMbeans() throws Exception {
         CompositeMeterRegistry registry = new CompositeMeterRegistry();
         AtomicInteger metric = registry.gauge("dummy", new AtomicInteger(0));
         metric.set(42);
-        metrics.configure(new ConfigurationContext(cmd, registry, null, null, null));
+        metrics.configure(new ConfigurationContext(cmd, registry, null, null, null, null));
 
         MBeanServer server = ManagementFactory.getPlatformMBeanServer();
         Set<ObjectName> objectNames = server.queryNames(new ObjectName("*:name=dummy"), null);

src/test/java/com/rabbitmq/perf/PrometheusMetricsTest.java

@@ -50,7 +50,7 @@ public void prometheusHttpEndpointExposed() throws Exception {
         CompositeMeterRegistry registry = new CompositeMeterRegistry();
         AtomicInteger metric = registry.gauge("dummy", new AtomicInteger(0));
         metric.set(42);
-        metrics.configure(new ConfigurationContext(cmd, registry, null, null, null));
+        metrics.configure(new ConfigurationContext(cmd, registry, null, null, null, null));
 
         URL url = new URL("http://localhost:" + port + "/metrics");
         HttpURLConnection con = (HttpURLConnection) url.openConnection();