Misc. small changes.

- Add os details from base (oshi)
- Add netstat from base (oshi)
- Update 3rd party dependencies
- Bump version

client/build.gradle

@@ -3,9 +3,9 @@ import org.redline_rpm.header.Os
 plugins {
     id 'application'
 
-    id "com.github.johnrengelman.shadow" version "7.0.0"
+    id "com.github.johnrengelman.shadow" version "7.1.0"
-    id "net.nemerosa.versioning" version "2.14.0"
+    id "net.nemerosa.versioning" version "2.15.1"
-    id "nebula.ospackage" version "8.6.1"
+    id "nebula.ospackage" version "9.0.0"
 }
 
 dependencies {

client/src/main/java/sysmon/client/Application.java

@@ -8,9 +8,8 @@ import org.slf4j.impl.SimpleLogger;
 import picocli.CommandLine;
 
 import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
 import java.net.URL;
+import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.concurrent.Callable;
 
@@ -40,7 +39,7 @@ public class Application implements Callable<Integer> {
 
 
     @Override
-    public Integer call() throws IOException {
+    public Integer call() {
 
         String sysmonDebug = System.getProperty("sysmon.debug");
         if(sysmonDebug != null || enableDebug) {
@@ -61,7 +60,7 @@ public class Application implements Callable<Integer> {
             try {
                 hostname = InetAddress.getLocalHost().getHostName();
             } catch (UnknownHostException e) {
-                System.err.println("Could not detect hostname. Use the '-n' or '--hostname' option to specify it.");
+                System.err.println("Could not detect hostname. Use the '-n' or '--hostname' option to specify.");
                 return -1;
             }
         }

gradle.properties

@@ -1,6 +1,6 @@
-version=0.1.6
+version=0.1.7
 pf4jVersion=3.6.0
 slf4jVersion=1.7.32
-camelVersion=3.11.3
+camelVersion=3.11.4
-picocliVersion=4.6.1
+picocliVersion=4.6.2
-oshiVersion=5.8.3
+oshiVersion=5.8.5

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
+
-cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        MAX_FD=$( ulimit -H -n ) ||
-            MAX_FD="$MAX_FD_LIMIT"
+            warn "Could not query maximum file descriptor limit"
-        fi
+    esac
-        ulimit -n $MAX_FD
+    case $MAX_FD in  #(
-        if [ $? -ne 0 ] ; then
+      '' | soft) :;; #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+      *)
-        fi
+        ulimit -n "$MAX_FD" ||
-    else
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=`save "$@"`
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

plugins/build.gradle

@@ -1,7 +1,7 @@
 import org.redline_rpm.header.Os
 
 plugins {
-    id "nebula.ospackage" version "8.6.1"
+    id "nebula.ospackage" version "9.0.0"
 }
 
 
@@ -48,7 +48,7 @@ subprojects {
             attributes(
                     'Plugin-Id'         : "${pluginId}",
                     'Plugin-Class'      : "${pluginClass}",
-                    'Plugin-Version'    : "${version}",
+                    'Plugin-Version'    : "${archiveVersion}",
                     'Plugin-Provider'   : "System Monitor",
                     'Plugin-Description': "${pluginDescription}"
             )

plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixNetstatExtension.java

@@ -83,8 +83,8 @@ public class AixNetstatExtension implements MetricExtension  {
     @Override
     public MetricResult getMetrics() throws Exception {
 
-        HashMap<String, String> tagsMap = null;
+        HashMap<String, String> tagsMap;
-        HashMap<String, Object> fieldsMap = null;
+        HashMap<String, Object> fieldsMap;
 
         try (InputStream buf = PluginHelper.executeCommand("netstat -s -f inet")) {
             AixNetstatParser parser = processCommandOutput(buf);

plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixProcessorStat.java

@@ -86,8 +86,8 @@ public class AixProcessorStat {
 
         //String lparstat = lines.get(lines.size() -1);
         String[] splitStr = Objects.requireNonNull(lastLine).trim().split("\\s+");
-        if(type.equalsIgnoreCase("shared") && splitStr.length < 9 ||
+        if(type == null || (type.equalsIgnoreCase("shared") && splitStr.length < 9) ||
-                type.equalsIgnoreCase("dedicated") && splitStr.length < 8) {
+                (type.equalsIgnoreCase("dedicated") && splitStr.length < 8) ) {
             throw new UnsupportedOperationException("lparstat string error: " + lastLine);
         }
 

plugins/os-base/src/main/java/sysmon/plugins/os_base/BasePlugin.java

@@ -4,6 +4,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.pf4j.Plugin;
 import org.pf4j.PluginWrapper;
+import oshi.PlatformEnum;
 import oshi.SystemInfo;
 import oshi.hardware.HardwareAbstractionLayer;
 
@@ -30,7 +31,8 @@ public class BasePlugin extends Plugin {
             }
 
         } catch (UnsupportedOperationException e) {
-            log.warn(e.getMessage());
+            log.warn("getHardwareAbstractionLayer() - {}", e.getMessage());
+            return null;
         }
 
         return hardwareAbstractionLayer;
@@ -43,9 +45,10 @@ public class BasePlugin extends Plugin {
             if(systemInfo == null) {
                 systemInfo = new SystemInfo();
             }
-
+            systemInfo.getOperatingSystem();
         } catch (UnsupportedOperationException e) {
-            log.warn(e.getMessage());
+            log.warn("getSystemInfo() - {}", e.getMessage());
+            return null;
         }
 
         return systemInfo;

plugins/os-ibmi/README.md

@@ -1,4 +1,4 @@
 # IBM i Plugin
 
-TODO. Nothing here yet.
+This is just for testing purposes.
 

plugins/os-ibmi/src/main/java/sysmon/plugins/os_ibmi/IbmIPlugin.java

@@ -1,18 +1,66 @@
 package sysmon.plugins.os_ibmi;
 
+import com.ibm.as400.access.AS400;
+import com.ibm.as400.access.SystemStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.pf4j.Plugin;
 import org.pf4j.PluginWrapper;
+import oshi.SystemInfo;
+import oshi.hardware.HardwareAbstractionLayer;
 
 public class IbmIPlugin extends Plugin {
 
     private static final Logger log = LoggerFactory.getLogger(IbmIPlugin.class);
 
+    private static SystemStatus systemStatus;
+    private static AS400 as400;
+
     public IbmIPlugin(PluginWrapper wrapper) {
         super(wrapper);
     }
 
+
+    public static SystemStatus getSystemStatus() {
+
+        try {
+            if (as400 == null) {
+                as400 = IbmIPlugin.getAS400();
+            }
+            if(systemStatus == null) {
+                systemStatus = new SystemStatus(as400);
+            }
+        } catch (Exception exception) {
+            log.error("getSystemStatus() - {}", exception.getMessage());
+            return null;
+        }
+
+        return systemStatus;
+    }
+
+
+    public static AS400 getAS400() {
+
+        String osArch = System.getProperty("os.arch").toLowerCase();
+        String osName = System.getProperty("os.name").toLowerCase();
+
+        if(!osArch.equals("ppc64") && !osName.equals("os/400")) {
+            log.info("getAS400() - OS Arch: {}", osArch);
+            log.info("getAS400() - OS Name: {}", osName);
+            return null;
+        }
+
+        try {
+            as400 = new AS400("localhost", "*CURRENT");
+            //as400 = new AS400("10.32.64.142");
+        } catch (Exception exception) {
+            log.error("getAS400() - {}", exception.getMessage());
+            return null;
+        }
+
+        return as400;
+    }
+
 }
 
 

plugins/os-ibmi/src/main/java/sysmon/plugins/os_ibmi/TestExtension.java

@@ -4,13 +4,14 @@ import com.ibm.as400.access.*;
 import org.pf4j.Extension;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import sysmon.shared.Measurement;
 import sysmon.shared.MetricExtension;
 import sysmon.shared.MetricResult;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 
-// Disable for now...
 //@Extension
 public class TestExtension implements MetricExtension {
 
@@ -25,7 +26,6 @@ public class TestExtension implements MetricExtension {
     private boolean enabled = true;
     private boolean threaded = false;
 
-    private AS400 as400;
     private SystemStatus systemStatus;
 
 
@@ -41,29 +41,8 @@ public class TestExtension implements MetricExtension {
 
     @Override
     public boolean isSupported() {
-
+        systemStatus = IbmIPlugin.getSystemStatus();
-        String osArch = System.getProperty("os.arch").toLowerCase();
+        return systemStatus != null;
-        String osName = System.getProperty("os.name").toLowerCase();
-
-        System.err.println("OS Arch: " + osArch);
-        System.err.println("OS Name: " + osName);
-
-        try {
-            //as400 = new AS400("localhost", "CURRENT");
-            as400 = new AS400("10.32.64.142");
-            systemStatus = new SystemStatus(as400);
-        } catch (Exception exception) {
-            log.error(exception.getMessage());
-        }
-
-        if(as400.isLocal()) {
-            log.info("as400 isLocal() true");
-        } else {
-            log.info("as400 isLocal() FALSE");
-        }
-
-
-        return true;
     }
 
     @Override
@@ -101,22 +80,32 @@ public class TestExtension implements MetricExtension {
 
         try {
             int jobsInSystem = systemStatus.getJobsInSystem();
-            log.info("Jobs In System: " + jobsInSystem);
+            log.info("Jobs In System: {}", jobsInSystem);
 
             int batchJobsRunning = systemStatus.getBatchJobsRunning();
-            log.info("Batch Jobs Running: " + batchJobsRunning);
+            log.info("Batch Jobs Running: {}", batchJobsRunning);
 
             int activeThreads = systemStatus.getActiveThreadsInSystem();
-            log.info("Active Threads: " + activeThreads);
+            log.info("Active Threads: {}", activeThreads);
 
             int activeJobs = systemStatus.getActiveJobsInSystem();
-            log.info("Active Jobs: " + activeJobs);
+            log.info("Active Jobs: {}", activeJobs);
 
             int onlineUsers = systemStatus.getUsersCurrentSignedOn();
-            log.info("Online Users: " + onlineUsers);
+            log.info("Online Users: {}", onlineUsers);
+
+            HashMap<String, Object> fieldsMap = new HashMap<String, Object>() {{
+                put("jobs_total", jobsInSystem);
+                put("jobs_running", batchJobsRunning);
+                put("jobs_active", activeJobs);
+                put("threads", activeThreads);
+                put("users", onlineUsers);
+
+            }};
+            return new MetricResult(name, new Measurement(new HashMap<>(), fieldsMap));
 
         } catch (AS400SecurityException | ErrorCompletingRequestException | InterruptedException | IOException | ObjectDoesNotExistException e) {
-            log.error(e.getMessage());
+            log.error("getMetrics() {}", e.getMessage());
             e.printStackTrace();
         }
 

server/build.gradle

@@ -3,9 +3,9 @@ import org.redline_rpm.header.Os
 plugins {
     id 'application'
 
-    id "com.github.johnrengelman.shadow" version "7.0.0"
+    id "com.github.johnrengelman.shadow" version "7.1.0"
-    id "net.nemerosa.versioning" version "2.14.0"
+    id "net.nemerosa.versioning" version "2.15.1"
-    id "nebula.ospackage" version "8.6.1"
+    id "nebula.ospackage" version "9.0.0"
 }
 
 dependencies {