From ffdf32ae5f6b0de53fe245386c366d5608f71270 Mon Sep 17 00:00:00 2001
From: Ben Evans <beevans@redhat.com>
Date: Fri, 16 Feb 2024 15:40:22 +0100
Subject: [PATCH] Close out MWTELE-108 (#26)

* Workaround lack of dynamic level change in SimpleLogger. Only sm0l crimes committed.

* Do what we can for JWS

* Bump version number, prepare for RC1
---
 pom.xml                                                |  5 ++++-
 .../java/com/redhat/insights/agent/AgentSubreport.java | 10 +++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 937a71d..cb3d0c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.redhat.insights</groupId>
   <artifactId>runtimes-agent</artifactId>
-  <version>0.9.3-SNAPSHOT</version>
+  <version>0.9.5-SNAPSHOT</version>
 
   <name>Red Hat Insights Java Agent</name>
   <description>Red Hat Insights Java Agent</description>
@@ -370,6 +370,9 @@
                 <relocation>
                   <pattern>org.apache</pattern>
                   <shadedPattern>${shade.prefix}.org.apache</shadedPattern>
+                  <excludes>
+                    <exclude>org.apache.catalina.**</exclude>
+                  </excludes>
                 </relocation>
                 <relocation>
                   <pattern>org.slf4j</pattern>
diff --git a/src/main/java/com/redhat/insights/agent/AgentSubreport.java b/src/main/java/com/redhat/insights/agent/AgentSubreport.java
index ac0f484..0e24e15 100644
--- a/src/main/java/com/redhat/insights/agent/AgentSubreport.java
+++ b/src/main/java/com/redhat/insights/agent/AgentSubreport.java
@@ -36,7 +36,7 @@ public class AgentSubreport implements InsightsSubreport {
     activeGuesses.put("org.jboss.modules.Module", AgentSubreport::fingerprintJBoss);
     activeGuesses.put(
         "io.quarkus.bootstrap.runner.QuarkusEntryPoint", AgentSubreport::fingerprintQuarkus);
-    activeGuesses.put("org.apache.catalina.Server", AgentSubreport::fingerprintTomcat);
+    activeGuesses.put("org.apache.catalina.startup.Bootstrap", AgentSubreport::fingerprintTomcat);
   }
 
   private AgentSubreport(ClasspathJarInfoSubreport jarsReport) {
@@ -80,10 +80,14 @@ private void fingerprintReflectively(Collection<JarInfo> jarInfos) {
     }
   }
 
-  static String fingerprintTomcat(Class<?> qClazz) {
+  // We can't reflectively call org.apache.catalina.util.ServerInfo.getServerNumber() for more info
+  // as this class is not included in minimal installs of JWS
+  static String fingerprintTomcat(Class<?> __) {
+    // We recommend, but don't mandate, the use of Vault in JWS so we can't use it as a definitive
+    // fingerprint
     try {
       Class.forName("org.apache.tomcat.vault.VaultInteraction");
-    } catch (ClassNotFoundException __) {
+    } catch (ClassNotFoundException _x) {
       return "Tomcat";
     }
     return "JWS";