SOLR-17638 Some CLI errors not logged when starting prometheus exporter

Author: stillalex

solr/packaging/test/bats_helper.bash

@@ -64,7 +64,9 @@ shutdown_all() {
 
 shutdown_exporter(){
   EXPORTER_PID=$(ps auxww | grep org.apache.solr.prometheus.exporter.SolrExporter | awk "/-classpath/"' {print $2}' | sort -r)
-  kill -9 $EXPORTER_PID
+  if [[ -n $EXPORTER_PID ]]; then
+    kill -9 $EXPORTER_PID
+  fi
 }
 
 delete_all_collections() {

solr/packaging/test/test_prometheus.bats

@@ -48,3 +48,9 @@ teardown() {
   assert_output --partial 'core="COLL_NAME"'
   assert_output --partial 'bats-test'
 }
+
+@test "unrecognized option logging" {
+  run ! solr-exporter --unknown-option unknown-option
+
+  assert_output --partial 'Unrecognized option: --unknown-option'
+}

solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java

@@ -148,7 +148,7 @@ public static void main(String[] args) {
             .argName("BASE_URL")
             .type(String.class)
             .desc(
-                "Specify the Solr base URL when connecting to Solr in standalone mode. If omitted both the -b parameter and the -z parameter, connect to http://localhost:8983/solr. For example 'http://localhost:8983/solr'.")
+                "Specify the Solr base URL when connecting to Solr in standalone mode. If omitted both the -s parameter and the -z parameter, connect to http://localhost:8983/solr. For example 'http://localhost:8983/solr'.")
             .build();
     mainOptions.addOption(solrUrlOption);
 
@@ -241,7 +241,7 @@ public static void main(String[] args) {
             .argName("ZK_HOST")
             .type(String.class)
             .desc(
-                "Specify the ZooKeeper connection string when connecting to Solr in SolrCloud mode. If omitted both the -b parameter and the -z parameter, connect to http://localhost:8983/solr. For example 'localhost:2181/solr'.")
+                "Specify the ZooKeeper connection string when connecting to Solr in SolrCloud mode. If omitted both the -s parameter and the -z parameter, connect to http://localhost:8983/solr. For example 'localhost:2181/solr'.")
             .build();
     mainOptions.addOption(zkHostOption);
 
@@ -270,13 +270,15 @@ public static void main(String[] args) {
         String baseUrl = commandLine.getOptionValue(solrUrlOption);
         defaultClusterId = makeShortHash(baseUrl);
         scrapeConfiguration = SolrScrapeConfiguration.standalone(baseUrl);
-      }
-
-      if (scrapeConfiguration == null) {
-        log.error(
-            "Must provide either --{} or --{}",
+      } else {
+        log.info(
+            "No --{} or --{} provided, defaulting to {}",
             solrUrlOption.getLongOpt(),
-            zkHostOption.getLongOpt());
+            zkHostOption.getLongOpt(),
+            DEFAULT_BASE_URL);
+        String baseUrl = DEFAULT_BASE_URL;
+        defaultClusterId = makeShortHash(baseUrl);
+        scrapeConfiguration = SolrScrapeConfiguration.standalone(baseUrl);
       }
 
       int port = commandLine.getParsedOptionValue(portOption, DEFAULT_PORT);
@@ -321,9 +323,11 @@ public static void main(String[] args) {
           clusterId,
           scrapeConfiguration);
     } catch (IOException e) {
-      log.error("Failed to start Solr Prometheus Exporter: ", e);
+      log.error("Failed to start Solr Prometheus Exporter: {}", e.getMessage());
+      exit(1);
     } catch (ParseException e) {
-      log.error("Failed to parse command line arguments: ", e);
+      log.error("Failed to parse command line arguments: {}", e.getMessage());
+      exit(1);
     }
   }
 
@@ -349,4 +353,13 @@ private static MetricsConfiguration loadMetricsConfiguration(String configPath)
   private static String getSystemVariable(String name) {
     return System.getProperty(name, System.getenv(name));
   }
+
+  public static void exit(int exitStatus) {
+    try {
+      System.exit(exitStatus);
+    } catch (java.lang.SecurityException secExc) {
+      if (exitStatus != 0)
+        throw new RuntimeException("SolrExporter failed to exit with status " + exitStatus);
+    }
+  }
 }