(accumulo) 01/01: Merge branch '2.1' into 3.1

[kturner]

This is an automated email from the ASF dual-hosted git repository.

kturner pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit c57baa93aba7c4e5e46de7f2c7774a7af17058ba
Merge: bf3e480662 93e44ec2ad
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Mon Oct 7 15:40:30 2024 +0000

    Merge branch '2.1' into 3.1

 assemble/conf/log4j2-service.properties            |   3 +
 pom.xml                                            |   8 +-
 .../java/org/apache/accumulo/manager/Manager.java  |   8 +-
 .../util/logging/AccumuloMonitorAppender.java      | 130 +++++++++++++++++++--
 4 files changed, 134 insertions(+), 15 deletions(-)

diff --cc pom.xml
index 148a1b3d34,a47435ace4..0406128385
--- a/pom.xml
+++ b/pom.xml
@@@ -150,7 -150,8 +150,8 @@@
      <version.bouncycastle>1.78.1</version.bouncycastle>
      <version.curator>5.5.0</version.curator>
      <version.errorprone>2.24.1</version.errorprone>
 -    <version.hadoop>3.3.6</version.hadoop>
 +    <version.hadoop>3.4.0</version.hadoop>
+     <version.log4j>2.24.0</version.log4j>
      <version.opentelemetry>1.34.1</version.opentelemetry>
      <version.powermock>2.0.9</version.powermock>
      <version.slf4j>2.0.12</version.slf4j>
diff --cc 
server/monitor/src/main/java/org/apache/accumulo/monitor/util/logging/AccumuloMonitorAppender.java
index dce3917910,f6f575eac0..7619e49bd2
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/logging/AccumuloMonitorAppender.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/logging/AccumuloMonitorAppender.java
@@@ -45,8 -51,11 +52,9 @@@ import org.apache.logging.log4j.core.Lo
  import org.apache.logging.log4j.core.appender.AbstractAppender;
  import org.apache.logging.log4j.core.config.Property;
  import org.apache.logging.log4j.core.config.plugins.Plugin;
+ import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute;
  import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
  
 -import com.google.gson.Gson;
 -
  import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
  
  /**
@@@ -74,8 -119,16 +118,15 @@@ public class AccumuloMonitorAppender ex
  
    }
  
-   private final HttpClient httpClient = HttpClient.newHttpClient();
 -  private final Gson gson = new Gson();
+   private final HttpClient httpClient;
    private final Supplier<Optional<URI>> monitorLocator;
+   private final ThreadPoolExecutor executor;
+   private final boolean async;
+   private final int queueSize;
+   private final AtomicLong appends = new AtomicLong(0);
+   private final AtomicLong discards = new AtomicLong(0);
+   private final AtomicLong errors = new AtomicLong(0);
+   private final ConcurrentMap<Integer,AtomicLong> statusCodes = new 
ConcurrentSkipListMap<>();
  
    private ServerContext context;
    private String path;