diff --git a/pom.xml b/pom.xml
index e079632..5674094 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
https://github.com/apache/accumulo-proxy/actions
- 2.1.3
+ 2.1.4
contrib/Eclipse-Accumulo-Codestyle.xml
@@ -98,7 +98,7 @@
11
11
true
- 2.0.12
+ 2.0.17
source-release-tar
src/main/spotbugs/exclude-filter.xml
0.17.0
@@ -108,14 +108,14 @@
io.micrometer
micrometer-bom
- 1.12.2
+ 1.14.5
pom
import
org.apache.logging.log4j
log4j-bom
- 2.23.1
+ 2.24.3
pom
import
@@ -131,7 +131,7 @@
com.github.spotbugs
spotbugs-annotations
- 4.8.3
+ 4.9.3
true
@@ -143,7 +143,7 @@
com.google.guava
guava
- 32.0.0-jre
+ 33.4.6-jre
commons-lang
@@ -222,13 +222,13 @@
org.easymock
easymock
- 5.1.0
+ 5.5.0
test
org.junit.jupiter
junit-jupiter-api
- 5.10.1
+ 5.12.1
test
diff --git a/src/main/java/org/apache/accumulo/proxy/Proxy.java b/src/main/java/org/apache/accumulo/proxy/Proxy.java
index 631320c..ae2df7b 100644
--- a/src/main/java/org/apache/accumulo/proxy/Proxy.java
+++ b/src/main/java/org/apache/accumulo/proxy/Proxy.java
@@ -25,7 +25,6 @@
import java.io.UncheckedIOException;
import java.nio.file.Files;
import java.util.Collection;
-import java.util.List;
import java.util.Properties;
import org.apache.accumulo.core.cli.Help;
@@ -61,7 +60,6 @@
import com.google.auto.service.AutoService;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Tag;
@AutoService(KeywordExecutable.class)
@@ -267,8 +265,8 @@ public static ServerAddress createProxyServer(HostAndPort address,
serverSocketTimeout, address);
}
- // TODO: This MetricsInfo is a stub Metrics Info to allow the timed processor to build. If Metrics
- // are wanted or needed in a later version of the proxy, this can be updated.
+ // This MetricsInfo is a stub MetricsInfo to allow the timed processor to build.
+ // Issue #85 in the GitHub regards updating this with a proper implementation.
static private class ProxyMetricsInfo implements MetricsInfo {
@Override
@@ -276,44 +274,19 @@ public boolean isMetricsEnabled() {
return false;
}
- @Override
- public void addServiceTags(String applicationName, HostAndPort hostAndPort) {
- throw new UnsupportedOperationException("Unimplemented method 'addServiceTags'");
- }
-
- @Override
- public void addCommonTags(List updates) {
- throw new UnsupportedOperationException("Unimplemented method 'addCommonTags'");
- }
-
- @Override
- public Collection getCommonTags() {
- throw new UnsupportedOperationException("Unimplemented method 'getCommonTags'");
- }
-
- @Override
- public void addRegistry(MeterRegistry registry) {
- throw new UnsupportedOperationException("Unimplemented method 'addRegistry'");
- }
-
@Override
public void addMetricsProducers(MetricsProducer... producer) {
return;
}
@Override
- public void init() {
- throw new UnsupportedOperationException("Unimplemented method 'init'");
- }
-
- @Override
- public MeterRegistry getRegistry() {
- throw new UnsupportedOperationException("Unimplemented method 'getRegistry'");
+ public void close() {
+ throw new UnsupportedOperationException("Unimplemented method 'close'");
}
@Override
- public void close() {
- throw new UnsupportedOperationException("Unimplemented method 'close'");
+ public void init(Collection commonTags) {
+ throw new UnsupportedOperationException("Unimplemented method 'init'");
}
}
diff --git a/src/main/java/org/apache/accumulo/proxy/TServerUtils.java b/src/main/java/org/apache/accumulo/proxy/TServerUtils.java
index 6c4af19..fe24f5d 100644
--- a/src/main/java/org/apache/accumulo/proxy/TServerUtils.java
+++ b/src/main/java/org/apache/accumulo/proxy/TServerUtils.java
@@ -505,11 +505,11 @@ public static ServerAddress startTServer(ThriftServerType serverType, TimedProce
final TServer finalServer = serverAddress.server;
- Threads.createThread(threadName, () -> {
+ Threads.createNonCriticalThread(threadName, () -> {
try {
finalServer.serve();
} catch (Error e) {
- Halt.halt("Unexpected error in TThreadPoolServer " + e + ", halting.", 1);
+ Halt.halt(1, "Unexpected error in TThreadPoolServer " + e + ", halting.");
}
}).start();